[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3834-g5caabdf

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  5caabdf64ea3d8ff0ff997a565b7708986c3d9d7 (commit)
       via  6b25b938824c544beed9d4a3aca0bd548587936e (commit)
      from  02836d45bc15d546f765f4f95c84d9b3ac5d4b57 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 5caabdf64ea3d8ff0ff997a565b7708986c3d9d7
Author: Volker Lendecke <vl at sernet.de>
Date:   Fri Aug 15 18:24:09 2008 +0200

    Increase the default positive idmap cache time to a week

commit 6b25b938824c544beed9d4a3aca0bd548587936e
Author: Volker Lendecke <vl at sernet.de>
Date:   Fri Aug 15 19:08:27 2008 +0200

    Move idmap_cache.c from winbindd/ to lib/

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/winbind/idmapcachetime.xml |    2 +-
 source/Makefile.in                             |    4 ++--
 source/{winbindd => lib}/idmap_cache.c         |    1 -
 source/param/loadparm.c                        |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename source/{winbindd => lib}/idmap_cache.c (99%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
index 1636cdf..ba52610 100644
--- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
@@ -9,5 +9,5 @@
 	</para>
 </description>
 
-<value type="default">900</value>
+<value type="default">604800 (one week)</value>
 </samba:parameter>
diff --git a/source/Makefile.in b/source/Makefile.in
index 5d814c5..486d47f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -339,7 +339,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
 	  lib/module.o lib/events.o lib/ldap_escape.o @CHARSET_STATIC@ \
 	  lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \
 	  libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \
-	  lib/file_id.o
+	  lib/file_id.o lib/idmap_cache.o
 
 LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o
 LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
@@ -980,7 +980,7 @@ PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_
 		$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
 		$(LDB_OBJ)
 
-IDMAP_OBJ     = winbindd/idmap.o winbindd/idmap_cache.o winbindd/idmap_util.o @IDMAP_STATIC@
+IDMAP_OBJ     = winbindd/idmap.o winbindd/idmap_util.o @IDMAP_STATIC@
 
 NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
 
diff --git a/source/winbindd/idmap_cache.c b/source/lib/idmap_cache.c
similarity index 99%
rename from source/winbindd/idmap_cache.c
rename to source/lib/idmap_cache.c
index 496f70a..6377635 100644
--- a/source/winbindd/idmap_cache.c
+++ b/source/lib/idmap_cache.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #include "includes.h"
-#include "winbindd.h"
 
 /**
  * Find a sid2uid mapping
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 84c2c7f..fbcc26a 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -4850,7 +4850,7 @@ static void init_globals(bool first_time_only)
 	Globals.bWinbindRefreshTickets = False;
 	Globals.bWinbindOfflineLogon = False;
 
-	Globals.iIdmapCacheTime = 900; /* 15 minutes by default */
+	Globals.iIdmapCacheTime = 86400 * 7; /* a week by default */
 	Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
 
 	Globals.bPassdbExpandExplicit = False;


-- 
Samba Shared Repository