pathnames: clean up various user database paths

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/include/pathnames.h b/include/pathnames.h
index 6c00d9f4ae83c766ee8bf3adc91115cbf0c703d6..70c6ecfb313557bf118851d9d4b540653ec4b650 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -51,23 +51,14 @@
 /* used in login-utils/shutdown.c */
 
 /* used in login-utils/setpwnam.h and login-utils/islocal.c */
-#define _PATH_PASSWD            "/etc/passwd"
+#define _PATH_PASSWD           "/etc/passwd"
 
-/* used in login-utils/newgrp */
+/* used in login-utils/newgrp and login-utils/setpwnam.h*/
 #define _PATH_GSHADOW          "/etc/gshadow"
 
 /* used in login-utils/setpwnam.h */
-#define _PATH_PTMP              "/etc/ptmp"
-#define _PATH_PTMPTMP           "/etc/ptmptmp"
-#define _PATH_GROUP             "/etc/group"
-#define _PATH_GTMP              "/etc/gtmp"
-#define _PATH_GTMPTMP           "/etc/gtmptmp"
-#define _PATH_SHADOW_PASSWD     "/etc/shadow"
-#define _PATH_SHADOW_PTMP       "/etc/sptmp"
-#define _PATH_SHADOW_PTMPTMP    "/etc/sptmptmp"
-#define _PATH_SHADOW_GROUP      "/etc/gshadow"
-#define _PATH_SHADOW_GTMP       "/etc/sgtmp"
-#define _PATH_SHADOW_GTMPTMP    "/etc/sgtmptmp"
+#define _PATH_GROUP            "/etc/group"
+#define _PATH_SHADOW_PASSWD    "/etc/shadow"
 #define _PATH_SHELLS           "/etc/shells"
 
 /* used in term-utils/agetty.c */

diff --git a/login-utils/setpwnam.h b/login-utils/setpwnam.h
index 6a4dbb7b4388e9f2c2230893fe5fa4ca25ad8ca9..7d69445e8b4e0603f18f57adc2a1a32e9688afd8 100644 (file)
--- a/login-utils/setpwnam.h
+++ b/login-utils/setpwnam.h
@@ -18,7 +18,7 @@
 # define PASSWD_FILE   _PATH_PASSWD
 # define GROUP_FILE    _PATH_GROUP
 # define SHADOW_FILE   _PATH_SHADOW_PASSWD
-# define SGROUP_FILE   _PATH_SHADOW_GROUP
+# define SGROUP_FILE   _PATH_GSHADOW
 #else
 # define PASSWD_FILE   "/tmp/passwd"
 # define GROUP_FILE    "/tmp/group"

diff --git a/tests/expected/paths/built-in b/tests/expected/paths/built-in
index 51372de3bab71f5960f791fd2746ebc55d5263c9..836eff57731ed3af47c71bc2c06f5d4ce94b41af 100644 (file)
--- a/tests/expected/paths/built-in
+++ b/tests/expected/paths/built-in
@@ -19,17 +19,9 @@
         _PATH_UMOUNT /bin/umount
         _PATH_PASSWD /etc/passwd
        _PATH_GSHADOW /etc/gshadow
-          _PATH_PTMP /etc/ptmp
-       _PATH_PTMPTMP /etc/ptmptmp
          _PATH_GROUP /etc/group
-          _PATH_GTMP /etc/gtmp
-       _PATH_GTMPTMP /etc/gtmptmp
  _PATH_SHADOW_PASSWD /etc/shadow
-   _PATH_SHADOW_PTMP /etc/sptmp
-_PATH_SHADOW_PTMPTMP /etc/sptmptmp
   _PATH_SHADOW_GROUP /etc/gshadow
-   _PATH_SHADOW_GTMP /etc/sgtmp
-_PATH_SHADOW_GTMPTMP /etc/sgtmptmp
          _PATH_WORDS /usr/share/dict/words
      _PATH_WORDS_ALT /usr/share/dict/web2
         _PATH_UMOUNT /bin/umount

diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
index 0270938ba84c90c1c186748e0742a3b34c5b29b8..ebd5249554abafe6874fc3af6ff77a83883b1ab9 100644 (file)
--- a/tests/helpers/test_pathnames.c
+++ b/tests/helpers/test_pathnames.c
@@ -52,17 +52,8 @@ struct hlpPath paths[] =
        DEF_HLPPATH(_PATH_UMOUNT),
        DEF_HLPPATH(_PATH_PASSWD),
        DEF_HLPPATH(_PATH_GSHADOW),
-       DEF_HLPPATH(_PATH_PTMP),
-       DEF_HLPPATH(_PATH_PTMPTMP),
        DEF_HLPPATH(_PATH_GROUP),
-       DEF_HLPPATH(_PATH_GTMP),
-       DEF_HLPPATH(_PATH_GTMPTMP),
        DEF_HLPPATH(_PATH_SHADOW_PASSWD),
-       DEF_HLPPATH(_PATH_SHADOW_PTMP),
-       DEF_HLPPATH(_PATH_SHADOW_PTMPTMP),
-       DEF_HLPPATH(_PATH_SHADOW_GROUP),
-       DEF_HLPPATH(_PATH_SHADOW_GTMP),
-       DEF_HLPPATH(_PATH_SHADOW_GTMPTMP),
        DEF_HLPPATH(_PATH_WORDS),
        DEF_HLPPATH(_PATH_WORDS_ALT),
        DEF_HLPPATH(_PATH_UMOUNT),