Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2017-11-23 09:34:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync" Thu Nov 23 09:34:05 2017 rev:48 rq:544014 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2017-11-20 17:02:27.940150543 +0100 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2017-11-23 09:34:07.971022032 +0100 @@ -18,0 +19,2 @@ + Modified: 0005-do-not-convert-empty-uid-gid-to-0.patch, + check whether the uid, gid is empty before calling strtol ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 0005-do-not-convert-empty-uid-gid-to-0.patch ++++++ --- /var/tmp/diff_new_pack.NGnMhT/_old 2017-11-23 09:34:08.630997952 +0100 +++ /var/tmp/diff_new_pack.NGnMhT/_new 2017-11-23 09:34:08.630997952 +0100 @@ -1,34 +1,42 @@ -From 34e3accfcbf1d5dd08468f0e7a8aa6ceb0a7828e Mon Sep 17 00:00:00 2001 +From a7a13690db8fc7508177138265c6930fa11ade3e Mon Sep 17 00:00:00 2001 From: Bin Liu <[email protected]> -Date: Mon, 6 Nov 2017 16:59:30 +0800 -Subject: [PATCH] do not convert empty uid, gid to 0 +Date: Tue, 21 Nov 2017 11:03:10 +0800 +Subject: [PATCH] do not convert empty uid gid to 0 --- - exec/coroparse.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + exec/coroparse.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/exec/coroparse.c b/exec/coroparse.c -index 374ed7dd..f27ead1a 100644 +index 374ed7dd..ac654a11 100644 --- a/exec/coroparse.c +++ b/exec/coroparse.c -@@ -140,7 +140,7 @@ static int uid_determine (const char *req_user) +@@ -139,6 +139,12 @@ static int uid_determine (const char *req_user) + long int id; char *ep; ++ if(*req_user == '\0') { ++ sprintf (error_string_response, ++ "The user can not be empty, please read the documentation."); ++ return (-1); ++ } ++ id = strtol(req_user, &ep, 10); -- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { -+ if (*req_user != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) { + if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { return (id); - } - -@@ -194,7 +194,7 @@ static int gid_determine (const char *req_group) +@@ -193,6 +199,12 @@ static int gid_determine (const char *req_group) + long int id; char *ep; ++ if(*req_group == '\0') { ++ sprintf (error_string_response, ++ "The group can not be empty, please read the documentation."); ++ return (-1); ++ } ++ id = strtol(req_group, &ep, 10); -- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { -+ if (*req_group != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) { + if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { return (id); - } - -- 2.13.6
