6d23c36567
- 1155977: Fixed upstream too so removed the associated patch - Updates other patches too.
53 lines
2.9 KiB
Diff
53 lines
2.9 KiB
Diff
diff -urNp stunnel-5.15/doc/stunnel.8 stunnel-5.15-patched/doc/stunnel.8
|
|
--- stunnel-5.15/doc/stunnel.8 2015-04-16 05:49:52.000000000 -0400
|
|
+++ stunnel-5.15-patched/doc/stunnel.8 2015-04-27 10:34:34.504034442 -0400
|
|
@@ -209,7 +209,7 @@ info (6), or debug (7). All logs for th
|
|
all levels numerically less than it will be shown. Use \fIdebug = debug\fR or
|
|
\&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
|
|
.Sp
|
|
-The syslog facility 'daemon' will be used unless a facility name is supplied.
|
|
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
|
|
(Facilities are not supported on Win32.)
|
|
.Sp
|
|
Case is ignored for both facilities and levels.
|
|
diff -urNp stunnel-5.15/doc/stunnel.html stunnel-5.15-patched/doc/stunnel.html
|
|
--- stunnel-5.15/doc/stunnel.html 2015-04-16 05:49:52.000000000 -0400
|
|
+++ stunnel-5.15-patched/doc/stunnel.html 2015-04-27 10:34:34.504034442 -0400
|
|
@@ -214,7 +214,7 @@
|
|
|
|
<p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p>
|
|
|
|
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
|
|
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied. (Facilities are not supported on Win32.)</p>
|
|
|
|
<p>Case is ignored for both facilities and levels.</p>
|
|
|
|
diff -urNp stunnel-5.15/doc/stunnel.pod stunnel-5.15-patched/doc/stunnel.pod
|
|
--- stunnel-5.15/doc/stunnel.pod 2015-04-16 05:49:52.000000000 -0400
|
|
+++ stunnel-5.15-patched/doc/stunnel.pod 2015-04-27 10:34:34.505034430 -0400
|
|
@@ -197,7 +197,7 @@ info (6), or debug (7). All logs for th
|
|
all levels numerically less than it will be shown. Use I<debug = debug> or
|
|
I<debug = 7> for greatest debugging output. The default is notice (5).
|
|
|
|
-The syslog facility 'daemon' will be used unless a facility name is supplied.
|
|
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
|
|
(Facilities are not supported on Win32.)
|
|
|
|
Case is ignored for both facilities and levels.
|
|
diff -urNp stunnel-5.15/src/options.c stunnel-5.15-patched/src/options.c
|
|
--- stunnel-5.15/src/options.c 2015-04-16 05:49:52.000000000 -0400
|
|
+++ stunnel-5.15-patched/src/options.c 2015-04-27 10:34:34.505034430 -0400
|
|
@@ -470,8 +470,12 @@ NOEXPORT char *parse_global_option(CMD c
|
|
case CMD_BEGIN:
|
|
new_service_options.log_level=LOG_NOTICE;
|
|
#if !defined (USE_WIN32) && !defined (__vms)
|
|
+#if defined(LOG_AUTHPRIV)
|
|
+ new_global_options.log_facility=LOG_AUTHPRIV;
|
|
+#else
|
|
new_global_options.log_facility=LOG_DAEMON;
|
|
#endif
|
|
+#endif
|
|
break;
|
|
case CMD_EXEC:
|
|
if(strcasecmp(opt, "debug"))
|