diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 20 | ||||
| -rw-r--r-- | source3/include/registry.h | 10 | ||||
| -rw-r--r-- | source3/include/smb.h | 7 |
3 files changed, 17 insertions, 20 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c547924c7d..76ef9aa36d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -127,7 +127,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, bool is_guest, uid_t *uid, gid_t *gid, char **found_username, - struct nt_user_token **token); + struct security_token **token); bool user_in_group_sid(const char *username, const struct dom_sid *group_sid); bool user_in_group(const char *username, const char *groupname); NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info, @@ -245,10 +245,10 @@ 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 ); NTSTATUS add_aliases(const struct dom_sid *domain_sid, - struct nt_user_token *token); + struct security_token *token); NTSTATUS create_builtin_users(const struct dom_sid *sid); NTSTATUS create_builtin_administrators(const struct dom_sid *sid); -struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx, +struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx, const struct dom_sid *user_sid, bool is_guest, int num_groupsids, @@ -257,7 +257,7 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx, bool is_guest, struct netr_SamInfo3 *info3, struct extra_auth_info *extra, - struct nt_user_token **ntok); + struct security_token **ntok); void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_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); @@ -1288,9 +1288,9 @@ void smb_nscd_flush_group_cache(void); NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken); NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, - const struct nt_user_token *token_1, - const struct nt_user_token *token_2, - struct nt_user_token **token_out); + const struct security_token *token_1, + const struct security_token *token_2, + struct security_token **token_out); bool token_sid_in_ace(const NT_USER_TOKEN *token, const struct security_ace *ace); /* The following definitions come from lib/util_pw.c */ @@ -5487,13 +5487,13 @@ void reply_sesssetup_and_X(struct smb_request *req); bool token_contains_name_in_list(const char *username, const char *domain, const char *sharename, - const struct nt_user_token *token, + const struct security_token *token, const char **list); bool user_ok_token(const char *username, const char *domain, - const struct nt_user_token *token, int snum); + const struct security_token *token, int snum); bool is_share_read_only_for_token(const char *username, const char *domain, - const struct nt_user_token *token, + const struct security_token *token, connection_struct *conn); /* The following definitions come from smbd/srvstr.c */ diff --git a/source3/include/registry.h b/source3/include/registry.h index ca3a1d0364..303b7ed06d 100644 --- a/source3/include/registry.h +++ b/source3/include/registry.h @@ -71,7 +71,7 @@ struct registry_key { struct registry_key_handle *key; struct regsubkey_ctr *subkeys; struct regval_ctr *values; - struct nt_user_token *token; + struct security_token *token; }; @@ -134,7 +134,7 @@ struct registry_key { WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive, uint32 desired_access, - const struct nt_user_token *token, + const struct security_token *token, struct registry_key **pkey); WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, uint32 desired_access, @@ -173,7 +173,7 @@ WERROR reg_restorekey(struct registry_key *key, const char *fname); WERROR reg_savekey(struct registry_key *key, const char *fname); WERROR reg_deleteallvalues(struct registry_key *key); WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path, - uint32 desired_access, const struct nt_user_token *token, + uint32 desired_access, const struct security_token *token, struct registry_key **pkey); WERROR reg_deletekey_recursive(TALLOC_CTX *ctx, struct registry_key *parent, @@ -183,10 +183,10 @@ WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx, const char *path); WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path, uint32 desired_access, - const struct nt_user_token *token, + const struct security_token *token, enum winreg_CreateAction *paction, struct registry_key **pkey); -WERROR reg_delete_path(const struct nt_user_token *token, +WERROR reg_delete_path(const struct security_token *token, const char *orig_path); /* The following definitions come from registry/reg_init_basic.c */ diff --git a/source3/include/smb.h b/source3/include/smb.h index f8b233ea6b..e9b85beab1 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -176,6 +176,7 @@ typedef union unid_t { #include "librpc/gen_ndr/epmapper.h" #include "librpc/gen_ndr/dcerpc.h" +#include "librpc/gen_ndr/security.h" struct lsa_dom_info { bool valid; @@ -231,11 +232,7 @@ extern const struct dom_sid global_sid_Unix_Groups; #define PRIMARY_USER_SID_INDEX 0 #define PRIMARY_GROUP_SID_INDEX 1 -typedef struct nt_user_token { - uint32_t num_sids; - struct dom_sid *sids; - uint64_t privilege_mask; -} NT_USER_TOKEN; +typedef struct security_token NT_USER_TOKEN; typedef struct unix_user_token { uid_t uid; |