summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_proto.h8
-rw-r--r--source3/utils/net_registry.c2
-rw-r--r--source3/utils/net_rpc.c14
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 1941418a1b..b06b7f9771 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -26,9 +26,9 @@
/* The following definitions come from auth/token_util.c */
-bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token );
-bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid );
-NT_USER_TOKEN *get_root_nt_token( void );
+bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token );
+bool nt_token_check_domain_rid( struct security_token *token, uint32 rid );
+struct security_token *get_root_nt_token( void );
NTSTATUS add_aliases(const struct dom_sid *domain_sid,
struct security_token *token);
struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
@@ -36,7 +36,7 @@ struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
bool is_guest,
int num_groupsids,
const struct dom_sid *groupsids);
-void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token);
+void debug_nt_user_token(int dbg_class, int dbg_lev, struct security_token *token);
void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
int n_groups, gid_t *groups);
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index f90d05454b..31703223e9 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -41,7 +41,7 @@ static WERROR open_hive(TALLOC_CTX *ctx, const char *path,
char **subkeyname)
{
WERROR werr;
- NT_USER_TOKEN *token = NULL;
+ struct security_token *token = NULL;
char *hivename = NULL;
char *tmp_subkeyname = NULL;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 4dd00d3dc2..671f7e81e9 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4114,7 +4114,7 @@ static NTSTATUS rpc_aliaslist_internals(struct net_context *c,
return result;
}
-static void init_user_token(NT_USER_TOKEN *token, struct dom_sid *user_sid)
+static void init_user_token(struct security_token *token, struct dom_sid *user_sid)
{
token->num_sids = 4;
@@ -4130,12 +4130,12 @@ static void init_user_token(NT_USER_TOKEN *token, struct dom_sid *user_sid)
sid_copy(&token->sids[3], &global_sid_Authenticated_Users);
}
-static void free_user_token(NT_USER_TOKEN *token)
+static void free_user_token(struct security_token *token)
{
SAFE_FREE(token->sids);
}
-static void add_sid_to_token(NT_USER_TOKEN *token, struct dom_sid *sid)
+static void add_sid_to_token(struct security_token *token, struct dom_sid *sid)
{
if (is_sid_in_token(token, sid))
return;
@@ -4152,7 +4152,7 @@ static void add_sid_to_token(NT_USER_TOKEN *token, struct dom_sid *sid)
struct user_token {
fstring name;
- NT_USER_TOKEN token;
+ struct security_token token;
};
static void dump_user_token(struct user_token *token)
@@ -4178,7 +4178,7 @@ static bool is_alias_member(struct dom_sid *sid, struct full_alias *alias)
return false;
}
-static void collect_sid_memberships(NT_USER_TOKEN *token, struct dom_sid sid)
+static void collect_sid_memberships(struct security_token *token, struct dom_sid sid)
{
int i;
@@ -4195,7 +4195,7 @@ static void collect_sid_memberships(NT_USER_TOKEN *token, struct dom_sid sid)
* add them to the token.
*/
-static void collect_alias_memberships(NT_USER_TOKEN *token)
+static void collect_alias_memberships(struct security_token *token)
{
int num_global_sids = token->num_sids;
int i;
@@ -4205,7 +4205,7 @@ static void collect_alias_memberships(NT_USER_TOKEN *token)
}
}
-static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token)
+static bool get_user_sids(const char *domain, const char *user, struct security_token *token)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
enum wbcSidType type;