[Pkg-samba-maint] r1888 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-05-22 14:51:34 +0000 (Thu, 22 May 2008)
New Revision: 1888

Modified:
   trunk/samba/debian/patches/smbpasswd-syslog.patch
Log:
Two more lines to change


Modified: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-05-22 12:11:01 UTC (rev 1887)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-05-22 14:51:34 UTC (rev 1888)
@@ -308,7 +308,7 @@
  
  	/* Get a few bytes so we can pass our return value to
  		pam_sm_setcred(). */
-@@ -93,12 +92,12 @@
+@@ -93,29 +92,29 @@
  	retval = pam_get_user( pamh, &name, "Username: " );
  	if ( retval != PAM_SUCCESS ) {
  		if (on( SMB_DEBUG, ctrl )) {
@@ -323,7 +323,10 @@
  	}
  
  	if (geteuid() != 0) {
-@@ -108,14 +107,14 @@
+-		_log_err(LOG_DEBUG, "Cannot access samba password database, not running as root.");
++		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
+ 		retval = PAM_AUTHINFO_UNAVAIL;
+ 		AUTH_RETURN;
  	}
  
  	if (!initialize_password_db(True)) {
@@ -373,7 +376,7 @@
 ===================================================================
 --- samba-3.0.29.orig/source/pam_smbpass/pam_smb_acct.c
 +++ samba-3.0.29/source/pam_smbpass/pam_smb_acct.c
-@@ -52,22 +52,21 @@
+@@ -52,26 +52,25 @@
  
  	/* Samba initialization. */
  	load_case_tables();
@@ -399,6 +402,11 @@
  	}
  
  	if (geteuid() != 0) {
+-		_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
++		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
+ 		return PAM_AUTHINFO_UNAVAIL;
+ 	}
+ 
 @@ -79,7 +78,7 @@
  		from a SIGPIPE it's not expecting */
  	oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
@@ -444,7 +452,7 @@
  
      /*
       * First get the name of a user.  No need to do anything if we can't
-@@ -117,12 +116,12 @@
+@@ -117,16 +116,16 @@
      retval = pam_get_user( pamh, &user, "Username: " );
      if (retval != PAM_SUCCESS) {
          if (on( SMB_DEBUG, ctrl )) {
@@ -459,6 +467,11 @@
      }
  
      if (geteuid() != 0) {
+-	_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
++	_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
+ 	return PAM_AUTHINFO_UNAVAIL;
+     }
+ 
 @@ -135,7 +134,7 @@
      oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);