From b7b6bea48609b78dea593fffe1f1abd36e4c7bdf Mon Sep 17 00:00:00 2001 From: Guenther Deschner Date: Tue, 29 May 2007 14:47:45 +0000 Subject: [PATCH] Fix pam_smbpass patch. Guenther --- samba-3.0.25a-pam_smbpass.patch | 48 ++++----------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/samba-3.0.25a-pam_smbpass.patch b/samba-3.0.25a-pam_smbpass.patch index f1c07b5..c94e0d0 100644 --- a/samba-3.0.25a-pam_smbpass.patch +++ b/samba-3.0.25a-pam_smbpass.patch @@ -16,44 +16,20 @@ Index: source/Makefile.in =================================================================== --- source/Makefile.in (revision 23120) +++ source/Makefile.in (revision 23121) -@@ -751,9 +751,9 @@ +@@ -750,10 +750,10 @@ + $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ +- pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ - $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ ++ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o +PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ - $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) + $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(ERRORMAP_OBJ) - IDMAP_OBJ = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@ - -Index: source/pam_smbpass/pam_smb_auth.c -=================================================================== ---- source/pam_smbpass/pam_smb_auth.c (revision 23120) -+++ source/pam_smbpass/pam_smb_auth.c (revision 23121) -@@ -109,7 +109,7 @@ - _log_err( LOG_DEBUG, "username [%s] obtained", name ); - } + IDMAP_OBJ = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@ -- if (!initialize_password_db(True)) { -+ if (!initialize_password_db(True, NULL)) { - _log_err( LOG_ALERT, "Cannot access samba password database" ); - retval = PAM_AUTHINFO_UNAVAIL; - AUTH_RETURN; -Index: source/pam_smbpass/pam_smb_passwd.c -=================================================================== ---- source/pam_smbpass/pam_smb_passwd.c (revision 23120) -+++ source/pam_smbpass/pam_smb_passwd.c (revision 23121) -@@ -137,7 +137,7 @@ - from a SIGPIPE it's not expecting */ - oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); - -- if (!initialize_password_db(False)) { -+ if (!initialize_password_db(False, NULL)) { - _log_err( LOG_ALERT, "Cannot access samba password database" ); - CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler); - return PAM_AUTHINFO_UNAVAIL; Index: source/pam_smbpass/general.h =================================================================== --- source/pam_smbpass/general.h (revision 23120) @@ -67,17 +43,3 @@ Index: source/pam_smbpass/general.h char *agent; /* attempt from user with name */ int count; /* number of failures so far */ }; -Index: source/pam_smbpass/pam_smb_acct.c -=================================================================== ---- source/pam_smbpass/pam_smb_acct.c (revision 23120) -+++ source/pam_smbpass/pam_smb_acct.c (revision 23121) -@@ -81,7 +81,7 @@ - /* Getting into places that might use LDAP -- protect the app - from a SIGPIPE it's not expecting */ - oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); -- if (!initialize_password_db(True)) { -+ if (!initialize_password_db(True, NULL)) { - _log_err( LOG_ALERT, "Cannot access samba password database" ); - CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler); - return PAM_AUTHINFO_UNAVAIL; -