svn commit: samba r23121 - in branches: SAMBA_3_0/source
SAMBA_3_0/source/pam_smbpass SAMBA_3_0_25/source
SAMBA_3_0_25/source/pam_smbpass SAMBA_3_0_26/source
SAMBA_3_0_26/source/pam_smbpass
gd at samba.org
gd at samba.org
Thu May 24 20:26:08 GMT 2007
Author: gd
Date: 2007-05-24 20:26:07 +0000 (Thu, 24 May 2007)
New Revision: 23121
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23121
Log:
Fix Bug #2727 and let pam_smbpass at least link and dlopen correctly again.
Thanks to Bartlomiej Solarz-Niesluchowski <Bartlomiej.Solarz-Niesluchowski at wit.edu.pl>.
Guenther
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/pam_smbpass/general.h
branches/SAMBA_3_0/source/pam_smbpass/pam_smb_acct.c
branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
branches/SAMBA_3_0/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
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-05-24 20:26:07 UTC (rev 23121)
@@ -806,10 +806,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) $(LDB_OBJ)
+ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ)
IDMAP_OBJ = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@
Modified: branches/SAMBA_3_0/source/pam_smbpass/general.h
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/general.h 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0/source/pam_smbpass/general.h 2007-05-24 20:26:07 UTC (rev 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 */
};
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_acct.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_acct.c 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_acct.c 2007-05-24 20:26:07 UTC (rev 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;
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c 2007-05-24 20:26:07 UTC (rev 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;
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c 2007-05-24 20:26:07 UTC (rev 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;
Modified: branches/SAMBA_3_0_25/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_25/source/Makefile.in 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0_25/source/Makefile.in 2007-05-24 20:26:07 UTC (rev 23121)
@@ -751,9 +751,9 @@
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_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@
Modified: branches/SAMBA_3_0_25/source/pam_smbpass/general.h
===================================================================
--- branches/SAMBA_3_0_25/source/pam_smbpass/general.h 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0_25/source/pam_smbpass/general.h 2007-05-24 20:26:07 UTC (rev 23121)
@@ -113,7 +113,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 */
};
Modified: branches/SAMBA_3_0_26/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_26/source/Makefile.in 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0_26/source/Makefile.in 2007-05-24 20:26:07 UTC (rev 23121)
@@ -758,10 +758,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@
Modified: branches/SAMBA_3_0_26/source/pam_smbpass/general.h
===================================================================
--- branches/SAMBA_3_0_26/source/pam_smbpass/general.h 2007-05-24 18:12:32 UTC (rev 23120)
+++ branches/SAMBA_3_0_26/source/pam_smbpass/general.h 2007-05-24 20:26:07 UTC (rev 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 */
};
More information about the samba-cvs
mailing list