From: Willy Tarreau <w@1wt.eu>
Date: Tue, 5 Mar 2013 10:31:55 +0000 (+0100)
Subject: MINOR: config: report missing peers section name
X-Git-Tag: v1.5-dev18~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbbf317;p=thirdparty%2Fhaproxy.git

MINOR: config: report missing peers section name

Right now we report "invalid character ''" which is a bit confusing,
better make a special case of the missing name.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index db2b21db45..c11c30a5f7 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1454,12 +1454,18 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
 	int err_code = 0;
 
 	if (strcmp(args[0], "peers") == 0) { /* new peers section */
+		if (!*args[1]) {
+			Alert("parsing [%s:%d] : missing name for peers section.\n", file, linenum);
+			err_code |= ERR_ALERT | ERR_FATAL;
+			goto out;
+		}
 
 		err = invalid_char(args[1]);
 		if (err) {
 			Alert("parsing [%s:%d] : character '%c' is not permitted in '%s' name '%s'.\n",
 			      file, linenum, *err, args[0], args[1]);
 			err_code |= ERR_ALERT | ERR_FATAL;
+			goto out;
 		}
 
 		for (curpeers = peers; curpeers != NULL; curpeers = curpeers->next) {