Fix the build, missing ->.
[samba.git] / source3 / winbindd / winbindd_pam.c
index 50b24864b559b66581785e13433aad5d5c12db2f..fe6485522e083f8ac1b32cb381b8c1f8a47105fe 100644 (file)
    Copyright (C) Tim Potter 2001
    Copyright (C) Andrew Bartlett 2001-2002
    Copyright (C) Guenther Deschner 2005
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "winbindd.h"
+#include "../libcli/auth/libcli_auth.h"
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx, 
-                                   struct winbindd_cli_state *state, 
-                                   NET_USER_INFO_3 *info3) 
+#define LOGON_KRB5_FAIL_CLOCK_SKEW     0x02000000
+
+static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx,
+                                   struct winbindd_cli_state *state,
+                                   struct netr_SamInfo3 *info3)
 {
-       fstring str_sid;
-
-       state->response.data.auth.info3.logon_time = 
-               nt_time_to_unix(info3->logon_time);
-       state->response.data.auth.info3.logoff_time = 
-               nt_time_to_unix(info3->logoff_time);
-       state->response.data.auth.info3.kickoff_time = 
-               nt_time_to_unix(info3->kickoff_time);
-       state->response.data.auth.info3.pass_last_set_time = 
-               nt_time_to_unix(info3->pass_last_set_time);
-       state->response.data.auth.info3.pass_can_change_time = 
-               nt_time_to_unix(info3->pass_can_change_time);
-       state->response.data.auth.info3.pass_must_change_time = 
-               nt_time_to_unix(info3->pass_must_change_time);
-
-       state->response.data.auth.info3.logon_count = info3->logon_count;
-       state->response.data.auth.info3.bad_pw_count = info3->bad_pw_count;
-
-       state->response.data.auth.info3.user_rid = info3->user_rid;
-       state->response.data.auth.info3.group_rid = info3->group_rid;
-       sid_to_string(str_sid, &(info3->dom_sid.sid));
-       fstrcpy(state->response.data.auth.info3.dom_sid, str_sid);
-
-       state->response.data.auth.info3.num_groups = info3->num_groups;
-       state->response.data.auth.info3.user_flgs = info3->user_flgs;
-
-       state->response.data.auth.info3.acct_flags = info3->acct_flags;
-       state->response.data.auth.info3.num_other_sids = info3->num_other_sids;
-
-       unistr2_to_ascii(state->response.data.auth.info3.user_name, 
-               &info3->uni_user_name, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.full_name, 
-               &info3->uni_full_name, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.logon_script, 
-               &info3->uni_logon_script, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.profile_path, 
-               &info3->uni_profile_path, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.home_dir, 
-               &info3->uni_home_dir, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.dir_drive, 
-               &info3->uni_dir_drive, -1);
-
-       unistr2_to_ascii(state->response.data.auth.info3.logon_srv, 
-               &info3->uni_logon_srv, -1);
-       unistr2_to_ascii(state->response.data.auth.info3.logon_dom, 
-               &info3->uni_logon_dom, -1);
+       char *ex;
+       uint32_t i;
+
+       state->response->data.auth.info3.logon_time =
+               nt_time_to_unix(info3->base.last_logon);
+       state->response->data.auth.info3.logoff_time =
+               nt_time_to_unix(info3->base.last_logoff);
+       state->response->data.auth.info3.kickoff_time =
+               nt_time_to_unix(info3->base.acct_expiry);
+       state->response->data.auth.info3.pass_last_set_time =
+               nt_time_to_unix(info3->base.last_password_change);
+       state->response->data.auth.info3.pass_can_change_time =
+               nt_time_to_unix(info3->base.allow_password_change);
+       state->response->data.auth.info3.pass_must_change_time =
+               nt_time_to_unix(info3->base.force_password_change);
+
+       state->response->data.auth.info3.logon_count = info3->base.logon_count;
+       state->response->data.auth.info3.bad_pw_count = info3->base.bad_password_count;
+
+       state->response->data.auth.info3.user_rid = info3->base.rid;
+       state->response->data.auth.info3.group_rid = info3->base.primary_gid;
+       sid_to_fstring(state->response->data.auth.info3.dom_sid, info3->base.domain_sid);
+
+       state->response->data.auth.info3.num_groups = info3->base.groups.count;
+       state->response->data.auth.info3.user_flgs = info3->base.user_flags;
+
+       state->response->data.auth.info3.acct_flags = info3->base.acct_flags;
+       state->response->data.auth.info3.num_other_sids = info3->sidcount;
+
+       fstrcpy(state->response->data.auth.info3.user_name,
+               info3->base.account_name.string);
+       fstrcpy(state->response->data.auth.info3.full_name,
+               info3->base.full_name.string);
+       fstrcpy(state->response->data.auth.info3.logon_script,
+               info3->base.logon_script.string);
+       fstrcpy(state->response->data.auth.info3.profile_path,
+               info3->base.profile_path.string);
+       fstrcpy(state->response->data.auth.info3.home_dir,
+               info3->base.home_directory.string);
+       fstrcpy(state->response->data.auth.info3.dir_drive,
+               info3->base.home_drive.string);
+
+       fstrcpy(state->response->data.auth.info3.logon_srv,
+               info3->base.logon_server.string);
+       fstrcpy(state->response->data.auth.info3.logon_dom,
+               info3->base.domain.string);
+
+       ex = talloc_strdup(state->mem_ctx, "");
+       NT_STATUS_HAVE_NO_MEMORY(ex);
+
+       for (i=0; i < info3->base.groups.count; i++) {
+               ex = talloc_asprintf_append_buffer(ex, "0x%08X:0x%08X\n",
+                                                  info3->base.groups.rids[i].rid,
+                                                  info3->base.groups.rids[i].attributes);
+               NT_STATUS_HAVE_NO_MEMORY(ex);
+       }
+
+       for (i=0; i < info3->sidcount; i++) {
+               char *sid;
+
+               sid = dom_sid_string(mem_ctx, info3->sids[i].sid);
+               NT_STATUS_HAVE_NO_MEMORY(sid);
+
+               ex = talloc_asprintf_append_buffer(ex, "%s:0x%08X\n",
+                                                  sid,
+                                                  info3->sids[i].attributes);
+               NT_STATUS_HAVE_NO_MEMORY(ex);
+
+               talloc_free(sid);
+       }
+
+       state->response->extra_data.data = ex;
+       state->response->length += talloc_get_size(ex);
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx, 
-                                   struct winbindd_cli_state *state, 
-                                   NET_USER_INFO_3 *info3) 
+static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx,
+                                   struct winbindd_cli_state *state,
+                                   struct netr_SamInfo3 *info3)
 {
-       prs_struct ps;
-       uint32 size;
-       if (!prs_init(&ps, 256 /* Random, non-zero number */, mem_ctx, MARSHALL)) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       if (!net_io_user_info3("", info3, &ps, 1, 3, False)) {
-               prs_mem_free(&ps);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
 
-       size = prs_data_size(&ps);
-       SAFE_FREE(state->response.extra_data.data);
-       state->response.extra_data.data = SMB_MALLOC(size);
-       if (!state->response.extra_data.data) {
-               prs_mem_free(&ps);
-               return NT_STATUS_NO_MEMORY;
+       ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, info3,
+                                      (ndr_push_flags_fn_t)ndr_push_netr_SamInfo3);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0,("append_info3_as_ndr: failed to append\n"));
+               return ndr_map_error2ntstatus(ndr_err);
        }
