Re: [systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-11-11 Thread Lennart Poettering 
On Wed, 29.10.14 14:20, Colin Guthrie (co...@mageia.org) wrote:

 When running sysusers we would clobber file ownership and permissions
 on the files /etc/passwd, /etc/group and /etc/[g]shadow.
 
 This simply preserves the ownership and mode if existing files are
 found.

I figure turning this into a new function that is just called a couple
of times would be much nicer than repeating the same lines multiple
times...

Done that now.

Lennart

-- 
Lennart Poettering, Red Hat
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Re: [systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-10-30 Thread Zbigniew Jędrzejewski-Szmek 
On Wed, Oct 29, 2014 at 05:27:28PM +, Colin Guthrie wrote:
 FWIW, I tested this now and it seems to have worked fine and properly
 preserved both mode and ownership of the files in question.
 
 OK to push this one?
Yeah, looks reasonable.

Zbyszek

 Colin Guthrie wrote on 29/10/14 14:34:
  When running sysusers we would clobber file ownership and permissions
  on the files /etc/passwd, /etc/group and /etc/[g]shadow.
  
  This simply preserves the ownership and mode if existing files are
  found.
  ---
   src/sysusers/sysusers.c | 61 
  +
   1 file changed, 41 insertions(+), 20 deletions(-)
  
  diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
  index 9b9be96..c133dc5 100644
  --- a/src/sysusers/sysusers.c
  +++ b/src/sysusers/sysusers.c
  @@ -358,6 +358,7 @@ static int write_files(void) {
   _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = 
  NULL, *gshadow = NULL;
   _cleanup_free_ char *passwd_tmp = NULL, *group_tmp = NULL, 
  *shadow_tmp = NULL, *gshadow_tmp = NULL;
   const char *passwd_path = NULL, *group_path = NULL, *shadow_path = 
  NULL, *gshadow_path = NULL;
  +struct stat st;
   bool group_changed = false;
   Iterator iterator;
   Item *i;
  @@ -372,15 +373,17 @@ static int write_files(void) {
   if (r  0)
   goto finish;
   
  -if (fchmod(fileno(group), 0644)  0) {
  -r = -errno;
  -goto finish;
  -}
  -
   original = fopen(group_path, re);
   if (original) {
   struct group *gr;
   
  +if (fstat(fileno(original), st)  0 ||
  +fchmod(fileno(group), st.st_mode  0)  0 
  ||
  +fchown(fileno(group), st.st_uid, st.st_gid)  
  0) {
  +r = -errno;
  +goto finish;
  +}
  +
   errno = 0;
   while ((gr = fgetgrent(original))) {
   /* Safety checks against name and GID
  @@ -418,6 +421,9 @@ static int write_files(void) {
   } else if (errno != ENOENT) {
   r = -errno;
   goto finish;
  +} else if (fchmod(fileno(group), 0644)  0) {
  +r = -errno;
  +goto finish;
   }
   
   HASHMAP_FOREACH(i, todo_gids, iterator) {
  @@ -449,15 +455,17 @@ static int write_files(void) {
   if (r  0)
   goto finish;
   
  -if (fchmod(fileno(gshadow), )  0) {
  -r = -errno;
  -goto finish;
  -}
  -
   original = fopen(gshadow_path, re);
   if (original) {
   struct sgrp *sg;
   
  +if (fstat(fileno(original), st)  0 ||
  +fchmod(fileno(gshadow), st.st_mode  0)  
  0 ||
  +fchown(fileno(gshadow), st.st_uid, st.st_gid) 
   0) {
  +r = -errno;
  +goto finish;
  +}
  +
   errno = 0;
   while ((sg = fgetsgent(original))) {
   
  @@ -483,6 +491,9 @@ static int write_files(void) {
   } else if (errno != ENOENT) {
   r = -errno;
   goto finish;
  +} else if (fchmod(fileno(gshadow), )  0) {
  +r = -errno;
  +goto finish;
   }
   
   HASHMAP_FOREACH(i, todo_gids, iterator) {
  @@ -513,15 +524,17 @@ static int write_files(void) {
   if (r  0)
   goto finish;
   
  -if (fchmod(fileno(passwd), 0644)  0) {
  -r = -errno;
  -goto finish;
  -}
  -
   original = fopen(passwd_path, re);
   if (original) {
   struct passwd *pw;
   
  +if (fstat(fileno(original), st)  0 ||
  +fchmod(fileno(passwd), st.st_mode  0)  0 
  ||
  +fchown(fileno(passwd), st.st_uid, st.st_gid)  
  0) {
  +r = -errno;
  +goto finish;
  +}
  +
   errno = 0;
   while ((pw = fgetpwent(original))) {
   
  @@ -552,6 +565,9 @@ static int write_files(void) {
   } else if (errno != ENOENT) {

Re: [systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-10-30 Thread Colin Guthrie 

Zbigniew Jędrzejewski-Szmek wrote on 30/10/14 12:35:
 On Wed, Oct 29, 2014 at 05:27:28PM +, Colin Guthrie wrote:
 FWIW, I tested this now and it seems to have worked fine and properly
 preserved both mode and ownership of the files in question.

 OK to push this one?
 Yeah, looks reasonable.

Cool. Pushed as e3c72c21d62aadabf4df436c3e2c7219eeeccc1c


-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited http://www.tribalogic.net/
Open Source:
  Mageia Contributor http://www.mageia.org/
  PulseAudio Hacker http://www.pulseaudio.org/
  Trac Hacker http://trac.edgewall.org/
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

[systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-10-29 Thread Colin Guthrie 
When running sysusers we would clobber file ownership and permissions
on the files /etc/passwd, /etc/group and /etc/[g]shadow.

This simply preserves the ownership and mode if existing files are
found.
---
 src/sysusers/sysusers.c | 93 ++---
 1 file changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 9b9be96..1935993 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -358,6 +358,7 @@ static int write_files(void) {
 _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, 
*gshadow = NULL;
 _cleanup_free_ char *passwd_tmp = NULL, *group_tmp = NULL, *shadow_tmp 
= NULL, *gshadow_tmp = NULL;
 const char *passwd_path = NULL, *group_path = NULL, *shadow_path = 
NULL, *gshadow_path = NULL;
+struct stat st;
 bool group_changed = false;
 Iterator iterator;
 Item *i;
@@ -372,15 +373,25 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(group), 0644)  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(group_path, re);
 if (original) {
 struct group *gr;
 
+if (fstat(fileno(original), st)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchmod(fileno(group), st.st_mode  0)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchown(fileno(group), st.st_uid, st.st_gid)  0) {
+r = -errno;
+goto finish;
+}
+
 errno = 0;
 while ((gr = fgetgrent(original))) {
 /* Safety checks against name and GID
@@ -418,6 +429,9 @@ static int write_files(void) {
 } else if (errno != ENOENT) {
 r = -errno;
 goto finish;
+} else if (fchmod(fileno(group), 0644)  0) {
+r = -errno;
+goto finish;
 }
 
 HASHMAP_FOREACH(i, todo_gids, iterator) {
@@ -449,15 +463,25 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(gshadow), )  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(gshadow_path, re);
 if (original) {
 struct sgrp *sg;
 
+if (fstat(fileno(original), st)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchmod(fileno(gshadow), st.st_mode  0)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchown(fileno(gshadow), st.st_uid, st.st_gid)  0) 
{
+r = -errno;
+goto finish;
+}
+
 errno = 0;
 while ((sg = fgetsgent(original))) {
 
@@ -483,6 +507,9 @@ static int write_files(void) {
 } else if (errno != ENOENT) {
 r = -errno;
 goto finish;
+} else if (fchmod(fileno(gshadow), )  0) {
+r = -errno;
+goto finish;
 }
 
 HASHMAP_FOREACH(i, todo_gids, iterator) {
@@ -513,15 +540,25 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(passwd), 0644)  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(passwd_path, re);
 if (original) {
 struct passwd *pw;
 
+if (fstat(fileno(original), st)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchmod(fileno(passwd), st.st_mode  0)  0) {
+r = -errno;
+goto finish;
+}
+
+if (fchown(fileno(passwd), st.st_uid, st.st_gid)  0) {
+r = -errno;
+goto finish;
+}
+
 errno = 0;

[systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-10-29 Thread Colin Guthrie 
When running sysusers we would clobber file ownership and permissions
on the files /etc/passwd, /etc/group and /etc/[g]shadow.

This simply preserves the ownership and mode if existing files are
found.
---
 src/sysusers/sysusers.c | 61 +
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 9b9be96..c133dc5 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -358,6 +358,7 @@ static int write_files(void) {
 _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, 
*gshadow = NULL;
 _cleanup_free_ char *passwd_tmp = NULL, *group_tmp = NULL, *shadow_tmp 
= NULL, *gshadow_tmp = NULL;
 const char *passwd_path = NULL, *group_path = NULL, *shadow_path = 
NULL, *gshadow_path = NULL;
+struct stat st;
 bool group_changed = false;
 Iterator iterator;
 Item *i;
@@ -372,15 +373,17 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(group), 0644)  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(group_path, re);
 if (original) {
 struct group *gr;
 
+if (fstat(fileno(original), st)  0 ||
+fchmod(fileno(group), st.st_mode  0)  0 ||
+fchown(fileno(group), st.st_uid, st.st_gid)  0) {
+r = -errno;
+goto finish;
+}
+
 errno = 0;
 while ((gr = fgetgrent(original))) {
 /* Safety checks against name and GID
@@ -418,6 +421,9 @@ static int write_files(void) {
 } else if (errno != ENOENT) {
 r = -errno;
 goto finish;
+} else if (fchmod(fileno(group), 0644)  0) {
+r = -errno;
+goto finish;
 }
 
 HASHMAP_FOREACH(i, todo_gids, iterator) {
@@ -449,15 +455,17 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(gshadow), )  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(gshadow_path, re);
 if (original) {
 struct sgrp *sg;
 
+if (fstat(fileno(original), st)  0 ||
+fchmod(fileno(gshadow), st.st_mode  0)  0 ||
+fchown(fileno(gshadow), st.st_uid, st.st_gid)  0) 
{
+r = -errno;
+goto finish;
+}
+
 errno = 0;
 while ((sg = fgetsgent(original))) {
 
@@ -483,6 +491,9 @@ static int write_files(void) {
 } else if (errno != ENOENT) {
 r = -errno;
 goto finish;
+} else if (fchmod(fileno(gshadow), )  0) {
+r = -errno;
+goto finish;
 }
 
 HASHMAP_FOREACH(i, todo_gids, iterator) {
@@ -513,15 +524,17 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(passwd), 0644)  0) {
-r = -errno;
-goto finish;
-}
-
 original = fopen(passwd_path, re);
 if (original) {
 struct passwd *pw;
 
+if (fstat(fileno(original), st)  0 ||
+fchmod(fileno(passwd), st.st_mode  0)  0 ||
+fchown(fileno(passwd), st.st_uid, st.st_gid)  0) {
+r = -errno;
+goto finish;
+}
+
 errno = 0;
 while ((pw = fgetpwent(original))) {
 
@@ -552,6 +565,9 @@ static int write_files(void) {
 } else if (errno != ENOENT) {
 r = -errno;
 goto finish;
+} else if (fchmod(fileno(passwd), 0644)  0) {
+r = -errno;
+goto finish;
 }
 
 HASHMAP_FOREACH(i, todo_uids, iterator) {
@@ -596,15 +612,17 @@ static int write_files(void) {
 if (r  0)
 goto finish;
 
-if (fchmod(fileno(shadow), )  0) {
-r = -errno;
-goto finish;
-

Re: [systemd-devel] [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and friends

2014-10-29 Thread Colin Guthrie 
FWIW, I tested this now and it seems to have worked fine and properly
preserved both mode and ownership of the files in question.

OK to push this one?

Col

Colin Guthrie wrote on 29/10/14 14:34:
 When running sysusers we would clobber file ownership and permissions
 on the files /etc/passwd, /etc/group and /etc/[g]shadow.
 
 This simply preserves the ownership and mode if existing files are
 found.
 ---
  src/sysusers/sysusers.c | 61 
 +
  1 file changed, 41 insertions(+), 20 deletions(-)
 
 diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
 index 9b9be96..c133dc5 100644
 --- a/src/sysusers/sysusers.c
 +++ b/src/sysusers/sysusers.c
 @@ -358,6 +358,7 @@ static int write_files(void) {
  _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, 
 *gshadow = NULL;
  _cleanup_free_ char *passwd_tmp = NULL, *group_tmp = NULL, 
 *shadow_tmp = NULL, *gshadow_tmp = NULL;
  const char *passwd_path = NULL, *group_path = NULL, *shadow_path = 
 NULL, *gshadow_path = NULL;
 +struct stat st;
  bool group_changed = false;
  Iterator iterator;
  Item *i;
 @@ -372,15 +373,17 @@ static int write_files(void) {
  if (r  0)
  goto finish;
  
 -if (fchmod(fileno(group), 0644)  0) {
 -r = -errno;
 -goto finish;
 -}
 -
  original = fopen(group_path, re);
  if (original) {
  struct group *gr;
  
 +if (fstat(fileno(original), st)  0 ||
 +fchmod(fileno(group), st.st_mode  0)  0 ||
 +fchown(fileno(group), st.st_uid, st.st_gid)  0) 
 {
 +r = -errno;
 +goto finish;
 +}
 +
  errno = 0;
  while ((gr = fgetgrent(original))) {
  /* Safety checks against name and GID
 @@ -418,6 +421,9 @@ static int write_files(void) {
  } else if (errno != ENOENT) {
  r = -errno;
  goto finish;
 +} else if (fchmod(fileno(group), 0644)  0) {
 +r = -errno;
 +goto finish;
  }
  
  HASHMAP_FOREACH(i, todo_gids, iterator) {
 @@ -449,15 +455,17 @@ static int write_files(void) {
  if (r  0)
  goto finish;
  
 -if (fchmod(fileno(gshadow), )  0) {
 -r = -errno;
 -goto finish;
 -}
 -
  original = fopen(gshadow_path, re);
  if (original) {
  struct sgrp *sg;
  
 +if (fstat(fileno(original), st)  0 ||
 +fchmod(fileno(gshadow), st.st_mode  0)  0 
 ||
 +fchown(fileno(gshadow), st.st_uid, st.st_gid)  
 0) {
 +r = -errno;
 +goto finish;
 +}
 +
  errno = 0;
  while ((sg = fgetsgent(original))) {
  
 @@ -483,6 +491,9 @@ static int write_files(void) {
  } else if (errno != ENOENT) {
  r = -errno;
  goto finish;
 +} else if (fchmod(fileno(gshadow), )  0) {
 +r = -errno;
 +goto finish;
  }
  
  HASHMAP_FOREACH(i, todo_gids, iterator) {
 @@ -513,15 +524,17 @@ static int write_files(void) {
  if (r  0)
  goto finish;
  
 -if (fchmod(fileno(passwd), 0644)  0) {
 -r = -errno;
 -goto finish;
 -}
 -
  original = fopen(passwd_path, re);
  if (original) {
  struct passwd *pw;
  
 +if (fstat(fileno(original), st)  0 ||
 +fchmod(fileno(passwd), st.st_mode  0)  0 ||
 +fchown(fileno(passwd), st.st_uid, st.st_gid)  
 0) {
 +r = -errno;
 +goto finish;
 +}
 +
  errno = 0;
  while ((pw = fgetpwent(original))) {
  
 @@ -552,6 +565,9 @@ static int write_files(void) {
  } else if (errno != ENOENT) {
  r = -errno;
  goto finish;
 +} else if (fchmod(fileno(passwd), 0644)  0) {
 +r = -errno;
 +goto finish;
  }