From 46fb492f867d77e4dc2b4b95e85b5aa0b33b3ad1 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 9 Oct 2014 16:41:10 +0200 Subject: [PATCH] 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. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11371 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Oct 9 22:05:26 CEST 2014 on sn-devel-104 (cherry picked from commit 9ae65baf3cd6382678624864f13fc053d942d013) --- source4/lib/http/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, " -- 2.4.3