[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-548-g5cec86e

[Andrew Bartlett]

The branch, master has been updated
       via  5cec86ec27a4292dcde1b45003ff74bd64c465d6 (commit)
       via  59bea8436267cbb6d6b1501af31b8948509b3bd4 (commit)
       via  d58976012eada94d55eb3ac89fd1601291167232 (commit)
      from  c386c027e7a5ea55a9e6375eaf736718c6dbaae0 (commit)

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


- Log -----------------------------------------------------------------
commit 5cec86ec27a4292dcde1b45003ff74bd64c465d6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Sep 19 14:27:29 2009 -0700

    s4:dsdb Print the partition we failed to suggest replication for

commit 59bea8436267cbb6d6b1501af31b8948509b3bd4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Sep 19 14:20:43 2009 -0700

    libcli:nbt move prototypes of lmhosts functions to libnbt.h

commit d58976012eada94d55eb3ac89fd1601291167232
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Sep 19 11:59:44 2009 -0700

    s4:utils Explian fix for testparm -v
    
    The problem here was that we take an address of a bool, and then (via
    a void*) cast it to a int *, so put this in a comment.
    
    Andrew Bartlett

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

Summary of changes:
 libcli/nbt/libnbt.h              |    7 ++++++-
 source3/include/proto.h          |    4 ----
 source4/dsdb/repl/drepl_notify.c |    3 ++-
 source4/utils/testparm.c         |    8 ++++++--
 4 files changed, 14 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index a37a213..2abcb56 100644
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -24,7 +24,7 @@
 
 #include "librpc/gen_ndr/nbt.h"
 #include "librpc/ndr/libndr.h"
-
+#include "system/network.h"
 /*
   possible states for pending requests
 */
@@ -355,4 +355,9 @@ NTSTATUS nbt_name_register_wins_recv(struct composite_context *c, TALLOC_CTX *me
 				     struct nbt_name_register_wins *io);
 
 
+XFILE *startlmhosts(const char *fname);
+bool getlmhostsent(TALLOC_CTX *ctx, XFILE *fp, char **pp_name, int *name_type,
+		struct sockaddr_storage *pss);
+void endlmhosts(XFILE *fp);
+
 #endif /* __LIBNBT_H__ */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1d8a6cd..f2350e7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3104,10 +3104,6 @@ struct sockaddr_storage *name_query(int fd,
 			int *count,
 			int *flags,
 			bool *timed_out);
-XFILE *startlmhosts(const char *fname);
-bool getlmhostsent(TALLOC_CTX *ctx, XFILE *fp, char **pp_name, int *name_type,
-		struct sockaddr_storage *pss);
-void endlmhosts(XFILE *fp);
 NTSTATUS name_resolve_bcast(const char *name,
 			int name_type,
 			struct ip_service **return_iplist,
diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index d354b4e..e8652dc 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -179,8 +179,9 @@ static void dreplsrv_notify_op_callback(struct dreplsrv_notify_operation *op)
 
 	status = composite_wait(op->creq);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("dreplsrv_notify: Failed to send DsReplicaSync to %s - %s\n",
+		DEBUG(0,("dreplsrv_notify: Failed to send DsReplicaSync to %s for %s - %s\n",
 			 op->source_dsa->repsFrom1->other_info->dns_name,
+			 ldb_dn_get_linearized(op->source_dsa->partition->dn),
 			 nt_errstr(status)));
 	} else {
 		DEBUG(2,("dreplsrv_notify: DsReplicaSync OK for %s\n",
diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c
index d9cbac6..a71470a 100644
--- a/source4/utils/testparm.c
+++ b/source4/utils/testparm.c
@@ -173,7 +173,6 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
 
  int main(int argc, const char *argv[])
 {
-	static bool silent_mode = false;
 	int ret = 0;
 	poptContext pc;
 /*
@@ -184,7 +183,12 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
 	static char *parameter_name = NULL;
 	static const char *cname;
 	static const char *caddr;
-	static int show_defaults = false;
+	static int silent_mode = false;
+	static int show_defaults = false;  /* This must be an 'int',
+					    * as we take it as we pass
+					    * it's address as an int
+					    * pointer  */
+.c
 	struct loadparm_context *lp_ctx;
 
 	struct poptOption long_options[] = {


-- 
Samba Shared Repository