From: Dave Reisner <d@falconindy.com>
To: util-linux@vger.kernel.org
Cc: Dave Reisner <dreisner@archlinux.org>
Subject: [PATCH 10/13] sulogin: use pathnames.h for file locations
Date: Tue, 28 Feb 2012 11:45:18 -0500 [thread overview]
Message-ID: <1330447521-886-11-git-send-email-dreisner@archlinux.org> (raw)
In-Reply-To: <1330447521-886-1-git-send-email-dreisner@archlinux.org>
This covers /etc/shadow and /etc/passwd. We don't have a define for
/bin/sh -- just replace the macro with the hardcoded string as done
elsewhere.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
login-utils/sulogin.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 451bca4..17ad044 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -51,9 +51,7 @@
# include <selinux/get_context_list.h>
#endif
-#define F_PASSWD "/etc/passwd"
-#define F_SHADOW "/etc/shadow"
-#define BINSH "/bin/sh"
+#include "pathnames.h"
static int timeout;
static int profile;
@@ -214,8 +212,8 @@ static struct passwd *getrootpwent(int try_manually)
pwd.pw_uid = 0;
pwd.pw_gid = 0;
- if ((fp = fopen(F_PASSWD, "r")) == NULL) {
- perror(F_PASSWD);
+ if ((fp = fopen(_PATH_PASSWD, "r")) == NULL) {
+ perror(_PATH_PASSWD);
return &pwd;
}
@@ -242,7 +240,7 @@ static struct passwd *getrootpwent(int try_manually)
* or not found, return.
*/
if (p == NULL) {
- fprintf(stderr, "%s: no entry for root\n", F_PASSWD);
+ fprintf(stderr, "%s: no entry for root\n", _PATH_PASSWD);
return &pwd;
}
if (valid(pwd.pw_passwd))
@@ -253,8 +251,8 @@ static struct passwd *getrootpwent(int try_manually)
* shadow password, try it.
*/
strcpy(pwd.pw_passwd, "");
- if ((fp = fopen(F_SHADOW, "r")) == NULL) {
- fprintf(stderr, "%s: root password garbled\n", F_PASSWD);
+ if ((fp = fopen(_PATH_SHADOW_PASSWD, "r")) == NULL) {
+ fprintf(stderr, "%s: root password garbled\n", _PATH_PASSWD);
return &pwd;
}
while ((p = fgets(sline, 256, fp)) != NULL) {
@@ -271,11 +269,11 @@ static struct passwd *getrootpwent(int try_manually)
* NULL it, and return.
*/
if (p == NULL) {
- fprintf(stderr, "%s: no entry for root\n", F_SHADOW);
+ fprintf(stderr, "%s: no entry for root\n", _PATH_SHADOW_PASSWD);
strcpy(pwd.pw_passwd, "");
}
if (!valid(pwd.pw_passwd)) {
- fprintf(stderr, "%s: root password garbled\n", F_SHADOW);
+ fprintf(stderr, "%s: root password garbled\n", _PATH_SHADOW_PASSWD);
strcpy(pwd.pw_passwd, "");
}
return &pwd;
@@ -352,7 +350,7 @@ static void sushell(struct passwd *pwd)
if (pwd->pw_shell[0])
sushell = pwd->pw_shell;
else
- sushell = BINSH;
+ sushell = "/bin/sh";
}
if ((p = strrchr(sushell, '/')) == NULL)
p = sushell;
@@ -396,9 +394,9 @@ static void sushell(struct passwd *pwd)
execl(sushell, shell, NULL);
perror(sushell);
- setenv("SHELL", BINSH, 1);
- execl(BINSH, profile ? "-sh" : "sh", NULL);
- perror(BINSH);
+ setenv("SHELL", "/bin/sh", 1);
+ execl("/bin/sh", profile ? "-sh" : "sh", NULL);
+ perror("/bin/sh");
}
static void usage(void)
--
1.7.9.2
next prev parent reply other threads:[~2012-02-28 16:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 16:45 [PATCH 00/13] Initial import of sulogin Dave Reisner
2012-02-28 16:45 ` [PATCH 01/13] fstab.5: fix misspelling of deprecated Dave Reisner
2012-02-28 16:45 ` [PATCH 02/13] sulogin: initial import from sysvinit Dave Reisner
2012-02-28 18:45 ` Davidlohr Bueso
2012-02-28 16:45 ` [PATCH 03/13] sulogin.8: refactor manpage Dave Reisner
2012-02-28 16:45 ` [PATCH 04/13] sulogin: whitespace fixes Dave Reisner
2012-02-28 16:45 ` [PATCH 05/13] sulogin: replace older signal() with sigaction() Dave Reisner
2012-02-28 16:45 ` [PATCH 06/13] sulogin: remove CHECK_{DES,MD5} defines Dave Reisner
2012-02-28 16:45 ` [PATCH 07/13] sulogin: remove USE_ONELINE and SANE_TIO defines Dave Reisner
2012-02-28 16:45 ` [PATCH 08/13] sulogin: use size_t for iterator to avoid cast Dave Reisner
2012-02-28 16:45 ` [PATCH 09/13] sulogin: get rid of calls to /bin/sash Dave Reisner
2012-02-28 16:45 ` Dave Reisner [this message]
2012-02-28 16:45 ` [PATCH 11/13] sulogin: header/include cleanup Dave Reisner
2012-02-28 16:45 ` [PATCH 12/13] sulogin: use a more standard usage output Dave Reisner
2012-02-28 16:45 ` [PATCH 13/13] sulogin: add i18n strings Dave Reisner
2012-02-28 16:48 ` [PATCH 00/13] Initial import of sulogin Dave Reisner
2012-10-12 12:53 ` [util-linux] " Dr. Werner Fink
2012-10-12 13:23 ` Karel Zak
2012-10-12 14:07 ` Dr. Werner Fink
2012-11-09 8:38 ` Karel Zak
2012-11-09 8:45 ` Karel Zak
2012-11-09 12:09 ` Karel Zak
2012-11-30 15:57 ` Dr. Werner Fink
2012-12-04 12:12 ` Dr. Werner Fink
2012-03-12 14:20 ` sulogin merged into util-linux (Re: [PATCH 00/13] Initial import of sulogin) Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330447521-886-11-git-send-email-dreisner@archlinux.org \
--to=d@falconindy.com \
--cc=dreisner@archlinux.org \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).