lib/, src/: add SELinux control flag in gr_close()

Expand gr_close() interface to add a control flag for SELinux file
context processing.

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>

diff --git a/lib/groupio.c b/lib/groupio.c
index 0bce549fdabc5749f0a257755d0072188ec5b8fa..b5a587aa271caa727552f4716f9abdb127767c01 100644 (file)
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -185,9 +185,9 @@ int gr_rewind (void)
        return commonio_next (&group_db);
 }
 
-int gr_close (void)
+int gr_close (bool process_selinux)
 {
-       return commonio_close (&group_db, true);
+       return commonio_close (&group_db, process_selinux);
 }
 
 int gr_unlock (void)

diff --git a/lib/groupio.h b/lib/groupio.h
index 2014de0cab3ba3e0428714d6a625ac1ec246cbfc..ef9242d04840e5a8f2315c76c027f435786f7e69 100644 (file)
--- a/lib/groupio.h
+++ b/lib/groupio.h
@@ -14,8 +14,9 @@
 
 #include <sys/types.h>
 #include <grp.h>
+#include <stdbool.h>
 
-extern int gr_close (void);
+extern int gr_close (bool process_selinux);
 extern /*@observer@*/ /*@null@*/const struct group *gr_locate (const char *name);
 extern /*@observer@*/ /*@null@*/const struct group *gr_locate_gid (gid_t gid);
 extern int gr_lock (void);

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index c0017e3380b5641fecbaf73c761d9cbdb905f07d..8f8f1a68e3e3f22ad5fcad2f259f014eeaba4466 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -398,7 +398,7 @@ static void close_files (void)
        }
 #endif
 
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/gpasswd.c b/src/gpasswd.c
index a64c270178abf6f6e5e8c09a2ea6f2546ad7a5f5..a9115824a1a3cf4e6b14dbb3d6b16f0259e83ee1 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -594,7 +594,7 @@ static void log_gpasswd_success_group (MAYBE_UNUSED void *arg)
  */
 static void close_files (void)
 {
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());
@@ -725,7 +725,7 @@ static void get_group (struct group *gr)
        gr->gr_passwd = xstrdup (tmpgr->gr_passwd);
        gr->gr_mem = dup_list (tmpgr->gr_mem);
 
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while closing read-only %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/groupadd.c b/src/groupadd.c
index 8210388bd3dd288301d5d300028f51a71dc334a8..10d9d781c949ac574da9469200554a19878c4c8f 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -275,7 +275,7 @@ check_new_name(void)
 static void close_files (void)
 {
        /* First, write the changes in the regular group database */
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/groupdel.c b/src/groupdel.c
index 2e754e31a757419dd3a2f11c04429bd5e7209e55..c43ff227358419b053c7530aacc047fb685089b4 100644 (file)
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -149,7 +149,7 @@ static void grp_update (void)
 static void close_files (void)
 {
        /* First, write the changes in the regular group database */
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/groupmems.c b/src/groupmems.c
index 68a186730ebea98b39979e24d6af1ec14423a88c..48a76aed6d13c4c73a11eb07d35599f422076047 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -523,7 +523,7 @@ static void open_files (void)
 
 static void close_files (void)
 {
-       if ((gr_close () == 0) && !list) {
+       if ((gr_close (true) == 0) && !list) {
                fprintf (stderr, _("%s: failure while writing changes to %s\n"), Prog, gr_dbname ());
                SYSLOG ((LOG_ERR, "failure while writing changes to %s", gr_dbname ()));
                fail_exit (EXIT_GROUP_FILE);

diff --git a/src/groupmod.c b/src/groupmod.c
index 66559432200dae249265f8eb43d642cbe238a87a..7cd7fb03e303bddcaf18851e3c62fb6038cd8d51 100644 (file)
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -483,7 +483,7 @@ static void process_flags (int argc, char **argv)
  */
 static void close_files (void)
 {
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/grpck.c b/src/grpck.c
index 2a6a11ee9b297a48073f2605c854711e8e066341..a3bf80ce353015f021af3f5a31bd0bb1fc7bbee9 100644 (file)
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -325,7 +325,7 @@ static void close_files (bool changed)
         * changes to the files.
         */
        if (changed) {
-               if (gr_close () == 0) {
+               if (gr_close (true) == 0) {
                        fprintf (stderr, _("%s: failure while writing changes to %s\n"),
                                 Prog, grp_file);
                        fail_exit (E_CANT_UPDATE);

diff --git a/src/grpconv.c b/src/grpconv.c
index 64b2157d2296e2951b12acb813be53953adef11f..99620edee9f31af8ec9a60744895a5628a229875 100644 (file)
--- a/src/grpconv.c
+++ b/src/grpconv.c
@@ -242,7 +242,7 @@ int main (int argc, char **argv)
                SYSLOG ((LOG_ERR, "failure while writing changes to %s", sgr_dbname ()));
                fail_exit (3);
        }
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/grpunconv.c b/src/grpunconv.c
index 4a822f7ed5b78679b1d1b411a2cd0b172f6ba5d4..9b05d162ef1dfd3a19fe0211babde9fabdcb87e0 100644 (file)
--- a/src/grpunconv.c
+++ b/src/grpunconv.c
@@ -194,7 +194,7 @@ int main (int argc, char **argv)
 
        (void) sgr_close (); /* was only open O_RDONLY */
 
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/newusers.c b/src/newusers.c
index ebe467441bed9431581a144a36f256fefa4c1f0c..327bc6db56152b15e7ce4a11bf222ceeee3acbbb 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -970,7 +970,7 @@ static void close_files (void)
                spw_locked = false;
        }
 
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr,
                         _("%s: failure while writing changes to %s\n"),
                         Prog, gr_dbname ());

diff --git a/src/useradd.c b/src/useradd.c
index 55444c811fee1eb67bd87aea8d5b2b086d09dae0..1971f69ad94b0e4d2eb122da56d44a3d90ff8b8b 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -1662,7 +1662,7 @@ static void close_group_files (void)
        if (!do_grp_update)
                return;
 
-       if (gr_close() == 0) {
+       if (gr_close(true) == 0) {
                fprintf(stderr,
                        _("%s: failure while writing changes to %s\n"),
                        Prog, gr_dbname());

diff --git a/src/userdel.c b/src/userdel.c
index d60c974b3abdb0fd1aab9e7ed4a105f1194f5ca5..7f118343a591f3b068d30202a85b5be68166a9a5 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -418,7 +418,7 @@ static void close_files (void)
                spw_locked = false;
        }
 
-       if (gr_close () == 0) {
+       if (gr_close (true) == 0) {
                fprintf (stderr, _("%s: failure while writing changes to %s\n"), Prog, gr_dbname ());
                SYSLOG ((LOG_ERR, "failure while writing changes to %s", gr_dbname ()));
                fail_exit (E_GRP_UPDATE);

diff --git a/src/usermod.c b/src/usermod.c
index f392ed58bd101ae0a31213c63137d5057e7b6bad..7ac9e6c467b3009d3519174dd633d36ebd0a6764 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1490,7 +1490,7 @@ static void close_files (void)
        }
 
        if (Gflg || lflg) {
-               if (gr_close () == 0) {
+               if (gr_close (true) == 0) {
                        fprintf (stderr,
                                 _("%s: failure while writing changes to %s\n"),
                                 Prog, gr_dbname ());