diff options
| -rw-r--r-- | source3/nsswitch/idmap_cache.c | 6 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source3/nsswitch/idmap_cache.c b/source3/nsswitch/idmap_cache.c index caf5fe72b3..13cb9f7eb9 100644 --- a/source3/nsswitch/idmap_cache.c +++ b/source3/nsswitch/idmap_cache.c @@ -103,7 +103,7 @@ NTSTATUS idmap_cache_build_idkey(TALLOC_CTX *ctx, char **idkey, const struct id_ 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 @@ done: 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 @@ done: 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; diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5d3a9c0c0a..6392da6f07 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -310,8 +310,8 @@ typedef struct { int client_signing; int server_signing; int iUsershareMaxShares; - int iIdmapExpireTime; - int iIdmapNegativeTime; + int iIdmapCacheTime; + int iIdmapNegativeCacheTime; BOOL bResetOnZeroVC; int iKeepalive; @@ -1270,8 +1270,8 @@ static struct parm_struct parm_table[] = { {"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 @@ static void init_globals(BOOL first_time_only) 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_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames) 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) |