summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-04-25 15:36:02 +0200
committerVolker Lendecke <vl@samba.org>2010-05-02 15:15:56 +0200
commit685b4625bcbae46b332a8c3dbb02d59812084519 (patch)
treef4027bfdf42f99dc89d2a53480d8702a6109f0ac
parent44e7ea692708c1c956fc9bd20ed9a6d5de9479a4 (diff)
downloadsamba-685b4625bcbae46b332a8c3dbb02d59812084519.tar.gz
samba-685b4625bcbae46b332a8c3dbb02d59812084519.tar.bz2
samba-685b4625bcbae46b332a8c3dbb02d59812084519.zip
s3: Fix the code order in append_auth_data
This is to comply with the comment "currently, anything from here on potentially overwrites extra_data." Günther, please check!
-rw-r--r--source3/winbindd/winbindd_pam.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index aea2a2a34f..b062fd1d77 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -757,10 +757,11 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
/* 8 */);
}
- if (flags & WBFLAG_PAM_INFO3_TEXT) {
- result = append_info3_as_txt(state->mem_ctx, state, info3);
+ if (flags & WBFLAG_PAM_UNIX_NAME) {
+ result = append_unix_username(state->mem_ctx, state, info3,
+ name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) {
- DEBUG(10,("Failed to append INFO3 (TXT): %s\n",
+ DEBUG(10,("Failed to append Unix Username: %s\n",
nt_errstr(result)));
return result;
}
@@ -777,11 +778,10 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
}
}
- if (flags & WBFLAG_PAM_UNIX_NAME) {
- result = append_unix_username(state->mem_ctx, state, info3,
- name_domain, name_user);
+ if (flags & WBFLAG_PAM_INFO3_TEXT) {
+ result = append_info3_as_txt(state->mem_ctx, state, info3);
if (!NT_STATUS_IS_OK(result)) {
- DEBUG(10,("Failed to append Unix Username: %s\n",
+ DEBUG(10,("Failed to append INFO3 (TXT): %s\n",
nt_errstr(result)));
return result;
}