diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-26 20:04:11 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:05 +1000 |
| commit | 4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb (patch) | |
| tree | ed3b1ab5b999884be53243afb6dcca245f2e36b1 /source3/lib | |
| parent | 4bf783d4d6693f927f5e7ef7a9855766c91983f2 (diff) | |
| download | samba-4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb.tar.gz samba-4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb.tar.bz2 samba-4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb.zip | |
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 <tridge@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/smbconf/smbconf_reg.c | 4 | ||||
| -rw-r--r-- | source3/lib/util_nttoken.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index 08d559b3c7..ba27b48206 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -568,7 +568,7 @@ done: static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path) { WERROR werr = WERR_OK; - struct nt_user_token *token; + struct security_token *token; if (path == NULL) { path = KEY_SMBCONF; @@ -696,7 +696,7 @@ static WERROR smbconf_reg_drop(struct smbconf_ctx *ctx) struct registry_key *new_key = NULL; TALLOC_CTX* mem_ctx = talloc_stackframe(); enum winreg_CreateAction action; - struct nt_user_token *token; + struct security_token *token; werr = ntstatus_to_werror(registry_create_admin_token(ctx, &token)); if (!W_ERROR_IS_OK(werr)) { diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c index 737e5ebfc2..3be5634a06 100644 --- a/source3/lib/util_nttoken.c +++ b/source3/lib/util_nttoken.c @@ -71,11 +71,11 @@ 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) { - struct nt_user_token *token = NULL; + struct security_token *token = NULL; NTSTATUS status; int i; @@ -83,7 +83,7 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, return NT_STATUS_INVALID_PARAMETER; } - token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token); + token = TALLOC_ZERO_P(mem_ctx, struct security_token); NT_STATUS_HAVE_NO_MEMORY(token); for (i=0; i < token_1->num_sids; i++) { |