[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1199-g1a8294f

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  1a8294f1dc7953bd7f45e9b65fe6b5ec005634d0 (commit)
      from  ffb6b4e6f7e47e8f22519d616e4e31444e417d16 (commit)

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


- Log -----------------------------------------------------------------
commit 1a8294f1dc7953bd7f45e9b65fe6b5ec005634d0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jul 13 13:24:19 2009 +0200

    s3:net: Fix Bug #6222. Default to DRSUAPI replication for net rpc vampire keytab
    
    metze
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 8646b9521d267284a335aafba3df6039c41b8370)

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

Summary of changes:
 source3/utils/net_rpc_samsync.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 6b23db7..309be17 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -493,17 +493,20 @@ int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv)
 
 	if (!dc_info.is_ad) {
 		printf("DC is not running Active Directory\n");
-		return -1;
-	}
-
-	if (dc_info.is_mixed_mode) {
 		ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id,
 				      0,
 				      rpc_vampire_keytab_internals, argc, argv);
+		return -1;
 	} else {
 		ret = run_rpc_command(c, cli, &ndr_table_drsuapi.syntax_id,
 				      NET_FLAGS_SEAL,
 				      rpc_vampire_keytab_ds_internals, argc, argv);
+		if (ret != 0 && dc_info.is_mixed_mode) {
+			printf("Fallback to NT4 vampire on Mixed-Mode AD Domain\n");
+			ret = run_rpc_command(c, cli, &ndr_table_netlogon.syntax_id,
+					      0,
+					      rpc_vampire_keytab_internals, argc, argv);
+		}
 	}
 
 	return ret;


-- 
Samba Shared Repository