From: Nicolas François <nicolas.francois@centraliens.net>
Date: Mon, 12 Aug 2013 21:57:32 +0000 (+0200)
Subject: Fix removal of ranges.
X-Git-Tag: 4.2.1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9d1bb4acbacaccb53831ef95365ddba5a32ef73;p=shadow

Fix removal of ranges.

	* lib/subordinateio.c: Fix removal of ranges. The database needs
	to be marked as changed or commonio_close will discard any change.
---

diff --git a/ChangeLog b/ChangeLog
index aa482afd..42483eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-12  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/subordinateio.c: Fix removal of ranges. The database needs
+	to be marked as changed or commonio_close will discard any change.
+
 2013-08-11  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/newusers.8.xml: Include documentation of SUB_GID_MIN,
diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index 4196434b..34630f2c 100644
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -319,12 +319,14 @@ static int remove_range(struct commonio_db *db,
 			range->count = (last - range->start) + 1;
 
 			ent->changed = true;
+			db->changed = true;
 		}
 		/* Is just the end of the entry removed? */
 		else if ((start > first) && (end >= last)) {
 			range->count = (start - range->start) + 1;
 
 			ent->changed = true;
+			db->changed = true;
 		}
 		/* The middle of the range is removed */
 		else {
@@ -339,6 +341,7 @@ static int remove_range(struct commonio_db *db,
 			range->count = (start - range->start) + 1;
 
 			ent->changed = true;
+			db->changed = true;
 		}
 	}