components/stunnel/patches/stunnel-4.29-authpriv.patch
changeset 1252 86b53be32d7c
parent 1131 4c414ada49de
equal deleted inserted replaced
1251:f1fb66b52f41 1252:86b53be32d7c
     1 diff -urNp stunnel-4.29-orig/doc/stunnel.8 stunnel-4.29/doc/stunnel.8
     1 # Make the 'authpriv' syslog facility the default on Solaris
     2 --- stunnel-4.29-orig/doc/stunnel.8	2009-11-20 15:50:52.000000000 -0500
     2 #
     3 +++ stunnel-4.29/doc/stunnel.8	2009-12-09 16:44:25.000000000 -0500
     3 
     4 @@ -169,7 +169,7 @@ info (6), or debug (7).  All logs for th
     4 diff -u -r stunnel-4.55.orig/doc/stunnel.fr.pod stunnel-4.55/doc/stunnel.fr.pod
     5  all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
     5 --- stunnel-4.55.orig/doc/stunnel.fr.pod	2012-12-02 11:00:24.000000000 -0800
     6  \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
     6 +++ stunnel-4.55/doc/stunnel.fr.pod	2013-03-21 22:30:02.672293057 -0700
     7  .Sp
     7 @@ -178,7 +178,7 @@
     8 -The syslog facility 'daemon' will be used unless a facility name is supplied.
     8  B<debug = 7> donneront le maximum d'informations. La valeur par défaut
     9 +The syslog facility 'authpriv' will be used unless a facility name is supplied.
     9  est notice (5).
    10  (Facilities are not supported on Win32.)
    10  
    11  .Sp
    11 -La facilité syslog «E<nbsp>daemonE<nbsp>» est utilisée, sauf si un autre nom est spécifié
    12  Case is ignored for both facilities and levels.
    12 +La facilité syslog «E<nbsp>authprivE<nbsp>» est utilisée, sauf si un autre nom est spécifié
    13 diff -urNp stunnel-4.29-orig/doc/stunnel.html stunnel-4.29/doc/stunnel.html
    13  (Win32 ne permet pas l'usage des facilités.)
    14 --- stunnel-4.29-orig/doc/stunnel.html	2009-11-20 15:50:52.000000000 -0500
    14  
    15 +++ stunnel-4.29/doc/stunnel.html	2009-12-09 16:43:09.000000000 -0500
    15  La casse est ignorée, aussi bien pour la facilité que pour le niveau.
    16 @@ -192,7 +192,7 @@ emerg (0), alert (1), crit (2), err (3),
    16 diff -u -r stunnel-4.55.orig/doc/stunnel.pod stunnel-4.55/doc/stunnel.pod
    17  info (6), or debug (7).  All logs for the specified level and
    17 --- stunnel-4.55.orig/doc/stunnel.pod	2013-01-13 09:25:20.000000000 -0800
    18  all levels numerically less than it will be shown.  Use <strong>debug = debug</strong> or
    18 +++ stunnel-4.55/doc/stunnel.pod	2013-03-21 22:28:04.473314299 -0700
    19  <strong>debug = 7</strong> for greatest debugging output.  The default is notice (5).</p>
    19 @@ -184,7 +184,7 @@
    20 -<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
    20  all levels numerically less than it will be shown.  Use I<debug = debug> or
    21 +<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
    21  I<debug = 7> for greatest debugging output.  The default is notice (5).
    22  (Facilities are not supported on Win32.)</p>
       
    23  <p>Case is ignored for both facilities and levels.</p>
       
    24  </dd>
       
    25 diff -urNp stunnel-4.29-orig/doc/stunnel.pod stunnel-4.29/doc/stunnel.pod
       
    26 --- stunnel-4.29-orig/doc/stunnel.pod	2009-11-20 15:48:33.000000000 -0500
       
    27 +++ stunnel-4.29/doc/stunnel.pod	2009-12-09 16:43:52.000000000 -0500
       
    28 @@ -144,7 +144,7 @@ info (6), or debug (7).  All logs for th
       
    29  all levels numerically less than it will be shown.  Use B<debug = debug> or
       
    30  B<debug = 7> for greatest debugging output.  The default is notice (5).
       
    31  
    22  
    32 -The syslog facility 'daemon' will be used unless a facility name is supplied.
    23 -The syslog facility 'daemon' will be used unless a facility name is supplied.
    33 +The syslog facility 'authpriv' will be used unless a facility name is supplied.
    24 +The syslog facility 'authpriv' will be used unless a facility name is supplied.
    34  (Facilities are not supported on Win32.)
    25  (Facilities are not supported on Win32.)
    35  
    26  
    36  Case is ignored for both facilities and levels.
    27  Case is ignored for both facilities and levels.
    37 diff -urNp stunnel-4.29-orig/src/options.c stunnel-4.29/src/options.c
    28 diff -u -r stunnel-4.55.orig/src/options.c stunnel-4.55/src/options.c
    38 --- stunnel-4.29-orig/src/options.c	2009-11-20 15:55:12.000000000 -0500
    29 --- stunnel-4.55.orig/src/options.c	2013-02-02 08:20:32.000000000 -0800
    39 +++ stunnel-4.29/src/options.c	2009-12-09 16:45:57.000000000 -0500
    30 +++ stunnel-4.55/src/options.c	2013-03-21 22:27:13.163038368 -0700
    40 @@ -136,8 +136,12 @@ static char *global_options(CMD cmd, cha
    31 @@ -185,8 +185,12 @@
    41      case CMD_INIT:
    32      case CMD_BEGIN:
    42          options.debug_level=5;
    33          new_global_options.debug_level=LOG_NOTICE;
    43  #if !defined (USE_WIN32) && !defined (__vms)
    34  #if !defined (USE_WIN32) && !defined (__vms)
    44 +#if defined(LOG_AUTHPRIV)
    35 +#if defined(LOG_AUTHPRIV)
    45 +        options.facility=LOG_AUTHPRIV;
    36 +        new_global_options.facility=LOG_AUTHPRIV;
    46 +#else
    37 +#else
    47          options.facility=LOG_DAEMON;
    38          new_global_options.facility=LOG_DAEMON;
    48  #endif
    39  #endif
    49 +#endif
    40 +#endif
    50          break;
    41          break;
    51      case CMD_EXEC:
    42      case CMD_EXEC:
    52          if(strcasecmp(opt, "debug"))
    43          if(strcasecmp(opt, "debug"))