[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5255-g242ae00

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  242ae00e56ac553f9ac736b4c2a18b4610bdb6e9 (commit)
      from  f97e37d0130752dded728a29f5b1024ca19a0733 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 242ae00e56ac553f9ac736b4c2a18b4610bdb6e9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 30 23:37:26 2009 +0200

    s3-netapi: Fix Bug #6309: support remote unjoining of Windows 2003 or greater.
    
    Found by David Markey <admin at dmarkey.com>. Thanks!
    
    Guenther
    (cherry picked from commit ab4b8c9c0438bc5afca17e3ebf05dde6f98bc0aa)

-----------------------------------------------------------------------

Summary of changes:
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    3 ++-
 source/utils/net_dom.c                             |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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;


-- 
Samba Shared Repository