-       memset( state->response.extra_data.data, '\0', size );
-       prs_copy_all_data_out((char *)state->response.extra_data.data, &ps);
-       state->response.length += size;
-       prs_mem_free(&ps);
+
+       state->response->extra_data.data = blob.data;
+       state->response->length += blob.length;
+
        return NT_STATUS_OK;
 }
 
 static NTSTATUS append_unix_username(TALLOC_CTX *mem_ctx,
                                     struct winbindd_cli_state *state,
-                                    const NET_USER_INFO_3 *info3,
+                                    const struct netr_SamInfo3 *info3,
                                     const char *name_domain,
                                     const char *name_user)
 {
        /* We've been asked to return the unix username, per
           'winbind use default domain' settings and the like */
 
-       fstring username_out;
        const char *nt_username, *nt_domain;
 
-       if (!(nt_domain = unistr2_tdup(mem_ctx,
-                                      &info3->uni_logon_dom))) {
+       nt_domain = talloc_strdup(mem_ctx, info3->base.domain.string);
+       if (!nt_domain) {
                /* If the server didn't give us one, just use the one
                 * we sent them */
                nt_domain = name_domain;
        }
 
-       if (!(nt_username = unistr2_tdup(mem_ctx,
-                                        &info3->uni_user_name))) {
+       nt_username = talloc_strdup(mem_ctx, info3->base.account_name.string);
+       if (!nt_username) {
                /* If the server didn't give us one, just use the one
                 * we sent them */
                nt_username = name_user;
        }
 
-       fill_domain_username(username_out, nt_domain, nt_username,
-                            True);
+       fill_domain_username(state->response->data.auth.unix_username,
+                            nt_domain, nt_username, true);
 
-       DEBUG(5,("Setting unix username to [%s]\n", username_out));
-
-       SAFE_FREE(state->response.extra_data.data);
-       state->response.extra_data.data = SMB_STRDUP(username_out);
-       if (!state->response.extra_data.data) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       state->response.length +=
-               strlen((const char *)state->response.extra_data.data)+1;
+       DEBUG(5,("Setting unix username to [%s]\n",
+               state->response->data.auth.unix_username));
 
        return NT_STATUS_OK;
 }
 
 static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
                                 struct winbindd_cli_state *state,
-                                const NET_USER_INFO_3 *info3,
+                                const struct netr_SamInfo3 *info3,
                                 const char *name_domain,
                                 const char *name_user)
 {
        char *afsname = NULL;
        char *cell;
+       char *token;
 
        afsname = talloc_strdup(mem_ctx, lp_afs_username_map());
        if (afsname == NULL) {
@@ -177,9 +192,9 @@ static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
                DOM_SID user_sid;
                fstring sidstr;
 
-               sid_copy(&user_sid, &info3->dom_sid.sid);
-               sid_append_rid(&user_sid, info3->user_rid);
-               sid_to_string(sidstr, &user_sid);
+               sid_copy(&user_sid, info3->base.domain_sid);
+               sid_append_rid(&user_sid, info3->base.rid);
+               sid_to_fstring(sidstr, &user_sid);
                afsname = talloc_string_sub(mem_ctx, afsname,
                                            "%s", sidstr);
        }
@@ -201,22 +216,23 @@ static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
        *cell = '\0';
        cell += 1;
 
-       /* Append an AFS token string */
-       SAFE_FREE(state->response.extra_data.data);
-       state->response.extra_data.data =
-               afs_createtoken_str(afsname, cell);
-
-       if (state->response.extra_data.data != NULL) {
-               state->response.length +=
-                       strlen((const char *)state->response.extra_data.data)+1;
+       token = afs_createtoken_str(afsname, cell);
+       if (token == NULL) {
+               return NT_STATUS_OK;
+       }
+       state->response->extra_data.data = talloc_strdup(state->mem_ctx,
+                                                        token);
+       if (state->response->extra_data.data == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
+       state->response->length +=
+               strlen((const char *)state->response->extra_data.data)+1;
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx, 
-                                    NET_USER_INFO_3 *info3,
-                                    const char *group_sid) 
+NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3,
+                             const char *group_sid)
 /**
  * Check whether a user belongs to a group or list of groups.
  *
@@ -231,22 +247,25 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
 {
        DOM_SID *require_membership_of_sid;
        size_t num_require_membership_of_sid;
-       fstring req_sid;
+       char *req_sid;
        const char *p;
        DOM_SID sid;
        size_t i;
        struct nt_user_token *token;
+       TALLOC_CTX *frame = talloc_stackframe();
        NTSTATUS status;
 
        /* Parse the 'required group' SID */
-       
+
        if (!group_sid || !group_sid[0]) {
                /* NO sid supplied, all users may access */
                return NT_STATUS_OK;
        }
 
-       if (!(token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token))) {
+       token = talloc_zero(talloc_tos(), struct nt_user_token);
+       if (token == NULL) {
                DEBUG(0, ("talloc failed\n"));
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -255,26 +274,30 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
 
        p = group_sid;
 
-       while (next_token(&p, req_sid, ",", sizeof(req_sid))) {
+       while (next_token_talloc(talloc_tos(), &p, &req_sid, ",")) {
                if (!string_to_sid(&sid, req_sid)) {
                        DEBUG(0, ("check_info3_in_group: could not parse %s "
                                  "as a SID!", req_sid));
+                       TALLOC_FREE(frame);
                        return NT_STATUS_INVALID_PARAMETER;
                }
 
-               if (!add_sid_to_array(mem_ctx, &sid,
-                                     &require_membership_of_sid,
-                                     &num_require_membership_of_sid)) {
+               status = add_sid_to_array(talloc_tos(), &sid,
+                                         &require_membership_of_sid,
+                                         &num_require_membership_of_sid);
+               if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("add_sid_to_array failed\n"));
-                       return NT_STATUS_NO_MEMORY;
+                       TALLOC_FREE(frame);
+                       return status;
                }
        }
 
-       status = sid_array_from_info3(mem_ctx, info3, 
-                                     &token->user_sids, 
+       status = sid_array_from_info3(talloc_tos(), info3,
+                                     &token->user_sids,
                                      &token->num_sids,
-                                     True);
+                                     true, false);
        if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
                return status;
        }
 
@@ -284,36 +307,39 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
                                                     token))) {
                DEBUG(3, ("could not add aliases: %s\n",
                          nt_errstr(status)));
+               TALLOC_FREE(frame);
                return status;
        }
 
        debug_nt_user_token(DBGC_CLASS, 10, token);
 
        for (i=0; i<num_require_membership_of_sid; i++) {
-               DEBUG(10, ("Checking SID %s\n", sid_string_static(
+               DEBUG(10, ("Checking SID %s\n", sid_string_dbg(
                                   &require_membership_of_sid[i])));
                if (nt_token_check_sid(&require_membership_of_sid[i],
                                       token)) {
                        DEBUG(10, ("Access ok\n"));
+                       TALLOC_FREE(frame);
                        return NT_STATUS_OK;
                }
        }
-       
+
        /* Do not distinguish this error from a wrong username/pw */
 
+       TALLOC_FREE(frame);
        return NT_STATUS_LOGON_FAILURE;
 }
 
-struct winbindd_domain *find_auth_domain(struct winbindd_cli_state *state, 
-                                       const char *domain_name)
+struct winbindd_domain *find_auth_domain(uint8_t flags,
+                                        const char *domain_name)
 {
        struct winbindd_domain *domain;
 
        if (IS_DC) {
                domain = find_domain_from_name_noinit(domain_name);
                if (domain == NULL) {
-                       DEBUG(3, ("Authentication for domain [%s] refused"
-                                 "as it is not a trusted domain\n", 
+                       DEBUG(3, ("Authentication for domain [%s] refused "
+                                 "as it is not a trusted domain\n",
                                  domain_name));
                }
                return domain;
@@ -327,30 +353,33 @@ struct winbindd_domain *find_auth_domain(struct winbindd_cli_state *state,
        }
 
        /* we can auth against trusted domains */
-       if (state->request.flags & WBFLAG_PAM_CONTACT_TRUSTDOM) {
+       if (flags & WBFLAG_PAM_CONTACT_TRUSTDOM) {
                domain = find_domain_from_name_noinit(domain_name);
                if (domain == NULL) {
-                       DEBUG(3, ("Authentication for domain [%s] skipped " 
-                                 "as it is not a trusted domain\n", 
+                       DEBUG(3, ("Authentication for domain [%s] skipped "
+                                 "as it is not a trusted domain\n",
                                  domain_name));
                } else {
                        return domain;
-               } 
+               }
        }
 
        return find_our_domain();
 }
 
-static void set_auth_errors(struct winbindd_response *resp, NTSTATUS result)
+static void fill_in_password_policy(struct winbindd_response *r,
+                                   const struct samr_DomInfo1 *p)
 {
-       resp->data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(resp->data.auth.nt_status_string, nt_errstr(result));
-
-       /* we might have given a more useful error above */
-       if (*resp->data.auth.error_string == '\0') 
-               fstrcpy(resp->data.auth.error_string,
-                       get_friendly_nt_error_msg(result));
-       resp->data.auth.pam_error = nt_status_to_pam(result);
+       r->data.auth.policy.min_length_password =
+               p->min_password_length;
+       r->data.auth.policy.password_history =
+               p->password_history_length;
+       r->data.auth.policy.password_properties =
+               p->password_properties;
+       r->data.auth.policy.expire      =
+               nt_time_to_unix_abs((NTTIME *)&(p->max_password_age));
+       r->data.auth.policy.min_passwordage =
+               nt_time_to_unix_abs((NTTIME *)&(p->min_password_age));
 }
 
 static NTSTATUS fillup_password_policy(struct winbindd_domain *domain,
@@ -358,13 +387,13 @@ static NTSTATUS fillup_password_policy(struct winbindd_domain *domain,
 {
        struct winbindd_methods *methods;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       SAM_UNK_INFO_1 password_policy;
+       struct samr_DomInfo1 password_policy;
 
        if ( !winbindd_can_contact_domain( domain ) ) {
                DEBUG(5,("fillup_password_policy: No inbound trust to "
-                        "contact domain %s\n", domain->name));         
+                        "contact domain %s\n", domain->name));
                return NT_STATUS_NOT_SUPPORTED;
-       }       
+       }
 
        methods = domain->methods;
 
@@ -373,29 +402,20 @@ static NTSTATUS fillup_password_policy(struct winbindd_domain *domain,
                return status;
        }
 
-       state->response.data.auth.policy.min_length_password =
-               password_policy.min_length_password;
-       state->response.data.auth.policy.password_history =
-               password_policy.password_history;
-       state->response.data.auth.policy.password_properties =
-               password_policy.password_properties;
-       state->response.data.auth.policy.expire =
-               nt_time_to_unix_abs(&(password_policy.expire));
-       state->response.data.auth.policy.min_passwordage = 
-               nt_time_to_unix_abs(&(password_policy.min_passwordage));
+       fill_in_password_policy(state->response, &password_policy);
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS get_max_bad_attempts_from_lockout_policy(struct winbindd_domain *domain, 
-                                                        TALLOC_CTX *mem_ctx, 
-                                                        uint16 *max_allowed_bad_attempts)
+static NTSTATUS get_max_bad_attempts_from_lockout_policy(struct winbindd_domain *domain,
+                                                        TALLOC_CTX *mem_ctx,
+                                                        uint16 *lockout_threshold)
 {
        struct winbindd_methods *methods;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       SAM_UNK_INFO_12 lockout_policy;
+       struct samr_DomInfo12 lockout_policy;
 
-       *max_allowed_bad_attempts = 0;
+       *lockout_threshold = 0;
 
        methods = domain->methods;
 
@@ -404,18 +424,18 @@ static NTSTATUS get_max_bad_attempts_from_lockout_policy(struct winbindd_domain
                return status;
        }
 
-       *max_allowed_bad_attempts = lockout_policy.bad_attempt_lockout;
+       *lockout_threshold = lockout_policy.lockout_threshold;
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS get_pwd_properties(struct winbindd_domain *domain, 
-                                  TALLOC_CTX *mem_ctx, 
+static NTSTATUS get_pwd_properties(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
                                   uint32 *password_properties)
 {
        struct winbindd_methods *methods;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       SAM_UNK_INFO_1 password_policy;
+       struct samr_DomInfo1 password_policy;
 
        *password_properties = 0;
 
@@ -433,10 +453,10 @@ static NTSTATUS get_pwd_properties(struct winbindd_domain *domain,
 
 #ifdef HAVE_KRB5
 
-static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx, 
+static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
                                        const char *type,
                                        uid_t uid,
-                                       BOOL *internal_ccache)
+                                       bool *internal_ccache)
 {
        /* accept FILE and WRFILE as krb5_cc_type from the client and then
         * build the full ccname string based on the user's uid here -
@@ -444,7 +464,7 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
 
        const char *gen_cc = NULL;
 
-       *internal_ccache = True;
+       *internal_ccache = true;
 
        if (uid == -1) {
                goto memory_ccache;
@@ -463,7 +483,7 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
                goto memory_ccache;
        }
 
-       *internal_ccache = False;
+       *internal_ccache = false;
        goto done;
 
   memory_ccache:
@@ -482,9 +502,9 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
 
 static void setup_return_cc_name(struct winbindd_cli_state *state, const char *cc)
 {
-       const char *type = state->request.data.auth.krb5_cc_type;
+       const char *type = state->request->data.auth.krb5_cc_type;
 
-       state->response.data.auth.krb5ccname[0] = '\0';
+       state->response->data.auth.krb5ccname[0] = '\0';
 
        if (type[0] == '\0') {
                return;
@@ -492,24 +512,24 @@ static void setup_return_cc_name(struct winbindd_cli_state *state, const char *c
 
        if (!strequal(type, "FILE") &&
            !strequal(type, "WRFILE")) {
-               DEBUG(10,("won't return krbccname for a %s type ccache\n", 
+               DEBUG(10,("won't return krbccname for a %s type ccache\n",
                        type));
                return;
        }
-       
-       fstrcpy(state->response.data.auth.krb5ccname, cc);
+
+       fstrcpy(state->response->data.auth.krb5ccname, cc);
 }
 
 #endif
 
 static uid_t get_uid_from_state(struct winbindd_cli_state *state)
 {
-       uid_t uid = -1;
+       uid_t uid;
 
-       uid = state->request.data.auth.uid;
+       uid = state->request->data.auth.uid;
 
        if (uid < 0) {
-               DEBUG(1,("invalid uid: '%d'\n", uid));
+               DEBUG(1,("invalid uid: '%u'\n", (unsigned int)uid));
                return -1;
        }
        return uid;
@@ -522,7 +542,7 @@ static uid_t get_uid_from_state(struct winbindd_cli_state *state)
 
 static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
                                            struct winbindd_cli_state *state,
-                                           NET_USER_INFO_3 **info3)
+                                           struct netr_SamInfo3 **info3)
 {
 #ifdef HAVE_KRB5
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -537,13 +557,13 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
        uid_t uid = -1;
        ADS_STRUCT *ads;
        time_t time_offset = 0;
-       BOOL internal_ccache = True;
+       bool internal_ccache = true;
 
        ZERO_STRUCTP(info3);
 
        *info3 = NULL;
-       
-       /* 1st step: 
+
+       /* 1st step:
         * prepare a krb5_cc_cache string for the user */
 
        uid = get_uid_from_state(state);
@@ -552,32 +572,32 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
        }
 
        cc = generate_krb5_ccache(state->mem_ctx,
-                                 state->request.data.auth.krb5_cc_type,
-                                 state->request.data.auth.uid, 
+                                 state->request->data.auth.krb5_cc_type,
+                                 state->request->data.auth.uid,
                                  &internal_ccache);
        if (cc == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
 
-       /* 2nd step: 
+       /* 2nd step:
         * get kerberos properties */
-       
+
        if (domain->private_data) {
                ads = (ADS_STRUCT *)domain->private_data;
-               time_offset = ads->auth.time_offset; 
+               time_offset = ads->auth.time_offset;
        }
 
 
-       /* 3rd step: 
+       /* 3rd step:
         * do kerberos auth and setup ccache as the user */
 
-       parse_domain_user(state->request.data.auth.user, name_domain, name_user);
+       parse_domain_user(state->request->data.auth.user, name_domain, name_user);
 
        realm = domain->alt_name;
        strupper_m(realm);
-       
-       principal_s = talloc_asprintf(state->mem_ctx, "%s@%s", name_user, realm); 
+
+       principal_s = talloc_asprintf(state->mem_ctx, "%s@%s", name_user, realm);
        if (principal_s == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -599,13 +619,13 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
 
        result = kerberos_return_info3_from_pac(state->mem_ctx,
                                                principal_s,
-                                               state->request.data.auth.pass,
+                                               state->request->data.auth.pass,
                                                time_offset,
                                                &ticket_lifetime,
                                                &renewal_until,
                                                cc,
-                                               True,
-                                               True,
+                                               true,
+                                               true,
                                                WINBINDD_PAM_AUTH_KRB5_RENEW_TIME,
                                                info3);
        if (!internal_ccache) {
@@ -625,22 +645,22 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
         * environment */
 
        if (!internal_ccache) {
-               
+
                setup_return_cc_name(state, cc);
 
                result = add_ccache_to_list(principal_s,
                                            cc,
                                            service,
-                                           state->request.data.auth.user,
+                                           state->request->data.auth.user,
                                            realm,
                                            uid,
                                            time(NULL),
                                            ticket_lifetime,
-                                           renewal_until, 
-                                           False);
+                                           renewal_until,
+                                           false);
 
                if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(10,("winbindd_raw_kerberos_login: failed to add ccache to list: %s\n", 
+                       DEBUG(10,("winbindd_raw_kerberos_login: failed to add ccache to list: %s\n",
                                nt_errstr(result)));
                }
        } else {
@@ -672,10 +692,10 @@ failed:
                         "%s\n", error_message(krb5_ret)));
        }
 
-       if (!NT_STATUS_IS_OK(remove_ccache(state->request.data.auth.user))) {
+       if (!NT_STATUS_IS_OK(remove_ccache(state->request->data.auth.user))) {
                DEBUG(3,("winbindd_raw_kerberos_login: "
                          "could not remove ccache for user %s\n",
-                       state->request.data.auth.user));
+                       state->request->data.auth.user));
        }
 
        return result;
@@ -687,46 +707,47 @@ failed:
 /****************************************************************
 ****************************************************************/
 
-static BOOL check_request_flags(uint32_t flags)
+bool check_request_flags(uint32_t flags)
 {
        uint32_t flags_edata = WBFLAG_PAM_AFS_TOKEN |
-                              WBFLAG_PAM_UNIX_NAME |
+                              WBFLAG_PAM_INFO3_TEXT |
                               WBFLAG_PAM_INFO3_NDR;
 
        if ( ( (flags & flags_edata) == WBFLAG_PAM_AFS_TOKEN) ||
             ( (flags & flags_edata) == WBFLAG_PAM_INFO3_NDR) ||
-            ( (flags & flags_edata) == WBFLAG_PAM_UNIX_NAME) ||
+            ( (flags & flags_edata) == WBFLAG_PAM_INFO3_TEXT)||
              !(flags & flags_edata) ) {
-               return True;
+               return true;
        }
 
-       DEBUG(1,("check_request_flags: invalid request flags\n"));
+       DEBUG(1, ("check_request_flags: invalid request flags[0x%08X]\n",
+                 flags));
 
-       return False;
+       return false;
 }
 
 /****************************************************************
 ****************************************************************/
 
-static NTSTATUS append_data(struct winbindd_cli_state *state,
-                           NET_USER_INFO_3 *info3,
-                           const char *name_domain,
-                           const char *name_user)
+NTSTATUS append_auth_data(struct winbindd_cli_state *state,
+                         struct netr_SamInfo3 *info3,
+                         const char *name_domain,
+                         const char *name_user)
 {
        NTSTATUS result;
-       uint32_t flags = state->request.flags;
+       uint32_t flags = state->request->flags;
 
        if (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)
+               memcpy(state->response->data.auth.user_session_key,
+                      info3->base.key.key,
+                      sizeof(state->response->data.auth.user_session_key)
                       /* 16 */);
        }
 
        if (flags & WBFLAG_PAM_LMKEY) {
-               memcpy(state->response.data.auth.first_8_lm_hash,
-                      info3->lm_sess_key,
-                      sizeof(state->response.data.auth.first_8_lm_hash)
+               memcpy(state->response->data.auth.first_8_lm_hash,
+                      info3->base.LMSessKey.key,
+                      sizeof(state->response->data.auth.first_8_lm_hash)
                       /* 8 */);
        }
 
@@ -776,36 +797,49 @@ static NTSTATUS append_data(struct winbindd_cli_state *state,
 void winbindd_pam_auth(struct winbindd_cli_state *state)
 {
        struct winbindd_domain *domain;
-       fstring name_domain, name_user;
+       fstring name_domain, name_user, mapped_user;
+       char *mapped = NULL;
        NTSTATUS result;
+       NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
 
        /* Ensure null termination */
-       state->request.data.auth.user
-               [sizeof(state->request.data.auth.user)-1]='\0';
+       state->request->data.auth.user
+               [sizeof(state->request->data.auth.user)-1]='\0';
 
        /* Ensure null termination */
-       state->request.data.auth.pass
-               [sizeof(state->request.data.auth.pass)-1]='\0';
+       state->request->data.auth.pass
+               [sizeof(state->request->data.auth.pass)-1]='\0';
 
        DEBUG(3, ("[%5lu]: pam auth %s\n", (unsigned long)state->pid,
-                 state->request.data.auth.user));
+                 state->request->data.auth.user));
 
-       if (!check_request_flags(state->request.flags)) {
+       if (!check_request_flags(state->request->flags)) {
                result = NT_STATUS_INVALID_PARAMETER_MIX;
                goto done;
        }
 
        /* Parse domain and username */
-       
-       ws_name_return( state->request.data.auth.user, WB_REPLACE_CHAR );
 
-       if (!canonicalize_username(state->request.data.auth.user,
-                              name_domain, name_user)) {
+       name_map_status = normalize_name_unmap(state->mem_ctx,
+                                              state->request->data.auth.user,
+                                              &mapped);
+
+       /* If the name normalization didnt' actually do anything,
+          just use the original name */
+
+       if (NT_STATUS_IS_OK(name_map_status)
+           ||NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED)) {
+               fstrcpy(mapped_user, mapped);
+       } else {
+               fstrcpy(mapped_user, state->request->data.auth.user);
+       }
+
+       if (!canonicalize_username(mapped_user, name_domain, name_user)) {
                result = NT_STATUS_NO_SUCH_USER;
                goto done;
        }
 
-       domain = find_auth_domain(state, name_domain);
+       domain = find_auth_domain(state->request->flags, name_domain);
 
        if (domain == NULL) {
                result = NT_STATUS_NO_SUCH_USER;
@@ -815,30 +849,30 @@ void winbindd_pam_auth(struct winbindd_cli_state *state)
        sendto_domain(state, domain);
        return;
  done:
-       set_auth_errors(&state->response, result);
+       set_auth_errors(state->response, result);
        DEBUG(5, ("Plain text authentication for %s returned %s "
                  "(PAM: %d)\n",
-                 state->request.data.auth.user,
-                 state->response.data.auth.nt_status_string,
-                 state->response.data.auth.pam_error));
+                 state->request->data.auth.user,
+                 state->response->data.auth.nt_status_string,
+                 state->response->data.auth.pam_error));
        request_error(state);
 }
 
-NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
-                                      struct winbindd_cli_state *state,
-                                      NET_USER_INFO_3 **info3)
+static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
+                                             struct winbindd_cli_state *state,
+                                             struct netr_SamInfo3 **info3)
 {
        NTSTATUS result = NT_STATUS_LOGON_FAILURE;
-       uint16 max_allowed_bad_attempts; 
+       uint16 max_allowed_bad_attempts;
        fstring name_domain, name_user;
        DOM_SID sid;
        enum lsa_SidType type;
        uchar new_nt_pass[NT_HASH_LEN];
        const uint8 *cached_nt_pass;
        const uint8 *cached_salt;
-       NET_USER_INFO_3 *my_info3;
+       struct netr_SamInfo3 *my_info3;
        time_t kickoff_time, must_change_time;
-       BOOL password_good = False;
+       bool password_good = false;
 #ifdef HAVE_KRB5
        struct winbindd_tdc_domain *tdc_domain = NULL;
 #endif
@@ -850,8 +884,8 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
        DEBUG(10,("winbindd_dual_pam_auth_cached\n"));
 
        /* Parse domain and username */
-       
-       parse_domain_user(state->request.data.auth.user, name_domain, name_user);
+
+       parse_domain_user(state->request->data.auth.user, name_domain, name_user);
 
 
        if (!lookup_cached_name(state->mem_ctx,
@@ -868,10 +902,10 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                return NT_STATUS_LOGON_FAILURE;
        }
 
-       result = winbindd_get_creds(domain, 
-                                   state->mem_ctx, 
-                                   &sid, 
-                                   &my_info3, 
+       result = winbindd_get_creds(domain,
+                                   state->mem_ctx,
+                                   &sid,
+                                   &my_info3,
                                    &cached_nt_pass,
                                    &cached_salt);
        if (!NT_STATUS_IS_OK(result)) {
@@ -881,7 +915,7 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 
        *info3 = my_info3;
 
-       E_md4hash(state->request.data.auth.pass, new_nt_pass);
+       E_md4hash(state->request->data.auth.pass, new_nt_pass);
 
        dump_data_pw("new_nt_pass", new_nt_pass, NT_HASH_LEN);
        dump_data_pw("cached_nt_pass", cached_nt_pass, NT_HASH_LEN);
@@ -895,71 +929,71 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                uchar salted_hash[NT_HASH_LEN];
                E_md5hash(cached_salt, new_nt_pass, salted_hash);
 
-               password_good = (memcmp(cached_nt_pass, salted_hash, NT_HASH_LEN) == 0) ?
-                       True : False;
+               password_good = (memcmp(cached_nt_pass, salted_hash,
+                                       NT_HASH_LEN) == 0);
        } else {
                /* Old cached cred - direct store of nt_hash (bad bad bad !). */
-               password_good = (memcmp(cached_nt_pass, new_nt_pass, NT_HASH_LEN) == 0) ?
-                       True : False;
+               password_good = (memcmp(cached_nt_pass, new_nt_pass,
+                                       NT_HASH_LEN) == 0);
        }
 
        if (password_good) {
 
                /* User *DOES* know the password, update logon_time and reset
                 * bad_pw_count */
-       
-               my_info3->user_flgs |= LOGON_CACHED_ACCOUNT;
-       
-               if (my_info3->acct_flags & ACB_AUTOLOCK) {
+
+               my_info3->base.user_flags |= NETLOGON_CACHED_ACCOUNT;
+
+               if (my_info3->base.acct_flags & ACB_AUTOLOCK) {
                        return NT_STATUS_ACCOUNT_LOCKED_OUT;
                }
-       
-               if (my_info3->acct_flags & ACB_DISABLED) {
+
+               if (my_info3->base.acct_flags & ACB_DISABLED) {
                        return NT_STATUS_ACCOUNT_DISABLED;
                }
-       
-               if (my_info3->acct_flags & ACB_WSTRUST) {
+
+               if (my_info3->base.acct_flags & ACB_WSTRUST) {
                        return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
                }
-       
-               if (my_info3->acct_flags & ACB_SVRTRUST) {
+
+               if (my_info3->base.acct_flags & ACB_SVRTRUST) {
                        return NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT;
                }
-       
-               if (my_info3->acct_flags & ACB_DOMTRUST) {
+
+               if (my_info3->base.acct_flags & ACB_DOMTRUST) {
                        return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
                }
 
-               if (!(my_info3->acct_flags & ACB_NORMAL)) {
-                       DEBUG(0,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n", 
-                               my_info3->acct_flags));
+               if (!(my_info3->base.acct_flags & ACB_NORMAL)) {
+                       DEBUG(0,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n",
+                               my_info3->base.acct_flags));
                        return NT_STATUS_LOGON_FAILURE;
                }
 
-               kickoff_time = nt_time_to_unix(my_info3->kickoff_time);
+               kickoff_time = nt_time_to_unix(my_info3->base.acct_expiry);
                if (kickoff_time != 0 && time(NULL) > kickoff_time) {
                        return NT_STATUS_ACCOUNT_EXPIRED;
                }
 
-               must_change_time = nt_time_to_unix(my_info3->pass_must_change_time);
+               must_change_time = nt_time_to_unix(my_info3->base.force_password_change);
                if (must_change_time != 0 && must_change_time < time(NULL)) {
                        /* we allow grace logons when the password has expired */
-                       my_info3->user_flgs |= LOGON_GRACE_LOGON;
+                       my_info3->base.user_flags |= NETLOGON_GRACE_LOGON;
                        /* return NT_STATUS_PASSWORD_EXPIRED; */
                        goto success;
                }
-       
+
 #ifdef HAVE_KRB5
-               if ((state->request.flags & WBFLAG_PAM_KRB5) &&
+               if ((state->request->flags & WBFLAG_PAM_KRB5) &&
                    ((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) &&
-                   (tdc_domain->trust_type & DS_DOMAIN_TRUST_TYPE_UPLEVEL)) {
+                   (tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL)) {
 
                        uid_t uid = -1;
                        const char *cc = NULL;
                        char *realm = NULL;
                        const char *principal_s = NULL;
                        const char *service = NULL;
-                       BOOL internal_ccache = False;
+                       bool internal_ccache = false;
 
                        uid = get_uid_from_state(state);
                        if (uid == -1) {
@@ -968,8 +1002,8 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                        }
 
                        cc = generate_krb5_ccache(state->mem_ctx,
-                                               state->request.data.auth.krb5_cc_type,
-                                               state->request.data.auth.uid,
+                                               state->request->data.auth.krb5_cc_type,
+                                               state->request->data.auth.uid,
                                                &internal_ccache);
                        if (cc == NULL) {
                                return NT_STATUS_NO_MEMORY;
@@ -995,13 +1029,13 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                                result = add_ccache_to_list(principal_s,
                                                            cc,
                                                            service,
-                                                           state->request.data.auth.user,
+                                                           state->request->data.auth.user,
                                                            domain->alt_name,
                                                            uid,
                                                            time(NULL),
                                                            time(NULL) + lp_winbind_cache_time(),
                                                            time(NULL) + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME,
-                                                           True);
+                                                           true);
 
                                if (!NT_STATUS_IS_OK(result)) {
                                        DEBUG(10,("winbindd_dual_pam_auth_cached: failed "
@@ -1015,13 +1049,13 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                /* FIXME: we possibly should handle logon hours as well (does xp when
                 * offline?) see auth/auth_sam.c:sam_account_ok for details */
 
-               unix_to_nt_time(&my_info3->logon_time, time(NULL));
-               my_info3->bad_pw_count = 0;
+               unix_to_nt_time(&my_info3->base.last_logon, time(NULL));
+               my_info3->base.bad_password_count = 0;
 
                result = winbindd_update_creds_by_info3(domain,
                                                        state->mem_ctx,
-                                                       state->request.data.auth.user,
-                                                       state->request.data.auth.pass,
+                                                       state->request->data.auth.user,
+                                                       state->request->data.auth.pass,
                                                        my_info3);
                if (!NT_STATUS_IS_OK(result)) {
                        DEBUG(1,("winbindd_dual_pam_auth_cached: failed to update creds: %s\n",
@@ -1043,14 +1077,14 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
        }
 
        /* increase counter */
-       my_info3->bad_pw_count++;
+       my_info3->base.bad_password_count++;
 
        if (max_allowed_bad_attempts == 0) {
                goto failed;
        }
 
        /* lockout user */
-       if (my_info3->bad_pw_count >= max_allowed_bad_attempts) {
+       if (my_info3->base.bad_password_count >= max_allowed_bad_attempts) {
 
                uint32 password_properties;
 
@@ -1059,68 +1093,68 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                        DEBUG(10,("winbindd_dual_pam_auth_cached: failed to get password properties.\n"));
                }
 
-               if ((my_info3->user_rid != DOMAIN_USER_RID_ADMIN) || 
-                   (password_properties & DOMAIN_LOCKOUT_ADMINS)) {
-                       my_info3->acct_flags |= ACB_AUTOLOCK;
+               if ((my_info3->base.rid != DOMAIN_USER_RID_ADMIN) ||
+                   (password_properties & DOMAIN_PASSWORD_LOCKOUT_ADMINS)) {
+                       my_info3->base.acct_flags |= ACB_AUTOLOCK;
                }
        }
 
 failed:
        result = winbindd_update_creds_by_info3(domain,
                                                state->mem_ctx,
-                                               state->request.data.auth.user,
+                                               state->request->data.auth.user,
                                                NULL,
                                                my_info3);
 
        if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0,("winbindd_dual_pam_auth_cached: failed to update creds %s\n", 
+               DEBUG(0,("winbindd_dual_pam_auth_cached: failed to update creds %s\n",
                        nt_errstr(result)));
        }
 
        return NT_STATUS_LOGON_FAILURE;
 }
 
-NTSTATUS winbindd_dual_pam_auth_kerberos(struct winbindd_domain *domain,
-                                        struct winbindd_cli_state *state, 
-                                        NET_USER_INFO_3 **info3)
+static NTSTATUS winbindd_dual_pam_auth_kerberos(struct winbindd_domain *domain,
+                                               struct winbindd_cli_state *state,
+                                               struct netr_SamInfo3 **info3)
 {
        struct winbindd_domain *contact_domain;
        fstring name_domain, name_user;
        NTSTATUS result;
 
        DEBUG(10,("winbindd_dual_pam_auth_kerberos\n"));
-       
+
        /* Parse domain and username */
-       
-       parse_domain_user(state->request.data.auth.user, name_domain, name_user);
+
+       parse_domain_user(state->request->data.auth.user, name_domain, name_user);
 
        /* what domain should we contact? */
-       
+
        if ( IS_DC ) {
                if (!(contact_domain = find_domain_from_name(name_domain))) {
-                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n", 
-                                 state->request.data.auth.user, name_domain, name_user, name_domain)); 
+                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n",
+                                 state->request->data.auth.user, name_domain, name_user, name_domain));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
-               
+
        } else {
                if (is_myname(name_domain)) {
                        DEBUG(3, ("Authentication for domain %s (local domain to this server) not supported at this stage\n", name_domain));
                        result =  NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
-               
+
                contact_domain = find_domain_from_name(name_domain);
                if (contact_domain == NULL) {
-                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n", 
-                                 state->request.data.auth.user, name_domain, name_user, name_domain)); 
+                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n",
+                                 state->request->data.auth.user, name_domain, name_user, name_domain));
 
                        contact_domain = find_our_domain();
                }
        }
 
-       if (contact_domain->initialized && 
+       if (contact_domain->initialized &&
            contact_domain->active_directory) {
                goto try_login;
        }
@@ -1139,9 +1173,21 @@ done:
        return result;
 }
 
-NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
-                                        struct winbindd_cli_state *state,
-                                        NET_USER_INFO_3 **info3)
+typedef        NTSTATUS (*netlogon_fn_t)(struct rpc_pipe_client *cli,
+                                 TALLOC_CTX *mem_ctx,
+                                 uint32 logon_parameters,
+                                 const char *server,
+                                 const char *username,
+                                 const char *domain,
+                                 const char *workstation,
+                                 const uint8 chal[8],
+                                 DATA_BLOB lm_response,
+                                 DATA_BLOB nt_response,
+                                 struct netr_SamInfo3 **info3);
+
+static NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
+                                               struct winbindd_cli_state *state,
+                                               struct netr_SamInfo3 **info3)
 {
 
        struct rpc_pipe_client *netlogon_pipe;
@@ -1153,28 +1199,20 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
        unsigned char local_nt_response[24];
        struct winbindd_domain *contact_domain;
        fstring name_domain, name_user;
-       BOOL retry;
+       bool retry;
        NTSTATUS result;
-       NET_USER_INFO_3 *my_info3;
-
-       ZERO_STRUCTP(info3);
+       struct netr_SamInfo3 *my_info3 = NULL;
 
        *info3 = NULL;
 
-       my_info3 = TALLOC_ZERO_P(state->mem_ctx, NET_USER_INFO_3);
-       if (my_info3 == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-
        DEBUG(10,("winbindd_dual_pam_auth_samlogon\n"));
-       
+
        /* Parse domain and username */
-       
-       parse_domain_user(state->request.data.auth.user, name_domain, name_user);
+
+       parse_domain_user(state->request->data.auth.user, name_domain, name_user);
 
        /* do password magic */
-       
+
 
        generate_random_buffer(chal, 8);
        if (lp_client_ntlmv2_auth()) {
@@ -1182,19 +1220,19 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                DATA_BLOB names_blob;
                DATA_BLOB nt_response;
                DATA_BLOB lm_response;
-               server_chal = data_blob_talloc(state->mem_ctx, chal, 8); 
-               
+               server_chal = data_blob_talloc(state->mem_ctx, chal, 8);
+
                /* note that the 'workgroup' here is a best guess - we don't know
                   the server's domain at this point.  The 'server name' is also
-                  dodgy... 
+                  dodgy...
                */
-               names_blob = NTLMv2_generate_names_blob(global_myname(), lp_workgroup());
-               
-               if (!SMBNTLMv2encrypt(name_user, name_domain, 
-                                     state->request.data.auth.pass, 
-                                     &server_chal, 
+               names_blob = NTLMv2_generate_names_blob(state->mem_ctx, global_myname(), lp_workgroup());
+
+               if (!SMBNTLMv2encrypt(NULL, name_user, name_domain,
+                                     state->request->data.auth.pass,
+                                     &server_chal,
                                      &names_blob,
-                                     &lm_response, &nt_response, NULL)) {
+                                     &lm_response, &nt_response, NULL, NULL)) {
                        data_blob_free(&names_blob);
                        data_blob_free(&server_chal);
                        DEBUG(0, ("winbindd_pam_auth: SMBNTLMv2encrypt() failed!\n"));
@@ -1211,35 +1249,35 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                data_blob_free(&nt_response);
 
        } else {
-               if (lp_client_lanman_auth() 
-                   && SMBencrypt(state->request.data.auth.pass, 
-                                 chal, 
+               if (lp_client_lanman_auth()
+                   && SMBencrypt(state->request->data.auth.pass,
+                                 chal,
                                  local_lm_response)) {
-                       lm_resp = data_blob_talloc(state->mem_ctx, 
-                                                  local_lm_response, 
+                       lm_resp = data_blob_talloc(state->mem_ctx,
+                                                  local_lm_response,
                                                   sizeof(local_lm_response));
                } else {
                        lm_resp = data_blob_null;
                }
-               SMBNTencrypt(state->request.data.auth.pass, 
+               SMBNTencrypt(state->request->data.auth.pass,
                             chal,
                             local_nt_response);
 
-               nt_resp = data_blob_talloc(state->mem_ctx, 
-                                          local_nt_response, 
+               nt_resp = data_blob_talloc(state->mem_ctx,
+                                          local_nt_response,
                                           sizeof(local_nt_response));
        }
-       
+
        /* what domain should we contact? */
-       
+
        if ( IS_DC ) {
                if (!(contact_domain = find_domain_from_name(name_domain))) {
-                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n", 
-                                 state->request.data.auth.user, name_domain, name_user, name_domain)); 
+                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n",
+                                 state->request->data.auth.user, name_domain, name_user, name_domain));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
-               
+
        } else {
                if (is_myname(name_domain)) {
                        DEBUG(3, ("Authentication for domain %s (local domain to this server) not supported at this stage\n", name_domain));
@@ -1253,20 +1291,10 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
        /* check authentication loop */
 
        do {
-               NTSTATUS (*logon_fn)(struct rpc_pipe_client
-                                    *cli, TALLOC_CTX *mem_ctx,
-                                    uint32 logon_parameters,
-                                    const char *server,
-                                    const char *username,
-                                    const char *domain,
-                                    const char *workstation, 
-                                    const uint8 chal[8], 
-                                    DATA_BLOB lm_response,
-                                    DATA_BLOB nt_response,
-                                    NET_USER_INFO_3 *info3);
+               netlogon_fn_t logon_fn;
 
                ZERO_STRUCTP(my_info3);
-               retry = False;
+               retry = false;
 
                result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
 
@@ -1275,47 +1303,67 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                        goto done;
                }
 
+               /* It is really important to try SamLogonEx here,
+                * because in a clustered environment, we want to use
+                * one machine account from multiple physical
+                * computers.
+                *
+                * With a normal SamLogon call, we must keep the
+                * credentials chain updated and intact between all
+                * users of the machine account (which would imply
+                * cross-node communication for every NTLM logon).
+                *
+                * (The credentials chain is not per NETLOGON pipe
+                * connection, but globally on the server/client pair
+                * by machine name).
+                *
+                * When using SamLogonEx, the credentials are not
+                * supplied, but the session key is implied by the
+                * wrapping SamLogon context.
+                *
+                *  -- abartlet 21 April 2008
+                */
+
                logon_fn = contact_domain->can_do_samlogon_ex
                        ? rpccli_netlogon_sam_network_logon_ex
                        : rpccli_netlogon_sam_network_logon;
 
                result = logon_fn(netlogon_pipe,
-                                                          state->mem_ctx,
-                                                          0,
-                                                          contact_domain->dcname, /* server name */
-                                                          name_user,              /* user name */
-                                                          name_domain,            /* target domain */
-                                                          global_myname(),        /* workstation */
-                                                          chal,
-                                                          lm_resp,
-                                                          nt_resp,
-                                                          my_info3);
+                                 state->mem_ctx,
+                                 0,
+                                 contact_domain->dcname, /* server name */
+                                 name_user,              /* user name */
+                                 name_domain,            /* target domain */
+                                 global_myname(),        /* workstation */
+                                 chal,
+                                 lm_resp,
+                                 nt_resp,
+                                 &my_info3);
+               attempts += 1;
 
                if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
                    && contact_domain->can_do_samlogon_ex) {
                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
                                  "retrying with NetSamLogon\n"));
-                       contact_domain->can_do_samlogon_ex = False;
-                       retry = True;
+                       contact_domain->can_do_samlogon_ex = false;
+                       retry = true;
                        continue;
                }
-                       
-               attempts += 1;
 
                /* We have to try a second time as cm_connect_netlogon
                   might not yet have noticed that the DC has killed
                   our connection. */
 
                if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL)) {
-                       retry = True;
+                       retry = true;
                        continue;
                }
-               
+
                /* if we get access denied, a possible cause was that we had
                   and open connection to the DC, but someone changed our
                   machine account password out from underneath us using 'net
                   rpc changetrustpw' */
-                  
+
                if ( NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) ) {
                        DEBUG(3,("winbindd_pam_auth: sam_logon returned "
                                 "ACCESS_DENIED.  Maybe the trust account "
@@ -1323,39 +1371,38 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                                 "Killing connections to domain %s\n",
                                name_domain));
                        invalidate_cm_connection(&contact_domain->conn);
-                       retry = True;
-               } 
-               
+                       retry = true;
+               }
+
        } while ( (attempts < 2) && retry );
 
        /* handle the case where a NT4 DC does not fill in the acct_flags in
         * the samlogon reply info3. When accurate info3 is required by the
         * caller, we look up the account flags ourselve - gd */
 
-       if ((state->request.flags & WBFLAG_PAM_INFO3_TEXT) && 
-           (my_info3->acct_flags == 0) && NT_STATUS_IS_OK(result)) {
+       if ((state->request->flags & WBFLAG_PAM_INFO3_TEXT) &&
+           NT_STATUS_IS_OK(result) && (my_info3->base.acct_flags == 0)) {
 
                struct rpc_pipe_client *samr_pipe;
-               POLICY_HND samr_domain_handle, user_pol;
-               SAM_USERINFO_CTR *user_ctr;
+               struct policy_handle samr_domain_handle, user_pol;
+               union samr_UserInfo *info = NULL;
                NTSTATUS status_tmp;
                uint32 acct_flags;
 
-               ZERO_STRUCT(user_ctr);
-
-               status_tmp = cm_connect_sam(contact_domain, state->mem_ctx, 
+               status_tmp = cm_connect_sam(contact_domain, state->mem_ctx,
                                            &samr_pipe, &samr_domain_handle);
 
                if (!NT_STATUS_IS_OK(status_tmp)) {
-                       DEBUG(3, ("could not open handle to SAMR pipe: %s\n", 
+                       DEBUG(3, ("could not open handle to SAMR pipe: %s\n",
                                nt_errstr(status_tmp)));
                        goto done;
                }
 
-               status_tmp = rpccli_samr_open_user(samr_pipe, state->mem_ctx, 
-                                                  &samr_domain_handle,
-                                                  MAXIMUM_ALLOWED_ACCESS,
-                                                  my_info3->user_rid, &user_pol);
+               status_tmp = rpccli_samr_OpenUser(samr_pipe, state->mem_ctx,
+                                                 &samr_domain_handle,
+                                                 MAXIMUM_ALLOWED_ACCESS,
+                                                 my_info3->base.rid,
+                                                 &user_pol);
 
                if (!NT_STATUS_IS_OK(status_tmp)) {
                        DEBUG(3, ("could not open user handle on SAMR pipe: %s\n",
@@ -1363,28 +1410,30 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                        goto done;
                }
 
-               status_tmp = rpccli_samr_query_userinfo(samr_pipe, state->mem_ctx, 
-                                                       &user_pol, 16, &user_ctr);
+               status_tmp = rpccli_samr_QueryUserInfo(samr_pipe, state->mem_ctx,
+                                                      &user_pol,
+                                                      16,
+                                                      &info);
 
                if (!NT_STATUS_IS_OK(status_tmp)) {
                        DEBUG(3, ("could not query user info on SAMR pipe: %s\n",
                                nt_errstr(status_tmp)));
-                       rpccli_samr_close(samr_pipe, state->mem_ctx, &user_pol);
+                       rpccli_samr_Close(samr_pipe, state->mem_ctx, &user_pol);
                        goto done;
                }
 
-               acct_flags = user_ctr->info.id16->acb_info;
+               acct_flags = info->info16.acct_flags;
 
                if (acct_flags == 0) {
-                       rpccli_samr_close(samr_pipe, state->mem_ctx, &user_pol);
+                       rpccli_samr_Close(samr_pipe, state->mem_ctx, &user_pol);
                        goto done;
                }
 
-               my_info3->acct_flags = acct_flags;
+               my_info3->base.acct_flags = acct_flags;
 
                DEBUG(10,("successfully retrieved acct_flags 0x%x\n", acct_flags));
 
-               rpccli_samr_close(samr_pipe, state->mem_ctx, &user_pol);
+               rpccli_samr_Close(samr_pipe, state->mem_ctx, &user_pol);
        }
 
        *info3 = my_info3;
@@ -1393,34 +1442,54 @@ done:
 }
 
 enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
-                                           struct winbindd_cli_state *state) 
+                                           struct winbindd_cli_state *state)
 {
        NTSTATUS result = NT_STATUS_LOGON_FAILURE;
-       NTSTATUS krb5_result = NT_STATUS_OK;    
+       NTSTATUS krb5_result = NT_STATUS_OK;
        fstring name_domain, name_user;
-       NET_USER_INFO_3 *info3 = NULL;
-       
+       char *mapped_user;
+       fstring domain_user;
+       struct netr_SamInfo3 *info3 = NULL;
+       NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
+
        /* Ensure null termination */
-       state->request.data.auth.user[sizeof(state->request.data.auth.user)-1]='\0';
+       state->request->data.auth.user[sizeof(state->request->data.auth.user)-1]='\0';
 
        /* Ensure null termination */
-       state->request.data.auth.pass[sizeof(state->request.data.auth.pass)-1]='\0';
+       state->request->data.auth.pass[sizeof(state->request->data.auth.pass)-1]='\0';
 
        DEBUG(3, ("[%5lu]: dual pam auth %s\n", (unsigned long)state->pid,
-                 state->request.data.auth.user));
+                 state->request->data.auth.user));
 
-       if (!check_request_flags(state->request.flags)) {
+       if (!check_request_flags(state->request->flags)) {
                result = NT_STATUS_INVALID_PARAMETER_MIX;
                goto done;
        }
 
        /* Parse domain and username */
-       
-       ws_name_return( state->request.data.auth.user, WB_REPLACE_CHAR );
 
-       parse_domain_user(state->request.data.auth.user, name_domain, name_user);
+       name_map_status = normalize_name_unmap(state->mem_ctx,
+                                              state->request->data.auth.user,
+                                              &mapped_user);
+
+       /* If the name normalization didnt' actually do anything,
+          just use the original name */
+
+       if (!NT_STATUS_IS_OK(name_map_status) &&
+           !NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED))
+       {
+               mapped_user = state->request->data.auth.user;
+       }
 
-       if (domain->online == False) {
+       parse_domain_user(mapped_user, name_domain, name_user);
+
+       if ( mapped_user != state->request->data.auth.user ) {
+               fstr_sprintf( domain_user, "%s\\%s", name_domain, name_user );
+               safe_strcpy( state->request->data.auth.user, domain_user,
+                            sizeof(state->request->data.auth.user)-1 );
+       }
+
+       if (domain->online == false) {
                result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
                if (domain->startup) {
                        /* Logons are very important to users. If we're offline and
@@ -1438,12 +1507,12 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
        DEBUG(10,("winbindd_dual_pam_auth: domain: %s last was %s\n", domain->name, domain->online ? "online":"offline"));
 
        /* Check for Kerberos authentication */
-       if (domain->online && (state->request.flags & WBFLAG_PAM_KRB5)) {
-       
+       if (domain->online && (state->request->flags & WBFLAG_PAM_KRB5)) {
+
                result = winbindd_dual_pam_auth_kerberos(domain, state, &info3);
                /* save for later */
                krb5_result = result;
-               
+
 
                if (NT_STATUS_IS_OK(result)) {
                        DEBUG(10,("winbindd_dual_pam_auth_kerberos succeeded\n"));
@@ -1457,7 +1526,7 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
                    NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
                        DEBUG(10,("winbindd_dual_pam_auth_kerberos setting domain to offline\n"));
                        set_domain_offline( domain );
-                       goto cached_logon;                      
+                       goto cached_logon;
                }
 
                /* there are quite some NT_STATUS errors where there is no
@@ -1476,8 +1545,8 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
                    NT_STATUS_EQUAL(result, NT_STATUS_WRONG_PASSWORD)) {
                        goto process_result;
                }
-               
-               if (state->request.flags & WBFLAG_PAM_FALLBACK_AFTER_KRB5) {
+
+               if (state->request->flags & WBFLAG_PAM_FALLBACK_AFTER_KRB5) {
                        DEBUG(3,("falling back to samlogon\n"));
                        goto sam_logon;
                } else {
@@ -1489,26 +1558,26 @@ sam_logon:
        /* Check for Samlogon authentication */
        if (domain->online) {
                result = winbindd_dual_pam_auth_samlogon(domain, state, &info3);
-       
+
                if (NT_STATUS_IS_OK(result)) {
                        DEBUG(10,("winbindd_dual_pam_auth_samlogon succeeded\n"));
                        /* add the Krb5 err if we have one */
                        if ( NT_STATUS_EQUAL(krb5_result, NT_STATUS_TIME_DIFFERENCE_AT_DC ) ) {
-                               info3->user_flgs |= LOGON_KRB5_FAIL_CLOCK_SKEW;                         
+                               info3->base.user_flags |= LOGON_KRB5_FAIL_CLOCK_SKEW;
                        }
                        goto process_result;
-               } 
+               }
 
-                       DEBUG(10,("winbindd_dual_pam_auth_samlogon failed: %s\n", 
+               DEBUG(10,("winbindd_dual_pam_auth_samlogon failed: %s\n",
                          nt_errstr(result)));
 
                if (NT_STATUS_EQUAL(result, NT_STATUS_NO_LOGON_SERVERS) ||
                    NT_STATUS_EQUAL(result, NT_STATUS_IO_TIMEOUT) ||
-                   NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) 
+                   NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND))
                {
                        DEBUG(10,("winbindd_dual_pam_auth_samlogon setting domain to offline\n"));
                        set_domain_offline( domain );
-                       goto cached_logon;                      
+                       goto cached_logon;
                }
 
                        if (domain->online) {
@@ -1519,9 +1588,9 @@ sam_logon:
 
 cached_logon:
        /* Check for Cached logons */
-       if (!domain->online && (state->request.flags & WBFLAG_PAM_CACHED_LOGIN) && 
+       if (!domain->online && (state->request->flags & WBFLAG_PAM_CACHED_LOGIN) &&
            lp_winbind_offline_logon()) {
-       
+
                result = winbindd_dual_pam_auth_cached(domain, state, &info3);
 
                if (NT_STATUS_IS_OK(result)) {
@@ -1536,7 +1605,7 @@ cached_logon:
 process_result:
 
        if (NT_STATUS_IS_OK(result)) {
-       
+
                DOM_SID user_sid;
 
                /* In all codepaths where result == NT_STATUS_OK info3 must have
@@ -1546,41 +1615,44 @@ process_result:
                        goto done;
                }
 
-               netsamlogon_cache_store(name_user, info3);
                wcache_invalidate_samlogon(find_domain_from_name(name_domain), info3);
+               netsamlogon_cache_store(name_user, info3);
 
                /* save name_to_sid info as early as possible (only if
                   this is our primary domain so we don't invalidate
                   the cache entry by storing the seq_num for the wrong
                   domain). */
-               if ( domain->primary ) {                        
-                       sid_compose(&user_sid, &info3->dom_sid.sid, 
-                                   info3->user_rid);
-                       cache_name2sid(domain, name_domain, name_user, 
+               if ( domain->primary ) {
+                       sid_compose(&user_sid, info3->base.domain_sid,
+                                   info3->base.rid);
+                       cache_name2sid(domain, name_domain, name_user,
                                       SID_NAME_USER, &user_sid);
                }
-               
+
                /* Check if the user is in the right group */
 
-               if (!NT_STATUS_IS_OK(result = check_info3_in_group(state->mem_ctx, info3,
-                                       state->request.data.auth.require_membership_of_sid))) {
+               result = check_info3_in_group(
+                       info3,
+                       state->request->data.auth.require_membership_of_sid);
+               if (!NT_STATUS_IS_OK(result)) {
                        DEBUG(3, ("User %s is not in the required group (%s), so plaintext authentication is rejected\n",
-                                 state->request.data.auth.user, 
-                                 state->request.data.auth.require_membership_of_sid));
+                                 state->request->data.auth.user,
+                                 state->request->data.auth.require_membership_of_sid));
                        goto done;
                }
 
-               result = append_data(state, info3, name_domain, name_user);
+               result = append_auth_data(state, info3, name_domain,
+                                         name_user);
                if (!NT_STATUS_IS_OK(result)) {
                        goto done;
                }
 
-               if ((state->request.flags & WBFLAG_PAM_CACHED_LOGIN)) {
+               if ((state->request->flags & WBFLAG_PAM_CACHED_LOGIN)) {
 
                        /* Store in-memory creds for single-signon using ntlm_auth. */
-                       result = winbindd_add_memory_creds(state->request.data.auth.user,
+                       result = winbindd_add_memory_creds(state->request->data.auth.user,
                                                        get_uid_from_state(state),
-                                                       state->request.data.auth.pass);
+                                                       state->request->data.auth.pass);
 
                        if (!NT_STATUS_IS_OK(result)) {
                                DEBUG(10,("Failed to store memory creds: %s\n", nt_errstr(result)));
@@ -1590,13 +1662,13 @@ process_result:
                        if (lp_winbind_offline_logon()) {
                                result = winbindd_store_creds(domain,
                                                      state->mem_ctx,
-                                                     state->request.data.auth.user,
-                                                     state->request.data.auth.pass,
+                                                     state->request->data.auth.user,
+                                                     state->request->data.auth.pass,
                                                      info3, NULL);
                                if (!NT_STATUS_IS_OK(result)) {
 
                                        /* Release refcount. */
-                                       winbindd_delete_memory_creds(state->request.data.auth.user);
+                                       winbindd_delete_memory_creds(state->request->data.auth.user);
 
                                        DEBUG(10,("Failed to store creds: %s\n", nt_errstr(result)));
                                        goto done;
@@ -1604,16 +1676,31 @@ process_result:
                        }
                }
 
-               result = fillup_password_policy(domain, state);
 
-               if (!NT_STATUS_IS_OK(result) 
-                   && !NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED) ) 
-               {
-                       DEBUG(10,("Failed to get password policies: %s\n", nt_errstr(result)));
-                       goto done;
+               if (state->request->flags & WBFLAG_PAM_GET_PWD_POLICY) {
+                       struct winbindd_domain *our_domain = find_our_domain();
+
+                       /* This is not entirely correct I believe, but it is
+                          consistent.  Only apply the password policy settings
+                          too warn users for our own domain.  Cannot obtain these
+                          from trusted DCs all the  time so don't do it at all.
+                          -- jerry */
+
+                       result = NT_STATUS_NOT_SUPPORTED;
+                       if (our_domain == domain ) {
+                               result = fillup_password_policy(our_domain, state);
+                       }
+
+                       if (!NT_STATUS_IS_OK(result)
+                           && !NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED) )
+                       {
+                               DEBUG(10,("Failed to get password policies for domain %s: %s\n",
+                                         domain->name, nt_errstr(result)));
+                               goto done;
+                       }
                }
 
-               result = NT_STATUS_OK;          
+               result = NT_STATUS_OK;
        }
 
 done:
@@ -1622,26 +1709,20 @@ done:
            (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL)))) {
                result = NT_STATUS_NO_LOGON_SERVERS;
        }
-       
-       state->response.data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
 
-       /* we might have given a more useful error above */
-       if (!*state->response.data.auth.error_string) 
-               fstrcpy(state->response.data.auth.error_string, get_friendly_nt_error_msg(result));
-       state->response.data.auth.pam_error = nt_status_to_pam(result);
+       set_auth_errors(state->response, result);
 
-       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, ("Plain-text authentication for user %s returned %s (PAM: %d)\n", 
-             state->request.data.auth.user, 
-             state->response.data.auth.nt_status_string,
-             state->response.data.auth.pam_error));          
+       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, ("Plain-text authentication for user %s returned %s (PAM: %d)\n",
+             state->request->data.auth.user,
+             state->response->data.auth.nt_status_string,
+             state->response->data.auth.pam_error));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
 
 /**********************************************************************
- Challenge Response Authentication Protocol 
+ Challenge Response Authentication Protocol
 **********************************************************************/
 
 void winbindd_pam_auth_crap(struct winbindd_cli_state *state)
@@ -1650,49 +1731,46 @@ void winbindd_pam_auth_crap(struct winbindd_cli_state *state)
        const char *domain_name = NULL;
        NTSTATUS result;
 
-       if (!check_request_flags(state->request.flags)) {
+       if (!check_request_flags(state->request->flags)) {
                result = NT_STATUS_INVALID_PARAMETER_MIX;
                goto done;
        }
 
        if (!state->privileged) {
-               char *error_string = NULL;
                DEBUG(2, ("winbindd_pam_auth_crap: non-privileged access "
                          "denied.  !\n"));
                DEBUGADD(2, ("winbindd_pam_auth_crap: Ensure permissions "
                             "on %s are set correctly.\n",
                             get_winbind_priv_pipe_dir()));
                /* send a better message than ACCESS_DENIED */
-               error_string = talloc_asprintf(state->mem_ctx,
-                                              "winbind client not authorized "
-                                              "to use winbindd_pam_auth_crap."
-                                              " Ensure permissions on %s "
-                                              "are set correctly.",
-                                              get_winbind_priv_pipe_dir());
-               fstrcpy(state->response.data.auth.error_string, error_string);
+               fstr_sprintf(state->response->data.auth.error_string,
+                            "winbind client not authorized to use "
+                            "winbindd_pam_auth_crap. Ensure permissions on "
+                            "%s are set correctly.",
+                            get_winbind_priv_pipe_dir());
                result = NT_STATUS_ACCESS_DENIED;
                goto done;
        }
 
        /* Ensure null termination */
-       state->request.data.auth_crap.user
-               [sizeof(state->request.data.auth_crap.user)-1]=0;
-       state->request.data.auth_crap.domain
-               [sizeof(state->request.data.auth_crap.domain)-1]=0;
+       state->request->data.auth_crap.user
+               [sizeof(state->request->data.auth_crap.user)-1]=0;
+       state->request->data.auth_crap.domain
+               [sizeof(state->request->data.auth_crap.domain)-1]=0;
 
        DEBUG(3, ("[%5lu]: pam auth crap domain: [%s] user: %s\n",
                  (unsigned long)state->pid,
-                 state->request.data.auth_crap.domain,
-                 state->request.data.auth_crap.user));
+                 state->request->data.auth_crap.domain,
+                 state->request->data.auth_crap.user));
 
-       if (*state->request.data.auth_crap.domain != '\0') {
-               domain_name = state->request.data.auth_crap.domain;
+       if (*state->request->data.auth_crap.domain != '\0') {
+               domain_name = state->request->data.auth_crap.domain;
        } else if (lp_winbind_use_default_domain()) {
                domain_name = lp_workgroup();
        }
 
        if (domain_name != NULL)
-               domain = find_auth_domain(state, domain_name);
+               domain = find_auth_domain(state->request->flags, domain_name);
 
        if (domain != NULL) {
                sendto_domain(state, domain);
@@ -1702,29 +1780,29 @@ void winbindd_pam_auth_crap(struct winbindd_cli_state *state)
        result = NT_STATUS_NO_SUCH_USER;
 
  done:
-       set_auth_errors(&state->response, result);
+       set_auth_errors(state->response, result);
        DEBUG(5, ("CRAP authentication for %s\\%s returned %s (PAM: %d)\n",
-                 state->request.data.auth_crap.domain,
-                 state->request.data.auth_crap.user, 
-                 state->response.data.auth.nt_status_string,
-                 state->response.data.auth.pam_error));
+                 state->request->data.auth_crap.domain,
+                 state->request->data.auth_crap.user,
+                 state->response->data.auth.nt_status_string,
+                 state->response->data.auth.pam_error));
        request_error(state);
        return;
 }
 
 
 enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
-                                                struct winbindd_cli_state *state) 
+                                                struct winbindd_cli_state *state)
 {
        NTSTATUS result;
-        NET_USER_INFO_3 info3;
+       struct netr_SamInfo3 *info3 = NULL;
        struct rpc_pipe_client *netlogon_pipe;
        const char *name_user = NULL;
        const char *name_domain = NULL;
        const char *workstation;
        struct winbindd_domain *contact_domain;
        int attempts = 0;
-       BOOL retry;
+       bool retry;
 
        DATA_BLOB lm_resp, nt_resp;
 
@@ -1732,22 +1810,22 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
           anymore */
 
        /* Ensure null termination */
-       state->request.data.auth_crap.user[sizeof(state->request.data.auth_crap.user)-1]=0;
-       state->request.data.auth_crap.domain[sizeof(state->request.data.auth_crap.domain)-1]=0;
+       state->request->data.auth_crap.user[sizeof(state->request->data.auth_crap.user)-1]=0;
+       state->request->data.auth_crap.domain[sizeof(state->request->data.auth_crap.domain)-1]=0;
 
-       if (!check_request_flags(state->request.flags)) {
+       if (!check_request_flags(state->request->flags)) {
                result = NT_STATUS_INVALID_PARAMETER_MIX;
                goto done;
        }
 
-       name_user = state->request.data.auth_crap.user;
+       name_user = state->request->data.auth_crap.user;
 
-       if (*state->request.data.auth_crap.domain) {
-               name_domain = state->request.data.auth_crap.domain;
+       if (*state->request->data.auth_crap.domain) {
+               name_domain = state->request->data.auth_crap.domain;
        } else if (lp_winbind_use_default_domain()) {
                name_domain = lp_workgroup();
        } else {
-               DEBUG(5,("no domain specified with username (%s) - failing auth\n", 
+               DEBUG(5,("no domain specified with username (%s) - failing auth\n",
                         name_user));
                result = NT_STATUS_NO_SUCH_USER;
                goto done;
@@ -1755,33 +1833,44 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
 
        DEBUG(3, ("[%5lu]: pam auth crap domain: %s user: %s\n", (unsigned long)state->pid,
                  name_domain, name_user));
-          
-       if (*state->request.data.auth_crap.workstation) {
-               workstation = state->request.data.auth_crap.workstation;
+
+       if (*state->request->data.auth_crap.workstation) {
+               workstation = state->request->data.auth_crap.workstation;
        } else {
                workstation = global_myname();
        }
 
-       if (state->request.data.auth_crap.lm_resp_len > sizeof(state->request.data.auth_crap.lm_resp)
-               || state->request.data.auth_crap.nt_resp_len > sizeof(state->request.data.auth_crap.nt_resp)) {
-               DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n", 
-                         state->request.data.auth_crap.lm_resp_len, 
-                         state->request.data.auth_crap.nt_resp_len));
-               result = NT_STATUS_INVALID_PARAMETER;
-               goto done;
+       if (state->request->data.auth_crap.lm_resp_len > sizeof(state->request->data.auth_crap.lm_resp)
+               || state->request->data.auth_crap.nt_resp_len > sizeof(state->request->data.auth_crap.nt_resp)) {
+               if (!(state->request->flags & WBFLAG_BIG_NTLMV2_BLOB) ||
+                    state->request->extra_len != state->request->data.auth_crap.nt_resp_len) {
+                       DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n",
+                                 state->request->data.auth_crap.lm_resp_len,
+                                 state->request->data.auth_crap.nt_resp_len));
+                       result = NT_STATUS_INVALID_PARAMETER;
+                       goto done;
+               }
        }
 
-       lm_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.lm_resp,
-                                       state->request.data.auth_crap.lm_resp_len);
-       nt_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.nt_resp,
-                                       state->request.data.auth_crap.nt_resp_len);
+       lm_resp = data_blob_talloc(state->mem_ctx, state->request->data.auth_crap.lm_resp,
+                                       state->request->data.auth_crap.lm_resp_len);
+
+       if (state->request->flags & WBFLAG_BIG_NTLMV2_BLOB) {
+               nt_resp = data_blob_talloc(state->mem_ctx,
+                                          state->request->extra_data.data,
+                                          state->request->data.auth_crap.nt_resp_len);
+       } else {
+               nt_resp = data_blob_talloc(state->mem_ctx,
+                                          state->request->data.auth_crap.nt_resp,
+                                          state->request->data.auth_crap.nt_resp_len);
+       }
 
        /* what domain should we contact? */
-       
+
        if ( IS_DC ) {
                if (!(contact_domain = find_domain_from_name(name_domain))) {
-                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n", 
-                                 state->request.data.auth_crap.user, name_domain, name_user, name_domain)); 
+                       DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n",
+                                 state->request->data.auth_crap.user, name_domain, name_user, name_domain));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
@@ -1795,20 +1884,9 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
        }
 
        do {
-               NTSTATUS (*logon_fn)(struct rpc_pipe_client
-                                    *cli, TALLOC_CTX *mem_ctx,
-                                    uint32 logon_parameters,
-                                    const char *server,
-                                    const char *username,
-                                    const char *domain,
-                                    const char *workstation, 
-                                    const uint8 chal[8], 
-                                    DATA_BLOB lm_response,
-                                    DATA_BLOB nt_response,
-                                    NET_USER_INFO_3 *info3);
-
-               ZERO_STRUCT(info3);
-               retry = False;
+               netlogon_fn_t logon_fn;
+
+               retry = false;
 
                netlogon_pipe = NULL;
                result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
@@ -1825,13 +1903,13 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
 
                result = logon_fn(netlogon_pipe,
                                  state->mem_ctx,
-                                 state->request.data.auth_crap.logon_parameters,
+                                 state->request->data.auth_crap.logon_parameters,
                                  contact_domain->dcname,
                                  name_user,
-                                 name_domain, 
-                                       /* Bug #3248 - found by Stefan Burkei. */
+                                 name_domain,
+                                 /* Bug #3248 - found by Stefan Burkei. */
                                  workstation, /* We carefully set this above so use it... */
-                                 state->request.data.auth_crap.chal,
+                                 state->request->data.auth_crap.chal,
                                  lm_resp,
                                  nt_resp,
                                  &info3);
@@ -1840,11 +1918,11 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
                    && contact_domain->can_do_samlogon_ex) {
                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
                                  "retrying with NetSamLogon\n"));
-                       contact_domain->can_do_samlogon_ex = False;
-                       retry = True;
+                       contact_domain->can_do_samlogon_ex = false;
+                       retry = true;
                        continue;
                }
-                       
+
                attempts += 1;
 
                /* We have to try a second time as cm_connect_netlogon
@@ -1852,14 +1930,14 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
                   our connection. */
 
                if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL)) {
-                       retry = True;
+                       retry = true;
                        continue;
                }
 
                /* if we get access denied, a possible cause was that we had and open
                   connection to the DC, but someone changed our machine account password
                   out from underneath us using 'net rpc changetrustpw' */
-                  
+
                if ( NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) ) {
                        DEBUG(3,("winbindd_pam_auth: sam_logon returned "
                                 "ACCESS_DENIED.  Maybe the trust account "
@@ -1867,28 +1945,31 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
                                 "Killing connections to domain %s\n",
                                name_domain));
                        invalidate_cm_connection(&contact_domain->conn);
-                       retry = True;
-               } 
+                       retry = true;
+               }
 
        } while ( (attempts < 2) && retry );
 
        if (NT_STATUS_IS_OK(result)) {
 
-               netsamlogon_cache_store(name_user, &info3);
-               wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3);
+               wcache_invalidate_samlogon(find_domain_from_name(name_domain), info3);
+               netsamlogon_cache_store(name_user, info3);
 
                /* Check if the user is in the right group */
 
-               if (!NT_STATUS_IS_OK(result = check_info3_in_group(state->mem_ctx, &info3,
-                                                       state->request.data.auth_crap.require_membership_of_sid))) {
+               result = check_info3_in_group(
+                       info3,
+                       state->request->data.auth_crap.require_membership_of_sid);
+               if (!NT_STATUS_IS_OK(result)) {
                        DEBUG(3, ("User %s is not in the required group (%s), so "
                                  "crap authentication is rejected\n",
-                                 state->request.data.auth_crap.user, 
-                                 state->request.data.auth_crap.require_membership_of_sid));
+                                 state->request->data.auth_crap.user,
+                                 state->request->data.auth_crap.require_membership_of_sid));
                        goto done;
                }
 
-               result = append_data(state, &info3, name_domain, name_user);
+               result = append_auth_data(state, info3, name_domain,
+                                         name_user);
                if (!NT_STATUS_IS_OK(result)) {
                        goto done;
                }
@@ -1902,25 +1983,18 @@ done:
                result = NT_STATUS_NO_LOGON_SERVERS;
        }
 
-       if (state->request.flags & WBFLAG_PAM_NT_STATUS_SQUASH) {
+       if (state->request->flags & WBFLAG_PAM_NT_STATUS_SQUASH) {
                result = nt_status_squash(result);
        }
 
-       state->response.data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
-
-       /* we might have given a more useful error above */
-       if (!*state->response.data.auth.error_string) {
-               fstrcpy(state->response.data.auth.error_string, get_friendly_nt_error_msg(result));
-       }
-       state->response.data.auth.pam_error = nt_status_to_pam(result);
+       set_auth_errors(state->response, result);
 
-       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, 
-             ("NTLM CRAP authentication for user [%s]\\[%s] returned %s (PAM: %d)\n", 
+       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2,
+             ("NTLM CRAP authentication for user [%s]\\[%s] returned %s (PAM: %d)\n",
               name_domain,
               name_user,
-              state->response.data.auth.nt_status_string,
-              state->response.data.auth.pam_error));         
+              state->response->data.auth.nt_status_string,
+              state->response->data.auth.pam_error));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
@@ -1930,31 +2004,47 @@ done:
 void winbindd_pam_chauthtok(struct winbindd_cli_state *state)
 {
        fstring domain, user;
+       char *mapped_user;
        struct winbindd_domain *contact_domain;
+       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
        DEBUG(3, ("[%5lu]: pam chauthtok %s\n", (unsigned long)state->pid,
-               state->request.data.chauthtok.user));
+               state->request->data.chauthtok.user));
 
        /* Setup crap */
 
-       ws_name_return( state->request.data.auth.user, WB_REPLACE_CHAR );
+       nt_status = normalize_name_unmap(state->mem_ctx,
+                                        state->request->data.chauthtok.user,
+                                        &mapped_user);
 
-       if (!canonicalize_username(state->request.data.chauthtok.user, domain, user)) {
-               set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
+       /* Update the chauthtok name if we did any mapping */
+
+       if (NT_STATUS_IS_OK(nt_status) ||
+           NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_RENAMED))
+       {
+               fstrcpy(state->request->data.chauthtok.user, mapped_user);
+       }
+
+       /* Must pass in state->...chauthtok.user because
+          canonicalize_username() assumes an fstring().  Since
+          we have already copied it (if necessary), this is ok. */
+
+       if (!canonicalize_username(state->request->data.chauthtok.user, domain, user)) {
+               set_auth_errors(state->response, NT_STATUS_NO_SUCH_USER);
                DEBUG(5, ("winbindd_pam_chauthtok: canonicalize_username %s failed with %s"
                          "(PAM: %d)\n",
-                         state->request.data.auth.user, 
-                         state->response.data.auth.nt_status_string,
-                         state->response.data.auth.pam_error));
+                         state->request->data.auth.user,
+                         state->response->data.auth.nt_status_string,
+                         state->response->data.auth.pam_error));
                request_error(state);
                return;
        }
 
        contact_domain = find_domain_from_name(domain);
        if (!contact_domain) {
-               set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
-               DEBUG(3, ("Cannot change password for [%s] -> [%s]\\[%s] as %s is not a trusted domain\n", 
-                         state->request.data.chauthtok.user, domain, user, domain)); 
+               set_auth_errors(state->response, NT_STATUS_NO_SUCH_USER);
+               DEBUG(3, ("Cannot change password for [%s] -> [%s]\\[%s] as %s is not a trusted domain\n",
+                         state->request->data.chauthtok.user, domain, user, domain));
                request_error(state);
                return;
        }
@@ -1967,28 +2057,28 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact
 {
        char *oldpass;
        char *newpass = NULL;
-       POLICY_HND dom_pol;
+       struct policy_handle dom_pol;
        struct rpc_pipe_client *cli;
-       BOOL got_info = False;
-       SAM_UNK_INFO_1 info;
-       SAMR_CHANGE_REJECT reject;
+       bool got_info = false;
+       struct samr_DomInfo1 *info = NULL;
+       struct userPwdChangeFailureInformation *reject = NULL;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        fstring domain, user;
 
        DEBUG(3, ("[%5lu]: dual pam chauthtok %s\n", (unsigned long)state->pid,
-                 state->request.data.auth.user));
+                 state->request->data.auth.user));
 
-       if (!parse_domain_user(state->request.data.chauthtok.user, domain, user)) {
+       if (!parse_domain_user(state->request->data.chauthtok.user, domain, user)) {
                goto done;
        }
 
        /* Change password */
 
-       oldpass = state->request.data.chauthtok.oldpass;
-       newpass = state->request.data.chauthtok.newpass;
+       oldpass = state->request->data.chauthtok.oldpass;
+       newpass = state->request->data.chauthtok.newpass;
 
        /* Initialize reject reason */
-       state->response.data.auth.reject_reason = Undefined;
+       state->response->data.auth.reject_reason = Undefined;
 
        /* Get sam handle */
 
@@ -1999,54 +2089,67 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct winbindd_domain *contact
                goto done;
        }
 
-       result = rpccli_samr_chgpasswd3(cli, state->mem_ctx, user, newpass, oldpass, &info, &reject);
+       result = rpccli_samr_chgpasswd_user3(cli, state->mem_ctx,
+                                            user,
+                                            newpass,
+                                            oldpass,
+                                            &info,
+                                            &reject);
 
        /* Windows 2003 returns NT_STATUS_PASSWORD_RESTRICTION */
 
        if (NT_STATUS_EQUAL(result, NT_STATUS_PASSWORD_RESTRICTION) ) {
-               state->response.data.auth.policy.min_length_password = 
-                       info.min_length_password;
-               state->response.data.auth.policy.password_history = 
-                       info.password_history;
-               state->response.data.auth.policy.password_properties = 
-                       info.password_properties;
-               state->response.data.auth.policy.expire = 
-                       nt_time_to_unix_abs(&info.expire);
-               state->response.data.auth.policy.min_passwordage = 
-                       nt_time_to_unix_abs(&info.min_passwordage);
 
-               state->response.data.auth.reject_reason = 
-                       reject.reject_reason;
+               fill_in_password_policy(state->response, info);
+
+               state->response->data.auth.reject_reason =
+                       reject->extendedFailureReason;
 
-               got_info = True;
+               got_info = true;
        }
 
-       /* only fallback when the chgpasswd3 call is not supported */
+       /* atm the pidl generated rpccli_samr_ChangePasswordUser3 function will
+        * return with NT_STATUS_BUFFER_TOO_SMALL for w2k dcs as w2k just
+        * returns with 4byte error code (NT_STATUS_NOT_SUPPORTED) which is too
+        * short to comply with the samr_ChangePasswordUser3 idl - gd */
+
+       /* only fallback when the chgpasswd_user3 call is not supported */
        if ((NT_STATUS_EQUAL(result, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR))) ||
                   (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) ||
+                  (NT_STATUS_EQUAL(result, NT_STATUS_BUFFER_TOO_SMALL)) ||
                   (NT_STATUS_EQUAL(result, NT_STATUS_NOT_IMPLEMENTED))) {
 
-               DEBUG(10,("Password change with chgpasswd3 failed with: %s, retrying chgpasswd_user\n", 
+               DEBUG(10,("Password change with chgpasswd_user3 failed with: %s, retrying chgpasswd_user2\n",
                        nt_errstr(result)));
-               
-               result = rpccli_samr_chgpasswd_user(cli, state->mem_ctx, user, newpass, oldpass);
+
+               result = rpccli_samr_chgpasswd_user2(cli, state->mem_ctx, user, newpass, oldpass);
 
                /* Windows 2000 returns NT_STATUS_ACCOUNT_RESTRICTION.
                   Map to the same status code as Windows 2003. */
 
                if ( NT_STATUS_EQUAL(NT_STATUS_ACCOUNT_RESTRICTION, result ) ) {
-                       result = NT_STATUS_PASSWORD_RESTRICTION;                        
+                       result = NT_STATUS_PASSWORD_RESTRICTION;
                }
        }
 
-done: 
+done:
+
+       if (NT_STATUS_IS_OK(result) && (state->request->flags & WBFLAG_PAM_CACHED_LOGIN)) {
 
-       if (NT_STATUS_IS_OK(result) && (state->request.flags & WBFLAG_PAM_CACHED_LOGIN)) {
-               
                /* Update the single sign-on memory creds. */
-               result = winbindd_replace_memory_creds(state->request.data.chauthtok.user,
+               result = winbindd_replace_memory_creds(state->request->data.chauthtok.user,
                                                        newpass);
 
+               /* When we login from gdm or xdm and password expires,
+                * we change password, but there are no memory crendentials
+                * So, winbindd_replace_memory_creds() returns
+                * NT_STATUS_OBJECT_NAME_NOT_FOUND. This is not a failure.
+                * --- BoYang
+                * */
+               if (NT_STATUS_EQUAL(result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                       result = NT_STATUS_OK;
+               }
+
                if (!NT_STATUS_IS_OK(result)) {
                        DEBUG(10,("Failed to replace memory creds: %s\n", nt_errstr(result)));
                        goto process_result;
@@ -2056,17 +2159,28 @@ done:
                        result = winbindd_update_creds_by_name(contact_domain,
                                                         state->mem_ctx, user,
                                                         newpass);
+                       /* Again, this happens when we login from gdm or xdm
+                        * and the password expires, *BUT* cached crendentials
+                        * doesn't exist. winbindd_update_creds_by_name()
+                        * returns NT_STATUS_NO_SUCH_USER.
+                        * This is not a failure.
+                        * --- BoYang
+                        * */
+                       if (NT_STATUS_EQUAL(result, NT_STATUS_NO_SUCH_USER)) {
+                               result = NT_STATUS_OK;
+                       }
+
                        if (!NT_STATUS_IS_OK(result)) {
                                DEBUG(10,("Failed to store creds: %s\n", nt_errstr(result)));
                                goto process_result;
                        }
                }
-       }               
+       }
 
        if (!NT_STATUS_IS_OK(result) && !got_info && contact_domain) {
 
                NTSTATUS policy_ret;
-               
+
                policy_ret = fillup_password_policy(contact_domain, state);
 
                /* failure of this is non critical, it will just provide no
@@ -2081,17 +2195,14 @@ done:
 
 process_result:
 
-       state->response.data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
-       fstrcpy(state->response.data.auth.error_string, get_friendly_nt_error_msg(result));
-       state->response.data.auth.pam_error = nt_status_to_pam(result);
+       set_auth_errors(state->response, result);
 
-       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, 
-             ("Password change for user [%s]\\[%s] returned %s (PAM: %d)\n", 
+       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2,
+             ("Password change for user [%s]\\[%s] returned %s (PAM: %d)\n",
               domain,
               user,
-              state->response.data.auth.nt_status_string,
-              state->response.data.auth.pam_error));         
+              state->response->data.auth.nt_status_string,
+              state->response->data.auth.pam_error));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
@@ -2101,32 +2212,33 @@ void winbindd_pam_logoff(struct winbindd_cli_state *state)
        struct winbindd_domain *domain;
        fstring name_domain, user;
        uid_t caller_uid = (uid_t)-1;
-       uid_t request_uid = state->request.data.logoff.uid;
+       uid_t request_uid = state->request->data.logoff.uid;
 
        DEBUG(3, ("[%5lu]: pam logoff %s\n", (unsigned long)state->pid,
-               state->request.data.logoff.user));
+               state->request->data.logoff.user));
 
        /* Ensure null termination */
-       state->request.data.logoff.user
-               [sizeof(state->request.data.logoff.user)-1]='\0';
+       state->request->data.logoff.user
+               [sizeof(state->request->data.logoff.user)-1]='\0';
 
-       state->request.data.logoff.krb5ccname
-               [sizeof(state->request.data.logoff.krb5ccname)-1]='\0';
+       state->request->data.logoff.krb5ccname
+               [sizeof(state->request->data.logoff.krb5ccname)-1]='\0';
 
        if (request_uid == (gid_t)-1) {
                goto failed;
        }
 
-       if (!canonicalize_username(state->request.data.logoff.user, name_domain, user)) {
+       if (!canonicalize_username(state->request->data.logoff.user, name_domain, user)) {
                goto failed;
        }
 
-       if ((domain = find_auth_domain(state, name_domain)) == NULL) {
+       if ((domain = find_auth_domain(state->request->flags,
+                                      name_domain)) == NULL) {
                goto failed;
        }
 
        if ((sys_getpeereid(state->sock, &caller_uid)) != 0) {
-               DEBUG(1,("winbindd_pam_logoff: failed to check peerid: %s\n", 
+               DEBUG(1,("winbindd_pam_logoff: failed to check peerid: %s\n",
                        strerror(errno)));
                goto failed;
        }
@@ -2136,14 +2248,14 @@ void winbindd_pam_logoff(struct winbindd_cli_state *state)
                        goto failed;
                case 0:
                        /* root must be able to logoff any user - gd */
-                       state->request.data.logoff.uid = request_uid;
+                       state->request->data.logoff.uid = request_uid;
                        break;
                default:
                        if (caller_uid != request_uid) {
                                DEBUG(1,("winbindd_pam_logoff: caller requested invalid uid\n"));
                                goto failed;
                        }
-                       state->request.data.logoff.uid = caller_uid;
+                       state->request->data.logoff.uid = caller_uid;
                        break;
        }
 
@@ -2151,37 +2263,37 @@ void winbindd_pam_logoff(struct winbindd_cli_state *state)
        return;
 
  failed:
-       set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
+       set_auth_errors(state->response, NT_STATUS_NO_SUCH_USER);
        DEBUG(5, ("Pam Logoff for %s returned %s "
                  "(PAM: %d)\n",
-                 state->request.data.logoff.user,
-                 state->response.data.auth.nt_status_string,
-                 state->response.data.auth.pam_error));
+                 state->request->data.logoff.user,
+                 state->response->data.auth.nt_status_string,
+                 state->response->data.auth.pam_error));
        request_error(state);
        return;
 }
 
 enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain,
-                                             struct winbindd_cli_state *state) 
+                                             struct winbindd_cli_state *state)
 {
        NTSTATUS result = NT_STATUS_NOT_SUPPORTED;
 
        DEBUG(3, ("[%5lu]: pam dual logoff %s\n", (unsigned long)state->pid,
-               state->request.data.logoff.user));
+               state->request->data.logoff.user));
 
-       if (!(state->request.flags & WBFLAG_PAM_KRB5)) {
+       if (!(state->request->flags & WBFLAG_PAM_KRB5)) {
                result = NT_STATUS_OK;
                goto process_result;
        }
 
-       if (state->request.data.logoff.krb5ccname[0] == '\0') {
+       if (state->request->data.logoff.krb5ccname[0] == '\0') {
                result = NT_STATUS_OK;
                goto process_result;
        }
 
 #ifdef HAVE_KRB5
-       
-       if (state->request.data.logoff.uid < 0) {
+
+       if (state->request->data.logoff.uid < 0) {
                DEBUG(0,("winbindd_pam_logoff: invalid uid\n"));
                goto process_result;
        }
@@ -2189,20 +2301,20 @@ enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain,
        /* what we need here is to find the corresponding krb5 ccache name *we*
         * created for a given username and destroy it */
 
-       if (!ccache_entry_exists(state->request.data.logoff.user)) {
+       if (!ccache_entry_exists(state->request->data.logoff.user)) {
                result = NT_STATUS_OK;
                DEBUG(10,("winbindd_pam_logoff: no entry found.\n"));
                goto process_result;
        }
 
-       if (!ccache_entry_identical(state->request.data.logoff.user, 
-                                       state->request.data.logoff.uid,
-                                       state->request.data.logoff.krb5ccname)) {
+       if (!ccache_entry_identical(state->request->data.logoff.user,
+                                       state->request->data.logoff.uid,
+                                       state->request->data.logoff.krb5ccname)) {
                DEBUG(0,("winbindd_pam_logoff: cached entry differs.\n"));
                goto process_result;
        }
 
-       result = remove_ccache(state->request.data.logoff.user);
+       result = remove_ccache(state->request->data.logoff.user);
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(0,("winbindd_pam_logoff: failed to remove ccache: %s\n",
                        nt_errstr(result)));
@@ -2215,12 +2327,9 @@ enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain,
 
 process_result:
 
-       winbindd_delete_memory_creds(state->request.data.logoff.user);
+       winbindd_delete_memory_creds(state->request->data.logoff.user);
 
-       state->response.data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
-       fstrcpy(state->response.data.auth.error_string, get_friendly_nt_error_msg(result));
-       state->response.data.auth.pam_error = nt_status_to_pam(result);
+       set_auth_errors(state->response, result);
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
@@ -2233,18 +2342,18 @@ void winbindd_pam_chng_pswd_auth_crap(struct winbindd_cli_state *state)
        const char *domain_name = NULL;
 
        /* Ensure null termination */
-       state->request.data.chng_pswd_auth_crap.user[
-               sizeof(state->request.data.chng_pswd_auth_crap.user)-1]=0;
-       state->request.data.chng_pswd_auth_crap.domain[
-               sizeof(state->request.data.chng_pswd_auth_crap.domain)-1]=0;
-       
+       state->request->data.chng_pswd_auth_crap.user[
+               sizeof(state->request->data.chng_pswd_auth_crap.user)-1]=0;
+       state->request->data.chng_pswd_auth_crap.domain[
+               sizeof(state->request->data.chng_pswd_auth_crap.domain)-1]=0;
+
        DEBUG(3, ("[%5lu]: pam change pswd auth crap domain: %s user: %s\n",
                  (unsigned long)state->pid,
-                 state->request.data.chng_pswd_auth_crap.domain,
-                 state->request.data.chng_pswd_auth_crap.user));
-       
-       if (*state->request.data.chng_pswd_auth_crap.domain != '\0') {
-               domain_name = state->request.data.chng_pswd_auth_crap.domain;
+                 state->request->data.chng_pswd_auth_crap.domain,
+                 state->request->data.chng_pswd_auth_crap.user));
+
+       if (*state->request->data.chng_pswd_auth_crap.domain != '\0') {
+               domain_name = state->request->data.chng_pswd_auth_crap.domain;
        } else if (lp_winbind_use_default_domain()) {
                domain_name = lp_workgroup();
        }
@@ -2259,12 +2368,12 @@ void winbindd_pam_chng_pswd_auth_crap(struct winbindd_cli_state *state)
                return;
        }
 
-       set_auth_errors(&state->response, NT_STATUS_NO_SUCH_USER);
+       set_auth_errors(state->response, NT_STATUS_NO_SUCH_USER);
        DEBUG(5, ("CRAP change password  for %s\\%s returned %s (PAM: %d)\n",
-                 state->request.data.chng_pswd_auth_crap.domain,
-                 state->request.data.chng_pswd_auth_crap.user, 
-                 state->response.data.auth.nt_status_string,
-                 state->response.data.auth.pam_error));
+                 state->request->data.chng_pswd_auth_crap.domain,
+                 state->request->data.chng_pswd_auth_crap.user,
+                 state->response->data.auth.nt_status_string,
+                 state->response->data.auth.pam_error));
        request_error(state);
        return;
 }
@@ -2277,22 +2386,22 @@ enum winbindd_result winbindd_dual_pam_chng_pswd_auth_crap(struct winbindd_domai
        DATA_BLOB new_lm_password;
        DATA_BLOB old_lm_hash_enc;
        fstring  domain,user;
-       POLICY_HND dom_pol;
+       struct policy_handle dom_pol;
        struct winbindd_domain *contact_domain = domainSt;
        struct rpc_pipe_client *cli;
 
        /* Ensure null termination */
-       state->request.data.chng_pswd_auth_crap.user[
-               sizeof(state->request.data.chng_pswd_auth_crap.user)-1]=0;
-       state->request.data.chng_pswd_auth_crap.domain[
-               sizeof(state->request.data.chng_pswd_auth_crap.domain)-1]=0;
+       state->request->data.chng_pswd_auth_crap.user[
+               sizeof(state->request->data.chng_pswd_auth_crap.user)-1]=0;
+       state->request->data.chng_pswd_auth_crap.domain[
+               sizeof(state->request->data.chng_pswd_auth_crap.domain)-1]=0;
        *domain = 0;
        *user = 0;
-       
+
        DEBUG(3, ("[%5lu]: pam change pswd auth crap domain: %s user: %s\n",
                  (unsigned long)state->pid,
-                 state->request.data.chng_pswd_auth_crap.domain,
-                 state->request.data.chng_pswd_auth_crap.user));
+                 state->request->data.chng_pswd_auth_crap.domain,
+                 state->request->data.chng_pswd_auth_crap.user));
 
        if (lp_winbind_offline_logon()) {
                DEBUG(0,("Refusing password change as winbind offline logons are enabled. "));
@@ -2301,16 +2410,16 @@ enum winbindd_result winbindd_dual_pam_chng_pswd_auth_crap(struct winbindd_domai
                goto done;
        }
 
-       if (*state->request.data.chng_pswd_auth_crap.domain) {
-               fstrcpy(domain,state->request.data.chng_pswd_auth_crap.domain);
+       if (*state->request->data.chng_pswd_auth_crap.domain) {
+               fstrcpy(domain,state->request->data.chng_pswd_auth_crap.domain);
        } else {
-               parse_domain_user(state->request.data.chng_pswd_auth_crap.user,
+               parse_domain_user(state->request->data.chng_pswd_auth_crap.user,
                                  domain, user);
 
                if(!*domain) {
                        DEBUG(3,("no domain specified with username (%s) - "
                                 "failing auth\n",
-                                state->request.data.chng_pswd_auth_crap.user));
+                                state->request->data.chng_pswd_auth_crap.user));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
@@ -2321,33 +2430,33 @@ enum winbindd_result winbindd_dual_pam_chng_pswd_auth_crap(struct winbindd_domai
        }
 
        if(!*user) {
-               fstrcpy(user, state->request.data.chng_pswd_auth_crap.user);
+               fstrcpy(user, state->request->data.chng_pswd_auth_crap.user);
        }
 
        DEBUG(3, ("[%5lu]: pam auth crap domain: %s user: %s\n",
                  (unsigned long)state->pid, domain, user));
-       
+
        /* Change password */
        new_nt_password = data_blob_talloc(
                state->mem_ctx,
-               state->request.data.chng_pswd_auth_crap.new_nt_pswd,
-               state->request.data.chng_pswd_auth_crap.new_nt_pswd_len);
+               state->request->data.chng_pswd_auth_crap.new_nt_pswd,
+               state->request->data.chng_pswd_auth_crap.new_nt_pswd_len);
 
        old_nt_hash_enc = data_blob_talloc(
                state->mem_ctx,
-               state->request.data.chng_pswd_auth_crap.old_nt_hash_enc,
-               state->request.data.chng_pswd_auth_crap.old_nt_hash_enc_len);
+               state->request->data.chng_pswd_auth_crap.old_nt_hash_enc,
+               state->request->data.chng_pswd_auth_crap.old_nt_hash_enc_len);
 
-       if(state->request.data.chng_pswd_auth_crap.new_lm_pswd_len > 0) {
+       if(state->request->data.chng_pswd_auth_crap.new_lm_pswd_len > 0)        {
                new_lm_password = data_blob_talloc(
                        state->mem_ctx,
-                       state->request.data.chng_pswd_auth_crap.new_lm_pswd,
-                       state->request.data.chng_pswd_auth_crap.new_lm_pswd_len);
+                       state->request->data.chng_pswd_auth_crap.new_lm_pswd,
+                       state->request->data.chng_pswd_auth_crap.new_lm_pswd_len);
 
                old_lm_hash_enc = data_blob_talloc(
                        state->mem_ctx,
-                       state->request.data.chng_pswd_auth_crap.old_lm_hash_enc,
-                       state->request.data.chng_pswd_auth_crap.old_lm_hash_enc_len);
+                       state->request->data.chng_pswd_auth_crap.old_lm_hash_enc,
+                       state->request->data.chng_pswd_auth_crap.old_lm_hash_enc_len);
        } else {
                new_lm_password.length = 0;
                old_lm_hash_enc.length = 0;
@@ -2365,18 +2474,15 @@ enum winbindd_result winbindd_dual_pam_chng_pswd_auth_crap(struct winbindd_domai
                cli, state->mem_ctx, user, new_nt_password, old_nt_hash_enc,
                new_lm_password, old_lm_hash_enc);
 
- done:    
-       state->response.data.auth.nt_status = NT_STATUS_V(result);
-       fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
-       fstrcpy(state->response.data.auth.error_string,
-               get_friendly_nt_error_msg(result));
-       state->response.data.auth.pam_error = nt_status_to_pam(result);
+ done:
+
+       set_auth_errors(state->response, result);
 
-       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, 
-             ("Password change for user [%s]\\[%s] returned %s (PAM: %d)\n", 
+       DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2,
+             ("Password change for user [%s]\\[%s] returned %s (PAM: %d)\n",
               domain, user,
-              state->response.data.auth.nt_status_string,
-              state->response.data.auth.pam_error));         
+              state->response->data.auth.nt_status_string,
+              state->response->data.auth.pam_error));
 
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }