svn commit: samba r12726 - in trunk/source/nsswitch: .

gd at samba.org gd at samba.org
Thu Jan 5 16:50:42 GMT 2006


Author: gd
Date: 2006-01-05 16:50:40 +0000 (Thu, 05 Jan 2006)
New Revision: 12726

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12726

Log:
use the same krb5 renewal time also in the refresh-handler.

Guenther


Modified:
   trunk/source/nsswitch/winbindd.h
   trunk/source/nsswitch/winbindd_cred_cache.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: trunk/source/nsswitch/winbindd.h
===================================================================
--- trunk/source/nsswitch/winbindd.h	2006-01-05 16:43:56 UTC (rev 12725)
+++ trunk/source/nsswitch/winbindd.h	2006-01-05 16:50:40 UTC (rev 12726)
@@ -316,7 +316,7 @@
 
 #define WINBINDD_ESTABLISH_LOOP 30
 #define WINBINDD_RESCAN_FREQ 300
-
+#define WINBINDD_PAM_AUTH_KRB5_RENEW_TIME 2592000 /* one month */
 #define DOM_SEQUENCE_NONE ((uint32)-1)
 
 #endif /* _WINBINDD_H */

Modified: trunk/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cred_cache.c	2006-01-05 16:43:56 UTC (rev 12725)
+++ trunk/source/nsswitch/winbindd_cred_cache.c	2006-01-05 16:50:40 UTC (rev 12726)
@@ -112,7 +112,7 @@
 					      &entry->renew_until,
 					      entry->ccname,
 					      False, /* no PAC required anymore */
-					      1); /* request a renewable ticket */
+					      WINBINDD_PAM_AUTH_KRB5_RENEW_TIME);
 		seteuid(0);
 
 		if (ret) {

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2006-01-05 16:43:56 UTC (rev 12725)
+++ trunk/source/nsswitch/winbindd_pam.c	2006-01-05 16:50:40 UTC (rev 12726)
@@ -498,7 +498,7 @@
 					   &renewal_until,
 					   cc, 
 					   True,
-					   2592000); /* one month (30 days) */
+					   WINBINDD_PAM_AUTH_KRB5_RENEW_TIME);
 
 	if (krb5_ret) {
 		DEBUG(1,("winbindd_raw_kerberos_login: kinit failed for '%s' with: %s (%d)\n", 



More information about the samba-cvs mailing list