diff options
| author | Tim Potter <tpot@samba.org> | 2002-11-07 01:06:38 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-11-07 01:06:38 +0000 |
| commit | bcf0c11e3d4477eb029a0259ed17db9ddbe706d5 (patch) | |
| tree | 2e6d31a418bb033e331d604e9b2a414a470557c7 /source3/nsswitch/winbindd_util.c | |
| parent | 1ae7b1395f59e5aa8988ffeed2dfe1895eba8187 (diff) | |
| download | samba-bcf0c11e3d4477eb029a0259ed17db9ddbe706d5.tar.gz samba-bcf0c11e3d4477eb029a0259ed17db9ddbe706d5.tar.bz2 samba-bcf0c11e3d4477eb029a0259ed17db9ddbe706d5.zip | |
Call winbindd_param_init() earlier on in the piece so we don't get stuck in
the holding pattern when started up when security = user or security = ads.
Clean up return value of winbindd_common_init() - what a mess!
(This used to be commit 8a6d37752182e0de7fd04b2c31f90e145dde783b)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index e3f00149f7..a14ed96c67 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -378,10 +378,16 @@ void free_getent_state(struct getent_state *state) } } -/* Initialise trusted domain info */ +/* Parse winbindd related parameters */ BOOL winbindd_param_init(void) { + if (lp_security() != SEC_DOMAIN && lp_security() != SEC_ADS) { + DEBUG(0, ("must be in security = domain or security = ads mode to run winbindd\n")); + return False; + } + + /* Parse winbind uid and winbind_gid parameters */ if (!lp_winbind_uid(&server_state.uid_low, &server_state.uid_high)) { |