From: Quentin Rameau <quinq@fifth.space>
To: util-linux@vger.kernel.org
Cc: Quentin Rameau <quinq@fifth.space>
Subject: [PATCH 2/2] chsh: replace getpw unsafe functions with xgetpw
Date: Sat, 21 Sep 2019 20:50:21 +0200 [thread overview]
Message-ID: <20190921185021.10568-3-quinq@fifth.space> (raw)
In-Reply-To: <20190921185021.10568-1-quinq@fifth.space>
---
login-utils/chsh.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 9b2761157..a9ebec86f 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -38,6 +38,7 @@
#include "islocal.h"
#include "nls.h"
#include "pathnames.h"
+#include "pwdutils.h"
#include "setpwnam.h"
#include "strutils.h"
#include "xalloc.h"
@@ -253,7 +254,7 @@ static void check_shell(const char *shell)
int main(int argc, char **argv)
{
- char *oldshell;
+ char *oldshell, *pwbuf;
int nullshell = 0;
const uid_t uid = getuid();
struct sinfo info = { NULL };
@@ -267,12 +268,12 @@ int main(int argc, char **argv)
parse_argv(argc, argv, &info);
if (!info.username) {
- pw = getpwuid(uid);
+ pw = xgetpwuid(uid, &pwbuf);
if (!pw)
errx(EXIT_FAILURE, _("you (user %d) don't exist."),
uid);
} else {
- pw = getpwnam(info.username);
+ pw = xgetpwnam(info.username, &pwbuf);
if (!pw)
errx(EXIT_FAILURE, _("user \"%s\" does not exist."),
info.username);
--
2.21.0
next prev parent reply other threads:[~2019-09-21 18:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-21 18:50 [PATCH 0/2] Fix chsh when called as root Quentin Rameau
2019-09-21 18:50 ` [PATCH 1/2] lib/pwdutils: add xgetpwuid Quentin Rameau
2019-09-21 18:50 ` Quentin Rameau [this message]
2019-09-26 13:57 ` [PATCH 0/2] Fix chsh when called as root Karel Zak
2019-09-26 21:34 ` Quentin Rameau
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=20190921185021.10568-3-quinq@fifth.space \
--to=quinq@fifth.space \
--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