diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-08 10:01:51 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-08 10:01:51 -0700 |
| commit | 77abc2dabd0477bf283793389da5add19aa42de1 (patch) | |
| tree | fee4af8e97dd736d6a4985182803059e928b746f /source3/winbindd | |
| parent | 46d193324082000f19221f1b1ac679512aff96ed (diff) | |
| parent | fb7096a55bb7873965797feee72ceef2404d689d (diff) | |
| download | samba-77abc2dabd0477bf283793389da5add19aa42de1.tar.gz samba-77abc2dabd0477bf283793389da5add19aa42de1.tar.bz2 samba-77abc2dabd0477bf283793389da5add19aa42de1.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 6d48fe5f85..543b8b12b7 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -4359,6 +4359,7 @@ static bool wcache_opnum_cacheable(uint32_t opnum) case NDR_WBINT_QUERYSEQUENCENUMBER: case NDR_WBINT_ALLOCATEUID: case NDR_WBINT_ALLOCATEGID: + case NDR_WBINT_CHECKMACHINEACCOUNT: return false; } return true; diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 178b3ea74b..edbaa55e9b 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -2060,7 +2060,7 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact struct rpc_pipe_client *cli; bool got_info = false; struct samr_DomInfo1 *info = NULL; - struct samr_ChangeReject *reject = NULL; + struct userPwdChangeFailureInformation *reject = NULL; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; fstring domain, user; @@ -2102,7 +2102,7 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact fill_in_password_policy(state->response, info); state->response->data.auth.reject_reason = - reject->reason; + reject->extendedFailureReason; got_info = true; } |