summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubulle <bubulle@alioth.debian.org>2008-03-09 09:46:48 +0000
committerbubulle <bubulle@alioth.debian.org>2008-03-09 09:46:48 +0000
commitdacf5e40848e20ce2bc4e7df5af475d5c2b5ccf8 (patch)
tree7db2a8c3fa07183371653c0f92020180551bbb5b
parent86ef3d46091fb14948b86db17fc96ae489e4d4e0 (diff)
downloadsamba-dacf5e40848e20ce2bc4e7df5af475d5c2b5ccf8.tar.gz
Cleaner patch
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1751 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r--patches/smbpasswd-syslog.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/smbpasswd-syslog.patch b/patches/smbpasswd-syslog.patch
index 1bd6c21c9b..6c5f73cc0d 100644
--- a/patches/smbpasswd-syslog.patch
+++ b/patches/smbpasswd-syslog.patch
@@ -313,13 +313,13 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_auth.c
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 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_auth.c
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 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_auth.c
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 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_acct.c
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 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_acct.c
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 @@ Index: samba-3.0.28a/source/pam_smbpass/pam_smb_acct.c
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;
}