The branch, master has been updated
via 770f222 script/autobuild.py: use --picky-developer for the
samba-ctdb target
via 8367089 s3:lib: fix allocation check in messages_ctdbd.c
via 6604b7b ctdb/server: add format string checking to
ctdb_tevent_logging()
via 5f4c154 lib/util: provide a dbgtext_va() function which takes
va_list
from 173a647 notify: Move path construction to notify_trigger
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 770f222f333dfe51d253038e706c195623df0c0c
Author: Stefan Metzmacher <[email protected]>
Date: Mon Dec 8 10:30:56 2014 +0100
script/autobuild.py: use --picky-developer for the samba-ctdb target
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Wed Dec 17 11:52:25 CET 2014 on sn-devel-104
commit 8367089b73cfffdfa809fe3ef27774d4902cdd11
Author: Stefan Metzmacher <[email protected]>
Date: Wed Dec 10 23:00:43 2014 +0100
s3:lib: fix allocation check in messages_ctdbd.c
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 6604b7bd8dbda9ba010452ec0d210f6424834231
Author: Stefan Metzmacher <[email protected]>
Date: Mon Dec 15 14:54:18 2014 +0100
ctdb/server: add format string checking to ctdb_tevent_logging()
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 5f4c1542de2ba6106b9edf247f07055ba6922fbb
Author: Stefan Metzmacher <[email protected]>
Date: Tue Dec 16 11:30:53 2014 +0100
lib/util: provide a dbgtext_va() function which takes va_list
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_logging.c | 6 +++++-
lib/util/debug.c | 24 +++++++++++++++++++-----
lib/util/debug.h | 1 +
script/autobuild.py | 2 +-
source3/lib/messages_ctdbd.c | 2 +-
5 files changed, 27 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 85dbfcf..129bdc9 100644
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -310,6 +310,10 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb)
static void ctdb_tevent_logging(void *private_data,
enum tevent_debug_level level,
const char *fmt,
+ va_list ap) PRINTF_ATTRIBUTE(3, 0);
+static void ctdb_tevent_logging(void *private_data,
+ enum tevent_debug_level level,
+ const char *fmt,
va_list ap)
{
enum debug_level lvl = DEBUG_CRIT;
@@ -330,7 +334,7 @@ static void ctdb_tevent_logging(void *private_data,
}
if (lvl <= DEBUGLEVEL) {
- dbgtext(fmt, ap);
+ dbgtext_va(fmt, ap);
}
}
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 750ad25..b050205 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1063,17 +1063,14 @@ full:
***************************************************************************/
- bool dbgtext( const char *format_str, ... )
+static inline bool __dbgtext_va(const char *format_str, va_list ap)
PRINTF_ATTRIBUTE(1,0);
+static inline bool __dbgtext_va(const char *format_str, va_list ap)
{
- va_list ap;
char *msgbuf = NULL;
bool ret = true;
int res;
- va_start(ap, format_str);
res = vasprintf(&msgbuf, format_str, ap);
- va_end(ap);
-
if (res != -1) {
format_debug_text(msgbuf);
} else {
@@ -1082,3 +1079,20 @@ full:
SAFE_FREE(msgbuf);
return ret;
}
+
+bool dbgtext_va(const char *format_str, va_list ap)
+{
+ return __dbgtext_va(format_str, ap);
+}
+
+bool dbgtext(const char *format_str, ... )
+{
+ va_list ap;
+ bool ret;
+
+ va_start(ap, format_str);
+ ret = __dbgtext_va(format_str, ap);
+ va_end(ap);
+
+ return ret;
+}
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 27c319b..67d122f 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -42,6 +42,7 @@
#define MAX_DEBUG_LEVEL 1000
#endif
+bool dbgtext_va(const char *, va_list ap) PRINTF_ATTRIBUTE(1,0);
bool dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
bool dbghdrclass( int level, int cls, const char *location, const char *func);
bool dbghdr( int level, const char *location, const char *func);
diff --git a/script/autobuild.py b/script/autobuild.py
index ba08e52..e776df8 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -60,7 +60,7 @@ tasks = {
# build samba with cluster support against this ctdb:
- ("samba-configure",
"PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH
PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab
--with-cluster-support --bundled-libraries=!tdb", "text/plain"),
+ ("samba-configure",
"PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH
PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
./configure.developer --picky-developer ${PREFIX}
--with-selftest-prefix=./bin/ab --with-cluster-support
--bundled-libraries=!tdb", "text/plain"),
("samba-make", "make", "text/plain"),
("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT",
"text/plain"),
("samba-install", "make install", "text/plain"),
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 53aeb1f..dbca103 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -113,7 +113,7 @@ static int messaging_ctdb_send(struct server_id src,
}
buf = talloc_array(talloc_tos(), uint8_t, buflen);
- if (buflen == NULL) {
+ if (buf == NULL) {
return ENOMEM;
}
iov_buf(iov, iovlen, buf, buflen);
--
Samba Shared Repository
