Balint Reczey
591aa8debe
Dropped patches: - 0001-Typos-fix-in-german-translation-of-man-pages.patch - 0002-Last-bits-of-enabling-subuids.patch - 0003-Dutch-translation-update.patch - 0004-Updated-Czech-translation.patch - 0005-Update-for-German-man-pages.patch - 0006-French-manpage-translation.patch - 0007-Fix-some-spelling-issues-in-the-Norwegian-translatio.patch - 0008-su-properly-clear-child-PID.patch - 1010_vietnamese_translation - 301-Reset-pid_child-only-if-waitpid-was-successful.patch
61 lines
1.3 KiB
Plaintext
61 lines
1.3 KiB
Plaintext
Goal: save the [g]shadow files with the 'shadow' group and mode 0440
|
|
|
|
Fixes: #166793
|
|
|
|
--- a/lib/commonio.c
|
|
+++ b/lib/commonio.c
|
|
@@ -44,6 +44,7 @@
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <signal.h>
|
|
+#include <grp.h>
|
|
#include "nscd.h"
|
|
#ifdef WITH_TCB
|
|
#include <tcb.h>
|
|
@@ -963,12 +964,23 @@
|
|
goto fail;
|
|
}
|
|
} else {
|
|
+ struct group *grp;
|
|
/*
|
|
* Default permissions for new [g]shadow files.
|
|
*/
|
|
sb.st_mode = db->st_mode;
|
|
sb.st_uid = db->st_uid;
|
|
sb.st_gid = db->st_gid;
|
|
+
|
|
+ /*
|
|
+ * Try to retrieve the shadow's GID, and fall back to GID 0.
|
|
+ */
|
|
+ if (sb.st_gid == 0) {
|
|
+ if ((grp = getgrnam("shadow")) != NULL)
|
|
+ sb.st_gid = grp->gr_gid;
|
|
+ else
|
|
+ sb.st_gid = 0;
|
|
+ }
|
|
}
|
|
|
|
snprintf (buf, sizeof buf, "%s+", db->filename);
|
|
--- a/lib/sgroupio.c
|
|
+++ b/lib/sgroupio.c
|
|
@@ -229,7 +229,7 @@
|
|
#ifdef WITH_SELINUX
|
|
NULL, /* scontext */
|
|
#endif
|
|
- 0400, /* st_mode */
|
|
+ 0440, /* st_mode */
|
|
0, /* st_uid */
|
|
0, /* st_gid */
|
|
NULL, /* head */
|
|
--- a/lib/shadowio.c
|
|
+++ b/lib/shadowio.c
|
|
@@ -105,7 +105,7 @@
|
|
#ifdef WITH_SELINUX
|
|
NULL, /* scontext */
|
|
#endif /* WITH_SELINUX */
|
|
- 0400, /* st_mode */
|
|
+ 0440, /* st_mode */
|
|
0, /* st_uid */
|
|
0, /* st_gid */
|
|
NULL, /* head */
|