svn commit: samba r4256 - in branches/SAMBA_3_0/source: lib param

[vlendec at samba.org]

Author: vlendec
Date: 2004-12-17 11:42:10 +0000 (Fri, 17 Dec 2004)
New Revision: 4256

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

Log:
Add a patch from kllin at it.su.se: New Parameter 'afs token lifetime' tells the
AFS client when to throw away a token.

Thanks,

Volker

Modified:
   branches/SAMBA_3_0/source/lib/afs.c
   branches/SAMBA_3_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/afs.c
===================================================================
--- branches/SAMBA_3_0/source/lib/afs.c	2004-12-17 10:22:34 UTC (rev 4255)
+++ branches/SAMBA_3_0/source/lib/afs.c	2004-12-17 11:42:10 UTC (rev 4256)
@@ -139,7 +139,11 @@
 	SIVAL(p, 0, now);
 	ct->BeginTimestamp = now;
 
-	ct->EndTimestamp = now + (255*60*5);
+	if(lp_afs_token_lifetime() == 0)
+		ct->EndTimestamp = NEVERDATE;
+	else
+		ct->EndTimestamp = now + lp_afs_token_lifetime();
+
 	if (((ct->EndTimestamp - ct->BeginTimestamp) & 1) == 1) {
 		ct->BeginTimestamp += 1; /* Lifetime must be even */
 	}

Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2004-12-17 10:22:34 UTC (rev 4255)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2004-12-17 11:42:10 UTC (rev 4256)
@@ -127,6 +127,7 @@
 	char *szSocketOptions;
 	char *szRealm;
 	char *szAfsUsernameMap;
+	int iAfsTokenLifetime;
 	char *szUsernameMap;
 	char *szLogonScript;
 	char *szLogonPath;
@@ -1125,6 +1126,7 @@
 	{"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL, NULL, FLAG_ADVANCED}, 
 	{"homedir map", P_STRING, P_GLOBAL, &Globals.szNISHomeMapName, NULL, NULL, FLAG_ADVANCED}, 
 	{"afs username map", P_STRING, P_GLOBAL, &Globals.szAfsUsernameMap, NULL, NULL, FLAG_ADVANCED}, 
+	{"afs token lifetime", P_INTEGER, P_GLOBAL, &Globals.iAfsTokenLifetime, NULL, NULL, FLAG_ADVANCED},
 	{"time offset", P_INTEGER, P_GLOBAL, &extra_time_offset, NULL, NULL, FLAG_ADVANCED}, 
 	{"NIS homedir", P_BOOL, P_GLOBAL, &Globals.bNISHomeMap, NULL, NULL, FLAG_ADVANCED}, 
 	{"-valid", P_BOOL, P_LOCAL, &sDefault.valid, NULL, NULL, FLAG_HIDE}, 
@@ -1474,6 +1476,11 @@
 	Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
 	Globals.ldap_timeout = LDAP_CONNECT_DEFAULT_TIMEOUT;
 
+	/* This is what we tell the afs client. in reality we set the token 
+	 * to never expire, though, when this runs out the afs client will 
+	 * forget the token. Set to 0 to get NEVERDATE.*/
+	Globals.iAfsTokenLifetime = 604800;
+
 /* these parameters are set to defaults that are more appropriate
    for the increasing samba install base:
 
@@ -1647,6 +1654,7 @@
 FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
 FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
 FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
+FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)
 FN_GLOBAL_STRING(lp_username_map, &Globals.szUsernameMap)
 FN_GLOBAL_CONST_STRING(lp_logon_script, &Globals.szLogonScript)
 FN_GLOBAL_CONST_STRING(lp_logon_path, &Globals.szLogonPath)