X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source3%2Fwinbindd%2Fwinbindd_check_machine_acct.c;h=610e9edfaaca30f72c2bdfc343f267892ee26070;hp=e3505cb35238b593b87c87eadd86d16cd8e46cf7;hb=3c3725a340ffe20ab679cf2f9d41ccd0b51b4b3a;hpb=7b3501200c55d7844c4d697456dbfa2b86cfdcc8

diff --git a/source3/winbindd/winbindd_check_machine_acct.c b/source3/winbindd/winbindd_check_machine_acct.c
index e3505cb3523..610e9edfaac 100644
--- a/source3/winbindd/winbindd_check_machine_acct.c
+++ b/source3/winbindd/winbindd_check_machine_acct.c
@@ -42,7 +42,16 @@ struct tevent_req *winbindd_check_machine_acct_send(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	domain = find_our_domain();
+	if (request->domain_name[0] == '0') {
+		/* preserve old behavior, when no domain name is given */
+		domain = find_our_domain();
+	} else {
+		domain = find_domain_from_name(request->domain_name);
+	}
+	if (domain == NULL) {
+		tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN);
+		return tevent_req_post(req, ev);
+	}
 	if (domain->internal) {
 		/*
 		 * Internal domains are passdb based, we can always