Attachment 8815 Details for Bug 9830 – patch against v4-0-test, same as what has been pushed to autobuild

[patch] patch against v4-0-test, same as what has been pushed to autobuild

0001-bug-9830-fix-panic-in-nt_printer_publish_ads.patch (text/plain), 1.66 KB, created by David Disseldorp on 2013-04-25 15:51:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2013-04-25 15:51:19 UTC

Size: 1.66 KB

patch

obsolete

>From a6b2c590998840622158a6a96bbad9f733dc7fbc Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>Date: Thu, 25 Apr 2013 16:41:17 +0200
>Subject: [PATCH] bug 9830: fix panic in nt_printer_publish_ads
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Check for ads_find_machine_acct() errors, to ensure a NULL LDAPMessage
>pointer doesn't get passed to ldap_get_dn().
>
>Signed-off-by: David Disseldorp <ddiss@samba.org>
>Reviewed-By: GÃ¼nther Deschner <gd@samba.org>
>---
> source3/printing/nt_printing_ads.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
>index b99a972..3a2baf40 100644
>--- a/source3/printing/nt_printing_ads.c
>+++ b/source3/printing/nt_printing_ads.c
>@@ -192,17 +192,23 @@ static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx,
> 	DEBUG(5, ("publishing printer %s\n", printer));
> 
> 	/* figure out where to publish */
>-	ads_find_machine_acct(ads, &res, lp_netbios_name());
>+	ads_rc = ads_find_machine_acct(ads, &res, lp_netbios_name());
>+	if (!ADS_ERR_OK(ads_rc)) {
>+		DEBUG(0, ("failed to find machine account for %s\n",
>+			  lp_netbios_name()));
>+		TALLOC_FREE(ctx);
>+		return WERR_NOT_FOUND;
>+	}
> 
> 	/* We use ldap_get_dn here as we need the answer
> 	 * in utf8 to call ldap_explode_dn(). JRA. */
> 
> 	srv_dn_utf8 = ldap_get_dn((LDAP *)ads->ldap.ld, (LDAPMessage *)res);
>+	ads_msgfree(ads, res);
> 	if (!srv_dn_utf8) {
> 		TALLOC_FREE(ctx);
> 		return WERR_SERVER_UNAVAILABLE;
> 	}
>-	ads_msgfree(ads, res);
> 	srv_cn_utf8 = ldap_explode_dn(srv_dn_utf8, 1);
> 	if (!srv_cn_utf8) {
> 		TALLOC_FREE(ctx);
>-- 
>1.8.1.4
>

Flags:

ddiss: review? (gd)
asn: review+

Actions: View

Attachments on bug 9830: 8815 | 8816