Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/stunnel/patches/stunnel-4.29-authpriv.patch
author Rich Burridge <rich.burridge@oracle.com>
Wed, 23 Jan 2013 12:16:44 -0800
changeset 1131 4c414ada49de
child 1252 86b53be32d7c
permissions -rw-r--r--
16133924 Move stunnel from the Desktop consolidation to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1131
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
--- stunnel-4.29-orig/doc/stunnel.8	2009-11-20 15:50:52.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
+++ stunnel-4.29/doc/stunnel.8	2009-12-09 16:44:25.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
@@ -169,7 +169,7 @@ info (6), or debug (7).  All logs for th
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
 \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
 .Sp
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
-The syslog facility 'daemon' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
 (Facilities are not supported on Win32.)
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
 .Sp
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
 Case is ignored for both facilities and levels.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
diff -urNp stunnel-4.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
--- stunnel-4.29-orig/doc/stunnel.html	2009-11-20 15:50:52.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
+++ stunnel-4.29/doc/stunnel.html	2009-12-09 16:43:09.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
@@ -192,7 +192,7 @@ emerg (0), alert (1), crit (2), err (3),
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
 info (6), or debug (7).  All logs for the specified level and
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
 all levels numerically less than it will be shown.  Use <strong>debug = debug</strong> or
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
 <strong>debug = 7</strong> for greatest debugging output.  The default is notice (5).</p>
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    22
 
 (Facilities are not supported on Win32.)</p>
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    23
 
 <p>Case is ignored for both facilities and levels.</p>
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    24
 
 </dd>
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    25
 
diff -urNp stunnel-4.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    26
 
--- stunnel-4.29-orig/doc/stunnel.pod	2009-11-20 15:48:33.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    27
 
+++ stunnel-4.29/doc/stunnel.pod	2009-12-09 16:43:52.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    28
 
@@ -144,7 +144,7 @@ info (6), or debug (7).  All logs for th
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    29
 
 all levels numerically less than it will be shown.  Use B<debug = debug> or
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    30
 
 B<debug = 7> for greatest debugging output.  The default is notice (5).
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    31
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    32
 
-The syslog facility 'daemon' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    33
 
+The syslog facility 'authpriv' will be used unless a facility name is supplied.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    34
 
 (Facilities are not supported on Win32.)
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    35
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    36
 
 Case is ignored for both facilities and levels.
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    37
 
diff -urNp stunnel-4.29-orig/src/options.c stunnel-4.29/src/options.c
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    38
 
--- stunnel-4.29-orig/src/options.c	2009-11-20 15:55:12.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    39
 
+++ stunnel-4.29/src/options.c	2009-12-09 16:45:57.000000000 -0500
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    40
 
@@ -136,8 +136,12 @@ static char *global_options(CMD cmd, cha
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    41
 
     case CMD_INIT:
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    42
 
         options.debug_level=5;
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    43
 
 #if !defined (USE_WIN32) && !defined (__vms)
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    44
 
+#if defined(LOG_AUTHPRIV)
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    45
 
+        options.facility=LOG_AUTHPRIV;
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    46
 
+#else
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    47
 
         options.facility=LOG_DAEMON;
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    48
 
 #endif
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    49
 
+#endif
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    50
 
         break;
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    51
 
     case CMD_EXEC:
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    52
 
         if(strcasecmp(opt, "debug"))
upstream/oracle/userland-gate