rpms/samba
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix pam_smbpass patch.

Browse Source 
Guenther
This commit is contained in:
Guenther Deschner 2007-05-29 14:47:45 +00:00
parent 6210744402
commit b7b6bea486
1 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
samba-3.0.25a-pam_smbpass.patch
View File

@ -16,11 +16,13 @@ Index: source/Makefile.in
=================================================================== ===================================================================
--- source/Makefile.in (revision 23120) --- source/Makefile.in (revision 23120)
+++ source/Makefile.in (revision 23121) +++ 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_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) \ - $(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) \ +PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
- $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) - $(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
@ -28,32 +30,6 @@ Index: source/Makefile.in
IDMAP_OBJ = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@ 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 );
}
- 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 Index: source/pam_smbpass/general.h
=================================================================== ===================================================================
--- source/pam_smbpass/general.h (revision 23120) --- source/pam_smbpass/general.h (revision 23120)
@ -67,17 +43,3 @@ Index: source/pam_smbpass/general.h
char *agent; /* attempt from user with name */ char *agent; /* attempt from user with name */
int count; /* number of failures so far */ 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;