[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-142-g1344702

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  13447026c4a6e5e0cf0f559d2430309c2a8f7e87 (commit)
       via  4b00f6606a1d90c498052ea4dbc1dc1d686cb9a4 (commit)
      from  09efcf4005c2a973c7dea9d0497e15bcfc5381a7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 13447026c4a6e5e0cf0f559d2430309c2a8f7e87
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 26 01:27:36 2008 +0100

    Fix wbcAuthenticateUserEx().
    
    Guenther
    (cherry picked from commit 79f7a519f8f61a31d84467c5b5975cae13db1c29)

commit 4b00f6606a1d90c498052ea4dbc1dc1d686cb9a4
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 26 01:25:57 2008 +0100

    Add debug statement in auth_winbind to display wbcAuthenticateUserEx error code.
    
    Guenther
    (cherry picked from commit 0ad00a452f03d8af6e6b6fabd4a05ca26a9910d0)

-----------------------------------------------------------------------

Summary of changes:
 source/auth/auth_winbind.c            |    5 +++++
 source/nsswitch/libwbclient/wbc_pam.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_winbind.c b/source/auth/auth_winbind.c
index 26a1b7f..20faa95 100644
--- a/source/auth/auth_winbind.c
+++ b/source/auth/auth_winbind.c
@@ -80,6 +80,11 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 	wbc_status = wbcAuthenticateUserEx(&params, &info, &err);
 	unbecome_root();
 
+	if (!WBC_ERROR_IS_OK(wbc_status)) {
+		DEBUG(10,("check_winbind_security: wbcAuthenticateUserEx failed: %s\n",
+			wbcErrorString(wbc_status)));
+	}
+
 	if (wbc_status == WBC_ERR_NO_MEMORY) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index 1164ab1..c1457cc 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -324,7 +324,7 @@ wbcErr wbcAuthenticateUserEx(const struct wbcAuthUserParams *params,
 				WBFLAG_PAM_LMKEY;
 
 		if (params->password.response.lm_length &&
-		    params->password.response.lm_data) {
+		    !params->password.response.lm_data) {
 			wbc_status = WBC_ERR_INVALID_PARAM;
 			BAIL_ON_WBC_ERROR(wbc_status);
 		}


-- 
Samba Shared Repository