diff options
| -rw-r--r-- | include/pathnames.h | 17 | ||||
| -rw-r--r-- | login-utils/setpwnam.h | 2 | ||||
| -rw-r--r-- | tests/expected/paths/built-in | 8 | ||||
| -rw-r--r-- | tests/helpers/test_pathnames.c | 9 |
4 files changed, 5 insertions, 31 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index 6c00d9f4a..70c6ecfb3 100644 --- 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 6a4dbb7b4..7d69445e8 100644 --- 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 51372de3b..836eff577 100644 --- 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 0270938ba..ebd524955 100644 --- 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), |