From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 11 Jun 2012 01:12:52 +0000 (+1000)
Subject: lib/param: simplfy lp_find_security()
X-Git-Tag: samba-4.0.0beta2~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92fd0fdd790d9a0fbb1e82e5dc7acbc1a193a7ca;p=thirdparty%2Fsamba.git

lib/param: simplfy lp_find_security()

All the roles other than ROLE_DOMAIN_MEMBER map to SEC_USER.

Andrew Bartlett
---

diff --git a/lib/param/loadparm_server_role.c b/lib/param/loadparm_server_role.c
index 9ff64be0461..5a1f4984feb 100644
--- a/lib/param/loadparm_server_role.c
+++ b/lib/param/loadparm_server_role.c
@@ -117,17 +117,12 @@ int lp_find_security(int server_role, int security)
 	}
 
 	switch (server_role) {
-	case ROLE_AUTO:
-	case ROLE_STANDALONE:
-		return SEC_USER;
 	case ROLE_DOMAIN_MEMBER:
 #if (defined(HAVE_ADS) || _SAMBA_BUILD_ >= 4)
 		return SEC_ADS;
 #else
 		return SEC_DOMAIN;
 #endif
-	case ROLE_DOMAIN_PDC:
-	case ROLE_DOMAIN_BDC:
 	default:
 		return SEC_USER;
 	}