From: Günther Deschner Date: Thu, 30 Apr 2009 21:37:26 +0000 (+0200) Subject: s3-netapi: Fix Bug #6309: support remote unjoining of Windows 2003 or greater. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=242ae00e56ac553f9ac736b4c2a18b4610bdb6e9;p=thirdparty%2Fsamba.git s3-netapi: Fix Bug #6309: support remote unjoining of Windows 2003 or greater. Found by David Markey . Thanks! Guenther (cherry picked from commit ab4b8c9c0438bc5afca17e3ebf05dde6f98bc0aa) --- diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index 8164b7456b3..629a447a245 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 132630de554..3bf6a27289a 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;