46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
Author: gd
|
|
Revision: r23121
|
|
Modified: source/Makefile.in source/pam_smbpass/general.h source/pam_smbpass/pam_smb_acct.c source/pam_smbpass/pam_smb_auth.c source/pam_smbpass/pam_smb_passwd.c /branches/SAMBA_3_0_25/source/Makefile.in /branches/SAMBA_3_0_25/source/pam_smbpass/general.h /branches/SAMBA_3_0_26/source/Makefile.in /branches/SAMBA_3_0_26/source/pam_smbpass/general.h
|
|
Added:
|
|
Removed:
|
|
|
|
|
|
Fix Bug #2727 and let pam_smbpass at least link and dlopen correctly again.
|
|
|
|
Thanks to Bartlomiej Solarz-Niesluchowski <Bartlomiej.Solarz-Niesluchowski@wit.edu.pl>.
|
|
|
|
Guenther
|
|
|
|
|
|
Index: source/Makefile.in
|
|
===================================================================
|
|
--- source/Makefile.in (revision 23120)
|
|
+++ source/Makefile.in (revision 23121)
|
|
@@ -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 \
|
|
- $(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/general.h
|
|
===================================================================
|
|
--- source/pam_smbpass/general.h (revision 23120)
|
|
+++ source/pam_smbpass/general.h (revision 23121)
|
|
@@ -121,7 +121,7 @@
|
|
|
|
struct _pam_failed_auth {
|
|
char *user; /* user that's failed to be authenticated */
|
|
- int id; /* uid of requested user */
|
|
+ uid_t id; /* uid of requested user */
|
|
char *agent; /* attempt from user with name */
|
|
int count; /* number of failures so far */
|
|
};
|