summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-11-30 00:09:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:15 -0500
commit2941b044b3fed09cd94d6b2e9057d3e58c12703b (patch)
tree6a4ad02678f7ecf0ca11648ab0017d4837d14dfd
parented34ffb14792cc47ca1af5ffeb076f3c2d7f28dc (diff)
downloadsamba-2941b044b3fed09cd94d6b2e9057d3e58c12703b.tar.gz
samba-2941b044b3fed09cd94d6b2e9057d3e58c12703b.tar.bz2
samba-2941b044b3fed09cd94d6b2e9057d3e58c12703b.zip
r19958: Add check for WINBIND_OFFLINE key.
Jeremy. (This used to be commit 270e84db6de66b4f20dc0a564f706dae4c00b0b2)
-rw-r--r--source3/nsswitch/winbindd.c6
-rw-r--r--source3/nsswitch/winbindd_cache.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 41662900ce..047b6c3b85 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -1022,6 +1022,9 @@ int main(int argc, char **argv, char **envp)
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 @@ int main(int argc, char **argv, char **envp)
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);
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index e9b0d2e8f9..436f5d1874 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -2663,6 +2663,11 @@ static int validate_trustdoms(TDB_DATA kbuf, TDB_DATA dbuf)
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 @@ struct key_val_struct {
{"UA", validate_ua},
{"GM/", validate_gm},
{"TRUSTDOMS/", validate_trustdoms},
+ {"WINBINDD_OFFLINE", validate_offline},
{NULL, NULL}
};