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)

diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 8164b7456b368efe76246d7df4f04c9449a5881d..629a447a245d4264f4c9d13d9168015b822b890a 100644 (file)
--- 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 132630de554fe8e19b685cddf524e873aaf94902..3bf6a27289ab6890c9101b24573f5915ce3f2f3a 100644 (file)
--- 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;