87c3c6d11e
From-source-git-commit: cdddaac47cf2c136edd1fcd572d286425263de4d Signed-off-by: Clemens Lang <cllang@redhat.com>
74 lines
3.0 KiB
Diff
74 lines
3.0 KiB
Diff
From 9cd8694f2b742e46370d38c34a53523c1aafae93 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Mraz <tmraz@fedoraproject.org>
|
|
Date: Mon, 12 Sep 2022 11:07:38 +0200
|
|
Subject: [PATCH 1/8] Apply patch stunnel-5.50-authpriv.patch
|
|
|
|
Patch-name: stunnel-5.50-authpriv.patch
|
|
Patch-id: 0
|
|
From-dist-git-commit: 70b3076eb09912b3a11f371b8c523303114fffa3
|
|
---
|
|
doc/stunnel.8.in | 2 +-
|
|
doc/stunnel.html.in | 2 +-
|
|
doc/stunnel.pod.in | 2 +-
|
|
src/options.c | 4 ++++
|
|
4 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/doc/stunnel.8.in b/doc/stunnel.8.in
|
|
index d5de80b..a56f0b7 100644
|
|
--- a/doc/stunnel.8.in
|
|
+++ b/doc/stunnel.8.in
|
|
@@ -204,7 +204,7 @@ info (6), or debug (7). All logs for the specified level and
|
|
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 --git a/doc/stunnel.html.in b/doc/stunnel.html.in
|
|
index 4f84d5c..608afa9 100644
|
|
--- a/doc/stunnel.html.in
|
|
+++ b/doc/stunnel.html.in
|
|
@@ -244,7 +244,7 @@
|
|
|
|
<p>Level is 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 --git a/doc/stunnel.pod.in b/doc/stunnel.pod.in
|
|
index 0246f82..840c708 100644
|
|
--- a/doc/stunnel.pod.in
|
|
+++ b/doc/stunnel.pod.in
|
|
@@ -192,7 +192,7 @@ 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> 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 --git a/src/options.c b/src/options.c
|
|
index 9ac9c7e..5007f83 100644
|
|
--- a/src/options.c
|
|
+++ b/src/options.c
|
|
@@ -1878,7 +1878,11 @@ NOEXPORT const char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr
|
|
case CMD_SET_DEFAULTS:
|
|
section->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_SET_COPY:
|
|
--
|
|
2.37.3
|
|
|