From 4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Aug 2010 20:04:11 +1000 Subject: s3-auth Change struct nt_user_token -> struct security_token This common structure is defined in security.idl Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/registry/reg_api.c | 10 +++++----- source3/registry/reg_backend_smbconf.c | 2 +- source3/registry/reg_dispatcher.c | 2 +- source3/registry/reg_dispatcher.h | 2 +- source3/registry/reg_util_legacy.c | 2 +- source3/registry/reg_util_legacy.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/registry') diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 4e3d871f6a..0352446e7b 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -130,7 +130,7 @@ static int regkey_destructor(struct registry_key_handle *key) static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, - const struct nt_user_token *token, + const struct security_token *token, uint32 access_desired, struct registry_key **pregkey) { @@ -235,7 +235,7 @@ done: 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) { SMB_ASSERT(hive != NULL); @@ -1055,7 +1055,7 @@ 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) { struct registry_key *hive, *key; @@ -1222,7 +1222,7 @@ WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx, 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) { @@ -1275,7 +1275,7 @@ WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path, * before. Will not delete a hive. */ -WERROR reg_delete_path(const struct nt_user_token *token, +WERROR reg_delete_path(const struct security_token *token, const char *orig_path) { struct registry_key *hive; diff --git a/source3/registry/reg_backend_smbconf.c b/source3/registry/reg_backend_smbconf.c index 20868d1696..a2bf506e52 100644 --- a/source3/registry/reg_backend_smbconf.c +++ b/source3/registry/reg_backend_smbconf.c @@ -58,7 +58,7 @@ static bool smbconf_store_values(const char *key, struct regval_ctr *val) static bool smbconf_reg_access_check(const char *keyname, uint32 requested, uint32 *granted, - const struct nt_user_token *token) + const struct security_token *token) { if (!(user_has_privileges(token, &se_disk_operators))) { return False; diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c index 0c61564d76..ea65c439b9 100644 --- a/source3/registry/reg_dispatcher.c +++ b/source3/registry/reg_dispatcher.c @@ -161,7 +161,7 @@ int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val) bool regkey_access_check(struct registry_key_handle *key, uint32 requested, uint32 *granted, - const struct nt_user_token *token ) + const struct security_token *token ) { struct security_descriptor *sec_desc; NTSTATUS status; diff --git a/source3/registry/reg_dispatcher.h b/source3/registry/reg_dispatcher.h index eb239334c3..c80ba15ec1 100644 --- a/source3/registry/reg_dispatcher.h +++ b/source3/registry/reg_dispatcher.h @@ -31,7 +31,7 @@ int fetch_reg_keys(struct registry_key_handle *key, int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val); bool regkey_access_check(struct registry_key_handle *key, uint32 requested, uint32 *granted, - const struct nt_user_token *token); + const struct security_token *token); WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, struct registry_key_handle *key, struct security_descriptor **psecdesc); WERROR regkey_set_secdesc(struct registry_key_handle *key, diff --git a/source3/registry/reg_util_legacy.c b/source3/registry/reg_util_legacy.c index 7f2eecc19e..3a3f0207e2 100644 --- a/source3/registry/reg_util_legacy.c +++ b/source3/registry/reg_util_legacy.c @@ -33,7 +33,7 @@ WERROR regkey_open_internal(TALLOC_CTX *ctx, struct registry_key_handle **regkey, const char *path, - const struct nt_user_token *token, + const struct security_token *token, uint32 access_desired ) { struct registry_key *key; diff --git a/source3/registry/reg_util_legacy.h b/source3/registry/reg_util_legacy.h index 8b330fb0a3..d0cb626fb2 100644 --- a/source3/registry/reg_util_legacy.h +++ b/source3/registry/reg_util_legacy.h @@ -39,7 +39,7 @@ WERROR regkey_open_internal(TALLOC_CTX *ctx, struct registry_key_handle **regkey, const char *path, - const struct nt_user_token *token, + const struct security_token *token, uint32 access_desired ); #endif /* _REG_UTIL_LEGACY_H */ -- cgit