From a879a4610dac03b814ad40800f408416d250c6be Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 18 Sep 2010 12:55:31 +1000 Subject: libcli/auth Merge source4/libcli/security and util_sid.c into the common code This should ensure we only have one copy of these core functions in the tree. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/include/proto.h | 18 ------------------ source3/include/smb.h | 26 -------------------------- 2 files changed, 44 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 81e1909521..3725ea3fa8 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1258,31 +1258,13 @@ bool is_setuid_root(void) ; /* The following definitions come from lib/util_sid.c */ -const char *sid_type_lookup(uint32 sid_type) ; -const struct security_token *get_system_token(void) ; char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid); char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); char *sid_string_dbg(const struct dom_sid *sid); char *sid_string_tos(const struct dom_sid *sid); -bool string_to_sid(struct dom_sid *sidout, const char *sidstr); -bool sid_append_rid(struct dom_sid *sid, uint32 rid); -bool sid_compose(struct dom_sid *dst, const struct dom_sid *domain_sid, uint32 rid); -bool sid_split_rid(struct dom_sid *sid, uint32 *rid); -bool sid_peek_rid(const struct dom_sid *sid, uint32 *rid); -bool sid_peek_check_rid(const struct dom_sid *exp_dom_sid, const struct dom_sid *sid, uint32 *rid); -void sid_copy(struct dom_sid *dst, const struct dom_sid *src); bool sid_linearize(char *outbuf, size_t len, const struct dom_sid *sid); -bool sid_parse(const char *inbuf, size_t len, struct dom_sid *sid); bool non_mappable_sid(struct dom_sid *sid); char *sid_binstring_hex(const struct dom_sid *sid); -NTSTATUS add_sid_to_array(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, - struct dom_sid **sids, uint32_t *num); -NTSTATUS add_sid_to_array_unique(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, - struct dom_sid **sids, uint32_t *num_sids); -void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids, size_t *num); -bool add_rid_to_array_unique(TALLOC_CTX *mem_ctx, - uint32 rid, uint32 **pp_rids, size_t *p_num); -bool is_null_sid(const struct dom_sid *sid); NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx, const struct netr_SamInfo3 *info3, struct dom_sid **user_sids, diff --git a/source3/include/smb.h b/source3/include/smb.h index ae93bbbe7e..07a53de8e6 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -193,32 +193,6 @@ struct lsa_name_info { int dom_idx; }; -/* Some well-known SIDs */ -extern const struct dom_sid global_sid_World_Domain; -extern const struct dom_sid global_sid_World; -extern const struct dom_sid global_sid_Creator_Owner_Domain; -extern const struct dom_sid global_sid_NT_Authority; -extern const struct dom_sid global_sid_System; -extern const struct dom_sid global_sid_NULL; -extern const struct dom_sid global_sid_Authenticated_Users; -extern const struct dom_sid global_sid_Network; -extern const struct dom_sid global_sid_Creator_Owner; -extern const struct dom_sid global_sid_Creator_Group; -extern const struct dom_sid global_sid_Anonymous; -extern const struct dom_sid global_sid_Builtin; -extern const struct dom_sid global_sid_Builtin_Administrators; -extern const struct dom_sid global_sid_Builtin_Users; -extern const struct dom_sid global_sid_Builtin_Guests; -extern const struct dom_sid global_sid_Builtin_Power_Users; -extern const struct dom_sid global_sid_Builtin_Account_Operators; -extern const struct dom_sid global_sid_Builtin_Server_Operators; -extern const struct dom_sid global_sid_Builtin_Print_Operators; -extern const struct dom_sid global_sid_Builtin_Backup_Operators; -extern const struct dom_sid global_sid_Builtin_Replicator; -extern const struct dom_sid global_sid_Builtin_PreWin2kAccess; -extern const struct dom_sid global_sid_Unix_Users; -extern const struct dom_sid global_sid_Unix_Groups; - /* * The complete list of SIDS belonging to this user. * Created when a vuid is registered. -- cgit