summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-05-13 00:23:06 +0000
committerTim Potter <tpot@samba.org>2002-05-13 00:23:06 +0000
commit52a832b3fac89b9d5487ba98f7c6497412a15ae4 (patch)
tree54f1a8bd9994b41549dfbc905e48e5cdcb4e8c6d
parent282d069ff4d6a9d06788e11caab67c47e4bb927b (diff)
downloadsamba-52a832b3fac89b9d5487ba98f7c6497412a15ae4.tar.gz
samba-52a832b3fac89b9d5487ba98f7c6497412a15ae4.tar.bz2
samba-52a832b3fac89b9d5487ba98f7c6497412a15ae4.zip
Merge of secrets_init() paranoia fix from 2.2
(This used to be commit 1c3c0d7cb64caa6be7ee6d786fe400a1d6944a72)
-rw-r--r--source3/nsswitch/winbindd.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 2c88d11cae..91215e0ef7 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -680,7 +680,12 @@ int winbind_setup_common(void)
{
load_interfaces();
- secrets_init();
+ if (!secrets_init()) {
+
+ DEBUG(0,("Could not initialize domain trust account secrets. Giving up\n"));
+ return 1;
+
+ }
/* Get list of domains we look up requests for. This includes the
domain which we are a member of as well as any trusted