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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-03-09 09:46:48 +0000 (Sun, 09 Mar 2008)
New Revision: 1751

Modified:
   trunk/samba/debian/patches/smbpasswd-syslog.patch
Log:
Cleaner patch


Modified: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-03-09 09:15:49 UTC (rev 1750)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch	2008-03-09 09:46:48 UTC (rev 1751)
@@ -313,13 +313,13 @@
  	if ( retval != PAM_SUCCESS ) {
  		if (on( SMB_DEBUG, ctrl )) {
 -			_log_err(LOG_DEBUG, "auth: could not identify user");
-+		  _log_err(pamh, LOG_DEBUG, "auth: could not identify user");
++			_log_err(pamh, LOG_DEBUG, "auth: could not identify user");
  		}
  		AUTH_RETURN;
  	}
  	if (on( SMB_DEBUG, ctrl )) {
 -		_log_err( LOG_DEBUG, "username [%s] obtained", name );
-+	  _log_err(pamh, LOG_DEBUG, "username [%s] obtained", name );
++		_log_err(pamh, LOG_DEBUG, "username [%s] obtained", name );
  	}
  
  	if (geteuid() != 0) {
@@ -328,7 +328,7 @@
  
  	if (!initialize_password_db(True)) {
 -		_log_err( LOG_ALERT, "Cannot access samba password database" );
-+	  _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
++		_log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
  		retval = PAM_AUTHINFO_UNAVAIL;
  		AUTH_RETURN;
  	}
@@ -336,7 +336,7 @@
  	sampass = samu_new( NULL );
      	if (!sampass) {
 -		_log_err( LOG_ALERT, "Cannot talloc a samu struct" );
-+	  _log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct" );
++		_log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct" );
  		retval = nt_status_to_pam(NT_STATUS_NO_MEMORY);
  		AUTH_RETURN;
  	}
@@ -381,7 +381,7 @@
  	in_client = True;
  
 -	ctrl = set_ctrl( flags, argc, argv );
-+	ctrl = set_ctrl(pamh, flags, argc, argv);
++	ctrl = set_ctrl(pamh, flags, argc, argv );
  
  	/* get the username */
  
@@ -389,13 +389,13 @@
  	if (retval != PAM_SUCCESS) {
  		if (on( SMB_DEBUG, ctrl )) {
 -			_log_err( LOG_DEBUG, "acct: could not identify user" );
-+		  _log_err(pamh, LOG_DEBUG, "acct: could not identify user" );
++			_log_err(pamh, LOG_DEBUG, "acct: could not identify user" );
  		}
  		return retval;
  	}
  	if (on( SMB_DEBUG, ctrl )) {
 -		_log_err( LOG_DEBUG, "acct: username [%s] obtained", name );
-+	  _log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name );
++		_log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name );
  	}
  
  	if (geteuid() != 0) {
@@ -404,7 +404,7 @@
  	oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
  	if (!initialize_password_db(True)) {
 -		_log_err( LOG_ALERT, "Cannot access samba password database" );
-+	  _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
++		_log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
  		CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
  		return PAM_AUTHINFO_UNAVAIL;
  	}