summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-07-11 17:43:07 +0200
committerVolker Lendecke <vl@samba.org>2008-07-11 17:53:24 +0200
commitd5ccdcce0b5627e082cf0cade2fc369a7611bcd5 (patch)
tree1ab7aef791df7cbc617cc99204fe5f3991ef6368
parentb6dcc24987c5c8790502c70687cb0c302333d12c (diff)
downloadsamba-d5ccdcce0b5627e082cf0cade2fc369a7611bcd5.tar.gz
samba-d5ccdcce0b5627e082cf0cade2fc369a7611bcd5.tar.bz2
samba-d5ccdcce0b5627e082cf0cade2fc369a7611bcd5.zip
Revert "Slightly increase the default idmap cache time"
This reverts commit 448836d44d0468a74b962ba3c0b7d51de236374f. (This used to be commit a9b29ab6b7503d6d30553a17219603a4f4cd3df9)
-rw-r--r--docs-xml/smbdotconf/winbind/idmapcachetime.xml2
-rw-r--r--source3/param/loadparm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
index 55ead617e2..1636cdfa58 100644
--- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
@@ -9,5 +9,5 @@
</para>
</description>
-<value type="default">604800 (i.e. 1 week)</value>
+<value type="default">900</value>
</samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c529948cc9..b2cbbf1671 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4827,7 +4827,7 @@ static void init_globals(bool first_time_only)
Globals.bWinbindRefreshTickets = False;
Globals.bWinbindOfflineLogon = False;
- Globals.iIdmapCacheTime = 7 * 24 * 3600; /* 1 week by default */
+ Globals.iIdmapCacheTime = 900; /* 15 minutes by default */
Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
Globals.bPassdbExpandExplicit = False;