diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-06 08:11:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:06 -0500 |
| commit | d17425ed52b086b7046708a207e849271cedc804 (patch) | |
| tree | 2b36b39f0332bed0281c30cfd75c47050a37704b /source3/nsswitch | |
| parent | 90b168bfc8bbbac3f96a82911260c8aa2d2e6a09 (diff) | |
| download | samba-d17425ed52b086b7046708a207e849271cedc804.tar.gz samba-d17425ed52b086b7046708a207e849271cedc804.tar.bz2 samba-d17425ed52b086b7046708a207e849271cedc804.zip | |
r69: Global rename of 'nt_session_key' -> 'user_session_key'. The session key could
be anything, and may not be based on anything 'NT'. This is also what microsoft
calls it.
(This used to be commit 724e8d3f33719543146280062435c69a835c491e)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_nss.h | 4 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h index c8fe5c826c..d0c80412df 100644 --- a/source3/nsswitch/winbindd_nss.h +++ b/source3/nsswitch/winbindd_nss.h @@ -150,7 +150,7 @@ typedef struct winbindd_gr { #define WBFLAG_PAM_INFO3_NDR 0x0001 #define WBFLAG_PAM_INFO3_TEXT 0x0002 -#define WBFLAG_PAM_NTKEY 0x0004 +#define WBFLAG_PAM_USER_SESSION_KEY 0x0004 #define WBFLAG_PAM_LMKEY 0x0008 #define WBFLAG_PAM_CONTACT_TRUSTDOM 0x0010 #define WBFLAG_QUERY_ONLY 0x0020 @@ -264,7 +264,7 @@ struct winbindd_response { fstring nt_status_string; fstring error_string; int pam_error; - char nt_session_key[16]; + char user_session_key[16]; char first_8_lm_hash[8]; } auth; uint32 rid; /* create user or group */ diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 1d232edfe3..f3e7daa6bf 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -464,8 +464,8 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state) state->response.length += strlen(state->response.extra_data)+1; } - if (state->request.flags & WBFLAG_PAM_NTKEY) { - memcpy(state->response.data.auth.nt_session_key, info3.user_sess_key, sizeof(state->response.data.auth.nt_session_key) /* 16 */); + if (state->request.flags & WBFLAG_PAM_USER_SESSION_KEY) { + memcpy(state->response.data.auth.user_session_key, info3.user_sess_key, sizeof(state->response.data.auth.user_session_key) /* 16 */); } if (state->request.flags & WBFLAG_PAM_LMKEY) { memcpy(state->response.data.auth.first_8_lm_hash, info3.padding, sizeof(state->response.data.auth.first_8_lm_hash) /* 8 */); |