svn commit: samba r19958 - in branches/SAMBA_3_0/source/nsswitch: .

jra at samba.org jra at samba.org
Thu Nov 30 00:09:35 GMT 2006


Author: jra
Date: 2006-11-30 00:09:34 +0000 (Thu, 30 Nov 2006)
New Revision: 19958

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19958

Log:
Add check for WINBIND_OFFLINE key.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c	2006-11-29 23:20:22 UTC (rev 19957)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c	2006-11-30 00:09:34 UTC (rev 19958)
@@ -1022,6 +1022,9 @@
 
 	pidfile_create("winbindd");
 
+	/* Ensure all cache and idmap caches are consistent
+	   before we startup. */
+
 	if (winbindd_validate_cache()) {
 		/* We have a bad cache, but luckily we
 		   just deleted it. Restart ourselves */
@@ -1051,9 +1054,6 @@
 		exit(1);
 	}
 	
-	/* Ensure all cache and idmap caches are consistent
-	   before we startup. */
-
 	/* React on 'smbcontrol winbindd reload-config' in the same way
 	   as to SIGHUP signal */
 	message_register(MSG_SMB_CONF_UPDATED, msg_reload_services);

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-11-29 23:20:22 UTC (rev 19957)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-11-30 00:09:34 UTC (rev 19958)
@@ -2663,6 +2663,11 @@
 	return 0;
 }
 
+static int validate_offline(TDB_DATA kbuf, TDB_DATA dbuf)
+{
+	return 0;
+}
+
 /***********************************************************************
  A list of all possible cache tdb keys with associated validation
  functions.
@@ -2685,6 +2690,7 @@
 	{"UA", validate_ua},
 	{"GM/", validate_gm},
 	{"TRUSTDOMS/", validate_trustdoms},
+	{"WINBINDD_OFFLINE", validate_offline},
 	{NULL, NULL}
 };
 



More information about the samba-cvs mailing list