aboutsummaryrefslogtreecommitdiff
path: root/libpwdgrp
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-20 15:12:58 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-20 15:12:58 +0000
commit9230582315a15dd7b95de9f03c48024858ec935d (patch)
tree5495a94e29baa12c71e33fa8d049131fe572f881 /libpwdgrp
parentc52248e41ce50bd3fa684d19b2bce4320267dc44 (diff)
downloadbusybox-9230582315a15dd7b95de9f03c48024858ec935d.tar.gz
busybox-9230582315a15dd7b95de9f03c48024858ec935d.tar.bz2
inetd: use change_identity().
libbb: shrink our internal initgroups(). httpd: remove stray 'else' and 'index_page = "index.html"' function old new delta httpd_main 750 743 -7 inetd_main 2033 2011 -22 bb_internal_initgroups 251 228 -23 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-52) Total: -52 bytes
Diffstat (limited to 'libpwdgrp')
-rw-r--r--libpwdgrp/pwd_grp.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 7e7ff4810..3fe70f40c 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -630,12 +630,11 @@ int initgroups(const char *user, gid_t gid)
char buff[PWD_BUFFER_SIZE];
rv = -1;
+ grfile = fopen(_PATH_GROUP, "r");
+ if (grfile != NULL) {
- /* We alloc space for 8 gids at a time. */
- group_list = (gid_t *) malloc(8*sizeof(gid_t *));
- if (group_list
- && ((grfile = fopen(_PATH_GROUP, "r")) != NULL)
- ) {
+ /* We alloc space for 8 gids at a time. */
+ group_list = xmalloc(8 * sizeof(gid_t *));
*group_list = gid;
num_groups = 1;
@@ -645,13 +644,8 @@ int initgroups(const char *user, gid_t gid)
for (m = group.gr_mem; *m; m++) {
if (!strcmp(*m, user)) {
if (!(num_groups & 7)) {
- gid_t *tmp = (gid_t *)
- realloc(group_list,
- (num_groups+8) * sizeof(gid_t *));
- if (!tmp) {
- rv = -1;
- goto DO_CLOSE;
- }
+ gid_t *tmp = xrealloc(group_list,
+ (num_groups+8) * sizeof(gid_t *));
group_list = tmp;
}
group_list[num_groups++] = group.gr_gid;
@@ -662,13 +656,10 @@ int initgroups(const char *user, gid_t gid)
}
rv = setgroups(num_groups, group_list);
- DO_CLOSE:
+ free(group_list);
fclose(grfile);
}
- /* group_list will be NULL if initial malloc failed, which may trigger
- * warnings from various malloc debuggers. */
- free(group_list);
return rv;
}
@@ -677,7 +668,7 @@ int putpwent(const struct passwd *__restrict p, FILE *__restrict f)
int rv = -1;
if (!p || !f) {
- errno=EINVAL;
+ errno = EINVAL;
} else {
/* No extra thread locking is needed above what fprintf does. */
if (fprintf(f, "%s:%s:%lu:%lu:%s:%s:%s\n",
@@ -702,7 +693,7 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f)
int rv = -1;
if (!p || !f) { /* Sigh... glibc checks. */
- errno=EINVAL;
+ errno = EINVAL;
} else {
if (fprintf(f, "%s:%s:%lu:",
p->gr_name, p->gr_passwd,