sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Call winbindd_param_init() earlier on in the piece so we don't get stuck in

Browse Source 
the holding pattern when started up when security = user or security = ads.

Clean up return value of winbindd_common_init() - what a mess!
This commit is contained in:
Tim Potter 0001-01-01 00:00:00 +00:00
parent 28871bb696
commit 8a6d377521
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/nsswitch/winbindd.c
View File

@ -3,7 +3,7 @@
Winbind daemon for ntdom nss module
Copyright (C) by Tim Potter 2000, 2001
Copyright (C) by Tim Potter 2000-2002
Copyright (C) Andrew Tridgell 2002
This program is free software; you can redistribute it and/or modify
@ -670,19 +670,23 @@ static void process_loop(void)
/*
these are split out from the main winbindd for use by the background daemon
*/
int winbind_setup_common(void)
BOOL winbind_setup_common(void)
{
load_interfaces();
load_interfaces();
if (!secrets_init()) {
DEBUG(0,("Could not initialize domain trust account secrets. Giving up\n"));
return 1;
return False;
}
namecache_enable(); /* Enable netbios namecache */
/* Check winbindd parameters are valid */
if (!winbindd_param_init())
return False;
/* Get list of domains we look up requests for. This includes the
domain which we are a member of as well as any trusted
domains. */
@ -693,11 +697,8 @@ int winbind_setup_common(void)
/* Winbind daemon initialisation */
if (!winbindd_param_init())
return 1;
if (!winbindd_idmap_init())
return 1;
return False;
/* Unblock all signals we are interested in as they may have been
blocked by the parent process. */
@ -720,7 +721,7 @@ int winbind_setup_common(void)
CatchSignal(SIGUSR2, sigusr2_handler); /* Debugging sigs */
CatchSignal(SIGHUP, sighup_handler);
return 0;
return True;
}
@ -857,12 +858,12 @@ static void usage(void)
setpgid( (pid_t)0, (pid_t)0);
#endif
if (opt_dual_daemon) {
do_dual_daemon();
if (!winbind_setup_common()) {
return 1;
}
if (winbind_setup_common() != 0) {
return 1;
if (opt_dual_daemon) {
do_dual_daemon();
}
/* Initialise messaging system */

8
source/nsswitch/winbindd_util.c
View File

@ -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)) {