emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/chsh.c: Use a bool when possible instead of int integers.

Browse Source 
* src/chsh.c: restricted_shell() renamed is_restricted_shell().
	check_shell() renamed shell_is_listed().
	* src/chsh.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
	* src/chsh.c: Avoid implicit conversion of pointers / integers
	to booleans.
	* src/chsh.c: Ignore the return value of pam_end() before
	exiting.
This commit is contained in:
nekral-guest 2008-06-10 19:42:22 +00:00
parent cac7d1a495
commit c8626c09af
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-06-10 Nicolas François <nicolas.francois@centraliens.net>
* src/chsh.c: Use a bool when possible instead of int integers.
* src/chsh.c: restricted_shell() renamed is_restricted_shell().
check_shell() renamed shell_is_listed().
* src/chsh.c: Ignore return value of setlocale(),
bindtextdomain(), and textdomain().
* src/chsh.c: Avoid implicit conversion of pointers / integers
to booleans.
* src/chsh.c: Ignore the return value of pam_end() before
exiting.
2008-06-10 Nicolas François <nicolas.francois@centraliens.net> 2008-06-10 Nicolas François <nicolas.francois@centraliens.net>
* src/grpunconv.c: Use a bool when possible instead of int * src/grpunconv.c: Use a bool when possible instead of int

52
src/chsh.c
View File

