The branch, master has been updated via 9ae65ba ncacn_http: fix GNUism via ccb0d9d lib/texpect: portability fix, include signal.h from 644e53d configure: Unload the wrappers so waf configure succeeds.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9ae65baf3cd6382678624864f13fc053d942d013 Author: Ralph Boehme <s...@samba.org> Date: Thu Oct 9 16:41:10 2014 +0200 ncacn_http: fix GNUism %a format conversion is a GNU extension, use the more portable %m. It's at least in SUSv4, supported by glibc since 2.7 and FreeBSD 10. Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Thu Oct 9 22:05:26 CEST 2014 on sn-devel-104 commit ccb0d9d6169594e8dd1c8935c9dfec51ee7125c4 Author: Ralph Boehme <s...@samba.org> Date: Thu Oct 9 14:34:02 2014 +0200 lib/texpect: portability fix, include signal.h Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/texpect/texpect.c | 1 + source4/lib/http/http.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c index c1a6a99..ac88979 100644 --- a/lib/texpect/texpect.c +++ b/lib/texpect/texpect.c @@ -62,6 +62,7 @@ #include <popt.h> #include <errno.h> #include <err.h> +#include <signal.h> struct command { enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type; diff --git a/source4/lib/http/http.c b/source4/lib/http/http.c index 314ceed..c3bd728 100644 --- a/source4/lib/http/http.c +++ b/source4/lib/http/http.c @@ -112,7 +112,7 @@ static enum http_read_status http_parse_headers(struct http_read_response_state return HTTP_ALL_DATA_READ; } - n = sscanf(line, "%a[^:]: %a[^\r\n]\r\n", &key, &value); + n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value); if (n != 2) { DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); status = HTTP_DATA_CORRUPTED; @@ -158,7 +158,7 @@ static bool http_parse_response_line(struct http_read_response_state *state) return false; } - n = sscanf(line, "%a[^/]/%c.%c %d %a[^\r\n]\r\n", + n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n", &protocol, &major, &minor, &code, &msg); DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, " -- Samba Shared Repository