Set the right return value if wbc_status is set to an error.
[ira/wip.git] / source3 / nsswitch / pam_winbind.c
index 81f522741046792c3a7d3f18650aa6e1f2beb35e..4cfd9001d6e17e2d2769fbf98b75776823220feb 100644 (file)
@@ -3,7 +3,7 @@
    Copyright Andrew Tridgell <tridge@samba.org> 2000
    Copyright Tim Potter <tpot@samba.org> 2000
    Copyright Andrew Bartlett <abartlet@samba.org> 2002
-   Copyright Guenther Deschner <gd@samba.org> 2005-2007
+   Copyright Guenther Deschner <gd@samba.org> 2005-2008
 
    largely based on pam_userdb by Cristian Gafton <gafton@redhat.com> also
    contains large slabs of code from pam_unix by Elliot Lee
 
 #include "pam_winbind.h"
 
-#define _PAM_LOG_FUNCTION_ENTER(function, pamh, ctrl, flags) \
+static int wbc_error_to_pam_error(wbcErr status)
+{
+       switch (status) {
+               case WBC_ERR_SUCCESS:
+                       return PAM_SUCCESS;
+               case WBC_ERR_NOT_IMPLEMENTED:
+                       return PAM_SERVICE_ERR;
+               case WBC_ERR_UNKNOWN_FAILURE:
+                       break;
+               case WBC_ERR_NO_MEMORY:
+                       return PAM_BUF_ERR;
+               case WBC_ERR_INVALID_SID:
+               case WBC_ERR_INVALID_PARAM:
+                       break;
+               case WBC_ERR_WINBIND_NOT_AVAILABLE:
+                       return PAM_AUTHINFO_UNAVAIL;
+               case WBC_ERR_DOMAIN_NOT_FOUND:
+                       return PAM_AUTHINFO_UNAVAIL;
+               case WBC_ERR_INVALID_RESPONSE:
+                       return PAM_BUF_ERR;
+               case WBC_ERR_NSS_ERROR:
+                       return PAM_USER_UNKNOWN;
+               case WBC_ERR_AUTH_ERROR:
+                       return PAM_AUTH_ERR;
+               case WBC_ERR_UNKNOWN_USER:
+                       return PAM_USER_UNKNOWN;
+               case WBC_ERR_UNKNOWN_GROUP:
+                       return PAM_USER_UNKNOWN;
+               case WBC_ERR_PWD_CHANGE_FAILED:
+                       break;
+       }
+
+       /* be paranoid */
+       return PAM_AUTH_ERR;
+}
+
+static const char *_pam_error_code_str(int err)
+{
+       switch (err) {
+               case PAM_SUCCESS:
+                       return "PAM_SUCCESS";
+               case PAM_OPEN_ERR:
+                       return "PAM_OPEN_ERR";
+               case PAM_SYMBOL_ERR:
+                       return "PAM_SYMBOL_ERR";
+               case PAM_SERVICE_ERR:
+                       return "PAM_SERVICE_ERR";
+               case PAM_SYSTEM_ERR:
+                       return "PAM_SYSTEM_ERR";
+               case PAM_BUF_ERR:
+                       return "PAM_BUF_ERR";
+               case PAM_PERM_DENIED:
+                       return "PAM_PERM_DENIED";
+               case PAM_AUTH_ERR:
+                       return "PAM_AUTH_ERR";
+               case PAM_CRED_INSUFFICIENT:
+                       return "PAM_CRED_INSUFFICIENT";
+               case PAM_AUTHINFO_UNAVAIL:
+                       return "PAM_AUTHINFO_UNAVAIL";
+               case PAM_USER_UNKNOWN:
+                       return "PAM_USER_UNKNOWN";
+               case PAM_MAXTRIES:
+                       return "PAM_MAXTRIES";
+               case PAM_NEW_AUTHTOK_REQD:
+                       return "PAM_NEW_AUTHTOK_REQD";
+               case PAM_ACCT_EXPIRED:
+                       return "PAM_ACCT_EXPIRED";
+               case PAM_SESSION_ERR:
+                       return "PAM_SESSION_ERR";
+               case PAM_CRED_UNAVAIL:
+                       return "PAM_CRED_UNAVAIL";
+               case PAM_CRED_EXPIRED:
+                       return "PAM_CRED_EXPIRED";
+               case PAM_CRED_ERR:
+                       return "PAM_CRED_ERR";
+               case PAM_NO_MODULE_DATA:
+                       return "PAM_NO_MODULE_DATA";
+               case PAM_CONV_ERR:
+                       return "PAM_CONV_ERR";
+               case PAM_AUTHTOK_ERR:
+                       return "PAM_AUTHTOK_ERR";
+               case PAM_AUTHTOK_RECOVERY_ERR:
+                       return "PAM_AUTHTOK_RECOVERY_ERR";
+               case PAM_AUTHTOK_LOCK_BUSY:
+                       return "PAM_AUTHTOK_LOCK_BUSY";
+               case PAM_AUTHTOK_DISABLE_AGING:
+                       return "PAM_AUTHTOK_DISABLE_AGING";
+               case PAM_TRY_AGAIN:
+                       return "PAM_TRY_AGAIN";
+               case PAM_IGNORE:
+                       return "PAM_IGNORE";
+               case PAM_ABORT:
+                       return "PAM_ABORT";
+               case PAM_AUTHTOK_EXPIRED:
+                       return "PAM_AUTHTOK_EXPIRED";
+#ifdef PAM_MODULE_UNKNOWN
+               case PAM_MODULE_UNKNOWN:
+                       return "PAM_MODULE_UNKNOWN";
+#endif
+#ifdef PAM_BAD_ITEM
+               case PAM_BAD_ITEM:
+                       return "PAM_BAD_ITEM";
+#endif
+#ifdef PAM_CONV_AGAIN
+               case PAM_CONV_AGAIN:
+                       return "PAM_CONV_AGAIN";
+#endif
+#ifdef PAM_INCOMPLETE
+               case PAM_INCOMPLETE:
+                       return "PAM_INCOMPLETE";
+#endif
+               default:
+                       return NULL;
+       }
+}
+
+#define _PAM_LOG_FUNCTION_ENTER(function, ctx) \
        do { \
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG, "[pamh: %p] ENTER: " \
-                              function " (flags: 0x%04x)", pamh, flags); \
-               _pam_log_state(pamh, ctrl); \
+               _pam_log_debug(ctx, LOG_DEBUG, "[pamh: %p] ENTER: " \
+                              function " (flags: 0x%04x)", ctx->pamh, ctx->flags); \
+               _pam_log_state(ctx); \
        } while (0)
 
-#define _PAM_LOG_FUNCTION_LEAVE(function, pamh, ctrl, retval) \
+#define _PAM_LOG_FUNCTION_LEAVE(function, ctx, retval) \
        do { \
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG, "[pamh: %p] LEAVE: " \
-                              function " returning %d", pamh, retval); \
-               _pam_log_state(pamh, ctrl); \
+               _pam_log_debug(ctx, LOG_DEBUG, "[pamh: %p] LEAVE: " \
+                              function " returning %d (%s)", ctx->pamh, retval, \
+                              _pam_error_code_str(retval)); \
+               _pam_log_state(ctx); \
        } while (0)
 
 /* data tokens */
@@ -88,8 +205,21 @@ static bool _pam_log_is_silent(int ctrl)
        return on(ctrl, WINBIND_SILENT);
 }
 
-static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
-static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...)
+static void _pam_log(struct pwb_context *r, int err, const char *format, ...) PRINTF_ATTRIBUTE(3,4);
+static void _pam_log(struct pwb_context *r, int err, const char *format, ...)
+{
+       va_list args;
+
+       if (_pam_log_is_silent(r->ctrl)) {
+               return;
+       }
+
+       va_start(args, format);
+       _pam_log_int(r->pamh, err, format, args);
+       va_end(args);
+}
+static void __pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
+static void __pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...)
 {
        va_list args;
 
@@ -128,8 +258,21 @@ static bool _pam_log_is_debug_state_enabled(int ctrl)
        return _pam_log_is_debug_enabled(ctrl);
 }
 
-static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
-static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...)
+static void _pam_log_debug(struct pwb_context *r, int err, const char *format, ...) PRINTF_ATTRIBUTE(3,4);
+static void _pam_log_debug(struct pwb_context *r, int err, const char *format, ...)
+{
+       va_list args;
+
+       if (!_pam_log_is_debug_enabled(r->ctrl)) {
+               return;
+       }
+
+       va_start(args, format);
+       _pam_log_int(r->pamh, err, format, args);
+       va_end(args);
+}
+static void __pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
+static void __pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...)
 {
        va_list args;
 
@@ -142,44 +285,43 @@ static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const ch
        va_end(args);
 }
 
-static void _pam_log_state_datum(const pam_handle_t *pamh,
-                                int ctrl,
+static void _pam_log_state_datum(struct pwb_context *ctx,
                                 int item_type,
                                 const char *key,
                                 int is_string)
 {
        const void *data = NULL;
        if (item_type != 0) {
-               pam_get_item(pamh, item_type, &data);
+               pam_get_item(ctx->pamh, item_type, &data);
        } else {
-               pam_get_data(pamh, key, &data);
+               pam_get_data(ctx->pamh, key, &data);
        }
        if (data != NULL) {
                const char *type = (item_type != 0) ? "ITEM" : "DATA";
                if (is_string != 0) {
-                       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+                       _pam_log_debug(ctx, LOG_DEBUG,
                                       "[pamh: %p] STATE: %s(%s) = \"%s\" (%p)",
-                                      pamh, type, key, (const char *)data,
+                                      ctx->pamh, type, key, (const char *)data,
                                       data);
                } else {
-                       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+                       _pam_log_debug(ctx, LOG_DEBUG,
                                       "[pamh: %p] STATE: %s(%s) = %p",
-                                      pamh, type, key, data);
+                                      ctx->pamh, type, key, data);
                }
        }
 }
 
-#define _PAM_LOG_STATE_DATA_POINTER(pamh, ctrl, module_data_name) \
-       _pam_log_state_datum(pamh, ctrl, 0, module_data_name, 0)
+#define _PAM_LOG_STATE_DATA_POINTER(ctx, module_data_name) \
+       _pam_log_state_datum(ctx, 0, module_data_name, 0)
 
-#define _PAM_LOG_STATE_DATA_STRING(pamh, ctrl, module_data_name) \
-       _pam_log_state_datum(pamh, ctrl, 0, module_data_name, 1)
+#define _PAM_LOG_STATE_DATA_STRING(ctx, module_data_name) \
+       _pam_log_state_datum(ctx, 0, module_data_name, 1)
 
-#define _PAM_LOG_STATE_ITEM_POINTER(pamh, ctrl, item_type) \
-       _pam_log_state_datum(pamh, ctrl, item_type, #item_type, 0)
+#define _PAM_LOG_STATE_ITEM_POINTER(ctx, item_type) \
+       _pam_log_state_datum(ctx, item_type, #item_type, 0)
 
-#define _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, item_type) \
-       _pam_log_state_datum(pamh, ctrl, item_type, #item_type, 1)
+#define _PAM_LOG_STATE_ITEM_STRING(ctx, item_type) \
+       _pam_log_state_datum(ctx, item_type, #item_type, 1)
 
 #ifdef DEBUG_PASSWORD
 #define _LOG_PASSWORD_AS_STRING 1
@@ -187,42 +329,42 @@ static void _pam_log_state_datum(const pam_handle_t *pamh,
 #define _LOG_PASSWORD_AS_STRING 0
 #endif
 
-#define _PAM_LOG_STATE_ITEM_PASSWORD(pamh, ctrl, item_type) \
-       _pam_log_state_datum(pamh, ctrl, item_type, #item_type, \
+#define _PAM_LOG_STATE_ITEM_PASSWORD(ctx, item_type) \
+       _pam_log_state_datum(ctx, item_type, #item_type, \
                             _LOG_PASSWORD_AS_STRING)
 
-static void _pam_log_state(const pam_handle_t *pamh, int ctrl)
+static void _pam_log_state(struct pwb_context *ctx)
 {
-       if (!_pam_log_is_debug_state_enabled(ctrl)) {
+       if (!_pam_log_is_debug_state_enabled(ctx->ctrl)) {
                return;
        }
 
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_SERVICE);
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_USER);
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_TTY);
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_RHOST);
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_RUSER);
-       _PAM_LOG_STATE_ITEM_PASSWORD(pamh, ctrl, PAM_OLDAUTHTOK);
-       _PAM_LOG_STATE_ITEM_PASSWORD(pamh, ctrl, PAM_AUTHTOK);
-       _PAM_LOG_STATE_ITEM_STRING(pamh, ctrl, PAM_USER_PROMPT);
-       _PAM_LOG_STATE_ITEM_POINTER(pamh, ctrl, PAM_CONV);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_SERVICE);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_USER);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_TTY);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_RHOST);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_RUSER);
+       _PAM_LOG_STATE_ITEM_PASSWORD(ctx, PAM_OLDAUTHTOK);
+       _PAM_LOG_STATE_ITEM_PASSWORD(ctx, PAM_AUTHTOK);
+       _PAM_LOG_STATE_ITEM_STRING(ctx, PAM_USER_PROMPT);
+       _PAM_LOG_STATE_ITEM_POINTER(ctx, PAM_CONV);
 #ifdef PAM_FAIL_DELAY
-       _PAM_LOG_STATE_ITEM_POINTER(pamh, ctrl, PAM_FAIL_DELAY);
+       _PAM_LOG_STATE_ITEM_POINTER(ctx, PAM_FAIL_DELAY);
 #endif
 #ifdef PAM_REPOSITORY
-       _PAM_LOG_STATE_ITEM_POINTER(pamh, ctrl, PAM_REPOSITORY);
+       _PAM_LOG_STATE_ITEM_POINTER(ctx, PAM_REPOSITORY);
 #endif
 
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl, PAM_WINBIND_HOMEDIR);
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl, PAM_WINBIND_LOGONSCRIPT);
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl, PAM_WINBIND_LOGONSERVER);
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl, PAM_WINBIND_PROFILEPATH);
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl,
+       _PAM_LOG_STATE_DATA_STRING(ctx, PAM_WINBIND_HOMEDIR);
+       _PAM_LOG_STATE_DATA_STRING(ctx, PAM_WINBIND_LOGONSCRIPT);
+       _PAM_LOG_STATE_DATA_STRING(ctx, PAM_WINBIND_LOGONSERVER);
+       _PAM_LOG_STATE_DATA_STRING(ctx, PAM_WINBIND_PROFILEPATH);
+       _PAM_LOG_STATE_DATA_STRING(ctx,
                                   PAM_WINBIND_NEW_AUTHTOK_REQD);
                                   /* Use atoi to get PAM result code */
