From: Volker Lendecke <vl@samba.org>
Date: Fri, 11 Jul 2008 15:43:07 +0000 (+0200)
Subject: Revert "Slightly increase the default idmap cache time"
X-Git-Tag: samba-4.0.0alpha6~801^2~716
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ccdcce0b5627e082cf0cade2fc369a7611bcd5;p=thirdparty%2Fsamba.git

Revert "Slightly increase the default idmap cache time"

This reverts commit 448836d44d0468a74b962ba3c0b7d51de236374f.
(This used to be commit a9b29ab6b7503d6d30553a17219603a4f4cd3df9)
---

diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
index 55ead617e20..1636cdfa58e 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 c529948cc9a..b2cbbf1671f 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;