svn commit: samba r12683 - in branches/SAMBA_4_0/source/kdc: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-02 22:34:18 +0000 (Mon, 02 Jan 2006)
New Revision: 12683

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12683

Log:
Fix declaration and initialisation placement.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/kdc/kpasswdd.c


Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kpasswdd.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kpasswdd.c	2006-01-02 22:00:40 UTC (rev 12682)
+++ branches/SAMBA_4_0/source/kdc/kpasswdd.c	2006-01-02 22:34:18 UTC (rev 12683)
@@ -207,10 +207,6 @@
 				    DATA_BLOB *reply)
 {
 	struct auth_session_info *session_info;
-	if (!msg) {
-		return False;
-	}
-
 	if (!NT_STATUS_IS_OK(gensec_session_info(gensec_security, 
 						 &session_info))) {
 		return kpasswdd_make_error_reply(kdc, mem_ctx, 
@@ -236,7 +232,7 @@
 		enum samr_RejectReason reject_reason;
 		struct samr_DomInfo1 *dominfo;
 		struct ldb_context *samdb;
-		struct ldb_message *msg = ldb_msg_new(mem_ctx);
+		struct ldb_message *msg;
 		krb5_context context = kdc->smb_krb5_context->krb5_context;
 
 		ChangePasswdDataMS chpw;
@@ -249,6 +245,11 @@
 		size_t len;
 		int ret;
 
+		msg = ldb_msg_new(mem_ctx);
+		if (!msg) {
+			return False;
+		}
+
 		ret = decode_ChangePasswdDataMS(input->data, input->length,
 						&chpw, &len);
 		if (ret) {