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

* src/groupmems.c: Add functions process_flags() and check_perms()

Browse Source 
from code of main().
	* src/groupmems.c: Harmonize the failure message in case of PAM
	failure with the other programs.
This commit is contained in:
nekral-guest 2008-07-27 00:59:42 +00:00
parent e6c015e0d0
commit d4227e75cd
2 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-07-27 Nicolas François <nicolas.francois@centraliens.net>
* src/groupmems.c: Add functions process_flags() and check_perms()
from code of main().
* src/groupmems.c: Harmonize the failure message in case of PAM
failure with the other programs.
2008-07-27 Nicolas François <nicolas.francois@centraliens.net> 2008-07-27 Nicolas François <nicolas.francois@centraliens.net>
* src/groupmems.c: Remove isgroup(), which always returns TRUE. * src/groupmems.c: Remove isgroup(), which always returns TRUE.

85
src/groupmems.c
View File

@ -69,6 +69,8 @@ static bool list = false;
static int exclusive = 0; static int exclusive = 0;
static char *Prog; static char *Prog;
static void process_flags (int argc, char **argv);
static void check_perms (void);
#define isroot() (getuid () == 0) #define isroot() (getuid () == 0)
static char *whoami (void) static char *whoami (void)
@ -106,17 +108,12 @@ static void usage (void)
exit (EXIT_USAGE); exit (EXIT_USAGE);
} }
int main (int argc, char **argv) /*
* process_flags - perform command line argument setting
*/
static void process_flags (int argc, char **argv)
{ {
int arg; int arg;
char *name;
struct group *grp;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
int retval;
#endif
int option_index = 0; int option_index = 0;
static struct option long_options[] = { static struct option long_options[] = {
{"add", required_argument, NULL, 'a'}, {"add", required_argument, NULL, 'a'},
@ -127,17 +124,7 @@ int main (int argc, char **argv)
{NULL, 0, NULL, '\0'} {NULL, 0, NULL, '\0'}
}; };
/* while ((arg = getopt_long (argc, argv, "a:d:g:lp", long_options,
* Get my name so that I can use it to report errors.
*/
Prog = Basename (argv[0]);
(void) setlocale (LC_ALL, "");
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
while ((arg =
getopt_long (argc, argv, "a:d:g:lp", long_options,
&option_index)) != EOF) { &option_index)) != EOF) {
switch (arg) { switch (arg) {
case 'a': case 'a':
@ -175,16 +162,15 @@ int main (int argc, char **argv)
exit (EXIT_INVALID_USER); exit (EXIT_INVALID_USER);
} }
if (!isroot () && NULL != thisgroup) {
fputs (_("Only root can add members to different groups\n"),
stderr);
exit (EXIT_NOT_ROOT);
} else if (isroot () && NULL != thisgroup) {
name = thisgroup;
} else if (NULL == (name = whoami ())) {
fputs (_("Not primary owner of current group\n"), stderr);
exit (EXIT_NOT_PRIMARY);
} }
static void check_perms (void)
{
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
int retval;
#endif
#ifdef USE_PAM #ifdef USE_PAM
retval = PAM_SUCCESS; retval = PAM_SUCCESS;
@ -216,10 +202,44 @@ int main (int argc, char **argv)
} }
if (retval != PAM_SUCCESS) { if (retval != PAM_SUCCESS) {
fputs (_("PAM authentication failed for\n"), stderr); fprintf (stderr, _("%s: PAM authentication failed\n"), Prog);
exit (1); exit (1);
} }
if (retval == PAM_SUCCESS) {
(void) pam_end (pamh, PAM_SUCCESS);
}
#endif #endif
}
int main (int argc, char **argv)
{
char *name;
struct group *grp;
/*
* Get my name so that I can use it to report errors.
*/
Prog = Basename (argv[0]);
(void) setlocale (LC_ALL, "");
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
process_flags (argc, argv);
if (!isroot () && NULL != thisgroup) {
fputs (_("Only root can add members to different groups\n"),
stderr);
exit (EXIT_NOT_ROOT);
} else if (isroot () && NULL != thisgroup) {
name = thisgroup;
} else if (NULL == (name = whoami ())) {
fputs (_("Not primary owner of current group\n"), stderr);
exit (EXIT_NOT_PRIMARY);
}
check_perms ();
if (!gr_lock ()) { if (!gr_lock ()) {
fputs (_("Unable to lock group file\n"), stderr); fputs (_("Unable to lock group file\n"), stderr);
@ -271,10 +291,5 @@ int main (int argc, char **argv)
gr_unlock (); gr_unlock ();
#ifdef USE_PAM
if (retval == PAM_SUCCESS) {
(void) pam_end (pamh, PAM_SUCCESS);
}
#endif /* USE_PAM */
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }