newgrp: fix coding style
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola
Sami Kerola
parent
3f9c237dcb
commit
b7cfaaf85b
|
|
@ -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>
|
||||
# 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))
|
||||
{
|
||||
char *cp = strchr (buf, ':');
|
||||
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 (cp-buf >= BUFSIZ)
|
||||
break; /* only group name on line */
|
||||
pwd = cp+1;
|
||||
if ((cp = strchr(pwd, ':')) && pwd == cp+1 )
|
||||
pwd = NULL; /* empty password */
|
||||
if (strcmp(buf, groupname) == 0) {
|
||||
if (cp - buf >= BUFSIZ)
|
||||
/* only group name on line */
|
||||
break;
|
||||
pwd = cp + 1;
|
||||
if ((cp = strchr(pwd, ':')) && pwd == cp + 1)
|
||||
/* empty password */
|
||||
pwd = NULL;
|
||||
else if (cp)
|
||||
*cp = '\0';
|
||||
break;
|
||||
|
|
@ -57,107 +56,114 @@ 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;
|
||||
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)));
|
||||
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 */
|
||||
/* 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 */
|
||||
|
||||
/* check /etc/gshadow */
|
||||
if (!(pwd = get_gshadow_pwd(ge->gr_name)))
|
||||
pwd = ge->gr_passwd;
|
||||
/* check /etc/gshadow */
|
||||
if (!(pwd = get_gshadow_pwd(ge->gr_name)))
|
||||
pwd = ge->gr_passwd;
|
||||
|
||||
if(pwd && *pwd && (xpwd = getpass(_("Password: ")))) {
|
||||
if(strcmp(pwd, crypt(xpwd, pwd)) == 0)
|
||||
return TRUE; /* password accepted */
|
||||
}
|
||||
if (pwd && *pwd && (xpwd = getpass(_("Password: "))))
|
||||
if (strcmp(pwd, crypt(xpwd, pwd)) == 0)
|
||||
/* password accepted */
|
||||
return TRUE;
|
||||
|
||||
return FALSE; /* default to denial */
|
||||
/* default to denial */
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void __attribute__ ((__noreturn__)) usage(FILE * out)
|
||||
{
|
||||
fprintf(out, USAGE_HEADER);
|
||||
fprintf(out, _(" %s <group>\n"), program_invocation_short_name);
|
||||
fprintf(out, USAGE_OPTIONS);
|
||||
fprintf(out, USAGE_HELP);
|
||||
fprintf(out, USAGE_VERSION);
|
||||
fprintf(out, USAGE_MAN_TAIL("newgrp(1)"));
|
||||
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
|
||||
fprintf(out, USAGE_HEADER);
|
||||
fprintf(out, _(" %s <group>\n"), program_invocation_short_name);
|
||||
fprintf(out, USAGE_OPTIONS);
|
||||
fprintf(out, USAGE_HELP);
|
||||
fprintf(out, USAGE_VERSION);
|
||||
fprintf(out, USAGE_MAN_TAIL("newgrp(1)"));
|
||||
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;
|
||||
char *shell;
|
||||
char ch;
|
||||
static const struct option longopts[] = {
|
||||
{"version", no_argument, NULL, 'V'},
|
||||
{"help", no_argument, NULL, 'h'},
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
struct passwd *pw_entry;
|
||||
struct group *gr_entry;
|
||||
char *shell;
|
||||
char ch;
|
||||
static const struct option longopts[] = {
|
||||
{"version", no_argument, NULL, 'V'},
|
||||
{"help", no_argument, NULL, 'h'},
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||
textdomain(PACKAGE);
|
||||
setlocale(LC_ALL, "");
|
||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||
textdomain(PACKAGE);
|
||||
|
||||
while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
|
||||
switch (ch) {
|
||||
case 'V':
|
||||
printf(UTIL_LINUX_VERSION);
|
||||
return EXIT_SUCCESS;
|
||||
case 'h':
|
||||
usage(stdout);
|
||||
default:
|
||||
usage(stderr);
|
||||
}
|
||||
while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
|
||||
switch (ch) {
|
||||
case 'V':
|
||||
printf(UTIL_LINUX_VERSION);
|
||||
return EXIT_SUCCESS;
|
||||
case 'h':
|
||||
usage(stdout);
|
||||
default:
|
||||
usage(stderr);
|
||||
}
|
||||
|
||||
if (!(pw_entry = getpwuid(getuid())))
|
||||
err(EXIT_FAILURE, _("who are you?"));
|
||||
if (!(pw_entry = getpwuid(getuid())))
|
||||
err(EXIT_FAILURE, _("who are you?"));
|
||||
|
||||
shell = (pw_entry->pw_shell[0] ? pw_entry->pw_shell : _PATH_BSHELL);
|
||||
shell = (pw_entry->pw_shell[0] ? pw_entry->pw_shell : _PATH_BSHELL);
|
||||
|
||||
if (argc < 2) {
|
||||
if(setgid(pw_entry->pw_gid) < 0)
|
||||
err(EXIT_FAILURE, _("setgid failed"));
|
||||
} else {
|
||||
errno = 0;
|
||||
if (!(gr_entry = getgrnam(argv[1]))) {
|
||||
if (errno)
|
||||
err(EXIT_FAILURE, _("no such group"));
|
||||
else
|
||||
errx(EXIT_FAILURE, _("no such group")); /* No group */
|
||||
if (argc < 2) {
|
||||
if (setgid(pw_entry->pw_gid) < 0)
|
||||
err(EXIT_FAILURE, _("setgid failed"));
|
||||
} else {
|
||||
if (allow_setgid(pw_entry, gr_entry)) {
|
||||
if (setgid(gr_entry->gr_gid) < 0)
|
||||
err(EXIT_FAILURE, _("setgid failed"));
|
||||
} else
|
||||
errx(EXIT_FAILURE, _("permission denied"));
|
||||
errno = 0;
|
||||
if (!(gr_entry = getgrnam(argv[1]))) {
|
||||
if (errno)
|
||||
err(EXIT_FAILURE, _("no such group"));
|
||||
else
|
||||
/* No group */
|
||||
errx(EXIT_FAILURE, _("no such group"));
|
||||
} else {
|
||||
if (allow_setgid(pw_entry, gr_entry)) {
|
||||
if (setgid(gr_entry->gr_gid) < 0)
|
||||
err(EXIT_FAILURE, _("setgid failed"));
|
||||
} else
|
||||
errx(EXIT_FAILURE, _("permission denied"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (setuid(getuid()) < 0)
|
||||
err(EXIT_FAILURE, _("setuid failed"));
|
||||
if (setuid(getuid()) < 0)
|
||||
err(EXIT_FAILURE, _("setuid failed"));
|
||||
|
||||
fflush(stdout); fflush(stderr);
|
||||
execl(shell,shell,(char*)0);
|
||||
warn(_("exec %s failed"), shell);
|
||||
fflush(stderr);
|
||||
fflush(stdout);
|
||||
fflush(stderr);
|
||||
execl(shell, shell, (char *)0);
|
||||
warn(_("exec %s failed"), shell);
|
||||
fflush(stderr);
|
||||
|
||||
return EXIT_FAILURE;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue