ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

newgrp: fix coding style 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-11-13 19:40:23 +01:00 committed by Sami Kerola
parent 3f9c237dcb
commit b7cfaaf85b
1 changed files with 109 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
login-utils/newgrp.c
View File

@ -1,32 +1,30 @@
/* setgrp.c - by Michael Haardt. Set the gid if possible */
/* Added a bit more error recovery/reporting - poe */
/* Vesa Roukonen added code for asking password */
/* Currently maintained at ftp://ftp.daimi.aau.dk/pub/linux/poe/ */
/* setgrp.c - by Michael Haardt. Set the gid if possible
* Added a bit more error recovery/reporting - poe
* Vesa Roukonen added code for asking password */
/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
* - added Native Language Support
*/
#include <unistd.h>
#include <pwd.h>
#include <grp.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <getopt.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef HAVE_CRYPT_H
# include <crypt.h>
#endif
#include "c.h"
#include "pathnames.h"
#include "nls.h"
#include "pathnames.h"
/* try to read password from gshadow */
static char *
get_gshadow_pwd(char *groupname)
static char *get_gshadow_pwd(char *groupname)
{
char buf[BUFSIZ];
char *pwd = NULL;
@ -35,19 +33,20 @@ get_gshadow_pwd(char *groupname)
if (groupname == NULL || *groupname == '\0' || f == NULL)
return NULL;
while(fgets(buf, sizeof buf, f))
{
while (fgets(buf, sizeof buf, f)) {
char *cp = strchr(buf, ':');
if (!cp)
continue; /* any junk in gshadow? */
/* any junk in gshadow? */
continue;
*cp = '\0';
if (strcmp(buf, groupname) == 0)
{
if (strcmp(buf, groupname) == 0) {
if (cp - buf >= BUFSIZ)
break; /* only group name on line */
/* only group name on line */
break;
pwd = cp + 1;
if ((cp = strchr(pwd, ':')) && pwd == cp + 1)
pwd = NULL; /* empty password */
/* empty password */
pwd = NULL;
else if (cp)
*cp = '\0';
break;
@ -57,35 +56,41 @@ get_gshadow_pwd(char *groupname)
return pwd ? strdup(pwd) : NULL;
}
static int
allow_setgid(struct passwd *pe, struct group *ge)
static int allow_setgid(struct passwd *pe, struct group *ge)
{
char **look;
int notfound = 1;
char *pwd, *xpwd;
if (getuid() == 0) return TRUE; /* root may do anything */
if (ge->gr_gid == pe->pw_gid) return TRUE; /* You can switch back to your default group */
if (getuid() == 0)
/* root may do anything */
return TRUE;
if (ge->gr_gid == pe->pw_gid)
/* You can switch back to your default group */
return TRUE;
look = ge->gr_mem;
while (*look && (notfound = strcmp(*look++, pe->pw_name))) ;
if(!notfound) return TRUE; /* member of group => OK */
if (!notfound)
/* member of group => OK */
return TRUE;
/* Ask for password. Often there is no password in /etc/group, so
contrary to login et al. we let an empty password mean the same
as * in /etc/passwd */
* contrary to login et al. we let an empty password mean the same
* as in /etc/passwd */
/* check /etc/gshadow */
if (!(pwd = get_gshadow_pwd(ge->gr_name)))
pwd = ge->gr_passwd;
if(pwd && *pwd && (xpwd = getpass(_("Password: ")))) {
if (pwd && *pwd && (xpwd = getpass(_("Password: "))))
if (strcmp(pwd, crypt(xpwd, pwd)) == 0)
return TRUE; /* password accepted */
}
/* password accepted */
return TRUE;
return FALSE; /* default to denial */
/* default to denial */
return FALSE;
}
static void __attribute__ ((__noreturn__)) usage(FILE * out)
@ -99,8 +104,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
int
main(int argc, char *argv[])
int main(int argc, char *argv[])
{
struct passwd *pw_entry;
struct group *gr_entry;
@ -141,7 +145,8 @@ main(int argc, char *argv[])
if (errno)
err(EXIT_FAILURE, _("no such group"));
else
errx(EXIT_FAILURE, _("no such group")); /* No group */
/* No group */
errx(EXIT_FAILURE, _("no such group"));
} else {
if (allow_setgid(pw_entry, gr_entry)) {
if (setgid(gr_entry->gr_gid) < 0)
@ -154,7 +159,8 @@ main(int argc, char *argv[])
if (setuid(getuid()) < 0)
err(EXIT_FAILURE, _("setuid failed"));
fflush(stdout); fflush(stderr);
fflush(stdout);
fflush(stderr);
execl(shell, shell, (char *)0);
warn(_("exec %s failed"), shell);
fflush(stderr);