Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

By popular demand don't bail out if a user's shell is not in /etc/shells. 

Issue a warning instead.
This commit is contained in:
christos 2006-02-23 22:45:25 +00:00
parent 1256423cda
commit aa3a9e822d
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
usr.sbin/user/user.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: user.c,v 1.103 2006/01/26 17:24:52 jmmv Exp $ */
/* $NetBSD: user.c,v 1.104 2006/02/23 22:45:25 christos Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999 \
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: user.c,v 1.103 2006/01/26 17:24:52 jmmv Exp $");
__RCSID("$NetBSD: user.c,v 1.104 2006/02/23 22:45:25 christos Exp $");
#endif
#include <sys/types.h>
@ -967,17 +967,16 @@ valid_shell(const char *shellname)
}
/* if nologin is used as a shell, consider it a valid shell */
if (strcmp(shellname, NOLOGIN) == 0) {
if (strcmp(shellname, NOLOGIN) == 0)
return 1;
}
while ((shellp = getusershell()) != NULL) {
if (strcmp(shellp, shellname) == 0) {
while ((shellp = getusershell()) != NULL)
if (strcmp(shellp, shellname) == 0)
return 1;
}
}
return 0;
warnx("Shell `%s' not found in `%s'", shellname, _PATH_SHELLS);
return access(shellname, X_OK) != -1;
}
#endif
@ -1142,10 +1141,13 @@ adduser(char *login_name, user_t *up)
if (up->u_flags & F_SHELL) {
#ifdef EXTENSIONS
if (!valid_shell(up->u_shell)) {
int oerrno = errno;
(void)close(ptmpfd);
(void)pw_abort();
errno = oerrno;
errx(EXIT_FAILURE, "Can't add user `%s': "
"shell `%s' is not valid", login_name, up->u_shell);
"Cannot access shell `%s'",
login_name, up->u_shell);
}
#endif
}
@ -1568,10 +1570,13 @@ moduser(char *login_name, char *newlogin, user_t *up, int allow_samba)
if (up->u_flags & F_SHELL) {
#ifdef EXTENSIONS
if (!valid_shell(up->u_shell)) {
int oerrno = errno;
(void)close(ptmpfd);
(void)pw_abort();
errno = oerrno;
errx(EXIT_FAILURE, "Can't modify user `%s': "
"shell `%s' is not valid", login_name, up->u_shell);
"Cannot access shell `%s'",
login_name, up->u_shell);
}
pwp->pw_shell = up->u_shell;
#else