[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  679bbd0 s3: don't replace the error message if already defined
       via  7916d64 s3: print a nice warning when HAVE_ADS is not enabled but you still try to do net rpc keytab vampire
      from  4a8d55c selftest: Remove unused vde functions.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 679bbd014e03f60cddbcabfe0c6b5b8bae9fea4c
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Mar 3 21:20:59 2012 -0800

    s3: don't replace the error message if already defined
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sun Mar  4 10:13:24 CET 2012 on sn-devel-104

commit 7916d64bbdbe0d7bc972611dc6d897ddbd746823
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Mar 1 16:29:15 2012 -0800

    s3: print a nice warning when HAVE_ADS is not enabled but you still try to do net rpc keytab vampire

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

Summary of changes:
 source3/libnet/libnet_dssync.c  |    8 +++++---
 source3/utils/net_rpc_samsync.c |    5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index c768226..a843106 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -652,9 +652,11 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
 		status = libnet_dssync_getncchanges(mem_ctx, ctx, level, &req,
 						    &pnew_utdv);
 		if (!NT_STATUS_IS_OK(status)) {
-			ctx->error_message = talloc_asprintf(ctx,
-				"Failed to call DsGetNCCHanges: %s",
-				nt_errstr(status));
+			if (!ctx->error_message) {
+				ctx->error_message = talloc_asprintf(ctx,
+					"Failed to call DsGetNCCHanges: %s",
+					nt_errstr(status));
+			}
 			goto out;
 		}
 	}
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index d6c0542..772651f 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -614,6 +614,11 @@ int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv)
 			ret = run_rpc_command(c, cli, &ndr_table_netlogon,
 					      0,
 					      rpc_vampire_keytab_internals, argc, argv);
+		} else {
+#ifndef HAVE_ADS
+			printf(_("Vampire requested against AD DC but ADS"
+				" support not built in: HAVE_ADS is not defined\n"));
+#endif
 		}
 	}
 


-- 
Samba Shared Repository