The branch, master has been updated
via 8646b9521d267284a335aafba3df6039c41b8370 (commit)
from f7ff6bd1425cc4f0aa13ce8e7498cdac3967acf3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8646b9521d267284a335aafba3df6039c41b8370
Author: Stefan Metzmacher <me...@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 <g...@samba.org>
-----------------------------------------------------------------------
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 bd5047c..c0de247 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
