changed ROLE_DOMAIN_NONE to ROLE_STANDALONE.

12 files changed, 8 insertions, 42 deletions

diff --git a/source/groupdb/aliasldap.c b/source/groupdb/aliasldap.c
index 1e9a72a9d41..9ab88811442 100644
--- a/source/groupdb/aliasldap.c
+++ b/source/groupdb/aliasldap.c
@@ -166,9 +166,6 @@ static BOOL ldapalias_memmods(DOM_SID *user_sid, LDAPMod ***mods,
 
 static void *ldapalias_enumfirst(BOOL update)
 {
-	if (lp_server_role() == ROLE_DOMAIN_NONE)
-		return NULL;
-
 	if (!ldap_connect())
 		return NULL;
 
diff --git a/source/groupdb/aliasnt5ldap.c b/source/groupdb/aliasnt5ldap.c
index 4f01d829120..970b3695a3f 100644
--- a/source/groupdb/aliasnt5ldap.c
+++ b/source/groupdb/aliasnt5ldap.c
@@ -44,9 +44,6 @@ nt5ldapalias_enumfirst (BOOL update)
 	LDAPDB_DECLARE_HANDLE (hds);
 	fstring filter;
 
-	if (lp_server_role () == ROLE_DOMAIN_NONE)
-		return NULL;
-
 	if (!ldapdb_open (&hds))
 		return NULL;
 
diff --git a/source/groupdb/aliasunix.c b/source/groupdb/aliasunix.c
index bb519ab680f..6cb3ec39b3b 100644
--- a/source/groupdb/aliasunix.c
+++ b/source/groupdb/aliasunix.c
@@ -170,16 +170,6 @@ static LOCAL_GRP *getalsunixpwent(void *vp, LOCAL_GRP_MEMBER **mem, int *num_mem
 	struct group unix_grp;
 	struct unix_entries *grps = (struct unix_entries *)vp;
 
-	if (lp_server_role() == ROLE_DOMAIN_NONE)
-	{
-		/*
-		 * no domain role, no domain aliases (or domain groups,
-		 * but that's dealt with by groupdb...).
-		 */
-
-		return NULL;
-	}
-
 	aldb_init_als(&gp_buf);
 
 	/* get array of unix names + gids.  this function does NOT
diff --git a/source/groupdb/builtinldap.c b/source/groupdb/builtinldap.c
index baac82f1bab..7e4a3fb8c62 100644
--- a/source/groupdb/builtinldap.c
+++ b/source/groupdb/builtinldap.c
@@ -167,9 +167,6 @@ static BOOL ldapbuiltin_memmods(DOM_SID *user_sid, LDAPMod ***mods,
 
 static void *ldapbuiltin_enumfirst(BOOL update)
 {
-	if (lp_server_role() == ROLE_DOMAIN_NONE)
-		return NULL;
-
 	if (!ldap_connect())
 		return NULL;
 
diff --git a/source/groupdb/builtinnt5ldap.c b/source/groupdb/builtinnt5ldap.c
index 1427e53dbed..20b8c296a3f 100644
--- a/source/groupdb/builtinnt5ldap.c
+++ b/source/groupdb/builtinnt5ldap.c
@@ -47,9 +47,6 @@ nt5ldapbuiltin_enumfirst (BOOL update)
 	LDAPDB_DECLARE_HANDLE (hds);
 	fstring filter;
 
-	if (lp_server_role () == ROLE_DOMAIN_NONE)
-		return NULL;
-
 	if (!ldapdb_open (&hds))
 	{
 		return NULL;
diff --git a/source/groupdb/builtinunix.c b/source/groupdb/builtinunix.c
index 9f1e3d73378..363acc18ed2 100644
--- a/source/groupdb/builtinunix.c
+++ b/source/groupdb/builtinunix.c
@@ -175,16 +175,6 @@ static LOCAL_GRP *getbltunixpwent(void *vp, LOCAL_GRP_MEMBER **mem, int *num_mem
 		return NULL;
 	}
 
-	if (lp_server_role() == ROLE_DOMAIN_NONE)
-	{
-		/*
-		 * no domain role, no domain aliases (or domain groups,
-		 * but that's dealt with by groupdb...).
-		 */
-
-		return NULL;
-	}
-
 	bidb_init_blt(&gp_buf);
 
 	/* get array of unix names + gids.  this function does NOT
diff --git a/source/groupdb/groupldap.c b/source/groupdb/groupldap.c
index 086df4717d5..963bd41e21b 100644
--- a/source/groupdb/groupldap.c
+++ b/source/groupdb/groupldap.c
@@ -174,8 +174,7 @@ static void *ldapgroup_enumfirst(BOOL update)
 {
 	int server_role = lp_server_role();
 
-        if (server_role == ROLE_DOMAIN_NONE ||
-			server_role == ROLE_DOMAIN_MEMBER)
+        if (server_role == ROLE_STANDALONE || server_role == ROLE_DOMAIN_MEMBER)
                 return NULL;
 
 	if (!ldap_connect())
diff --git a/source/groupdb/groupnt5ldap.c b/source/groupdb/groupnt5ldap.c
index 2f1211eb62f..2afc93cd7f0 100644
--- a/source/groupdb/groupnt5ldap.c
+++ b/source/groupdb/groupnt5ldap.c
@@ -46,8 +46,7 @@ nt5ldapgroup_enumfirst (BOOL update)
 	int server_role = lp_server_role ();
 	LDAPDB_DECLARE_HANDLE (hds);
 
-	if (server_role == ROLE_DOMAIN_NONE ||
-	    server_role == ROLE_DOMAIN_MEMBER)
+	if (server_role == ROLE_STANDALONE || server_role == ROLE_DOMAIN_MEMBER)
 	{
 		return NULL;
 	}
diff --git a/source/groupdb/groupunix.c b/source/groupdb/groupunix.c
index e4e21dbc696..11f10ce4739 100644
--- a/source/groupdb/groupunix.c
+++ b/source/groupdb/groupunix.c
@@ -177,7 +177,7 @@ static DOMAIN_GRP *getgrpunixpwent(void *vp, DOMAIN_GRP_MEMBER **mem, int *num_m
 		return NULL;
 	}
 
-	if (lp_server_role() == ROLE_DOMAIN_NONE || 
+	if (lp_server_role() == ROLE_STANDALONE || 
 	    lp_server_role() == ROLE_DOMAIN_MEMBER)
 	{
 		/*
diff --git a/source/include/smb.h b/source/include/smb.h
index 605b950f51e..467e27bf04a 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1662,7 +1662,7 @@ enum security_types
 /* server roles */
 enum server_types
 {
-	ROLE_DOMAIN_NONE,
+	ROLE_STANDALONE,
 	ROLE_DOMAIN_MEMBER,
 	ROLE_DOMAIN_BDC,
 	ROLE_DOMAIN_PDC
diff --git a/source/lib/sids.c b/source/lib/sids.c
index e2d8fe99c4c..505e33b039f 100644
--- a/source/lib/sids.c
+++ b/source/lib/sids.c
@@ -193,7 +193,7 @@ static void get_sam_domain_name(void)
 			break;
 		}
 		case ROLE_DOMAIN_MEMBER:
-		case ROLE_DOMAIN_NONE:
+		case ROLE_STANDALONE:
 		{
 			/* we are a "PDC", but FOR LOCAL SAM DATABASE ONLY */
 			fstrcpy(global_sam_name, global_myname);
@@ -220,7 +220,7 @@ BOOL get_member_domain_sid(void)
 	DEBUG(10,("get_member_domain_sid: "));
 	switch (lp_server_role())
 	{
-		case ROLE_DOMAIN_NONE:
+		case ROLE_STANDALONE:
 		{
 			ZERO_STRUCT(global_member_sid);
 			DEBUG(10,("none\n"));
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 142a34edcbb..4d7f44413b8 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -2967,7 +2967,7 @@ static void lp_save_defaults(void)
 ********************************************************************/
 static void set_server_role(void)
 {
-	server_role = ROLE_DOMAIN_NONE;
+	server_role = ROLE_STANDALONE;
 
 	switch (lp_security())
 	{
@@ -3199,7 +3199,7 @@ static void set_default_server_announce_type(void)
 			default_server_announce |= SV_TYPE_DOMAIN_BAKCTRL;
 			break;
 		}
-		case ROLE_DOMAIN_NONE:
+		case ROLE_STANDALONE:
 		default:
 		{
 			break;