[Pkg-samba-maint] r2118 - in trunk/samba: . debian/patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-08-11 17:56:39 +0000 (Mon, 11 Aug 2008)
New Revision: 2118

Modified:
   trunk/samba/
   trunk/samba/debian/patches/smbpasswd-syslog.patch
Log:
patch update for 3.2.1


Property changes on: trunk/samba
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-08-11 13:16:48.421000004 -0300
committer: Steve Langasek <vorlon at debian.org>
properties: 
	branch-nick: samba.deb

   + timestamp: 2008-08-11 14:56:21.832999945 -0300
committer: Steve Langasek <vorlon at debian.org>
properties: 
	branch-nick: samba.deb

Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWTAzeBkAAA5RgAAQABC6yR4AIAAxTAAA0nqA9RtJaDAREhvTa9c1PHSHfi7kinChIGBm8DI.
   - 332 vorlon at debian.org-20080721232950-4j05wu8r6shw8swy
333 vorlon at debian.org-20080722004048-on37vpdqp2t66hcq
341 vorlon at debian.org-20080811161648-19y9ic2eqzk5krz0

   + 332 vorlon at debian.org-20080721232950-4j05wu8r6shw8swy
333 vorlon at debian.org-20080722004048-on37vpdqp2t66hcq
341 vorlon at debian.org-20080811161648-19y9ic2eqzk5krz0
342 vorlon at debian.org-20080811175621-543yhn2j18uxw9as


Modified: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-08-11 16:20:09 UTC (rev 2117)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-08-11 17:56:39 UTC (rev 2118)
@@ -4,10 +4,10 @@
 
 Upstream status: submitted as bugzilla bug #4831
 
-Index: samba-3.2.1/source/pam_smbpass/support.c
+Index: samba.deb/source/pam_smbpass/support.c
 ===================================================================
---- samba-3.2.1.orig/source/pam_smbpass/support.c
-+++ samba-3.2.1/source/pam_smbpass/support.c
+--- samba.deb.orig/source/pam_smbpass/support.c
++++ samba.deb/source/pam_smbpass/support.c
 @@ -14,6 +14,7 @@
   * this program; if not, see <http://www.gnu.org/licenses/>.
   */
@@ -172,7 +172,7 @@
          return PAM_AUTH_ERR;
      }
      strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
-@@ -388,14 +413,14 @@
+@@ -388,31 +413,31 @@
                          retval = PAM_MAXTRIES;
                      }
                  } else {
@@ -189,7 +189,11 @@
                        "failed auth request by %s for service %s as %s",
                        uidtoname(getuid()),
                        service ? service : "**unknown**", name);
-@@ -405,14 +430,14 @@
+ 		}		
+-                newauth->user = smbpXstrDup( name );
+-                newauth->agent = smbpXstrDup( uidtoname( getuid() ) );
++                newauth->user = smbpXstrDup( pamh, name );
++                newauth->agent = smbpXstrDup( pamh, uidtoname( getuid() ) );
                  pam_set_data( pamh, data_name, newauth, _cleanup_failures );
  
              } else {
@@ -277,10 +281,10 @@
  	}
  	make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
  				"No password supplied" : "Password unchanged" );
-Index: samba-3.2.1/source/pam_smbpass/pam_smb_auth.c
+Index: samba.deb/source/pam_smbpass/pam_smb_auth.c
 ===================================================================
---- samba-3.2.1.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.2.1/source/pam_smbpass/pam_smb_auth.c
+--- samba.deb.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba.deb/source/pam_smbpass/pam_smb_auth.c
 @@ -81,10 +81,9 @@
  
  	/* Samba initialization. */
@@ -355,10 +359,10 @@
  			, "pam_get_item returned error to pam_sm_authenticate" );
  		return PAM_AUTHTOK_RECOVER_ERR;
  	} else if (pass == NULL) {
-Index: samba-3.2.1/source/pam_smbpass/pam_smb_acct.c
+Index: samba.deb/source/pam_smbpass/pam_smb_acct.c
 ===================================================================
---- samba-3.2.1.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.2.1/source/pam_smbpass/pam_smb_acct.c
+--- samba.deb.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba.deb/source/pam_smbpass/pam_smb_acct.c
 @@ -58,26 +58,25 @@
  
  	/* Samba initialization. */
@@ -419,10 +423,10 @@
  		}
  		make_remark( pamh, ctrl, PAM_ERROR_MSG
  			, "Your account has been disabled; "
-Index: samba-3.2.1/source/pam_smbpass/pam_smb_passwd.c
+Index: samba.deb/source/pam_smbpass/pam_smb_passwd.c
 ===================================================================
---- samba-3.2.1.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.2.1/source/pam_smbpass/pam_smb_passwd.c
+--- samba.deb.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba.deb/source/pam_smbpass/pam_smb_passwd.c
 @@ -106,10 +106,9 @@
  
      /* Samba initialization. */
@@ -559,10 +563,10 @@
          retval = PAM_ABORT;
  
      }
-Index: samba-3.2.1/source/pam_smbpass/support.h
+Index: samba.deb/source/pam_smbpass/support.h
 ===================================================================
---- samba-3.2.1.orig/source/pam_smbpass/support.h
-+++ samba-3.2.1/source/pam_smbpass/support.h
+--- samba.deb.orig/source/pam_smbpass/support.h
++++ samba.deb/source/pam_smbpass/support.h
 @@ -1,8 +1,8 @@
  /* syslogging function for errors and other information */
 -extern void _log_err(int, const char *, ...);