@ -61,10 +61,10 @@
* Global variables * Global variables
*/ */
static char *Prog; /* Program name */ static char *Prog; /* Program name */
static int amroot; /* Real UID is root */ static bool amroot; /* Real UID is root */
static char loginsh[BUFSIZ]; /* Name of new login shell */ static char loginsh[BUFSIZ]; /* Name of new login shell */
/* command line options */ /* command line options */
static int sflg = 0; /* -s - set shell from command line */ static bool sflg = false; /* -s - set shell from command line */
#ifdef USE_PAM #ifdef USE_PAM
static pam_handle_t *pamh = NULL; static pam_handle_t *pamh = NULL;
#endif #endif
@ -74,8 +74,8 @@ static pam_handle_t *pamh = NULL;
/* local function prototypes */ /* local function prototypes */
static void usage (void); static void usage (void);
static void new_fields (void); static void new_fields (void);
static int check_shell (const char *); static bool shell_is_listed (const char *);
static int restricted_shell (const char *); static bool is_restricted_shell (const char *);
static void process_flags (int argc, char **argv); static void process_flags (int argc, char **argv);
static void check_perms (const struct passwd *pw); static void check_perms (const struct passwd *pw);
static void update_shell (const char *user, char *loginsh); static void update_shell (const char *user, char *loginsh);
@ -107,23 +107,21 @@ static void new_fields (void)
} }
/* /*
* restricted_shell - return true if the named shell begins with 'r' or 'R' * is_restricted_shell - return true if the shell is restricted
* *
* If the first letter of the filename is 'r' or 'R', the shell is
* considered to be restricted.
*/ */
static int restricted_shell (const char *sh) static bool is_restricted_shell (const char *sh)
{ {
/* /*
* Shells not listed in /etc/shells are considered to be restricted. * Shells not listed in /etc/shells are considered to be restricted.
* Changed this to avoid confusion with "rc" (the plan9 shell - not * Changed this to avoid confusion with "rc" (the plan9 shell - not
* restricted despite the name starting with 'r'). --marekm * restricted despite the name starting with 'r'). --marekm
*/ */
return !check_shell (sh); return !shell_is_listed (sh);
} }
/* /*
* check_shell - see if the user's login shell is listed in /etc/shells * shell_is_listed - see if the user's login shell is listed in /etc/shells
* *
* The /etc/shells file is read for valid names of login shells. If the * The /etc/shells file is read for valid names of login shells. If the
* /etc/shells file does not exist the user cannot set any shell unless * /etc/shells file does not exist the user cannot set any shell unless
@ -132,10 +130,10 @@ static int restricted_shell (const char *sh)
* If getusershell() is available (Linux, *BSD, possibly others), use it * If getusershell() is available (Linux, *BSD, possibly others), use it
* instead of re-implementing it. * instead of re-implementing it.
*/ */
static int check_shell (const char *sh) static bool shell_is_listed (const char *sh)
{ {
char *cp; char *cp;
int found = 0; bool found = false;
#ifndef HAVE_GETUSERSHELL #ifndef HAVE_GETUSERSHELL
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -150,7 +148,7 @@ static int check_shell (const char *sh)
} }
if (strcmp (cp, sh) == 0) { if (strcmp (cp, sh) == 0) {
found = 1; found = true;
break; break;
} }
} }
@ -158,7 +156,7 @@ static int check_shell (const char *sh)
#else #else
fp = fopen (SHELLS_FILE, "r"); fp = fopen (SHELLS_FILE, "r");
if (NULL == fp) { if (NULL == fp) {
return 0; return false;
} }
while (fgets (buf, sizeof (buf), fp)) { while (fgets (buf, sizeof (buf), fp)) {
@ -172,7 +170,7 @@ static int check_shell (const char *sh)
} }
if (strcmp (buf, sh) == 0) { if (strcmp (buf, sh) == 0) {
found = 1; found = true;
break; break;
} }
} }
@ -204,7 +202,7 @@ static void process_flags (int argc, char **argv)
usage (); usage ();
break; break;
case 's': case 's':
sflg++; sflg = true;
STRFCPY (loginsh, optarg); STRFCPY (loginsh, optarg);
break; break;
default: default:
@ -255,7 +253,7 @@ static void check_perms (const struct passwd *pw)
* Non-privileged users are only allowed to change the shell if it * Non-privileged users are only allowed to change the shell if it
* is not a restricted one. * is not a restricted one.
*/ */
if (!amroot && restricted_shell (pw->pw_shell)) { if (!amroot && is_restricted_shell (pw->pw_shell)) {
SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name)); SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
closelog (); closelog ();
fprintf (stderr, fprintf (stderr,
@ -433,14 +431,14 @@ int main (int argc, char **argv)
sanitize_env (); sanitize_env ();
setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); (void) textdomain (PACKAGE);
/* /*
* This command behaves different for root and non-root users. * This command behaves different for root and non-root users.
*/ */
amroot = getuid () == 0; amroot = (getuid () == 0);
/* /*
* Get the program name. The program name is used as a prefix to * Get the program name. The program name is used as a prefix to
@ -460,14 +458,14 @@ int main (int argc, char **argv)
if (optind < argc) { if (optind < argc) {
user = argv[optind]; user = argv[optind];
pw = xgetpwnam (user); pw = xgetpwnam (user);
if (!pw) { if (NULL == pw) {
fprintf (stderr, fprintf (stderr,
_("%s: unknown user %s\n"), Prog, user); _("%s: unknown user %s\n"), Prog, user);
exit (1); exit (1);
} }
} else { } else {
pw = get_my_pwent (); pw = get_my_pwent ();
if (!pw) { if (NULL == pw) {
fprintf (stderr, fprintf (stderr,
_ _
("%s: Cannot determine your user name.\n"), ("%s: Cannot determine your user name.\n"),
@ -525,12 +523,14 @@ int main (int argc, char **argv)
* users are restricted to using the shells in /etc/shells. * users are restricted to using the shells in /etc/shells.
* The shell must be executable by the user. * The shell must be executable by the user.
*/ */
if (valid_field (loginsh, ":,=")) { if (valid_field (loginsh, ":,=") != 0) {
fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh); fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh);
closelog (); closelog ();
exit (1); exit (1);
} }
if (!amroot && (!check_shell (loginsh) || access (loginsh, X_OK) != 0)) { if ( !amroot
&& ( is_restricted_shell (loginsh)
|| (access (loginsh, X_OK) != 0))) {
fprintf (stderr, _("%s is an invalid shell.\n"), loginsh); fprintf (stderr, _("%s is an invalid shell.\n"), loginsh);
closelog (); closelog ();
exit (1); exit (1);
@ -543,7 +543,7 @@ int main (int argc, char **argv)
nscd_flush_cache ("passwd"); nscd_flush_cache ("passwd");
#ifdef USE_PAM #ifdef USE_PAM
pam_end (pamh, PAM_SUCCESS); (void) pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */ #endif /* USE_PAM */
closelog (); closelog ();