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 55ead617e20c4af0138847c3014d5328da91cfc1..1636cdfa58e743e1062dbd5424921e04eed5f521 100644 (file)
--- 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 c529948cc9a5dbc98a9af5c0cab2e848c273a796..b2cbbf1671f3bc724b47f91dffba9ee00bd46a6c 100644 (file)
--- 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;