From: Jeremy Allison <jra@samba.org>
Date: Fri, 15 Feb 2008 17:35:18 +0000 (-0800)
Subject: Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
X-Git-Tag: samba-3.2.0pre2~37^2~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=847874ca757ac8ca32082305c8caed5abc7fed1d;p=thirdparty%2Fsamba.git

Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
---

847874ca757ac8ca32082305c8caed5abc7fed1d
diff --cc source/nsswitch/libwbclient/wbc_pam.c
index d614474cb71,de49a6b5434..9b8a913a57b
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@@ -326,19 -372,24 +372,27 @@@ wbcErr wbcAuthenticateUserEx(const stru
  		request.data.auth_crap.nt_resp_len =
  				MIN(params->password.response.nt_length,
  				    sizeof(request.data.auth_crap.nt_resp));
- 		memcpy(request.data.auth_crap.lm_resp,
- 		       params->password.response.lm_data,
- 		       request.data.auth_crap.lm_resp_len);
- 		memcpy(request.data.auth_crap.nt_resp,
- 		       params->password.response.nt_data,
- 		       request.data.auth_crap.nt_resp_len);
- 
+ 		if (params->password.response.lm_data) {
+ 			memcpy(request.data.auth_crap.lm_resp,
+ 			       params->password.response.lm_data,
+ 			       request.data.auth_crap.lm_resp_len);
+ 		}
+ 		if (params->password.response.nt_data) {
+ 			memcpy(request.data.auth_crap.nt_resp,
+ 			       params->password.response.nt_data,
+ 			       request.data.auth_crap.nt_resp_len);
+ 		}
  		break;
 +	default:
 +		wbc_status = WBC_ERR_INVALID_PARAM;
 +		BAIL_ON_WBC_ERROR(wbc_status);
  	}
  
+ 	if (cmd == 0) {
+ 		wbc_status = WBC_ERR_INVALID_PARAM;
+ 		BAIL_ON_WBC_ERROR(wbc_status);
+ 	}
+ 
  	wbc_status = wbcRequestResponse(cmd,
  					&request,
  					&response);