[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  62d08ea replace: Fix bug 11455
       via  9638742 ctdb: Fix some clang uninitialized errors
       via  1d79f6c ctdb: Fix the build on FreeBSD 10.1
      from  e8c602d s4:torture/rpc: fix ndr_security.h include in fsrvp.c

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


- Log -----------------------------------------------------------------
commit 62d08ea715d1664a7600250abbd1dc83f3a33a4c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Aug 18 20:57:27 2015 +0200

    replace: Fix bug 11455
    
    Don't call rep_strtoull recursively
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Wed Aug 19 11:22:38 CEST 2015 on sn-devel-104

commit 963874279997b98c8b29bee6d2417f81a0e8b0d2
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 19 07:35:32 2015 +0200

    ctdb: Fix some clang uninitialized errors
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 1d79f6c9e5423202d5275727e1ddc60acce65b4c
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Aug 19 07:33:48 2015 +0200

    ctdb: Fix the build on FreeBSD 10.1
    
    We get sockaddr_in directly in parse_ipv4
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 ctdb/common/system_util.c | 2 +-
 ctdb/tools/ctdb.c         | 8 ++++----
 lib/replace/replace.c     | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 1ae0bae..663df6e 100644
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -157,7 +157,7 @@ bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
 	}
 
 #ifdef HAVE_SOCK_SIN_LEN
-	sin->ip.sin_len = sizeof(*sin);
+	sin->sin_len = sizeof(*sin);
 #endif
 	return true;
 }
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index c6da621..1081eec 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -4914,7 +4914,7 @@ static int control_getreclock(struct ctdb_context *ctdb, int argc, const char **
 static int control_setreclock(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	int ret;
-	const char *reclock;
+	const char *reclock = NULL;
 
 	if (argc == 0) {
 		reclock = NULL;
@@ -4938,7 +4938,7 @@ static int control_setreclock(struct ctdb_context *ctdb, int argc, const char **
 static int control_setnatgwstate(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	int ret;
-	uint32_t natgwstate;
+	uint32_t natgwstate = 0;
 
 	if (argc == 0) {
 		usage();
@@ -4967,7 +4967,7 @@ static int control_setnatgwstate(struct ctdb_context *ctdb, int argc, const char
 static int control_setlmasterrole(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	int ret;
-	uint32_t lmasterrole;
+	uint32_t lmasterrole = 0;
 
 	if (argc == 0) {
 		usage();
@@ -4996,7 +4996,7 @@ static int control_setlmasterrole(struct ctdb_context *ctdb, int argc, const cha
 static int control_setrecmasterrole(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	int ret;
-	uint32_t recmasterrole;
+	uint32_t recmasterrole = 0;
 
 	if (argc == 0) {
 		usage();
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 0806ce3..798990a 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -538,6 +538,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
 }
 #else
 #ifdef HAVE_BSD_STRTOLL
+#undef strtoll
 long long int rep_strtoll(const char *str, char **endptr, int base)
 {
 	long long int nb = strtoll(str, endptr, base);


-- 
Samba Shared Repository