diff options
| author | Volker Lendecke <vl@samba.org> | 2008-05-06 17:37:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-07 14:47:29 +0200 |
| commit | 64ddd381b74ca94e8ff8ae62d8f019a9b5290a80 (patch) | |
| tree | 37e07a70b9b67c65d1a0674025f2fcfb4e01ce1c /source3/auth | |
| parent | 4f731150bdc4e7257e1fc87e6ea6944d33cb1e34 (diff) | |
| download | samba-64ddd381b74ca94e8ff8ae62d8f019a9b5290a80.tar.gz samba-64ddd381b74ca94e8ff8ae62d8f019a9b5290a80.tar.bz2 samba-64ddd381b74ca94e8ff8ae62d8f019a9b5290a80.zip | |
Rename server_info->was_mapped to server_info->nss_token
"nss_token" from my point of view much better reflects what this flag actually
represents
(This used to be commit b121a5acb2ef0bb3067d953b028696175432f10d)
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_domain.c | 4 | ||||
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 2 | ||||
| -rw-r--r-- | source3/auth/auth_sam.c | 2 | ||||
| -rw-r--r-- | source3/auth/auth_util.c | 6 | ||||
| -rw-r--r-- | source3/auth/auth_winbind.c | 4 |
5 files changed, 7 insertions, 11 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index f526677eca..f483718552 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -270,9 +270,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, info3); if (NT_STATUS_IS_OK(nt_status)) { - if (user_info->was_mapped) { - (*server_info)->was_mapped = user_info->was_mapped; - } + (*server_info)->nss_token |= user_info->was_mapped; if ( ! (*server_info)->guest) { /* if a real user check pam account restrictions */ diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index b6c26a1fc8..0d46b14f97 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -122,7 +122,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, return nt_status; } - auth_ntlmssp_state->server_info->was_mapped |= username_was_mapped; + auth_ntlmssp_state->server_info->nss_token |= username_was_mapped; nt_status = create_local_token(auth_ntlmssp_state->server_info); diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index 4d25d31b56..5e393f7220 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -367,7 +367,7 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, lm_sess_key.length); data_blob_free(&lm_sess_key); - (*server_info)->was_mapped |= user_info->was_mapped; + (*server_info)->nss_token |= user_info->was_mapped; return nt_status; } diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 5116425606..5e9da4eaff 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -634,7 +634,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info) */ if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) || - (server_info->was_mapped)) { + (server_info->nss_token)) { status = create_token_from_username(server_info, server_info->unix_name, server_info->guest, @@ -1626,7 +1626,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, sizeof(info3->base.LMSessKey.key)); } - result->was_mapped = username_was_mapped; + result->nss_token |= username_was_mapped; *server_info = result; @@ -1859,7 +1859,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx, sizeof(info->lm_session_key)); } - result->was_mapped = username_was_mapped; + result->nss_token |= username_was_mapped; *server_info = result; diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index 20faa95b01..d1b00a3268 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -120,9 +120,7 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context, return nt_status; } - if (user_info->was_mapped) { - (*server_info)->was_mapped = user_info->was_mapped; - } + (*server_info)->nss_token |= user_info->was_mapped; return nt_status; } |