r14840: - rename some functions

- stack specific functions on top of generic ones

metze
(This used to be commit e391f3c98aae600c5f64d5975dd55567a09c3100)

2 files changed, 11 insertions, 8 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 53acb77899..f7efdb65e4 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -65,19 +65,22 @@ static enum user_is what_is_user(struct ldb_module *module)
 		return ANONYMOUS;
 	}
 	
-	if (is_system_token(session_info->security_token)) {
+	if (security_token_is_system(session_info->security_token)) {
 		return SYSTEM;
 	}
 
-	if (is_administrator_token(session_info->security_token)) {
+	if (security_token_is_anonymous(session_info->security_token)) {
+		return ANONYMOUS;
+	}
+
+	if (security_token_has_builtin_administrators(session_info->security_token)) {
 		return ADMINISTRATOR;
 	}
-	if (is_authenticated_token(session_info->security_token)) {
+
+	if (security_token_has_nt_authenticated_users(session_info->security_token)) {
 		return USER;
 	}
-	if (is_anonymous_token(session_info->security_token)) {
-		return ANONYMOUS;
-	}
+
 	return ANONYMOUS;
 }
 
diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index c1a6f2005b..d4c1471e1c 100644
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -83,12 +83,12 @@ _PUBLIC_ NTSTATUS samdb_privilege_setup(struct security_token *token)
 	NTSTATUS status;
 
 	/* Shortcuts to prevent recursion and avoid lookups */
-	if (is_system_token(token)) {
+	if (security_token_is_system(token)) {
 		token->privilege_mask = ~0;
 		return NT_STATUS_OK;
 	}
 
-	if (is_anonymous_token(token)) {
+	if (security_token_is_anonymous(token)) {
 		token->privilege_mask = 0;
 		return NT_STATUS_OK;
 	}