-       _PAM_LOG_STATE_DATA_STRING(pamh, ctrl,
+       _PAM_LOG_STATE_DATA_STRING(ctx,
                                   PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH);
-       _PAM_LOG_STATE_DATA_POINTER(pamh, ctrl, PAM_WINBIND_PWD_LAST_SET);
+       _PAM_LOG_STATE_DATA_POINTER(ctx, PAM_WINBIND_PWD_LAST_SET);
 }
 
 static int _pam_parse(const pam_handle_t *pamh,
@@ -295,6 +437,10 @@ static int _pam_parse(const pam_handle_t *pamh,
                ctrl |= WINBIND_WARN_PWD_EXPIRE;
        }
 
+       if (iniparser_getboolean(d, "global:mkhomedir", false)) {
+               ctrl |= WINBIND_MKHOMEDIR;
+       }
+
 config_from_pam:
        /* step through arguments */
        for (i=argc,v=argv; i-- > 0; ++v) {
@@ -327,8 +473,10 @@ config_from_pam:
                        ctrl |= WINBIND_KRB5_CCACHE_TYPE;
                else if (!strcasecmp(*v, "cached_login"))
                        ctrl |= WINBIND_CACHED_LOGIN;
+               else if (!strcasecmp(*v, "mkhomedir"))
+                       ctrl |= WINBIND_MKHOMEDIR;
                else {
-                       _pam_log(pamh, ctrl, LOG_ERR,
+                       __pam_log(pamh, ctrl, LOG_ERR,
                                 "pam_parse: unknown option: %s", *v);
                        return -1;
                }
@@ -346,18 +494,61 @@ config_from_pam:
        return ctrl;
 };
 
+static int _pam_winbind_free_context(struct pwb_context *ctx)
+{
+       if (!ctx) {
+               return 0;
+       }
+
+       if (ctx->dict) {
+               iniparser_freedict(ctx->dict);
+       }
+
+       return 0;
+}
+
+static int _pam_winbind_init_context(pam_handle_t *pamh,
+                                    int flags,
+                                    int argc,
+                                    const char **argv,
+                                    struct pwb_context **ctx_p)
+{
+       struct pwb_context *r = NULL;
+
+       r = TALLOC_ZERO_P(NULL, struct pwb_context);
+       if (!r) {
+               return PAM_BUF_ERR;
+       }
+
+       talloc_set_destructor(r, _pam_winbind_free_context);
+
+       r->pamh = pamh;
+       r->flags = flags;
+       r->argc = argc;
+       r->argv = argv;
+       r->ctrl = _pam_parse(pamh, flags, argc, argv, &r->dict);
+       if (r->ctrl == -1) {
+               TALLOC_FREE(r);
+               return PAM_SYSTEM_ERR;
+       }
+
+       *ctx_p = r;
+
+       return PAM_SUCCESS;
+}
+
 static void _pam_winbind_cleanup_func(pam_handle_t *pamh,
                                      void *data,
                                      int error_status)
 {
        int ctrl = _pam_parse(pamh, 0, 0, NULL, NULL);
        if (_pam_log_is_debug_state_enabled(ctrl)) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               __pam_log_debug(pamh, ctrl, LOG_DEBUG,
                               "[pamh: %p] CLEAN: cleaning up PAM data %p "
                               "(error_status = %d)", pamh, data,
                               error_status);
        }
-       SAFE_FREE(data);
+       TALLOC_FREE(data);
 }
 
 
@@ -407,7 +598,7 @@ static const struct ntstatus_errors {
        {NULL, NULL}
 };
 
-const char *_get_ntstatus_error_string(const char *nt_status_string)
+static const char *_get_ntstatus_error_string(const char *nt_status_string)
 {
        int i;
        for (i=0; ntstatus_errors[i].ntstatus_string != NULL; i++) {
@@ -423,7 +614,7 @@ const char *_get_ntstatus_error_string(const char *nt_status_string)
 
 /* Attempt a conversation */
 
-static int converse(pam_handle_t *pamh,
+static int converse(const pam_handle_t *pamh,
                    int nargs,
                    struct pam_message **message,
                    struct pam_response **response)
@@ -442,8 +633,7 @@ static int converse(pam_handle_t *pamh,
 }
 
 
-static int _make_remark(pam_handle_t * pamh,
-                       int flags,
+static int _make_remark(struct pwb_context *ctx,
                        int type,
                        const char *text)
 {
@@ -452,7 +642,7 @@ static int _make_remark(pam_handle_t * pamh,
        struct pam_message *pmsg[1], msg[1];
        struct pam_response *resp;
 
-       if (flags & WINBIND_SILENT) {
+       if (ctx->flags & WINBIND_SILENT) {
                return PAM_SUCCESS;
        }
 
@@ -461,7 +651,7 @@ static int _make_remark(pam_handle_t * pamh,
        msg[0].msg_style = type;
 
        resp = NULL;
-       retval = converse(pamh, 1, pmsg, &resp);
+       retval = converse(ctx->pamh, 1, pmsg, &resp);
 
        if (resp) {
                _pam_drop_reply(resp, 1);
@@ -469,8 +659,7 @@ static int _make_remark(pam_handle_t * pamh,
        return retval;
 }
 
-static int _make_remark_v(pam_handle_t *pamh,
-                         int flags,
+static int _make_remark_v(struct pwb_context *ctx,
                          int type,
                          const char *format,
                          va_list args)
@@ -480,166 +669,126 @@ static int _make_remark_v(pam_handle_t *pamh,
 
        ret = vasprintf(&var, format, args);
        if (ret < 0) {
-               _pam_log(pamh, 0, LOG_ERR, "memory allocation failure");
+               _pam_log(ctx, LOG_ERR, "memory allocation failure");
                return ret;
        }
 
-       ret = _make_remark(pamh, flags, type, var);
+       ret = _make_remark(ctx, type, var);
        SAFE_FREE(var);
        return ret;
 }
 
-static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
-static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const char *format, ...)
+static int _make_remark_format(struct pwb_context *ctx, int type, const char *format, ...) PRINTF_ATTRIBUTE(3,4);
+static int _make_remark_format(struct pwb_context *ctx, int type, const char *format, ...)
 {
        int ret;
        va_list args;
 
        va_start(args, format);
-       ret = _make_remark_v(pamh, flags, type, format, args);
+       ret = _make_remark_v(ctx, type, format, args);
        va_end(args);
        return ret;
 }
 
-static int pam_winbind_request(pam_handle_t *pamh,
-                              int ctrl,
-                              enum winbindd_cmd req_type,
-                              struct winbindd_request *request,
-                              struct winbindd_response *response)
+static int pam_winbind_request_log(struct pwb_context *ctx,
+                                  int retval,
+                                  const char *user,
+                                  const char *fn)
 {
-       /* Fill in request and send down pipe */
-       winbindd_init_request(request, req_type);
-
-       if (winbind_write_sock(request, sizeof(*request), 0, 0) == -1) {
-               _pam_log(pamh, ctrl, LOG_ERR,
-                        "pam_winbind_request: write to socket failed!");
-               winbind_close_sock();
-               return PAM_SERVICE_ERR;
-       }
-
-       /* Wait for reply */
-       if (winbindd_read_reply(response) == -1) {
-               _pam_log(pamh, ctrl, LOG_ERR,
-                        "pam_winbind_request: read from socket failed!");
-               winbind_close_sock();
-               return PAM_SERVICE_ERR;
-       }
-
-       /* We are done with the socket - close it and avoid mischeif */
-       winbind_close_sock();
-
-       /* Copy reply data from socket */
-       if (response->result == WINBINDD_OK) {
-               return PAM_SUCCESS;
-       }
-
-       /* no need to check for pam_error codes for getpwnam() */
-       switch (req_type) {
-
-               case WINBINDD_GETPWNAM:
-               case WINBINDD_LOOKUPNAME:
-                       if (strlen(response->data.auth.nt_status_string) > 0) {
-                               _pam_log(pamh, ctrl, LOG_ERR,
-                                        "request failed, NT error was %s",
-                                        response->data.auth.nt_status_string);
-                       } else {
-                               _pam_log(pamh, ctrl, LOG_ERR, "request failed");
-                       }
-                       return PAM_USER_UNKNOWN;
-               default:
-                       break;
-       }
-
-       if (response->data.auth.pam_error != PAM_SUCCESS) {
-               _pam_log(pamh, ctrl, LOG_ERR,
-                        "request failed: %s, "
-                        "PAM error was %s (%d), NT error was %s",
-                        response->data.auth.error_string,
-                        pam_strerror(pamh, response->data.auth.pam_error),
-                        response->data.auth.pam_error,
-                        response->data.auth.nt_status_string);
-               return response->data.auth.pam_error;
-       }
-
-       _pam_log(pamh, ctrl, LOG_ERR, "request failed, but PAM error 0!");
-
-       return PAM_SERVICE_ERR;
-}
-
-static int pam_winbind_request_log(pam_handle_t *pamh,
-                                  int ctrl,
-                                  enum winbindd_cmd req_type,
-                                  struct winbindd_request *request,
-                                  struct winbindd_response *response,
-                                  const char *user)
-{
-       int retval;
-
-       retval = pam_winbind_request(pamh, ctrl, req_type, request, response);
-
        switch (retval) {
        case PAM_AUTH_ERR:
                /* incorrect password */
-               _pam_log(pamh, ctrl, LOG_WARNING, "user '%s' denied access "
+               _pam_log(ctx, LOG_WARNING, "user '%s' denied access "
                         "(incorrect password or invalid membership)", user);
                return retval;
        case PAM_ACCT_EXPIRED:
                /* account expired */
-               _pam_log(pamh, ctrl, LOG_WARNING, "user '%s' account expired",
+               _pam_log(ctx, LOG_WARNING, "user '%s' account expired",
                         user);
                return retval;
        case PAM_AUTHTOK_EXPIRED:
                /* password expired */
-               _pam_log(pamh, ctrl, LOG_WARNING, "user '%s' password expired",
+               _pam_log(ctx, LOG_WARNING, "user '%s' password expired",
                         user);
                return retval;
        case PAM_NEW_AUTHTOK_REQD:
                /* new password required */
-               _pam_log(pamh, ctrl, LOG_WARNING, "user '%s' new password "
+               _pam_log(ctx, LOG_WARNING, "user '%s' new password "
                         "required", user);
                return retval;
        case PAM_USER_UNKNOWN:
                /* the user does not exist */
-               _pam_log_debug(pamh, ctrl, LOG_NOTICE, "user '%s' not found",
+               _pam_log_debug(ctx, LOG_NOTICE, "user '%s' not found",
                               user);
-               if (ctrl & WINBIND_UNKNOWN_OK_ARG) {
+               if (ctx->ctrl & WINBIND_UNKNOWN_OK_ARG) {
                        return PAM_IGNORE;
                }
                return retval;
        case PAM_SUCCESS:
                /* Otherwise, the authentication looked good */
-               switch (req_type) {
-                       case WINBINDD_INFO:
-                               break;
-                       case WINBINDD_PAM_AUTH:
-                               _pam_log(pamh, ctrl, LOG_NOTICE,
-                                        "user '%s' granted access", user);
-                               break;
-                       case WINBINDD_PAM_CHAUTHTOK:
-                               _pam_log(pamh, ctrl, LOG_NOTICE,
-                                        "user '%s' password changed", user);
-                               break;
-                       default:
-                               _pam_log(pamh, ctrl, LOG_NOTICE,
-                                        "user '%s' OK", user);
-                               break;
+               if (strcmp(fn, "wbcLogonUser") == 0) {
+                       _pam_log(ctx, LOG_NOTICE,
+                                "user '%s' granted access", user);
+               } else {
+                       _pam_log(ctx, LOG_NOTICE,
+                                "user '%s' OK", user);
                }
-
                return retval;
        default:
                /* we don't know anything about this return value */
-               _pam_log(pamh, ctrl, LOG_ERR,
-                        "internal module error (retval = %d, user = '%s')",
-                        retval, user);
+               _pam_log(ctx, LOG_ERR,
+                        "internal module error (retval = %s(%d), user = '%s')",
+                       _pam_error_code_str(retval), retval, user);
                return retval;
        }
 }
 
+static int wbc_auth_error_to_pam_error(struct pwb_context *ctx,
+                                      struct wbcAuthErrorInfo *e,
+                                      wbcErr status,
+                                      const char *username,
+                                      const char *fn)
+{
+       int ret = PAM_AUTH_ERR;
+
+       if (WBC_ERROR_IS_OK(status)) {
+               _pam_log_debug(ctx, LOG_DEBUG, "request %s succeeded",
+                       fn);
+               ret = PAM_SUCCESS;
+               return pam_winbind_request_log(ctx, ret, username, fn);
+       }
+
+       if (e) {
+               if (e->pam_error != PAM_SUCCESS) {
+                       _pam_log(ctx, LOG_ERR,
+                                "request %s failed: %s, "
+                                "PAM error: %s (%d), NTSTATUS: %s, "
+                                "Error message was: %s",
+                                fn,
+                                wbcErrorString(status),
+                                _pam_error_code_str(e->pam_error),
+                                e->pam_error,
+                                e->nt_string,
+                                e->display_string);
+                       ret = e->pam_error;
+                       return pam_winbind_request_log(ctx, ret, username, fn);
+               }
+
+               _pam_log(ctx, LOG_ERR, "request %s failed, but PAM error 0!", fn);
+
+               ret = PAM_SERVICE_ERR;
+               return pam_winbind_request_log(ctx, ret, username, fn);
+       }
+
+       ret = wbc_error_to_pam_error(status);
+       return pam_winbind_request_log(ctx, ret, username, fn);
+}
+
+
 /**
  * send a password expiry message if required
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param next_change expected (calculated) next expiry date.
  * @param already_expired pointer to a boolean to indicate if the password is
  *        already expired.
@@ -647,8 +796,7 @@ static int pam_winbind_request_log(pam_handle_t *pamh,
  * @return boolean Returns true if message has been sent, false if not.
  */
 
-static bool _pam_send_password_expiry_message(pam_handle_t *pamh,
-                                             int ctrl,
+static bool _pam_send_password_expiry_message(struct pwb_context *ctx,
                                              time_t next_change,
                                              time_t now,
                                              int warn_pwd_expire,
@@ -662,7 +810,7 @@ static bool _pam_send_password_expiry_message(pam_handle_t *pamh,
        }
 
        if (next_change <= now) {
-               PAM_WB_REMARK_DIRECT(pamh, ctrl, "NT_STATUS_PASSWORD_EXPIRED");
+               PAM_WB_REMARK_DIRECT(ctx, "NT_STATUS_PASSWORD_EXPIRED");
                if (already_expired) {
                        *already_expired = true;
                }
@@ -683,13 +831,13 @@ static bool _pam_send_password_expiry_message(pam_handle_t *pamh,
               (tm_now.tm_yday+tm_now.tm_year*365);
 
        if (days == 0) {
-               _make_remark(pamh, ctrl, PAM_TEXT_INFO,
+               _make_remark(ctx, PAM_TEXT_INFO,
                             "Your password expires today");
                return true;
        }
 
        if (days > 0 && days < warn_pwd_expire) {
-               _make_remark_format(pamh, ctrl, PAM_TEXT_INFO,
+               _make_remark_format(ctx, PAM_TEXT_INFO,
                                    "Your password will expire in %d %s",
                                    days, (days > 1) ? "days":"day");
                return true;
@@ -701,41 +849,44 @@ static bool _pam_send_password_expiry_message(pam_handle_t *pamh,
 /**
  * Send a warning if the password expires in the near future
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param response The full authentication response structure.
  * @param already_expired boolean, is the pwd already expired?
  *
  * @return void.
  */
 
-static void _pam_warn_password_expiry(pam_handle_t *pamh,
-                                     int flags,
-                                     const struct winbindd_response *response,
+static void _pam_warn_password_expiry(struct pwb_context *ctx,
+                                     const struct wbcAuthUserInfo *info,
+                                     const struct wbcUserPasswordPolicyInfo *policy,
                                      int warn_pwd_expire,
                                      bool *already_expired)
 {
        time_t now = time(NULL);
        time_t next_change = 0;
 
+       if (!info || !policy) {
+               return;
+       }
+
        if (already_expired) {
                *already_expired = false;
        }
 
-       /* accounts with ACB_PWNOEXP set never receive a warning */
-       if (response->data.auth.info3.acct_flags & ACB_PWNOEXP) {
+       /* accounts with WBC_ACB_PWNOEXP set never receive a warning */
+       if (info->acct_flags & WBC_ACB_PWNOEXP) {
                return;
        }
 
        /* no point in sending a warning if this is a grace logon */
-       if (PAM_WB_GRACE_LOGON(response->data.auth.info3.user_flgs)) {
+       if (PAM_WB_GRACE_LOGON(info->user_flags)) {
                return;
        }
 
        /* check if the info3 must change timestamp has been set */
-       next_change = response->data.auth.info3.pass_must_change_time;
+       next_change = info->pass_must_change_time;
 
-       if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+       if (_pam_send_password_expiry_message(ctx, next_change, now,
                                              warn_pwd_expire,
                                              already_expired)) {
                return;
@@ -744,14 +895,13 @@ static void _pam_warn_password_expiry(pam_handle_t *pamh,
        /* now check for the global password policy */
        /* good catch from Ralf Haferkamp: an expiry of "never" is translated
         * to -1 */
-       if (response->data.auth.policy.expire <= 0) {
+       if (policy->expire <= 0) {
                return;
        }
 
-       next_change = response->data.auth.info3.pass_last_set_time +
-                     response->data.auth.policy.expire;
+       next_change = info->pass_last_set_time + policy->expire;
 
-       if (_pam_send_password_expiry_message(pamh, flags, next_change, now,
+       if (_pam_send_password_expiry_message(ctx, next_change, now,
                                              warn_pwd_expire,
                                              already_expired)) {
                return;
@@ -792,8 +942,7 @@ static bool safe_append_string(char *dest,
 /**
  * Convert a names into a SID string, appending it to a buffer.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param user User in PAM request.
  * @param name Name to convert.
  * @param sid_list_buffer Where to append the string sid.
@@ -801,41 +950,40 @@ static bool safe_append_string(char *dest,
  *
  * @return false on failure, true on success.
  */
-static bool winbind_name_to_sid_string(pam_handle_t *pamh,
-                                      int ctrl,
+static bool winbind_name_to_sid_string(struct pwb_context *ctx,
                                       const char *user,
                                       const char *name,
                                       char *sid_list_buffer,
                                       int sid_list_buffer_size)
 {
        const char* sid_string;
-       struct winbindd_response sid_response;
 
        /* lookup name? */
        if (IS_SID_STRING(name)) {
                sid_string = name;
        } else {
-               struct winbindd_request sid_request;
-
-               ZERO_STRUCT(sid_request);
-               ZERO_STRUCT(sid_response);
+               wbcErr wbc_status;
+               struct wbcDomainSid sid;
+               enum wbcSidType type;
+               char *sid_str;
 
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "no sid given, looking up: %s\n", name);
 
-               /* fortunatly winbindd can handle non-separated names */
-               strncpy(sid_request.data.name.name, name,
-                       sizeof(sid_request.data.name.name) - 1);
-
-               if (pam_winbind_request_log(pamh, ctrl, WINBINDD_LOOKUPNAME,
-                                           &sid_request, &sid_response,
-                                           user)) {
-                       _pam_log(pamh, ctrl, LOG_INFO,
+               wbc_status = wbcLookupName("", name, &sid, &type);
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       _pam_log(ctx, LOG_INFO,
                                 "could not lookup name: %s\n", name);
                        return false;
                }
 
-               sid_string = sid_response.data.sid.sid;
+               wbc_status = wbcSidToString(&sid, &sid_str);
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       return false;
+               }
+
+               wbcFreeMemory(sid_str);
+               sid_string = sid_str;
        }
 
        if (!safe_append_string(sid_list_buffer, sid_string,
@@ -849,8 +997,7 @@ static bool winbind_name_to_sid_string(pam_handle_t *pamh,
 /**
  * Convert a list of names into a list of sids.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param user User in PAM request.
  * @param name_list List of names or string sids, separated by commas.
  * @param sid_list_buffer Where to put the list of string sids.
@@ -858,8 +1005,7 @@ static bool winbind_name_to_sid_string(pam_handle_t *pamh,
  *
  * @return false on failure, true on success.
  */
-static bool winbind_name_list_to_sid_string_list(pam_handle_t *pamh,
-                                                int ctrl,
+static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
                                                 const char *user,
                                                 const char *name_list,
                                                 char *sid_list_buffer,
@@ -882,7 +1028,7 @@ static bool winbind_name_list_to_sid_string_list(pam_handle_t *pamh,
                        goto out;
                }
 
-               if (!winbind_name_to_sid_string(pamh, ctrl, user,
+               if (!winbind_name_to_sid_string(ctx, user,
                                                current_name,
                                                sid_list_buffer,
                                                sid_list_buffer_size)) {
@@ -899,7 +1045,7 @@ static bool winbind_name_list_to_sid_string_list(pam_handle_t *pamh,
                search_location = comma + 1;
        }
 
-       if (!winbind_name_to_sid_string(pamh, ctrl, user, search_location,
+       if (!winbind_name_to_sid_string(ctx, user, search_location,
                                        sid_list_buffer,
                                        sid_list_buffer_size)) {
                goto out;
@@ -915,56 +1061,100 @@ out:
 /**
  * put krb5ccname variable into environment
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param krb5ccname env variable retrieved from winbindd.
  *
  * @return void.
  */
 
-static void _pam_setup_krb5_env(pam_handle_t *pamh,
-                               int ctrl,
-                               const char *krb5ccname)
+static void _pam_setup_krb5_env(struct pwb_context *ctx,
+                               struct wbcLogonUserInfo *info)
 {
        char var[PATH_MAX];
        int ret;
+       uint32_t i;
+       const char *krb5ccname = NULL;
 
-       if (off(ctrl, WINBIND_KRB5_AUTH)) {
+       if (off(ctx->ctrl, WINBIND_KRB5_AUTH)) {
                return;
        }
 
+       if (!info) {
+               return;
+       }
+
+       for (i=0; i < info->num_blobs; i++) {
+               if (strcasecmp(info->blobs[i].name, "krb5ccname") == 0) {
+                       krb5ccname = (const char *)info->blobs[i].blob.data;
+                       break;
+               }
+       }
+
        if (!krb5ccname || (strlen(krb5ccname) == 0)) {
                return;
        }
 
-       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+       _pam_log_debug(ctx, LOG_DEBUG,
                       "request returned KRB5CCNAME: %s", krb5ccname);
 
        if (snprintf(var, sizeof(var), "KRB5CCNAME=%s", krb5ccname) == -1) {
                return;
        }
 
-       ret = pam_putenv(pamh, var);
+       ret = pam_putenv(ctx->pamh, var);
        if (ret) {
-               _pam_log(pamh, ctrl, LOG_ERR,
+               _pam_log(ctx, LOG_ERR,
                         "failed to set KRB5CCNAME to %s: %s",
-                        var, pam_strerror(pamh, ret));
+                        var, pam_strerror(ctx->pamh, ret));
+       }
+}
+
+/**
+ * Copy unix username if available (further processed in PAM).
+ *
+ * @param ctx PAM winbind context
+ * @param user_ret A pointer that holds a pointer to a string
+ * @param unix_username A username
+ *
+ * @return void.
+ */
+
+static void _pam_setup_unix_username(struct pwb_context *ctx,
+                                    char **user_ret,
+                                    struct wbcLogonUserInfo *info)
+{
+       const char *unix_username = NULL;
+       uint32_t i;
+
+       if (!user_ret || !info) {
+               return;
+       }
+
+       for (i=0; i < info->num_blobs; i++) {
+               if (strcasecmp(info->blobs[i].name, "unix_username") == 0) {
+                       unix_username = (const char *)info->blobs[i].blob.data;
+                       break;
+               }
+       }
+
+       if (!unix_username || !unix_username[0]) {
+               return;
        }
+
+       *user_ret = strdup(unix_username);
 }
 
 /**
  * Set string into the PAM stack.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param data_name Key name for pam_set_data.
  * @param value String value.
  *
  * @return void.
  */
 
-static void _pam_set_data_string(pam_handle_t *pamh,
-                                int ctrl,
+static void _pam_set_data_string(struct pwb_context *ctx,
                                 const char *data_name,
                                 const char *value)
 {
@@ -975,39 +1165,36 @@ static void _pam_set_data_string(pam_handle_t *pamh,
                return;
        }
 
-       ret = pam_set_data(pamh, data_name, (void *)strdup(value),
+       ret = pam_set_data(ctx->pamh, data_name, talloc_strdup(NULL, value),
                           _pam_winbind_cleanup_func);
        if (ret) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "Could not set data %s: %s\n",
-                              data_name, pam_strerror(pamh, ret));
+                              data_name, pam_strerror(ctx->pamh, ret));
        }
-
 }
 
 /**
  * Set info3 strings into the PAM stack.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param data_name Key name for pam_set_data.
  * @param value String value.
  *
  * @return void.
  */
 
-static void _pam_set_data_info3(pam_handle_t *pamh,
-                               int ctrl,
-                               struct winbindd_response *response)
+static void _pam_set_data_info3(struct pwb_context *ctx,
+                               const struct wbcAuthUserInfo *info)
 {
-       _pam_set_data_string(pamh, ctrl, PAM_WINBIND_HOMEDIR,
-                            response->data.auth.info3.home_dir);
-       _pam_set_data_string(pamh, ctrl, PAM_WINBIND_LOGONSCRIPT,
-                            response->data.auth.info3.logon_script);
-       _pam_set_data_string(pamh, ctrl, PAM_WINBIND_LOGONSERVER,
-                            response->data.auth.info3.logon_srv);
-       _pam_set_data_string(pamh, ctrl, PAM_WINBIND_PROFILEPATH,
-                            response->data.auth.info3.profile_path);
+       _pam_set_data_string(ctx, PAM_WINBIND_HOMEDIR,
+                            info->home_directory);
+       _pam_set_data_string(ctx, PAM_WINBIND_LOGONSCRIPT,
+                            info->logon_script);
+       _pam_set_data_string(ctx, PAM_WINBIND_LOGONSERVER,
+                            info->logon_server);
+       _pam_set_data_string(ctx, PAM_WINBIND_PROFILEPATH,
+                            info->profile_path);
 }
 
 /**
@@ -1029,37 +1216,35 @@ static void _pam_free_data_info3(pam_handle_t *pamh)
 /**
  * Send PAM_ERROR_MSG for cached or grace logons.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param username User in PAM request.
  * @param info3_user_flgs Info3 flags containing logon type bits.
  *
  * @return void.
  */
 
-static void _pam_warn_logon_type(pam_handle_t *pamh,
-                                int ctrl,
+static void _pam_warn_logon_type(struct pwb_context *ctx,
                                 const char *username,
                                 uint32_t info3_user_flgs)
 {
        /* inform about logon type */
        if (PAM_WB_GRACE_LOGON(info3_user_flgs)) {
 
-               _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+               _make_remark(ctx, PAM_ERROR_MSG,
                             "Grace login. "
                             "Please change your password as soon you're "
                             "online again");
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "User %s logged on using grace logon\n",
                               username);
 
        } else if (PAM_WB_CACHED_LOGON(info3_user_flgs)) {
 
-               _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+               _make_remark(ctx, PAM_ERROR_MSG,
                             "Domain Controller unreachable, "
                             "using cached credentials instead. "
                             "Network resources may be unavailable");
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "User %s logged on using cached credentials\n",
                               username);
        }
@@ -1068,392 +1253,609 @@ static void _pam_warn_logon_type(pam_handle_t *pamh,
 /**
  * Send PAM_ERROR_MSG for krb5 errors.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param username User in PAM request.
  * @param info3_user_flgs Info3 flags containing logon type bits.
  *
  * @return void.
  */
 
-static void _pam_warn_krb5_failure(pam_handle_t *pamh,
-                                  int ctrl,
+static void _pam_warn_krb5_failure(struct pwb_context *ctx,
                                   const char *username,
                                   uint32_t info3_user_flgs)
 {
        if (PAM_WB_KRB5_CLOCK_SKEW(info3_user_flgs)) {
-               _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+               _make_remark(ctx, PAM_ERROR_MSG,
                             "Failed to establish your Kerberos Ticket cache "
                             "due time differences\n"
                             "with the domain controller.  "
                             "Please verify the system time.\n");
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "User %s: Clock skew when getting Krb5 TGT\n",
                               username);
        }
 }
 
+static bool _pam_check_remark_auth_err(struct pwb_context *ctx,
+                                      const struct wbcAuthErrorInfo *e,
+                                      const char *nt_status_string,
+                                      int *pam_error)
+{
+       const char *ntstatus = NULL;
+       const char *error_string = NULL;
+
+       if (!e || !pam_error) {
+               return false;
+       }
+
+       ntstatus = e->nt_string;
+       if (!ntstatus) {
+               return false;
+       }
+
+       if (strcasecmp(ntstatus, nt_status_string) == 0) {
+
+               error_string = _get_ntstatus_error_string(nt_status_string);
+               if (error_string) {
+                       _make_remark(ctx, PAM_ERROR_MSG, error_string);
+                       *pam_error = e->pam_error;
+                       return true;
+               }
+
+               if (e->display_string) {
+                       _make_remark(ctx, PAM_ERROR_MSG, e->display_string);
+                       *pam_error = e->pam_error;
+                       return true;
+               }
+
+               _make_remark(ctx, PAM_ERROR_MSG, nt_status_string);
+               *pam_error = e->pam_error;
+
+               return true;
+       }
+
+       return false;
+};
+
 /**
  * Compose Password Restriction String for a PAM_ERROR_MSG conversation.
  *
- * @param response The struct winbindd_response.
+ * @param i The wbcUserPasswordPolicyInfo struct.
  *
- * @return string (caller needs to free).
+ * @return string (caller needs to talloc_free).
  */
 
-static char *_pam_compose_pwd_restriction_string(struct winbindd_response *response)
+static char *_pam_compose_pwd_restriction_string(struct pwb_context *ctx,
+                                                struct wbcUserPasswordPolicyInfo *i)
 {
        char *str = NULL;
-       size_t offset = 0, ret = 0, str_size = 1024;
 
-       str = (char *)malloc(str_size);
-       if (!str) {
-               return NULL;
+       if (!i) {
+               goto failed;
        }
 
-       memset(str, '\0', str_size);
-
-       offset = snprintf(str, str_size, "Your password ");
-       if (offset == -1) {
+       str = talloc_asprintf(ctx, "Your password ");
+       if (!str) {
                goto failed;
        }
 
-       if (response->data.auth.policy.min_length_password > 0) {
-               ret = snprintf(str+offset, str_size-offset,
+       if (i->min_length_password > 0) {
+               str = talloc_asprintf_append(str,
                               "must be at least %d characters; ",
-                              response->data.auth.policy.min_length_password);
-               if (ret == -1) {
+                              i->min_length_password);
+               if (!str) {
                        goto failed;
                }
-               offset += ret;
        }
 
-       if (response->data.auth.policy.password_history > 0) {
-               ret = snprintf(str+offset, str_size-offset,
+       if (i->password_history > 0) {
+               str = talloc_asprintf_append(str,
                               "cannot repeat any of your previous %d "
                               "passwords; ",
-                              response->data.auth.policy.password_history);
-               if (ret == -1) {
+                              i->password_history);
+               if (!str) {
                        goto failed;
                }
-               offset += ret;
        }
 
-       if (response->data.auth.policy.password_properties &
-           DOMAIN_PASSWORD_COMPLEX) {
-               ret = snprintf(str+offset, str_size-offset,
+       if (i->password_properties & WBC_DOMAIN_PASSWORD_COMPLEX) {
+               str = talloc_asprintf_append(str,
                               "must contain capitals, numerals "
                               "or punctuation; "
                               "and cannot contain your account "
                               "or full name; ");
-               if (ret == -1) {
+               if (!str) {
                        goto failed;
                }
-               offset += ret;
        }
 
-       ret = snprintf(str+offset, str_size-offset,
+       str = talloc_asprintf_append(str,
                       "Please type a different password. "
                       "Type a password which meets these requirements in "
                       "both text boxes.");
-       if (ret == -1) {
+       if (!str) {
                goto failed;
        }
 
        return str;
 
  failed:
-       SAFE_FREE(str);
+       TALLOC_FREE(str);
        return NULL;
 }
 
+static int _pam_create_homedir(struct pwb_context *ctx,
+                              const char *dirname,
+                              mode_t mode)
+{
+       struct stat sbuf;
+
+       if (stat(dirname, &sbuf) == 0) {
+               return PAM_SUCCESS;
+       }
+
+       if (mkdir(dirname, mode) != 0) {
+
+               _make_remark_format(ctx, PAM_TEXT_INFO,
+                                   "Creating directory: %s failed: %s",
+                                   dirname, strerror(errno));
+               _pam_log(ctx, LOG_ERR, "could not create dir: %s (%s)",
+                dirname, strerror(errno));
+                return PAM_PERM_DENIED;
+       }
+
+       return PAM_SUCCESS;
+}
+
+static int _pam_chown_homedir(struct pwb_context *ctx,
+                             const char *dirname,
+                             uid_t uid,
+                             gid_t gid)
+{
+       if (chown(dirname, uid, gid) != 0) {
+               _pam_log(ctx, LOG_ERR, "failed to chown user homedir: %s (%s)",
+                        dirname, strerror(errno));
+               return PAM_PERM_DENIED;
+       }
+
+       return PAM_SUCCESS;
+}
+
+static int _pam_mkhomedir(struct pwb_context *ctx)
+{
+       struct passwd *pwd = NULL;
+       char *token = NULL;
+       char *create_dir = NULL;
+       char *user_dir = NULL;
+       int ret;
+       const char *username;
+       mode_t mode = 0700;
+       char *safe_ptr = NULL;
+       char *p = NULL;
+
+       /* Get the username */
+       ret = pam_get_user(ctx->pamh, &username, NULL);
+       if ((ret != PAM_SUCCESS) || (!username)) {
+               _pam_log_debug(ctx, LOG_DEBUG, "can not get the username");
+               return PAM_SERVICE_ERR;
+       }
+
+       pwd = getpwnam(username);
+       if (pwd == NULL) {
+               _pam_log_debug(ctx, LOG_DEBUG, "can not get the username");
+               return PAM_USER_UNKNOWN;
+       }
+       _pam_log_debug(ctx, LOG_DEBUG, "homedir is: %s", pwd->pw_dir);
+
+       ret = _pam_create_homedir(ctx, pwd->pw_dir, 0700);
+       if (ret == PAM_SUCCESS) {
+               ret = _pam_chown_homedir(ctx, pwd->pw_dir,
+                                        pwd->pw_uid,
+                                        pwd->pw_gid);
+       }
+
+       if (ret == PAM_SUCCESS) {
+               return ret;
+       }
+
+       /* maybe we need to create parent dirs */
+       create_dir = talloc_strdup(ctx, "/");
+       if (!create_dir) {
+               return PAM_BUF_ERR;
+       }
+
+       /* find final directory */
+       user_dir = strrchr(pwd->pw_dir, '/');
+       if (!user_dir) {
+               return PAM_BUF_ERR;
+       }
+       user_dir++;
+
+       _pam_log(ctx, LOG_DEBUG, "final directory: %s", user_dir);
+
+       p = pwd->pw_dir;
+
+       while ((token = strtok_r(p, "/", &safe_ptr)) != NULL) {
+
+               mode = 0755;
+
+               p = NULL;
+
+               _pam_log_debug(ctx, LOG_DEBUG, "token is %s", token);
+
+               create_dir = talloc_asprintf_append(create_dir, "%s/", token);
+               if (!create_dir) {
+                       return PAM_BUF_ERR;
+               }
+               _pam_log_debug(ctx, LOG_DEBUG, "current_dir is %s", create_dir);
+
+               if (strcmp(token, user_dir) == 0) {
+                       _pam_log_debug(ctx, LOG_DEBUG, "assuming last directory: %s", token);
+                       mode = 0700;
+               }
+
+               ret = _pam_create_homedir(ctx, create_dir, mode);
+               if (ret) {
+                       return ret;
+               }
+       }
+
+       return _pam_chown_homedir(ctx, create_dir,
+                                 pwd->pw_uid,
+                                 pwd->pw_gid);
+}
+
 /* talk to winbindd */
-static int winbind_auth_request(pam_handle_t * pamh,
-                               int ctrl,
+static int winbind_auth_request(struct pwb_context *ctx,
                                const char *user,
                                const char *pass,
                                const char *member,
                                const char *cctype,
                                const int warn_pwd_expire,
-                               struct winbindd_response *p_response,
+                               struct wbcAuthErrorInfo **p_error,
+                               struct wbcLogonUserInfo **p_info,
+                               struct wbcUserPasswordPolicyInfo **p_policy,
                                time_t *pwd_last_set,
                                char **user_ret)
 {
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int ret;
-       bool already_expired = false;
+       wbcErr wbc_status;
+
+       struct wbcLogonUserParams logon;
+       char membership_of[1024];
+       uid_t user_uid = -1;
+       uint32_t flags = WBFLAG_PAM_INFO3_TEXT |
+                        WBFLAG_PAM_GET_PWD_POLICY;
 
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
+       struct wbcLogonUserInfo *info = NULL;
+       struct wbcAuthUserInfo *user_info = NULL;
+       struct wbcAuthErrorInfo *error = NULL;
+       struct wbcUserPasswordPolicyInfo *policy = NULL;
+
+       int ret = PAM_AUTH_ERR;
+       int i;
+       const char *codes[] = {
+               "NT_STATUS_PASSWORD_EXPIRED",
+               "NT_STATUS_PASSWORD_MUST_CHANGE",
+               "NT_STATUS_INVALID_WORKSTATION",
+               "NT_STATUS_INVALID_LOGON_HOURS",
+               "NT_STATUS_ACCOUNT_EXPIRED",
+               "NT_STATUS_ACCOUNT_DISABLED",
+               "NT_STATUS_ACCOUNT_LOCKED_OUT",
+               "NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT",
+               "NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT",
+               "NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT",
+               "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND",
+               "NT_STATUS_NO_LOGON_SERVERS",
+               "NT_STATUS_WRONG_PASSWORD",
+               "NT_STATUS_ACCESS_DENIED"
+       };
 
        if (pwd_last_set) {
                *pwd_last_set = 0;
        }
 
-       strncpy(request.data.auth.user, user,
-               sizeof(request.data.auth.user)-1);
-
-       strncpy(request.data.auth.pass, pass,
-               sizeof(request.data.auth.pass)-1);
+       /* Krb5 auth always has to go against the KDC of the user's realm */
 
-       request.data.auth.krb5_cc_type[0] = '\0';
-       request.data.auth.uid = -1;
-
-       request.flags = WBFLAG_PAM_INFO3_TEXT |
-                       WBFLAG_PAM_GET_PWD_POLICY |
-                       WBFLAG_PAM_CONTACT_TRUSTDOM;
+       if (ctx->ctrl & WINBIND_KRB5_AUTH) {
+               flags           |= WBFLAG_PAM_CONTACT_TRUSTDOM;
+       }
 
-       if (ctrl & (WINBIND_KRB5_AUTH|WINBIND_CACHED_LOGIN)) {
+       if (ctx->ctrl & (WINBIND_KRB5_AUTH|WINBIND_CACHED_LOGIN)) {
                struct passwd *pwd = NULL;
 
                pwd = getpwnam(user);
                if (pwd == NULL) {
                        return PAM_USER_UNKNOWN;
                }
-               request.data.auth.uid = pwd->pw_uid;
+               user_uid        = pwd->pw_uid;
        }
 
-       if (ctrl & WINBIND_KRB5_AUTH) {
+       if (ctx->ctrl & WINBIND_KRB5_AUTH) {
 
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "enabling krb5 login flag\n");
 
-               request.flags |= WBFLAG_PAM_KRB5 |
-                                WBFLAG_PAM_FALLBACK_AFTER_KRB5;
+               flags           |= WBFLAG_PAM_KRB5 |
+                                  WBFLAG_PAM_FALLBACK_AFTER_KRB5;
        }
 
-       if (ctrl & WINBIND_CACHED_LOGIN) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+       if (ctx->ctrl & WINBIND_CACHED_LOGIN) {
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "enabling cached login flag\n");
-               request.flags |= WBFLAG_PAM_CACHED_LOGIN;
+               flags           |= WBFLAG_PAM_CACHED_LOGIN;
        }
 
        if (user_ret) {
                *user_ret = NULL;
-               request.flags |= WBFLAG_PAM_UNIX_NAME;
+               flags           |= WBFLAG_PAM_UNIX_NAME;
        }
 
        if (cctype != NULL) {
-               strncpy(request.data.auth.krb5_cc_type, cctype,
-                       sizeof(request.data.auth.krb5_cc_type) - 1);
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "enabling request for a %s krb5 ccache\n",
                               cctype);
        }
 
-       request.data.auth.require_membership_of_sid[0] = '\0';
-
        if (member != NULL) {
 
-               if (!winbind_name_list_to_sid_string_list(pamh, ctrl, user,
-                       member,
-                       request.data.auth.require_membership_of_sid,
-                       sizeof(request.data.auth.require_membership_of_sid))) {
+               ZERO_STRUCT(membership_of);
 
-                       _pam_log_debug(pamh, ctrl, LOG_ERR,
+               if (!winbind_name_list_to_sid_string_list(ctx, user, member,
+                                                         membership_of,
+                                                         sizeof(membership_of))) {
+                       _pam_log_debug(ctx, LOG_ERR,
                                       "failed to serialize membership of sid "
                                       "\"%s\"\n", member);
                        return PAM_AUTH_ERR;
                }
        }
 
-       ret = pam_winbind_request_log(pamh, ctrl, WINBINDD_PAM_AUTH,
-                                     &request, &response, user);
+       ZERO_STRUCT(logon);
 
-       if (pwd_last_set) {
-               *pwd_last_set = response.data.auth.info3.pass_last_set_time;
+       logon.username                  = user;
+       logon.password                  = pass;
+
+       wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+                                    &logon.blobs,
+                                    "krb5_cc_type",
+                                    0,
+                                    (uint8_t *)cctype,
+                                    strlen(cctype)+1);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
+       }
+
+       wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+                                    &logon.blobs,
+                                    "flags",
+                                    0,
+                                    (uint8_t *)&flags,
+                                    sizeof(flags));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
+       }
+
+       wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+                                    &logon.blobs,
+                                    "user_uid",
+                                    0,
+                                    (uint8_t *)&user_uid,
+                                    sizeof(user_uid));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
        }
 
-       if (p_response) {
-               /* We want to process the response in the caller. */
-               *p_response = response;
+       wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+                                    &logon.blobs,
+                                    "membership_of",
+                                    0,
+                                    (uint8_t *)membership_of,
+                                    sizeof(membership_of));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
+       }
+
+       wbc_status = wbcLogonUser(&logon, &info, &error, &policy);
+       ret = wbc_auth_error_to_pam_error(ctx, error, wbc_status,
+                                         user, "wbcLogonUser");
+       wbcFreeMemory(logon.blobs);
+       logon.blobs = NULL;
+
+       if (info && info->info) {
+               user_info = info->info;
+       }
+
+       if (pwd_last_set && user_info) {
+               *pwd_last_set = user_info->pass_last_set_time;
+       }
+
+       if (p_info && info) {
+               *p_info = info;
+       }
+
+       if (p_policy && policy) {
+               *p_policy = policy;
+       }
+
+       if (p_error && error) {
+               /* We want to process the error in the caller. */
+               *p_error = error;
                return ret;
        }
 
-       if (ret) {
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_PASSWORD_EXPIRED");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_PASSWORD_MUST_CHANGE");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_INVALID_WORKSTATION");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_INVALID_LOGON_HOURS");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_ACCOUNT_EXPIRED");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_ACCOUNT_DISABLED");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_ACCOUNT_LOCKED_OUT");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_NO_LOGON_SERVERS");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_WRONG_PASSWORD");
-               PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                                "NT_STATUS_ACCESS_DENIED");
+       for (i=0; i<ARRAY_SIZE(codes); i++) {
+               int _ret = ret;
+               if (_pam_check_remark_auth_err(ctx, error, codes[i], &_ret)) {
+                       ret = _ret;
+                       goto done;
+               }
        }
 
-       if (ret == PAM_SUCCESS) {
+       if ((ret == PAM_SUCCESS) && user_info && policy && info) {
+
+               bool already_expired = false;
 
                /* warn a user if the password is about to expire soon */
-               _pam_warn_password_expiry(pamh, ctrl, &response,
+               _pam_warn_password_expiry(ctx, user_info, policy,
                                          warn_pwd_expire,
                                          &already_expired);
 
                if (already_expired == true) {
-                       SMB_TIME_T last_set;
-                       last_set = response.data.auth.info3.pass_last_set_time;
-                       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+
+                       SMB_TIME_T last_set = user_info->pass_last_set_time;
+
+                       _pam_log_debug(ctx, LOG_DEBUG,
                                       "Password has expired "
                                       "(Password was last set: %lld, "
                                       "the policy says it should expire here "
                                       "%lld (now it's: %lu))\n",
                                       (long long int)last_set,
                                       (long long int)last_set +
-                                      response.data.auth.policy.expire,
+                                      policy->expire,
                                       time(NULL));
 
                        return PAM_AUTHTOK_EXPIRED;
                }
 
                /* inform about logon type */
-               _pam_warn_logon_type(pamh, ctrl, user,
-                                    response.data.auth.info3.user_flgs);
+               _pam_warn_logon_type(ctx, user, user_info->user_flags);
 
                /* inform about krb5 failures */
-               _pam_warn_krb5_failure(pamh, ctrl, user,
-                                      response.data.auth.info3.user_flgs);
+               _pam_warn_krb5_failure(ctx, user, user_info->user_flags);
 
                /* set some info3 info for other modules in the stack */
-               _pam_set_data_info3(pamh, ctrl, &response);
+               _pam_set_data_info3(ctx, user_info);
 
                /* put krb5ccname into env */
-               _pam_setup_krb5_env(pamh, ctrl, response.data.auth.krb5ccname);
+               _pam_setup_krb5_env(ctx, info);
 
                /* If winbindd returned a username, return the pointer to it
                 * here. */
-               if (user_ret && response.data.auth.unix_username[0]) {
-                       /* We have to trust it's a null terminated string. */
-                       *user_ret = strndup(response.data.auth.unix_username,
-                                   sizeof(response.data.auth.unix_username) - 1);
-               }
+               _pam_setup_unix_username(ctx, user_ret, info);
+       }
+
+ done:
+       if (logon.blobs) {
+               wbcFreeMemory(logon.blobs);
+       }
+       if (info && info->blobs) {
+               wbcFreeMemory(info->blobs);
+       }
+       if (error && !p_error) {
+               wbcFreeMemory(error);
+       }
+       if (info && !p_info) {
+               wbcFreeMemory(info);
+       }
+       if (policy && !p_policy) {
+               wbcFreeMemory(policy);
        }
 
        return ret;
 }
 
 /* talk to winbindd */
-static int winbind_chauthtok_request(pam_handle_t * pamh,
-                                    int ctrl,
+static int winbind_chauthtok_request(struct pwb_context *ctx,
                                     const char *user,
                                     const char *oldpass,
                                     const char *newpass,
                                     time_t pwd_last_set)
 {
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int ret;
+       wbcErr wbc_status;
+       struct wbcChangePasswordParams params;
+       struct wbcAuthErrorInfo *error = NULL;
+       struct wbcUserPasswordPolicyInfo *policy = NULL;
+       enum wbcPasswordChangeRejectReason reject_reason = -1;
+       uint32_t flags = 0;
 
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       if (request.data.chauthtok.user == NULL) {
-               return -2;
-       }
+       int i;
+       const char *codes[] = {
+               "NT_STATUS_BACKUP_CONTROLLER",
+               "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND",
+               "NT_STATUS_NO_LOGON_SERVERS",
+               "NT_STATUS_ACCESS_DENIED",
+               "NT_STATUS_PWD_TOO_SHORT", /* TODO: tell the min pwd length ? */
+               "NT_STATUS_PWD_TOO_RECENT", /* TODO: tell the minage ? */
+               "NT_STATUS_PWD_HISTORY_CONFLICT" /* TODO: tell the history length ? */
+       };
+       int ret = PAM_AUTH_ERR;
 
-       strncpy(request.data.chauthtok.user, user,
-               sizeof(request.data.chauthtok.user) - 1);
+       ZERO_STRUCT(params);
 
-       if (oldpass != NULL) {
-               strncpy(request.data.chauthtok.oldpass, oldpass,
-                       sizeof(request.data.chauthtok.oldpass) - 1);
-       } else {
-               request.data.chauthtok.oldpass[0] = '\0';
+       if (ctx->ctrl & WINBIND_KRB5_AUTH) {
+               flags |= WBFLAG_PAM_KRB5 |
+                        WBFLAG_PAM_CONTACT_TRUSTDOM;
        }
 
-       if (newpass != NULL) {
-               strncpy(request.data.chauthtok.newpass, newpass,
-                       sizeof(request.data.chauthtok.newpass) - 1);
-       } else {
-               request.data.chauthtok.newpass[0] = '\0';
+       if (ctx->ctrl & WINBIND_CACHED_LOGIN) {
+               flags |= WBFLAG_PAM_CACHED_LOGIN;
        }
 
-       if (ctrl & WINBIND_KRB5_AUTH) {
-               request.flags = WBFLAG_PAM_KRB5 |
-                               WBFLAG_PAM_CONTACT_TRUSTDOM;
-       }
+       params.account_name             = user;
+       params.level                    = WBC_AUTH_USER_LEVEL_PLAIN;
+       params.old_password.plaintext   = oldpass;
+       params.new_password.plaintext   = newpass;
+       params.flags                    = flags;
 
-       ret = pam_winbind_request_log(pamh, ctrl, WINBINDD_PAM_CHAUTHTOK,
-                                     &request, &response, user);
+       wbc_status = wbcChangeUserPasswordEx(&params, &error, &reject_reason, &policy);
+       ret = wbc_auth_error_to_pam_error(ctx, error, wbc_status,
+                                         user, "wbcChangeUserPasswordEx");
 
-       if (ret == PAM_SUCCESS) {
-               return ret;
+       if (WBC_ERROR_IS_OK(wbc_status)) {
+               _pam_log(ctx, LOG_NOTICE,
+                        "user '%s' password changed", user);
+               return PAM_SUCCESS;
        }
 
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_BACKUP_CONTROLLER");
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND");
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_NO_LOGON_SERVERS");
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_ACCESS_DENIED");
-
-       /* TODO: tell the min pwd length ? */
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_PWD_TOO_SHORT");
-
-       /* TODO: tell the minage ? */
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_PWD_TOO_RECENT");
+       if (!error) {
+               wbcFreeMemory(policy);
+               return ret;
+       }
 
-       /* TODO: tell the history length ? */
-       PAM_WB_REMARK_CHECK_RESPONSE_RET(pamh, ctrl, response,
-                                        "NT_STATUS_PWD_HISTORY_CONFLICT");
+       for (i=0; i<ARRAY_SIZE(codes); i++) {
+               int _ret = ret;
+               if (_pam_check_remark_auth_err(ctx, error, codes[i], &_ret)) {
+                       ret = _ret;
+                       goto done;
+               }
+       }
 
-       if (!strcasecmp(response.data.auth.nt_status_string,
+       if (!strcasecmp(error->nt_string,
                        "NT_STATUS_PASSWORD_RESTRICTION")) {
 
                char *pwd_restriction_string = NULL;
-               SMB_TIME_T min_pwd_age;
-               uint32_t reject_reason = response.data.auth.reject_reason;
-               min_pwd_age = response.data.auth.policy.min_passwordage;
+               SMB_TIME_T min_pwd_age = 0;
+
+               if (policy) {
+                       min_pwd_age     = policy->min_passwordage;
+               }
 
                /* FIXME: avoid to send multiple PAM messages after another */
                switch (reject_reason) {
                        case -1:
                                break;
-                       case SAMR_REJECT_OTHER:
+                       case WBC_PWD_CHANGE_REJECT_OTHER:
                                if ((min_pwd_age > 0) &&
                                    (pwd_last_set + min_pwd_age > time(NULL))) {
-                                       PAM_WB_REMARK_DIRECT(pamh, ctrl,
+                                       PAM_WB_REMARK_DIRECT(ctx,
                                             "NT_STATUS_PWD_TOO_RECENT");
                                }
                                break;
-                       case SAMR_REJECT_TOO_SHORT:
-                               PAM_WB_REMARK_DIRECT(pamh, ctrl,
+                       case WBC_PWD_CHANGE_REJECT_TOO_SHORT:
+                               PAM_WB_REMARK_DIRECT(ctx,
                                        "NT_STATUS_PWD_TOO_SHORT");
                                break;
-                       case SAMR_REJECT_IN_HISTORY:
-                               PAM_WB_REMARK_DIRECT(pamh, ctrl,
+                       case WBC_PWD_CHANGE_REJECT_IN_HISTORY:
+                               PAM_WB_REMARK_DIRECT(ctx,
                                        "NT_STATUS_PWD_HISTORY_CONFLICT");
                                break;
-                       case SAMR_REJECT_COMPLEXITY:
-                               _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+                       case WBC_PWD_CHANGE_REJECT_COMPLEXITY:
+                               _make_remark(ctx, PAM_ERROR_MSG,
                                             "Password does not meet "
                                             "complexity requirements");
                                break;
                        default:
-                               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+                               _pam_log_debug(ctx, LOG_DEBUG,
                                               "unknown password change "
                                               "reject reason: %d",
                                               reject_reason);
@@ -1461,13 +1863,16 @@ static int winbind_chauthtok_request(pam_handle_t * pamh,
                }
 
                pwd_restriction_string =
-                       _pam_compose_pwd_restriction_string(&response);
+                       _pam_compose_pwd_restriction_string(ctx, policy);
                if (pwd_restriction_string) {
-                       _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+                       _make_remark(ctx, PAM_ERROR_MSG,
                                     pwd_restriction_string);
-                       SAFE_FREE(pwd_restriction_string);
+                       TALLOC_FREE(pwd_restriction_string);
                }
        }
+ done:
+       wbcFreeMemory(error);
+       wbcFreeMemory(policy);
 
        return ret;
 }
@@ -1480,37 +1885,33 @@ static int winbind_chauthtok_request(pam_handle_t * pamh,
  *      0  = OK
  *     -1  = System error
  */
-static int valid_user(pam_handle_t *pamh,
-                     int ctrl,
+static int valid_user(struct pwb_context *ctx,
                      const char *user)
 {
        /* check not only if the user is available over NSS calls, also make
         * sure it's really a winbind user, this is important when stacking PAM
         * modules in the 'account' or 'password' facility. */
 
+       wbcErr wbc_status;
        struct passwd *pwd = NULL;
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int ret;
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
+       struct passwd *wb_pwd = NULL;
 
        pwd = getpwnam(user);
        if (pwd == NULL) {
                return 1;
        }
 
-       strncpy(request.data.username, user,
-               sizeof(request.data.username) - 1);
-
-       ret = pam_winbind_request_log(pamh, ctrl, WINBINDD_GETPWNAM,
-                                     &request, &response, user);
+       wbc_status = wbcGetpwnam(user, &wb_pwd);
+       wbcFreeMemory(wb_pwd);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               _pam_log(ctx, LOG_DEBUG, "valid_user: wbcGetpwnam gave %s\n",
+                       wbcErrorString(wbc_status));
+       }
 
-       switch (ret) {
-               case PAM_USER_UNKNOWN:
+       switch (wbc_status) {
+               case WBC_ERR_UNKNOWN_USER:
                        return 1;
-               case PAM_SUCCESS:
+               case WBC_ERR_SUCCESS:
                        return 0;
                default:
                        break;
@@ -1529,7 +1930,7 @@ static char *_pam_delete(register char *xx)
  * obtain a password from the user
  */
 
-static int _winbind_read_password(pam_handle_t * pamh,
+static int _winbind_read_password(struct pwb_context *ctx,
                                  unsigned int ctrl,
                                  const char *comment,
                                  const char *prompt1,
@@ -1541,7 +1942,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
        const char *item;
        char *token;
 
-       _pam_log(pamh, ctrl, LOG_DEBUG, "getting password (0x%08x)", ctrl);
+       _pam_log(ctx, LOG_DEBUG, "getting password (0x%08x)", ctrl);
 
        /*
         * make sure nothing inappropriate gets returned
@@ -1565,17 +1966,17 @@ static int _winbind_read_password(pam_handle_t * pamh,
 
        if (on(WINBIND_TRY_FIRST_PASS_ARG, ctrl) ||
            on(WINBIND_USE_FIRST_PASS_ARG, ctrl)) {
-               retval = _pam_get_item(pamh, authtok_flag, &item);
+               retval = _pam_get_item(ctx->pamh, authtok_flag, &item);
                if (retval != PAM_SUCCESS) {
                        /* very strange. */
-                       _pam_log(pamh, ctrl, LOG_ALERT,
+                       _pam_log(ctx, LOG_ALERT,
                                 "pam_get_item returned error "
                                 "to unix-read-password");
                        return retval;
                } else if (item != NULL) {      /* we have a password! */
                        *pass = item;
                        item = NULL;
-                       _pam_log(pamh, ctrl, LOG_DEBUG,
+                       _pam_log(ctx, LOG_DEBUG,
                                 "pam_get_item returned a password");
                        return PAM_SUCCESS;
                } else if (on(WINBIND_USE_FIRST_PASS_ARG, ctrl)) {
@@ -1619,7 +2020,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
                }
                /* so call the conversation expecting i responses */
                resp = NULL;
-               retval = converse(pamh, i, pmsg, &resp);
+               retval = converse(ctx->pamh, i, pmsg, &resp);
                if (resp == NULL) {
                        if (retval == PAM_SUCCESS) {
                                retval = PAM_AUTHTOK_RECOVER_ERR;
@@ -1635,7 +2036,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
 
                token = x_strdup(resp[i - replies].resp);
                if (!token) {
-                       _pam_log(pamh, ctrl, LOG_NOTICE,
+                       _pam_log(ctx, LOG_NOTICE,
                                 "could not recover "
                                 "authentication token");
                        retval = PAM_AUTHTOK_RECOVER_ERR;
@@ -1648,7 +2049,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
                            strcmp(token, resp[i - 1].resp)) {
                                _pam_delete(token);     /* mistyped */
                                retval = PAM_AUTHTOK_RECOVER_ERR;
-                               _make_remark(pamh, ctrl, PAM_ERROR_MSG,
+                               _make_remark(ctx, PAM_ERROR_MSG,
                                             MISTYPED_PASS);
                        }
                }
@@ -1662,7 +2063,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
 
  done:
        if (retval != PAM_SUCCESS) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "unable to obtain a password");
                return retval;
        }
@@ -1670,12 +2071,12 @@ static int _winbind_read_password(pam_handle_t * pamh,
 
        /* we store this password as an item */
 
-       retval = pam_set_item(pamh, authtok_flag, token);
+       retval = pam_set_item(ctx->pamh, authtok_flag, token);
        _pam_delete(token);     /* clean it up */
        if (retval != PAM_SUCCESS ||
-           (retval = _pam_get_item(pamh, authtok_flag, &item)) != PAM_SUCCESS) {
+           (retval = _pam_get_item(ctx->pamh, authtok_flag, &item)) != PAM_SUCCESS) {
 
-               _pam_log(pamh, ctrl, LOG_CRIT, "error manipulating password");
+               _pam_log(ctx, LOG_CRIT, "error manipulating password");
                return retval;
 
        }
@@ -1686,101 +2087,95 @@ static int _winbind_read_password(pam_handle_t * pamh,
        return PAM_SUCCESS;
 }
 
-const char *get_conf_item_string(const pam_handle_t *pamh,
-                                int argc,
-                                const char **argv,
-                                int ctrl,
-                                dictionary *d,
-                                const char *item,
-                                int config_flag)
+static const char *get_conf_item_string(struct pwb_context *ctx,
+                                       const char *item,
+                                       int config_flag)
 {
        int i = 0;
        const char *parm_opt = NULL;
 
-       if (!(ctrl & config_flag)) {
+       if (!(ctx->ctrl & config_flag)) {
                goto out;
        }
 
        /* let the pam opt take precedence over the pam_winbind.conf option */
-       for (i=0; i<argc; i++) {
+       for (i=0; i<ctx->argc; i++) {
 
-               if ((strncmp(argv[i], item, strlen(item)) == 0)) {
+               if ((strncmp(ctx->argv[i], item, strlen(item)) == 0)) {
                        char *p;
 
-                       if ((p = strchr(argv[i], '=')) == NULL) {
-                               _pam_log(pamh, ctrl, LOG_INFO,
+                       if ((p = strchr(ctx->argv[i], '=')) == NULL) {
+                               _pam_log(ctx, LOG_INFO,
                                         "no \"=\" delimiter for \"%s\" found\n",
                                         item);
                                goto out;
                        }
-                       _pam_log_debug(pamh, ctrl, LOG_INFO,
+                       _pam_log_debug(ctx, LOG_INFO,
                                       "PAM config: %s '%s'\n", item, p+1);
                        return p + 1;
                }
        }
 
-       if (d != NULL) {
+       if (ctx->dict) {
                char *key = NULL;
 
-               if (!asprintf(&key, "global:%s", item)) {
+               key = talloc_asprintf(ctx, "global:%s", item);
+               if (!key) {
                        goto out;
                }
 
-               parm_opt = iniparser_getstr(d, key);
-               SAFE_FREE(key);
+               parm_opt = iniparser_getstr(ctx->dict, key);
+               TALLOC_FREE(key);
 
-               _pam_log_debug(pamh, ctrl, LOG_INFO, "CONFIG file: %s '%s'\n",
+               _pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",
                               item, parm_opt);
        }
 out:
        return parm_opt;
 }
 
-int get_config_item_int(const pam_handle_t *pamh,
-                             int argc,
-                             const char **argv,
-                             int ctrl,
-                             dictionary *d,
-                             const char *item,
-                             int config_flag)
+static int get_config_item_int(struct pwb_context *ctx,
+                              const char *item,
+                              int config_flag)
 {
        int i, parm_opt = -1;
 
-       if (!(ctrl & config_flag)) {
+       if (!(ctx->ctrl & config_flag)) {
                goto out;
        }
 
        /* let the pam opt take precedence over the pam_winbind.conf option */
-       for (i = 0; i < argc; i++) {
+       for (i = 0; i < ctx->argc; i++) {
 
-               if ((strncmp(argv[i], item, strlen(item)) == 0)) {
+               if ((strncmp(ctx->argv[i], item, strlen(item)) == 0)) {
                        char *p;
 
-                       if ((p = strchr(argv[i], '=')) == NULL) {
-                               _pam_log(pamh, ctrl, LOG_INFO,
+                       if ((p = strchr(ctx->argv[i], '=')) == NULL) {
+                               _pam_log(ctx, LOG_INFO,
                                         "no \"=\" delimiter for \"%s\" found\n",
                                         item);
                                goto out;
                        }
                        parm_opt = atoi(p + 1);
-                       _pam_log_debug(pamh, ctrl, LOG_INFO,
+                       _pam_log_debug(ctx, LOG_INFO,
                                       "PAM config: %s '%d'\n",
                                       item, parm_opt);
                        return parm_opt;
                }
        }
 
-       if (d != NULL) {
+       if (ctx->dict) {
                char *key = NULL;
 
-               if (!asprintf(&key, "global:%s", item)) {
+               key = talloc_asprintf(ctx, "global:%s", item);
+               if (!key) {
                        goto out;
                }
 
-               parm_opt = iniparser_getint(d, key, -1);
-               SAFE_FREE(key);
+               parm_opt = iniparser_getint(ctx->dict, key, -1);
+               TALLOC_FREE(key);
 
-               _pam_log_debug(pamh, ctrl, LOG_INFO,
+               _pam_log_debug(ctx, LOG_INFO,
                               "CONFIG file: %s '%d'\n",
                               item, parm_opt);
        }
@@ -1788,44 +2183,28 @@ out:
        return parm_opt;
 }
 
-const char *get_krb5_cc_type_from_config(const pam_handle_t *pamh,
-                                        int argc,
-                                        const char **argv,
-                                        int ctrl,
-                                        dictionary *d)
+static const char *get_krb5_cc_type_from_config(struct pwb_context *ctx)
 {
-       return get_conf_item_string(pamh, argc, argv, ctrl, d,
-                                   "krb5_ccache_type",
+       return get_conf_item_string(ctx, "krb5_ccache_type",
                                    WINBIND_KRB5_CCACHE_TYPE);
 }
 
-const char *get_member_from_config(const pam_handle_t *pamh,
-                                  int argc,
-                                  const char **argv,
-                                  int ctrl,
-                                  dictionary *d)
+static const char *get_member_from_config(struct pwb_context *ctx)
 {
        const char *ret = NULL;
-       ret = get_conf_item_string(pamh, argc, argv, ctrl, d,
-                                  "require_membership_of",
+       ret = get_conf_item_string(ctx, "require_membership_of",
                                   WINBIND_REQUIRED_MEMBERSHIP);
        if (ret) {
                return ret;
        }
-       return get_conf_item_string(pamh, argc, argv, ctrl, d,
-                                   "require-membership-of",
+       return get_conf_item_string(ctx, "require-membership-of",
                                    WINBIND_REQUIRED_MEMBERSHIP);
 }
 
-int get_warn_pwd_expire_from_config(const pam_handle_t *pamh,
-                                   int argc,
-                                   const char **argv,
-                                   int ctrl,
-                                   dictionary *d)
+static int get_warn_pwd_expire_from_config(struct pwb_context *ctx)
 {
        int ret;
-       ret = get_config_item_int(pamh, argc, argv, ctrl, d,
-                                 "warn_pwd_expire",
+       ret = get_config_item_int(ctx, "warn_pwd_expire",
                                  WINBIND_WARN_PWD_EXPIRE);
        /* no or broken setting */
        if (ret <= 0) {
@@ -1837,88 +2216,73 @@ int get_warn_pwd_expire_from_config(const pam_handle_t *pamh,
 /**
  * Retrieve the winbind separator.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  *
  * @return string separator character. NULL on failure.
  */
 
-static char winbind_get_separator(pam_handle_t *pamh,
-                                 int ctrl)
+static char winbind_get_separator(struct pwb_context *ctx)
 {
-       struct winbindd_request request;
-       struct winbindd_response response;
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
+       wbcErr wbc_status;
+       static struct wbcInterfaceDetails *details = NULL;
+
+       wbc_status = wbcInterfaceDetails(&details);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               _pam_log(ctx, LOG_ERR,
+                        "Could not retrieve winbind interface details: %s",
+                        wbcErrorString(wbc_status));
+               return '\0';
+       }
 
-       if (pam_winbind_request_log(pamh, ctrl, WINBINDD_INFO,
-                                   &request, &response, NULL)) {
+       if (!details) {
                return '\0';
        }
 
-       return response.data.info.winbind_separator;
+       return details->winbind_separator;
 }
 
+
 /**
  * Convert a upn to a name.
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param upn  USer UPN to be trabslated.
  *
  * @return converted name. NULL pointer on failure. Caller needs to free.
  */
 
-static char* winbind_upn_to_username(pam_handle_t *pamh,
-                                    int ctrl,
+static char* winbind_upn_to_username(struct pwb_context *ctx,
                                     const char *upn)
 {
-       struct winbindd_request req;
-       struct winbindd_response resp;
-       int retval;
-       char *account_name;
-       int account_name_len;
        char sep;
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcDomainSid sid;
+       enum wbcSidType type;
+       char *domain;
+       char *name;
 
        /* This cannot work when the winbind separator = @ */
 
-       sep = winbind_get_separator(pamh, ctrl);
+       sep = winbind_get_separator(ctx);
        if (!sep || sep == '@') {
                return NULL;
        }
 
        /* Convert the UPN to a SID */
 
-       ZERO_STRUCT(req);
-       ZERO_STRUCT(resp);
-
-       strncpy(req.data.name.dom_name, "",
-               sizeof(req.data.name.dom_name) - 1);
-       strncpy(req.data.name.name, upn,
-               sizeof(req.data.name.name) - 1);
-       retval = pam_winbind_request_log(pamh, ctrl, WINBINDD_LOOKUPNAME,
-                                        &req, &resp, upn);
-       if (retval != PAM_SUCCESS) {
+       wbc_status = wbcLookupName("", upn, &sid, &type);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
                return NULL;
        }
 
        /* Convert the the SID back to the sAMAccountName */
 
-       ZERO_STRUCT(req);
-       strncpy(req.data.sid, resp.data.sid.sid, sizeof(req.data.sid)-1);
-       ZERO_STRUCT(resp);
-       retval =  pam_winbind_request_log(pamh, ctrl, WINBINDD_LOOKUPSID,
-                                         &req, &resp, upn);
-       if (retval != PAM_SUCCESS) {
+       wbc_status = wbcLookupSid(&sid, &domain, &name, &type);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
                return NULL;
        }
 
-       account_name_len = asprintf(&account_name, "%s\\%s",
-                                   resp.data.name.dom_name,
-                                   resp.data.name.name);
-
-       return account_name;
+       return talloc_asprintf(ctx, "%s\\%s", domain, name);
 }
 
 PAM_EXTERN
@@ -1931,24 +2295,22 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        const char *cctype = NULL;
        int warn_pwd_expire;
        int retval = PAM_AUTH_ERR;
-       dictionary *d = NULL;
        char *username_ret = NULL;
        char *new_authtok_required = NULL;
        char *real_username = NULL;
+       struct pwb_context *ctx = NULL;
 
-       /* parse arguments */
-       int ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               retval = PAM_SYSTEM_ERR;
+       retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (retval) {
                goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_authenticate", pamh, ctrl, flags);
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_authenticate", ctx);
 
        /* Get the username */
        retval = pam_get_user(pamh, &username, NULL);
        if ((retval != PAM_SUCCESS) || (!username)) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "can not get the username");
                retval = PAM_SERVICE_ERR;
                goto out;
@@ -1972,7 +2334,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        if (!real_username) {
                /* Just making a copy of the username we got from PAM */
                if ((real_username = strdup(username)) == NULL) {
-                       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+                       _pam_log_debug(ctx, LOG_DEBUG,
                                       "memory allocation failure when copying "
                                       "username");
                        retval = PAM_SERVICE_ERR;
@@ -1985,20 +2347,20 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        if (strchr(real_username, '@') != NULL) {
                char *samaccountname = NULL;
 
-               samaccountname = winbind_upn_to_username(pamh, ctrl,
+               samaccountname = winbind_upn_to_username(ctx,
                                                         real_username);
                if (samaccountname) {
                        free(real_username);
-                       real_username = samaccountname;
+                       real_username = strdup(samaccountname);
                }
        }
 
-       retval = _winbind_read_password(pamh, ctrl, NULL,
+       retval = _winbind_read_password(ctx, ctx->ctrl, NULL,
                                        "Password: ", NULL,
                                        &password);
 
        if (retval != PAM_SUCCESS) {
-               _pam_log(pamh, ctrl, LOG_ERR,
+               _pam_log(ctx, LOG_ERR,
                         "Could not retrieve user's password");
                retval = PAM_AUTHTOK_ERR;
                goto out;
@@ -2007,24 +2369,22 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
        /* Let's not give too much away in the log file */
 
 #ifdef DEBUG_PASSWORD
-       _pam_log_debug(pamh, ctrl, LOG_INFO,
+       _pam_log_debug(ctx, LOG_INFO,
                       "Verify user '%s' with password '%s'",
                       real_username, password);
 #else
-       _pam_log_debug(pamh, ctrl, LOG_INFO,
+       _pam_log_debug(ctx, LOG_INFO,
                       "Verify user '%s'", real_username);
 #endif
 
-       member = get_member_from_config(pamh, argc, argv, ctrl, d);
-
-       cctype = get_krb5_cc_type_from_config(pamh, argc, argv, ctrl, d);
-
-       warn_pwd_expire = get_warn_pwd_expire_from_config(pamh, argc, argv,
-                                                         ctrl, d);
+       member = get_member_from_config(ctx);
+       cctype = get_krb5_cc_type_from_config(ctx);
+       warn_pwd_expire = get_warn_pwd_expire_from_config(ctx);
 
        /* Now use the username to look up password */
-       retval = winbind_auth_request(pamh, ctrl, real_username, password,
-                                     member, cctype, warn_pwd_expire, NULL,
+       retval = winbind_auth_request(ctx, real_username, password,
+                                     member, cctype, warn_pwd_expire,
+                                     NULL, NULL, NULL,
                                      NULL, &username_ret);
 
        if (retval == PAM_NEW_AUTHTOK_REQD ||
@@ -2032,7 +2392,8 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
 
                char *new_authtok_required_during_auth = NULL;
 
-               if (!asprintf(&new_authtok_required, "%d", retval)) {
+               new_authtok_required = talloc_asprintf(NULL, "%d", retval);
+               if (!new_authtok_required) {
                        retval = PAM_BUF_ERR;
                        goto out;
                }
@@ -2043,7 +2404,8 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
 
                retval = PAM_SUCCESS;
 
-               if (!asprintf(&new_authtok_required_during_auth, "%d", true)) {
+               new_authtok_required_during_auth = talloc_asprintf(NULL, "%d", true);
+               if (!new_authtok_required_during_auth) {
                        retval = PAM_BUF_ERR;
                        goto out;
                }
@@ -2058,7 +2420,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
 out:
        if (username_ret) {
                pam_set_item (pamh, PAM_USER, username_ret);
-               _pam_log_debug(pamh, ctrl, LOG_INFO,
+               _pam_log_debug(ctx, LOG_INFO,
                               "Returned user was '%s'", username_ret);
                free(username_ret);
        }
@@ -2067,10 +2429,6 @@ out:
                free(real_username);
        }
 
-       if (d) {
-               iniparser_freedict(d);
-       }
-
        if (!new_authtok_required) {
                pam_set_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, NULL, NULL);
        }
@@ -2079,7 +2437,9 @@ out:
                _pam_free_data_info3(pamh);
        }
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", pamh, ctrl, retval);
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
+
+       TALLOC_FREE(ctx);
 
        return retval;
 }
@@ -2089,16 +2449,14 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
                   int argc, const char **argv)
 {
        int ret = PAM_SYSTEM_ERR;
-       dictionary *d = NULL;
+       struct pwb_context *ctx = NULL;
 
-       /* parse arguments */
-       int ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               ret = PAM_SYSTEM_ERR;
+       ret = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (ret) {
                goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_setcred", pamh, ctrl, flags);
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_setcred", ctx);
 
        switch (flags & ~PAM_SILENT) {
 
@@ -2106,17 +2464,17 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
                        ret = pam_sm_close_session(pamh, flags, argc, argv);
                        break;
                case PAM_REFRESH_CRED:
-                       _pam_log_debug(pamh, ctrl, LOG_WARNING,
+                       _pam_log_debug(ctx, LOG_WARNING,
                                       "PAM_REFRESH_CRED not implemented");
                        ret = PAM_SUCCESS;
                        break;
                case PAM_REINITIALIZE_CRED:
-                       _pam_log_debug(pamh, ctrl, LOG_WARNING,
+                       _pam_log_debug(ctx, LOG_WARNING,
                                       "PAM_REINITIALIZE_CRED not implemented");
                        ret = PAM_SUCCESS;
                        break;
                case PAM_ESTABLISH_CRED:
-                       _pam_log_debug(pamh, ctrl, LOG_WARNING,
+                       _pam_log_debug(ctx, LOG_WARNING,
                                       "PAM_ESTABLISH_CRED not implemented");
                        ret = PAM_SUCCESS;
                        break;
@@ -2126,11 +2484,10 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags,
        }
 
  out:
-       if (d) {
-               iniparser_freedict(d);
-       }
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_setcred", pamh, ctrl, ret);
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_setcred", ctx, ret);
+
+       TALLOC_FREE(ctx);
 
        return ret;
 }
@@ -2146,28 +2503,27 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
        const char *username;
        int ret = PAM_USER_UNKNOWN;
        void *tmp = NULL;
-       dictionary *d = NULL;
+       struct pwb_context *ctx = NULL;
 
-       /* parse arguments */
-       int ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               return PAM_SYSTEM_ERR;
+       ret = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (ret) {
+               goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_acct_mgmt", pamh, ctrl, flags);
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_acct_mgmt", ctx);
 
 
        /* Get the username */
        ret = pam_get_user(pamh, &username, NULL);
        if ((ret != PAM_SUCCESS) || (!username)) {
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "can not get the username");
                ret = PAM_SERVICE_ERR;
                goto out;
        }
 
        /* Verify the username */
-       ret = valid_user(pamh, ctrl, username);
+       ret = valid_user(ctx, username);
        switch (ret) {
        case -1:
                /* some sort of system error. The log was already printed */
@@ -2175,9 +2531,9 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
                goto out;
        case 1:
                /* the user does not exist */
-               _pam_log_debug(pamh, ctrl, LOG_NOTICE, "user '%s' not found",
+               _pam_log_debug(ctx, LOG_NOTICE, "user '%s' not found",
                               username);
-               if (ctrl & WINBIND_UNKNOWN_OK_ARG) {
+               if (ctx->ctrl & WINBIND_UNKNOWN_OK_ARG) {
                        ret = PAM_IGNORE;
                        goto out;
                }
@@ -2192,19 +2548,19 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
                        case PAM_AUTHTOK_EXPIRED:
                                /* fall through, since new token is required in this case */
                        case PAM_NEW_AUTHTOK_REQD:
-                               _pam_log(pamh, ctrl, LOG_WARNING,
+                               _pam_log(ctx, LOG_WARNING,
                                         "pam_sm_acct_mgmt success but %s is set",
                                         PAM_WINBIND_NEW_AUTHTOK_REQD);
-                               _pam_log(pamh, ctrl, LOG_NOTICE,
+                               _pam_log(ctx, LOG_NOTICE,
                                         "user '%s' needs new password",
                                         username);
                                /* PAM_AUTHTOKEN_REQD does not exist, but is documented in the manpage */
                                ret = PAM_NEW_AUTHTOK_REQD;
                                goto out;
                        default:
-                               _pam_log(pamh, ctrl, LOG_WARNING,
+                               _pam_log(ctx, LOG_WARNING,
                                         "pam_sm_acct_mgmt success");
-                               _pam_log(pamh, ctrl, LOG_NOTICE,
+                               _pam_log(ctx, LOG_NOTICE,
                                         "user '%s' granted access", username);
                                ret = PAM_SUCCESS;
                                goto out;
@@ -2212,13 +2568,13 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
                }
 
                /* Otherwise, the authentication looked good */
-               _pam_log(pamh, ctrl, LOG_NOTICE,
+               _pam_log(ctx, LOG_NOTICE,
                         "user '%s' granted access", username);
                ret = PAM_SUCCESS;
                goto out;
        default:
                /* we don't know anything about this return value */
-               _pam_log(pamh, ctrl, LOG_ERR,
+               _pam_log(ctx, LOG_ERR,
                         "internal module error (ret = %d, user = '%s')",
                         ret, username);
                ret = PAM_SERVICE_ERR;
@@ -2230,11 +2586,9 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
 
  out:
 
-       if (d) {
-               iniparser_freedict(d);
-       }
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_acct_mgmt", ctx, ret);
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_acct_mgmt", pamh, ctrl, ret);
+       TALLOC_FREE(ctx);
 
        return ret;
 }
@@ -2243,26 +2597,24 @@ PAM_EXTERN
 int pam_sm_open_session(pam_handle_t *pamh, int flags,
                        int argc, const char **argv)
 {
-       int ret = PAM_SYSTEM_ERR;
-       dictionary *d = NULL;
+       int ret = PAM_SUCCESS;
+       struct pwb_context *ctx = NULL;
 
-       /* parse arguments */
-       int ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               ret = PAM_SYSTEM_ERR;
+       ret = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (ret) {
                goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_open_session", pamh, ctrl, flags);
-
-       ret = PAM_SUCCESS;
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_open_session", ctx);
 
- out:
-       if (d) {
-               iniparser_freedict(d);
+       if (ctx->ctrl & WINBIND_MKHOMEDIR) {
+               /* check and create homedir */
+               ret = _pam_mkhomedir(ctx);
        }
+ out:
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_open_session", ctx, ret);
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_open_session", pamh, ctrl, ret);
+       TALLOC_FREE(ctx);
 
        return ret;
 }
@@ -2271,87 +2623,126 @@ PAM_EXTERN
 int pam_sm_close_session(pam_handle_t *pamh, int flags,
                         int argc, const char **argv)
 {
-       dictionary *d = NULL;
        int retval = PAM_SUCCESS;
+       struct pwb_context *ctx = NULL;
+       struct wbcLogoffUserParams logoff;
 
-       /* parse arguments */
-       int ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               retval = PAM_SYSTEM_ERR;
+       retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (retval) {
                goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_close_session", pamh, ctrl, flags);
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_close_session", ctx);
 
        if (!(flags & PAM_DELETE_CRED)) {
                retval = PAM_SUCCESS;
                goto out;
        }
 
-       if (ctrl & WINBIND_KRB5_AUTH) {
+       if (ctx->ctrl & WINBIND_KRB5_AUTH) {
 
                /* destroy the ccache here */
-               struct winbindd_request request;
-               struct winbindd_response response;
+
+               wbcErr wbc_status;
+               struct wbcAuthErrorInfo *error = NULL;
+
+               uint32_t flags = 0;
                const char *user;
                const char *ccname = NULL;
                struct passwd *pwd = NULL;
 
-               ZERO_STRUCT(request);
-               ZERO_STRUCT(response);
-
                retval = pam_get_user(pamh, &user, "Username: ");
                if (retval) {
-                       _pam_log(pamh, ctrl, LOG_ERR,
+                       _pam_log(ctx, LOG_ERR,
                                 "could not identify user");
                        goto out;
                }
 
                if (user == NULL) {
-                       _pam_log(pamh, ctrl, LOG_ERR,
+                       _pam_log(ctx, LOG_ERR,
                                 "username was NULL!");
                        retval = PAM_USER_UNKNOWN;
                        goto out;
                }
 
-               _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+               _pam_log_debug(ctx, LOG_DEBUG,
                               "username [%s] obtained", user);
 
                ccname = pam_getenv(pamh, "KRB5CCNAME");
                if (ccname == NULL) {
-                       _pam_log_debug(pamh, ctrl, LOG_DEBUG,
+                       _pam_log_debug(ctx, LOG_DEBUG,
                                       "user has no KRB5CCNAME environment");
                }
 
-               strncpy(request.data.logoff.user, user,
-                       sizeof(request.data.logoff.user) - 1);
-
-               if (ccname) {
-                       strncpy(request.data.logoff.krb5ccname, ccname,
-                               sizeof(request.data.logoff.krb5ccname) - 1);
-               }
-
                pwd = getpwnam(user);
                if (pwd == NULL) {
                        retval = PAM_USER_UNKNOWN;
                        goto out;
                }
-               request.data.logoff.uid = pwd->pw_uid;
 
-               request.flags = WBFLAG_PAM_KRB5 |
-                               WBFLAG_PAM_CONTACT_TRUSTDOM;
+               flags = WBFLAG_PAM_KRB5 |
+                       WBFLAG_PAM_CONTACT_TRUSTDOM;
 
-               retval = pam_winbind_request_log(pamh, ctrl,
-                                                WINBINDD_PAM_LOGOFF,
-                                                &request, &response, user);
+               ZERO_STRUCT(logoff);
+
+               logoff.username         = user;
+
+               wbc_status = wbcAddNamedBlob(&logoff.num_blobs,
+                                            &logoff.blobs,
+                                            "ccfilename",
+                                            0,
+                                            (uint8_t *)ccname,
+                                            strlen(ccname)+1);
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       goto out;
+               }
+
+               wbc_status = wbcAddNamedBlob(&logoff.num_blobs,
+                                            &logoff.blobs,
+                                            "flags",
+                                            0,
+                                            (uint8_t *)&flags,
+                                            sizeof(flags));
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       goto out;
+               }
+
+               wbc_status = wbcAddNamedBlob(&logoff.num_blobs,
+                                            &logoff.blobs,
+                                            "user_uid",
+                                            0,
+                                            (uint8_t *)&pwd->pw_uid,
+                                            sizeof(pwd->pw_uid));
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       goto out;
+               }
+
+               wbc_status = wbcLogoffUserEx(&logoff, &error);
+               retval = wbc_auth_error_to_pam_error(ctx, error, wbc_status,
+                                                    user, "wbcLogoffUser");
+               wbcFreeMemory(error);
+               wbcFreeMemory(logoff.blobs);
+
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       _pam_log(ctx, LOG_INFO,
+                                "failed to logoff user %s: %s\n",
+                                        user, wbcErrorString(wbc_status));
+               }
        }
 
 out:
-       if (d) {
-               iniparser_freedict(d);
+       if (logoff.blobs) {
+               wbcFreeMemory(logoff.blobs);
+       }
+
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               retval = wbc_auth_error_to_pam_error(ctx, error, wbc_status,
+                    user, "wbcLogoffUser");
        }
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", pamh, ctrl, retval);
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", ctx, retval);
+
+       TALLOC_FREE(ctx);
 
        return retval;
 }
@@ -2360,33 +2751,33 @@ out:
  * evaluate whether we need to re-authenticate with kerberos after a
  * password change
  *
- * @param pamh PAM handle
- * @param ctrl PAM winbind options.
+ * @param ctx PAM winbind context.
  * @param user The username
  *
  * @return boolean Returns true if required, false if not.
  */
 
-static bool _pam_require_krb5_auth_after_chauthtok(pam_handle_t *pamh,
-                                                  int ctrl,
+static bool _pam_require_krb5_auth_after_chauthtok(struct pwb_context *ctx,
                                                   const char *user)
 {
 
        /* Make sure that we only do this if a) the chauthtok got initiated
         * during a logon attempt (authenticate->acct_mgmt->chauthtok) b) any
         * later password change via the "passwd" command if done by the user
-        * itself */
+        * itself
+        * NB. If we login from gdm or xdm and the password expires,
+        * we change the password, but there is no memory cache.
+        * Thus, even for passthrough login, we should do the
+        * authentication again to update memory cache.
+        * --- BoYang
+        * */
 
        char *new_authtok_reqd_during_auth = NULL;
        struct passwd *pwd = NULL;
 
-       if (!(ctrl & WINBIND_KRB5_AUTH)) {
-               return false;
-       }
-
-       _pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH,
+       _pam_get_data(ctx->pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH,
                      &new_authtok_reqd_during_auth);
-       pam_set_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH,
+       pam_set_data(ctx->pamh, PAM_WINBIND_NEW_AUTHTOK_REQD_DURING_AUTH,
                     NULL, NULL);
 
        if (new_authtok_reqd_during_auth) {
@@ -2412,7 +2803,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 {
        unsigned int lctrl;
        int ret;
-       unsigned int ctrl;
+       bool cached_login = false;
 
        /* <DO NOT free() THESE> */
        const char *user;
@@ -2422,43 +2813,42 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
        char *Announce;
 
        int retry = 0;
-       dictionary *d = NULL;
        char *username_ret = NULL;
-       struct winbindd_response response;
+       struct wbcAuthErrorInfo *error = NULL;
+       struct pwb_context *ctx = NULL;
 
-       ZERO_STRUCT(response);
-
-       ctrl = _pam_parse(pamh, flags, argc, argv, &d);
-       if (ctrl == -1) {
-               ret = PAM_SYSTEM_ERR;
+       ret = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
+       if (ret) {
                goto out;
        }
 
-       _PAM_LOG_FUNCTION_ENTER("pam_sm_chauthtok", pamh, ctrl, flags);
+       _PAM_LOG_FUNCTION_ENTER("pam_sm_chauthtok", ctx);
 
-       /* clearing offline bit for the auth in the password change */
-       ctrl &= ~WINBIND_CACHED_LOGIN;
+       cached_login = (ctx->ctrl & WINBIND_CACHED_LOGIN);
+
+       /* clearing offline bit for auth */
+       ctx->ctrl &= ~WINBIND_CACHED_LOGIN;
 
        /*
         * First get the name of a user
         */
        ret = pam_get_user(pamh, &user, "Username: ");
        if (ret) {
-               _pam_log(pamh, ctrl, LOG_ERR,
+               _pam_log(ctx, LOG_ERR,
                         "password - could not identify user");
                goto out;
        }
 
        if (user == NULL) {
-               _pam_log(pamh, ctrl, LOG_ERR, "username was NULL!");
+               _pam_log(ctx, LOG_ERR, "username was NULL!");
                ret = PAM_USER_UNKNOWN;
                goto out;
        }
 
-       _pam_log_debug(pamh, ctrl, LOG_DEBUG, "username [%s] obtained", user);
+       _pam_log_debug(ctx, LOG_DEBUG, "username [%s] obtained", user);
 
        /* check if this is really a user in winbindd, not only in NSS */
-       ret = valid_user(pamh, ctrl, user);
+       ret = valid_user(ctx, user);
        switch (ret) {
                case 1:
                        ret = PAM_USER_UNKNOWN;
@@ -2479,34 +2869,35 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                time_t pwdlastset_prelim = 0;
 
                /* instruct user what is happening */
-#define greeting "Changing password for "
-               Announce = (char *) malloc(sizeof(greeting) + strlen(user));
-               if (Announce == NULL) {
-                       _pam_log(pamh, ctrl, LOG_CRIT,
+
+#define greeting "Changing password for"
+               Announce = talloc_asprintf(ctx, "%s %s", greeting, user);
+               if (!Announce) {
+                       _pam_log(ctx, LOG_CRIT,
                                 "password - out of memory");
                        ret = PAM_BUF_ERR;
                        goto out;
                }
-               (void) strcpy(Announce, greeting);
-               (void) strcpy(Announce + sizeof(greeting) - 1, user);
 #undef greeting
 
-               lctrl = ctrl | WINBIND__OLD_PASSWORD;
-               ret = _winbind_read_password(pamh, lctrl,
+               lctrl = ctx->ctrl | WINBIND__OLD_PASSWORD;
+               ret = _winbind_read_password(ctx, lctrl,
                                                Announce,
                                                "(current) NT password: ",
                                                NULL,
                                                (const char **) &pass_old);
+               TALLOC_FREE(Announce);
                if (ret != PAM_SUCCESS) {
-                       _pam_log(pamh, ctrl, LOG_NOTICE,
+                       _pam_log(ctx, LOG_NOTICE,
                                 "password - (old) token not obtained");
                        goto out;
                }
 
                /* verify that this is the password for this user */
 
-               ret = winbind_auth_request(pamh, ctrl, user, pass_old,
-                                          NULL, NULL, 0, &response,
+               ret = winbind_auth_request(ctx, user, pass_old,
+                                          NULL, NULL, 0,
+                                          &error, NULL, NULL,
                                           &pwdlastset_prelim, NULL);
 
                if (ret != PAM_ACCT_EXPIRED &&
@@ -2524,7 +2915,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                                   (const void *) pass_old);
                pass_old = NULL;
                if (ret != PAM_SUCCESS) {
-                       _pam_log(pamh, ctrl, LOG_CRIT,
+                       _pam_log(ctx, LOG_CRIT,
                                 "failed to set PAM_OLDAUTHTOK");
                }
        } else if (flags & PAM_UPDATE_AUTHTOK) {
@@ -2542,12 +2933,12 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                ret = _pam_get_item(pamh, PAM_OLDAUTHTOK, &pass_old);
 
                if (ret != PAM_SUCCESS) {
-                       _pam_log(pamh, ctrl, LOG_NOTICE,
+                       _pam_log(ctx, LOG_NOTICE,
                                 "user not authenticated");
                        goto out;
                }
 
-               lctrl = ctrl & ~WINBIND_TRY_FIRST_PASS_ARG;
+               lctrl = ctx->ctrl & ~WINBIND_TRY_FIRST_PASS_ARG;
 
                if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) {
                        lctrl |= WINBIND_USE_FIRST_PASS_ARG;
@@ -2560,14 +2951,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                         * password -- needed for pluggable password strength checking
                         */
 
-                       ret = _winbind_read_password(pamh, lctrl,
+                       ret = _winbind_read_password(ctx, lctrl,
                                                     NULL,
                                                     "Enter new NT password: ",
                                                     "Retype new NT password: ",
                                                     (const char **)&pass_new);
 
                        if (ret != PAM_SUCCESS) {
-                               _pam_log_debug(pamh, ctrl, LOG_ALERT,
+                               _pam_log_debug(ctx, LOG_ALERT,
                                               "password - "
                                               "new password not obtained");
                                pass_old = NULL;/* tidy up */
@@ -2592,7 +2983,16 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                _pam_get_data(pamh, PAM_WINBIND_PWD_LAST_SET,
                              &pwdlastset_update);
 
-               ret = winbind_chauthtok_request(pamh, ctrl, user, pass_old,
+               /*
+                * if cached creds were enabled, make sure to set the
+                * WINBIND_CACHED_LOGIN bit here in order to have winbindd
+                * update the cached creds storage - gd
+                */
+               if (cached_login) {
+                       ctx->ctrl |= WINBIND_CACHED_LOGIN;
+               }
+
+               ret = winbind_chauthtok_request(ctx, user, pass_old,
                                                pass_new, pwdlastset_update);
                if (ret) {
                        _pam_overwrite(pass_new);
@@ -2601,25 +3001,29 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
                        goto out;
                }
 
-               if (_pam_require_krb5_auth_after_chauthtok(pamh, ctrl, user)) {
+               if (_pam_require_krb5_auth_after_chauthtok(ctx, user)) {
 
                        const char *member = NULL;
                        const char *cctype = NULL;
                        int warn_pwd_expire;
-
-                       member = get_member_from_config(pamh, argc, argv,
-                                                       ctrl, d);
-                       cctype = get_krb5_cc_type_from_config(pamh, argc, argv,
-                                                             ctrl, d);
-                       warn_pwd_expire = get_warn_pwd_expire_from_config(pamh,
-                                                                         argc,
-                                                                         argv,
-                                                                         ctrl,
-                                                                         d);
-
-
-                       ret = winbind_auth_request(pamh, ctrl, user, pass_new,
-                                                  member, cctype, 0, &response,
+                       struct wbcLogonUserInfo *info = NULL;
+                       struct wbcUserPasswordPolicyInfo *policy = NULL;
+
+                       member = get_member_from_config(ctx);
+                       cctype = get_krb5_cc_type_from_config(ctx);
+                       warn_pwd_expire = get_warn_pwd_expire_from_config(ctx);
+
+                       /* Keep WINBIND_CACHED_LOGIN bit for
+                        * authentication after changing the password.
+                        * This will update the cached credentials in case
+                        * that winbindd_dual_pam_chauthtok() fails
+                        * to update them.
+                        * --- BoYang
+                        * */
+
+                       ret = winbind_auth_request(ctx, user, pass_new,
+                                                  member, cctype, 0,
+                                                  &error, &info, &policy,
                                                   NULL, &username_ret);
                        _pam_overwrite(pass_new);
                        _pam_overwrite(pass_old);
@@ -2627,28 +3031,36 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 
                        if (ret == PAM_SUCCESS) {
 
+                               struct wbcAuthUserInfo *user_info = NULL;
+
+                               if (info && info->info) {
+                                       user_info = info->info;
+                               }
+
                                /* warn a user if the password is about to
                                 * expire soon */
-                               _pam_warn_password_expiry(pamh, ctrl, &response,
+                               _pam_warn_password_expiry(ctx, user_info, policy,
                                                          warn_pwd_expire,
                                                          NULL);
 
                                /* set some info3 info for other modules in the
                                 * stack */
-                               _pam_set_data_info3(pamh, ctrl, &response);
+                               _pam_set_data_info3(ctx, user_info);
 
                                /* put krb5ccname into env */
-                               _pam_setup_krb5_env(pamh, ctrl,
-                                                   response.data.auth.krb5ccname);
+                               _pam_setup_krb5_env(ctx, info);
 
                                if (username_ret) {
                                        pam_set_item(pamh, PAM_USER,
                                                     username_ret);
-                                       _pam_log_debug(pamh, ctrl, LOG_INFO,
+                                       _pam_log_debug(ctx, LOG_INFO,
                                                       "Returned user was '%s'",
                                                       username_ret);
                                        free(username_ret);
                                }
+
+                               wbcFreeMemory(info);
+                               wbcFreeMemory(policy);
                        }
 
                        goto out;
@@ -2658,19 +3070,28 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
        }
 
 out:
-       if (d) {
-               iniparser_freedict(d);
+       {
+               /* Deal with offline errors. */
+               int i;
+               const char *codes[] = {
+                       "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND",
+                       "NT_STATUS_NO_LOGON_SERVERS",
+                       "NT_STATUS_ACCESS_DENIED"
+               };
+
+               for (i=0; i<ARRAY_SIZE(codes); i++) {
+                       int _ret;
+                       if (_pam_check_remark_auth_err(ctx, error, codes[i], &_ret)) {
+                               break;
+                       }
+               }
        }
 
-       /* Deal with offline errors. */
-       PAM_WB_REMARK_CHECK_RESPONSE(pamh, ctrl, response,
-                                    "NT_STATUS_NO_LOGON_SERVERS");
-       PAM_WB_REMARK_CHECK_RESPONSE(pamh, ctrl, response,
-                                    "NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND");
-       PAM_WB_REMARK_CHECK_RESPONSE(pamh, ctrl, response,
-                                    "NT_STATUS_ACCESS_DENIED");
+       wbcFreeMemory(error);
+
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_chauthtok", ctx, ret);
 
-       _PAM_LOG_FUNCTION_LEAVE("pam_sm_chauthtok", pamh, ctrl, ret);
+       TALLOC_FREE(ctx);
 
        return ret;
 }
@@ -2695,7 +3116,7 @@ struct pam_module _pam_winbind_modstruct = {
  * Copyright (c) Andrew Tridgell  <tridge@samba.org>   2000
  * Copyright (c) Tim Potter       <tpot@samba.org>     2000
  * Copyright (c) Andrew Bartlettt <abartlet@samba.org> 2002
- * Copyright (c) Guenther Deschner <gd@samba.org>      2005-2007
+ * Copyright (c) Guenther Deschner <gd@samba.org>      2005-2008
  * Copyright (c) Jan Rêkorajski 1999.
  * Copyright (c) Andrew G. Morgan 1996-8.
  * Copyright (c) Alex O. Yuriev, 1996.