*lots of small merges form HEAD

[tprouty/samba.git] / source / nsswitch / pam_winbind.c

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 7d0353664f26172c89ad49c6a0eb170b1ce5b1bc..123f67036656f423fdbc5930d9e851dd8402d7f2 100644 (file)
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -121,7 +121,8 @@ static int pam_winbind_request(enum winbindd_cmd req_type,
        /* Copy reply data from socket */
        if (response->result != WINBINDD_OK) {
                if (response->data.auth.pam_error != PAM_SUCCESS) {
-                       _pam_log(LOG_ERR, "request failed, PAM error was %d, NT error was %s", 
+                       _pam_log(LOG_ERR, "request failed: %s, PAM error was %d, NT error was %s", 
+                                response->data.auth.error_string,
                                 response->data.auth.pam_error,
                                 response->data.auth.nt_status_string);
                        return response->data.auth.pam_error;