summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-13 20:24:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:20 -0500
commitf57c18b946091470817d208e28bb705ab49fdaa2 (patch)
treed2ef8489e3c86e3eff21bcb7a647291024d9ef61
parent413ec64f27bb955f477b0b6b5737ed58453acd9c (diff)
downloadsamba-f57c18b946091470817d208e28bb705ab49fdaa2.tar.gz
samba-f57c18b946091470817d208e28bb705ab49fdaa2.tar.bz2
samba-f57c18b946091470817d208e28bb705ab49fdaa2.zip
r17023: security = server should not be considerd ROLE_DOMAIN_MEMBER
(This used to be commit 6eb77442a570b4ef3bb71dd5a1b7ea81ad18f09c)
-rw-r--r--source3/param/loadparm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c308378a22..89b07b4cda 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4199,7 +4199,8 @@ 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;
+ /* this used to be considered ROLE_DOMAIN_MEMBER but that's just wrong */
+ server_role = ROLE_STANDALONE;
break;
case SEC_DOMAIN:
if (lp_domain_logons()) {