svn commit: samba r21905 - in branches: SAMBA_3_0/source/nsswitch
SAMBA_3_0/source/param SAMBA_3_0_25/source/nsswitch
SAMBA_3_0_25/source/param SAMBA_3_0_RELEASE/source/nsswitch
SAMBA_3_0_RELEASE/source/param
jerry at samba.org
jerry at samba.org
Wed Mar 21 15:21:30 GMT 2007
Author: jerry
Date: 2007-03-21 15:21:28 +0000 (Wed, 21 Mar 2007)
New Revision: 21905
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21905
Log:
Rename
idmap expire time -> idmap cache time
idmap negative time -> idmap negative cache time
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap_cache.c
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_25/source/nsswitch/idmap_cache.c
branches/SAMBA_3_0_25/source/param/loadparm.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_cache.c
branches/SAMBA_3_0_RELEASE/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_cache.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_cache.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -103,7 +103,7 @@
NTSTATUS idmap_cache_set(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_expire_time();
+ time_t timeout = time(NULL) + lp_idmap_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *idkey;
@@ -219,7 +219,7 @@
NTSTATUS idmap_cache_set_negative_sid(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *valstr;
@@ -258,7 +258,7 @@
NTSTATUS idmap_cache_set_negative_id(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *idkey;
char *valstr;
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -310,8 +310,8 @@
int client_signing;
int server_signing;
int iUsershareMaxShares;
- int iIdmapExpireTime;
- int iIdmapNegativeTime;
+ int iIdmapCacheTime;
+ int iIdmapNegativeCacheTime;
BOOL bResetOnZeroVC;
int iKeepalive;
@@ -1270,8 +1270,8 @@
{"idmap domains", P_LIST, P_GLOBAL, &Globals.szIdmapDomains, NULL, NULL, FLAG_ADVANCED},
{"idmap backend", P_LIST, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED },
{"idmap alloc backend", P_STRING, P_GLOBAL, &Globals.szIdmapAllocBackend, NULL, NULL, FLAG_ADVANCED},
- {"idmap expire time", P_INTEGER, P_GLOBAL, &Globals.iIdmapExpireTime, NULL, NULL, FLAG_ADVANCED},
- {"idmap negative time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapCacheTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap negative cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeCacheTime, NULL, NULL, FLAG_ADVANCED},
{"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED },
{"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE },
{"idmap gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED },
@@ -1635,8 +1635,8 @@
Globals.bWinbindRefreshTickets = False;
Globals.bWinbindOfflineLogon = False;
- Globals.iIdmapExpireTime = 900; /* 15 minutes by default */
- Globals.iIdmapNegativeTime = 120; /* 2 minutes by default */
+ Globals.iIdmapCacheTime = 900; /* 15 minutes by default */
+ Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
Globals.bPassdbExpandExplicit = False;
@@ -1903,8 +1903,8 @@
FN_GLOBAL_LIST(lp_idmap_domains, &Globals.szIdmapDomains)
FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */
FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
-FN_GLOBAL_INTEGER(lp_idmap_expire_time, &Globals.iIdmapExpireTime)
-FN_GLOBAL_INTEGER(lp_idmap_negative_time, &Globals.iIdmapNegativeTime)
+FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
+FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_INTEGER(lp_keepalive, &Globals.iKeepalive)
FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit)
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_cache.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_cache.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_cache.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -103,7 +103,7 @@
NTSTATUS idmap_cache_set(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_expire_time();
+ time_t timeout = time(NULL) + lp_idmap_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *idkey;
@@ -219,7 +219,7 @@
NTSTATUS idmap_cache_set_negative_sid(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *valstr;
@@ -258,7 +258,7 @@
NTSTATUS idmap_cache_set_negative_id(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *idkey;
char *valstr;
Modified: branches/SAMBA_3_0_25/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0_25/source/param/loadparm.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0_25/source/param/loadparm.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -310,8 +310,8 @@
int client_signing;
int server_signing;
int iUsershareMaxShares;
- int iIdmapExpireTime;
- int iIdmapNegativeTime;
+ int iIdmapCacheTime;
+ int iIdmapNegativeCacheTime;
BOOL bResetOnZeroVC;
param_opt_struct *param_opt;
@@ -1271,8 +1271,8 @@
{"idmap domains", P_LIST, P_GLOBAL, &Globals.szIdmapDomains, NULL, NULL, FLAG_ADVANCED},
{"idmap backend", P_LIST, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED },
{"idmap alloc backend", P_STRING, P_GLOBAL, &Globals.szIdmapAllocBackend, NULL, NULL, FLAG_ADVANCED},
- {"idmap expire time", P_INTEGER, P_GLOBAL, &Globals.iIdmapExpireTime, NULL, NULL, FLAG_ADVANCED},
- {"idmap negative time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapCacheTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap negative cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeCacheTime, NULL, NULL, FLAG_ADVANCED},
{"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED },
{"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE },
{"idmap gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED },
@@ -1637,8 +1637,8 @@
Globals.bWinbindRefreshTickets = False;
Globals.bWinbindOfflineLogon = False;
- Globals.iIdmapExpireTime = 900; /* 15 minutes by default */
- Globals.iIdmapNegativeTime = 120; /* 2 minutes by default */
+ Globals.iIdmapCacheTime = 900; /* 15 minutes by default */
+ Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
Globals.bPassdbExpandExplicit = False;
@@ -1900,8 +1900,8 @@
FN_GLOBAL_LIST(lp_idmap_domains, &Globals.szIdmapDomains)
FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */
FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
-FN_GLOBAL_INTEGER(lp_idmap_expire_time, &Globals.iIdmapExpireTime)
-FN_GLOBAL_INTEGER(lp_idmap_negative_time, &Globals.iIdmapNegativeTime)
+FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
+FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit)
FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_cache.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_cache.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_cache.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -103,7 +103,7 @@
NTSTATUS idmap_cache_set(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_expire_time();
+ time_t timeout = time(NULL) + lp_idmap_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *idkey;
@@ -219,7 +219,7 @@
NTSTATUS idmap_cache_set_negative_sid(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *sidkey;
char *valstr;
@@ -258,7 +258,7 @@
NTSTATUS idmap_cache_set_negative_id(struct idmap_cache_ctx *cache, const struct id_map *id)
{
NTSTATUS ret;
- time_t timeout = time(NULL) + lp_idmap_negative_time();
+ time_t timeout = time(NULL) + lp_idmap_negative_cache_time();
TDB_DATA keybuf, databuf;
char *idkey;
char *valstr;
Modified: branches/SAMBA_3_0_RELEASE/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/param/loadparm.c 2007-03-21 14:13:42 UTC (rev 21904)
+++ branches/SAMBA_3_0_RELEASE/source/param/loadparm.c 2007-03-21 15:21:28 UTC (rev 21905)
@@ -310,8 +310,8 @@
int client_signing;
int server_signing;
int iUsershareMaxShares;
- int iIdmapExpireTime;
- int iIdmapNegativeTime;
+ int iIdmapCacheTime;
+ int iIdmapNegativeCacheTime;
BOOL bResetOnZeroVC;
param_opt_struct *param_opt;
@@ -1271,8 +1271,8 @@
{"idmap domains", P_LIST, P_GLOBAL, &Globals.szIdmapDomains, NULL, NULL, FLAG_ADVANCED},
{"idmap backend", P_LIST, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED },
{"idmap alloc backend", P_STRING, P_GLOBAL, &Globals.szIdmapAllocBackend, NULL, NULL, FLAG_ADVANCED},
- {"idmap expire time", P_INTEGER, P_GLOBAL, &Globals.iIdmapExpireTime, NULL, NULL, FLAG_ADVANCED},
- {"idmap negative time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapCacheTime, NULL, NULL, FLAG_ADVANCED},
+ {"idmap negative cache time", P_INTEGER, P_GLOBAL, &Globals.iIdmapNegativeCacheTime, NULL, NULL, FLAG_ADVANCED},
{"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED },
{"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE },
{"idmap gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED },
@@ -1637,8 +1637,8 @@
Globals.bWinbindRefreshTickets = False;
Globals.bWinbindOfflineLogon = False;
- Globals.iIdmapExpireTime = 900; /* 15 minutes by default */
- Globals.iIdmapNegativeTime = 120; /* 2 minutes by default */
+ Globals.iIdmapCacheTime = 900; /* 15 minutes by default */
+ Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
Globals.bPassdbExpandExplicit = False;
@@ -1900,8 +1900,8 @@
FN_GLOBAL_LIST(lp_idmap_domains, &Globals.szIdmapDomains)
FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */
FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
-FN_GLOBAL_INTEGER(lp_idmap_expire_time, &Globals.iIdmapExpireTime)
-FN_GLOBAL_INTEGER(lp_idmap_negative_time, &Globals.iIdmapNegativeTime)
+FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
+FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit)
FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
More information about the samba-cvs
mailing list