From: Nicolas François <nicolas.francois@centraliens.net>
Date: Mon, 5 Aug 2013 21:16:00 +0000 (+0200)
Subject: Revert b10cba0e0af5b1e3e8cda0201d5563f085aab2a4
X-Git-Tag: 4.2.1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d491ef9daaa5c8245a991549b1860e9c29fef98;p=shadow

Revert b10cba0e0af5b1e3e8cda0201d5563f085aab2a4

The length of the concatenated 2 lines was correct.
---

diff --git a/ChangeLog b/ChangeLog
index 0b20387a..10509928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/groupio.c: Revert change from 2013-07-29. The length of the
+	concatenated 2 lines was correct.
+
 2013-08-05  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* libmisc/salt.c: random() max value is 2^31-1 (same as RAND_MAX
diff --git a/lib/groupio.c b/lib/groupio.c
index 137aaea6..2a37bfd9 100644
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -329,7 +329,7 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 	}
 
 	/* Concatenate the 2 lines */
-	new_line_len = strlen (gr1->line) + strlen (gr2->line) +2;
+	new_line_len = strlen (gr1->line) + strlen (gr2->line) +1;
 	new_line = (char *)malloc (new_line_len + 1);
 	if (NULL == new_line) {
 		errno = ENOMEM;