diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-11 10:13:57 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-11 10:13:57 +0000 |
| commit | 60a8e3c20c24b6150946d7b6f348e8e5b050ed94 (patch) | |
| tree | d30c288003a62dcb7c27c2ac174a5d5ba1bc59a2 | |
| parent | da6266f4f18b3406676372c6632d3b8199aaa420 (diff) | |
| download | samba-60a8e3c20c24b6150946d7b6f348e8e5b050ed94.tar.gz samba-60a8e3c20c24b6150946d7b6f348e8e5b050ed94.tar.bz2 samba-60a8e3c20c24b6150946d7b6f348e8e5b050ed94.zip | |
Some further tought on the server role issue - try not to break it compeatly.
Andrew Bartlett
(This used to be commit 4c6a2d8d28d1752d7fee52d253ce2829bd0a0671)
| -rw-r--r-- | source3/param/loadparm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5bffa2c862..7d0208fb85 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3810,6 +3810,12 @@ static void set_server_role(void) case SEC_SERVER: if (lp_domain_logons()) DEBUG(0, ("Server's Role (logon server) conflicts with server-level security\n")); + server_role = ROLE_DOMAIN_MEMBER; + break; + case SEC_DOMAIN: + if (lp_domain_logons()) + DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n")); + server_role = ROLE_DOMAIN_MEMBER; break; case SEC_ADS: if (lp_domain_logons()) { @@ -3818,9 +3824,6 @@ static void set_server_role(void) } server_role = ROLE_DOMAIN_MEMBER; break; - case SEC_DOMAIN: - if (lp_domain_logons()) - DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n")); case SEC_USER: if (lp_domain_logons()) { |