diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 11:25:01 +1000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-21 10:39:59 +0200 |
| commit | cba7f8b8273e661d3c43652900d93e5a8eab4e5f (patch) | |
| tree | 714e00240ddc0c7e689240d2c8fb7d9196b1fff2 /source3/libgpo | |
| parent | a92b653af964364ee438c6ee69a87eb7603ceab0 (diff) | |
| download | samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.gz samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.bz2 samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.zip | |
s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to,
and removes one more of the old-style named structures, and
the need to know that is is just an alias for struct dom_sid.
Andrew Bartlett
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/libgpo')
| -rw-r--r-- | source3/libgpo/gpo_proto.h | 4 | ||||
| -rw-r--r-- | source3/libgpo/gpo_reg.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/libgpo/gpo_proto.h b/source3/libgpo/gpo_proto.h index e093d1eb0c..e77e0351ec 100644 --- a/source3/libgpo/gpo_proto.h +++ b/source3/libgpo/gpo_proto.h @@ -49,12 +49,12 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx, struct GROUP_POLICY_OBJECT *gpo_list); WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx, uint32_t flags, - const DOM_SID *sid, + const struct dom_sid *sid, struct GROUP_POLICY_OBJECT **gpo_list); WERROR gp_secure_key(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *key, - const DOM_SID *sid); + const struct dom_sid *sid); void dump_reg_val(int lvl, const char *direction, const char *key, const char *subkey, struct registry_value *val); diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c index b764eaffab..5f6a97cec7 100644 --- a/source3/libgpo/gpo_reg.c +++ b/source3/libgpo/gpo_reg.c @@ -297,7 +297,7 @@ static WERROR gp_store_reg_gpovals(TALLOC_CTX *mem_ctx, ****************************************************************/ static const char *gp_reg_groupmembership_path(TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, uint32_t flags) { if (flags & GPO_LIST_FLAG_MACHINE) { @@ -375,7 +375,7 @@ static WERROR gp_reg_store_groupmembership(TALLOC_CTX *mem_ctx, /* not used yet */ static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx, struct gp_registry_context *reg_ctx, - const DOM_SID *object_sid, + const struct dom_sid *object_sid, struct nt_user_token **token, uint32_t flags) { @@ -426,7 +426,7 @@ static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx, ****************************************************************/ static const char *gp_req_state_path(TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, uint32_t flags) { if (flags & GPO_LIST_FLAG_MACHINE) { @@ -612,7 +612,7 @@ static WERROR gp_read_reg_gpo(TALLOC_CTX *mem_ctx, WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx, uint32_t flags, - const DOM_SID *sid, + const struct dom_sid *sid, struct GROUP_POLICY_OBJECT **gpo_list) { struct gp_registry_context *reg_ctx = NULL; @@ -687,7 +687,7 @@ WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx, ****************************************************************/ static WERROR gp_reg_generate_sd(TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, struct security_descriptor **sd, size_t *sd_size) { @@ -758,11 +758,11 @@ static WERROR gp_reg_generate_sd(TALLOC_CTX *mem_ctx, WERROR gp_secure_key(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *key, - const DOM_SID *sid) + const struct dom_sid *sid) { struct security_descriptor *sd = NULL; size_t sd_size = 0; - const DOM_SID *sd_sid = NULL; + const struct dom_sid *sd_sid = NULL; WERROR werr; if (!(flags & GPO_LIST_FLAG_MACHINE)) { |