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

* src/useradd.c, src/usermod.c, libmisc/getgr_nam_gid.c,

Browse Source 
libmisc/Makefile.am, lib/prototypes.h: Moved getgr_nam_gid() from
	src/useradd.c and src/usermod.c to libmisc/getgr_nam_gid.c.
This commit is contained in:
nekral-guest
2009-04-10 22:34:10 +00:00
parent ffd3e43ad8
commit 77459dc27d
6 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/useradd.c
View File

@ -169,7 +169,6 @@ static bool home_added = false;
/* local function prototypes */
static void fail_exit (int);
static struct group *getgr_nam_gid (const char *);
static void get_defaults (void);
static void show_defaults (void);
static int set_defaults (void);
@ -264,22 +263,6 @@ static void fail_exit (int code)
exit (code);
}
static struct group *getgr_nam_gid (const char *grname)
{
long long int gid;
char *endptr;
errno = 0;
gid = strtoll (grname, &endptr, 10);
if ( ('\0' != *grname)
&& ('\0' == *endptr)
&& (ERANGE != errno)
&& (gid == (gid_t)gid)) {
return xgetgrgid ((gid_t) gid);
}
return xgetgrnam (grname);
}
#define MATCH(x,y) (strncmp((x),(y),strlen(y)) == 0)
/*

20
src/usermod.c
View File

@ -184,26 +184,6 @@ static void date_to_str (char *buf, size_t maxsize,
}
buf[maxsize - 1] = '\0';
}
/*
* Had to move this over from useradd.c since we have groups named
* "56k-family"... ergh.
* --Pac.
*/
static struct group *getgr_nam_gid (const char *grname)
{
long long int val;
char *endptr;
errno = 0;
val = strtoll (grname, &endptr, 10);
if ( ('\0' != *grname)
&& ('\0' == *endptr)
&& (ERANGE != errno)
&& (val == (gid_t)val)) {
return xgetgrgid ((gid_t) val);
}
return xgetgrnam (grname);
}
/*
* get_groups - convert a list of group names to an array of group IDs