| author | pkidd <patrick.kidd@oracle.com> |
| Thu, 10 Mar 2016 08:38:19 -0800 | |
| branch | s11u3-sru |
| changeset 5573 | 56564f280aba |
| parent 2723 | 138732f62341 |
| permissions | -rw-r--r-- |
|
2723
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# Make the 'authpriv' syslog facility the default on Solaris |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
diff -u -r stunnel-4.55.orig/doc/stunnel.fr.pod stunnel-4.55/doc/stunnel.fr.pod |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- stunnel-4.55.orig/doc/stunnel.fr.pod 2012-12-02 11:00:24.000000000 -0800 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ stunnel-4.55/doc/stunnel.fr.pod 2013-03-21 22:30:02.672293057 -0700 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -178,7 +178,7 @@ |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
B<debug = 7> donneront le maximum d'informations. La valeur par défaut |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
est notice (5). |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
-La facilité syslog «E<nbsp>daemonE<nbsp>» est utilisée, sauf si un autre nom est spécifié |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+La facilité syslog «E<nbsp>authprivE<nbsp>» est utilisée, sauf si un autre nom est spécifié |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
(Win32 ne permet pas l'usage des facilités.) |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
|
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
La casse est ignorée, aussi bien pour la facilité que pour le niveau. |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
diff -u -r stunnel-4.55.orig/doc/stunnel.pod stunnel-4.55/doc/stunnel.pod |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
--- stunnel-4.55.orig/doc/stunnel.pod 2013-01-13 09:25:20.000000000 -0800 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+++ stunnel-4.55/doc/stunnel.pod 2013-03-21 22:28:04.473314299 -0700 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
@@ -184,7 +184,7 @@ |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
all levels numerically less than it will be shown. Use I<debug = debug> or |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
I<debug = 7> for greatest debugging output. The default is notice (5). |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
|
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
-The syslog facility 'daemon' will be used unless a facility name is supplied. |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+The syslog facility 'authpriv' will be used unless a facility name is supplied. |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
(Facilities are not supported on Win32.) |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
|
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
Case is ignored for both facilities and levels. |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
diff -u -r stunnel-4.55.orig/src/options.c stunnel-4.55/src/options.c |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
--- stunnel-4.55.orig/src/options.c 2013-02-02 08:20:32.000000000 -0800 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+++ stunnel-4.55/src/options.c 2013-03-21 22:27:13.163038368 -0700 |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
@@ -185,8 +185,12 @@ |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
case CMD_BEGIN: |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
new_global_options.debug_level=LOG_NOTICE; |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
#if !defined (USE_WIN32) && !defined (__vms) |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
+#if defined(LOG_AUTHPRIV) |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
+ new_global_options.facility=LOG_AUTHPRIV; |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
+#else |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
new_global_options.facility=LOG_DAEMON; |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
#endif |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
+#endif |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
break; |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
case CMD_EXEC: |
|
138732f62341
17219320 Various Userland components should be back-ported to 11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
43 |
if(strcasecmp(opt, "debug")) |