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

* libmisc/getgr_nam_gid.c: Added support for NULL argument.

Browse Source 
* libmisc/chowntty.c: Reuse getgr_nam_gid(), and get rid of atol().
This commit is contained in:
nekral-guest 2009-04-11 16:23:21 +00:00
parent e27f4a91b9
commit 60a7cc9d7c
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-11 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/getgr_nam_gid.c: Added support for NULL argument.
* libmisc/chowntty.c: Reuse getgr_nam_gid(), and get rid of atol().
2009-04-11 Peter Vrabec <pvrabec@redhat.com> 2009-04-11 Peter Vrabec <pvrabec@redhat.com>
* libmisc/find_new_gid.c, libmisc/find_new_uid.c: For system * libmisc/find_new_gid.c, libmisc/find_new_uid.c: For system

18
libmisc/chowntty.c
View File

@ -2,7 +2,7 @@
* Copyright (c) 1989 - 1994, Julianne Frances Haugh * Copyright (c) 1989 - 1994, Julianne Frances Haugh
* Copyright (c) 1996 - 2001, Marek Michałkiewicz * Copyright (c) 1996 - 2001, Marek Michałkiewicz
* Copyright (c) 2003 - 2005, Tomasz Kłoczko * Copyright (c) 2003 - 2005, Tomasz Kłoczko
* Copyright (c) 2007 - 2008, Nicolas François * Copyright (c) 2007 - 2009, Nicolas François
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -51,7 +51,6 @@
void chown_tty (const struct passwd *info) void chown_tty (const struct passwd *info)
{ {
char *group; /* TTY group name or number */
struct group *grent; struct group *grent;
gid_t gid; gid_t gid;
@ -60,18 +59,11 @@ void chown_tty (const struct passwd *info)
* ID. Otherwise, use the user's primary group ID. * ID. Otherwise, use the user's primary group ID.
*/ */
group = getdef_str ("TTYGROUP"); grent = getgr_nam_gid (getdef_str ("TTYGROUP"));
if (NULL == group) { if (NULL != grent) {
gid = info->pw_gid; gid = grent->gr_gid;
} else if ((group[0] >= '0') && (group[0] <= '9')) {
gid = (gid_t) atol (group);
} else { } else {
grent = getgrnam (group); /* local, no need for xgetgrnam */ gid = info->pw_gid;
if (NULL != grent) {
gid = grent->gr_gid;
} else {
gid = info->pw_gid;
}
} }
/* /*

4
libmisc/getgr_nam_gid.c
View File

@ -49,6 +49,10 @@ extern struct group *getgr_nam_gid (const char *grname)
long long int gid; long long int gid;
char *endptr; char *endptr;
if (NULL == grname) {
return NULL;
}
errno = 0; errno = 0;
gid = strtoll (grname, &endptr, 10); gid = strtoll (grname, &endptr, 10);
if ( ('\0' != *grname) if ( ('\0' != *grname)