suckless
/
sbase
mirror of git://git.suckless.org/sbase
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Port login(1) to pw_check()

This commit is contained in:
sin 2014-06-09 10:59:48 +01:00
parent 12083d49e5
commit 4b05ca07cc
1 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
login.c
View File

@ -2,13 +2,13 @@
#include <errno.h> #include <errno.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#include <shadow.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "passwd.h"
#include "config.h" #include "config.h"
#include "util.h" #include "util.h"
@ -24,8 +24,7 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
struct passwd *pw; struct passwd *pw;
struct spwd *spw; char *pass;
char *pass, *cryptpass;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
int pflag = 0; int pflag = 0;
@ -51,53 +50,18 @@ main(int argc, char *argv[])
else if (!pw) else if (!pw)
eprintf("who are you?\n"); eprintf("who are you?\n");
switch (pw->pw_passwd[0]) {
case '!':
case '*':
eprintf("denied\n");
}
uid = pw->pw_uid; uid = pw->pw_uid;
gid = pw->pw_gid; gid = pw->pw_gid;
/* Empty password? Login now */
if (pw->pw_passwd[0] == '\0')
goto login;
/* Flush pending input */ /* Flush pending input */
ioctl(STDIN_FILENO, TCFLSH, (void *)0); ioctl(STDIN_FILENO, TCFLSH, (void *)0);
pass = getpass("Password: "); pass = getpass("Password: "); putchar('\n');
putchar('\n');
if (!pass) if (!pass)
eprintf("getpass:"); eprintf("getpass:");
if (pw_check(pw, pass) == 0)
eprintf("incorrect password\n");
if (pw->pw_passwd[0] == 'x' && pw->pw_passwd[1] == '\0') {
errno = 0;
spw = getspnam(argv[0]);
if (errno)
eprintf("getspnam: %s:", argv[0]);
else if (!spw)
eprintf("who are you?\n");
switch (spw->sp_pwdp[0]) {
case '!':
case '*':
eprintf("denied\n");
}
cryptpass = crypt(pass, spw->sp_pwdp);
if (!cryptpass)
eprintf("crypt:");
if (strcmp(cryptpass, spw->sp_pwdp) != 0)
eprintf("login failed\n");
} else {
cryptpass = crypt(pass, pw->pw_passwd);
if (!cryptpass)
eprintf("crypt:");
if (strcmp(cryptpass, pw->pw_passwd) != 0)
eprintf("login failed\n");
}
login:
if (initgroups(argv[0], gid) < 0) if (initgroups(argv[0], gid) < 0)
eprintf("initgroups:"); eprintf("initgroups:");
if (setgid(gid) < 0) if (setgid(gid) < 0)