svn commit: samba r24953 - in branches/SAMBA_3_2_0/source: lib
pam_smbpass
vlendec at samba.org
vlendec at samba.org
Tue Sep 4 14:10:25 GMT 2007
Author: vlendec
Date: 2007-09-04 14:10:23 +0000 (Tue, 04 Sep 2007)
New Revision: 24953
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24953
Log:
Merge r21785 and r23121:
Avoid an unnecessary gettimeofday() call
Volker
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_2_0/source/lib/smbldap.c
branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_acct.c
branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_auth.c
branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_passwd.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/smbldap.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/smbldap.c 2007-09-04 14:06:33 UTC (rev 24952)
+++ branches/SAMBA_3_2_0/source/lib/smbldap.c 2007-09-04 14:10:23 UTC (rev 24953)
@@ -1574,7 +1574,7 @@
state->idle_event = event_add_timed(
event_ctx, NULL,
- timeval_current_ofs(SMBLDAP_IDLE_TIME, 0),
+ timeval_add(now, SMBLDAP_IDLE_TIME, 0),
"smbldap_idle_fn", smbldap_idle_fn,
private_data);
return;
Modified: branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_acct.c
===================================================================
--- branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_acct.c 2007-09-04 14:06:33 UTC (rev 24952)
+++ branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_acct.c 2007-09-04 14:10:23 UTC (rev 24953)
@@ -80,7 +80,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_2_0/source/pam_smbpass/pam_smb_auth.c
===================================================================
--- branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_auth.c 2007-09-04 14:06:33 UTC (rev 24952)
+++ branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_auth.c 2007-09-04 14:10:23 UTC (rev 24953)
@@ -108,7 +108,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_2_0/source/pam_smbpass/pam_smb_passwd.c
===================================================================
--- branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_passwd.c 2007-09-04 14:06:33 UTC (rev 24952)
+++ branches/SAMBA_3_2_0/source/pam_smbpass/pam_smb_passwd.c 2007-09-04 14:10:23 UTC (rev 24953)
@@ -136,7 +136,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;
More information about the samba-cvs
mailing list