Attachment 4123 Details for Bug 6309 – Patch for 3.3

[patch] Patch for 3.3

patch-3-3-test (text/plain), 1.68 KB, created by Guenther Deschner on 2009-05-05 16:27:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2009-05-05 16:27:28 UTC

Size: 1.68 KB

patch

obsolete

>From 942d47e5ed583e29afaa005f9ca6251373db8e2f Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Thu, 30 Apr 2009 23:37:26 +0200
>Subject: [PATCH] s3-netapi: Fix Bug #6309: support remote unjoining of Windows 2003 or greater.
>
>Found by David Markey <admin@dmarkey.com>. Thanks!
>
>Guenther
>(cherry picked from commit ab4b8c9c0438bc5afca17e3ebf05dde6f98bc0aa)
>---
> .../examples/netdomjoin-gui/netdomjoin-gui.c       |    3 ++-
> source/utils/net_dom.c                            |    3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
>index 8164b74..629a447 100644
>--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
>+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
>@@ -655,7 +655,8 @@ static void callback_do_join(GtkWidget *widget,
> 		unjoin_creds_required = TRUE;
> 		join_creds_required = FALSE;
> 		unjoin_flags = NETSETUP_JOIN_DOMAIN |
>-			       NETSETUP_ACCT_DELETE;
>+			       NETSETUP_ACCT_DELETE |
>+			       NETSETUP_IGNORE_UNSUPPORTED_FLAGS;
> 	}
> 
> 	if (try_unjoin) {
>diff --git a/source/utils/net_dom.c b/source/utils/net_dom.c
>index 132630d..3bf6a27 100644
>--- a/source/utils/net_dom.c
>+++ b/source/utils/net_dom.c
>@@ -38,7 +38,8 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv)
> 	const char *account = NULL;
> 	const char *password = NULL;
> 	uint32_t unjoin_flags = NETSETUP_ACCT_DELETE |
>-				NETSETUP_JOIN_DOMAIN;
>+				NETSETUP_JOIN_DOMAIN |
>+				NETSETUP_IGNORE_UNSUPPORTED_FLAGS;
> 	struct cli_state *cli = NULL;
> 	bool do_reboot = false;
> 	NTSTATUS ntstatus;
>-- 
>1.6.0.6
>

Actions: View

Attachments on bug 6309: 4123