diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 15:12:58 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 15:12:58 +0000 |
commit | 9230582315a15dd7b95de9f03c48024858ec935d (patch) | |
tree | 5495a94e29baa12c71e33fa8d049131fe572f881 /libpwdgrp | |
parent | c52248e41ce50bd3fa684d19b2bce4320267dc44 (diff) | |
download | busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.tar.gz busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.tar.bz2 busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.zip |
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.c | 27 |
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) | |||
630 | char buff[PWD_BUFFER_SIZE]; | 630 | char buff[PWD_BUFFER_SIZE]; |
631 | 631 | ||
632 | rv = -1; | 632 | rv = -1; |
633 | grfile = fopen(_PATH_GROUP, "r"); | ||
634 | if (grfile != NULL) { | ||
633 | 635 | ||
634 | /* We alloc space for 8 gids at a time. */ | 636 | /* We alloc space for 8 gids at a time. */ |
635 | group_list = (gid_t *) malloc(8*sizeof(gid_t *)); | 637 | group_list = xmalloc(8 * sizeof(gid_t *)); |
636 | if (group_list | ||
637 | && ((grfile = fopen(_PATH_GROUP, "r")) != NULL) | ||
638 | ) { | ||
639 | *group_list = gid; | 638 | *group_list = gid; |
640 | num_groups = 1; | 639 | num_groups = 1; |
641 | 640 | ||
@@ -645,13 +644,8 @@ int initgroups(const char *user, gid_t gid) | |||
645 | for (m = group.gr_mem; *m; m++) { | 644 | for (m = group.gr_mem; *m; m++) { |
646 | if (!strcmp(*m, user)) { | 645 | if (!strcmp(*m, user)) { |
647 | if (!(num_groups & 7)) { | 646 | if (!(num_groups & 7)) { |
648 | gid_t *tmp = (gid_t *) | 647 | gid_t *tmp = xrealloc(group_list, |
649 | realloc(group_list, | 648 | (num_groups+8) * sizeof(gid_t *)); |
650 | (num_groups+8) * sizeof(gid_t *)); | ||
651 | if (!tmp) { | ||
652 | rv = -1; | ||
653 | goto DO_CLOSE; | ||
654 | } | ||
655 | group_list = tmp; | 649 | group_list = tmp; |
656 | } | 650 | } |
657 | group_list[num_groups++] = group.gr_gid; | 651 | group_list[num_groups++] = group.gr_gid; |
@@ -662,13 +656,10 @@ int initgroups(const char *user, gid_t gid) | |||
662 | } | 656 | } |
663 | 657 | ||
664 | rv = setgroups(num_groups, group_list); | 658 | rv = setgroups(num_groups, group_list); |
665 | DO_CLOSE: | 659 | free(group_list); |
666 | fclose(grfile); | 660 | fclose(grfile); |
667 | } | 661 | } |
668 | 662 | ||
669 | /* group_list will be NULL if initial malloc failed, which may trigger | ||
670 | * warnings from various malloc debuggers. */ | ||
671 | free(group_list); | ||
672 | return rv; | 663 | return rv; |
673 | } | 664 | } |
674 | 665 | ||
@@ -677,7 +668,7 @@ int putpwent(const struct passwd *__restrict p, FILE *__restrict f) | |||
677 | int rv = -1; | 668 | int rv = -1; |
678 | 669 | ||
679 | if (!p || !f) { | 670 | if (!p || !f) { |
680 | errno=EINVAL; | 671 | errno = EINVAL; |
681 | } else { | 672 | } else { |
682 | /* No extra thread locking is needed above what fprintf does. */ | 673 | /* No extra thread locking is needed above what fprintf does. */ |
683 | if (fprintf(f, "%s:%s:%lu:%lu:%s:%s:%s\n", | 674 | 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) | |||
702 | int rv = -1; | 693 | int rv = -1; |
703 | 694 | ||
704 | if (!p || !f) { /* Sigh... glibc checks. */ | 695 | if (!p || !f) { /* Sigh... glibc checks. */ |
705 | errno=EINVAL; | 696 | errno = EINVAL; |
706 | } else { | 697 | } else { |
707 | if (fprintf(f, "%s:%s:%lu:", | 698 | if (fprintf(f, "%s:%s:%lu:", |
708 | p->gr_name, p->gr_passwd, | 699 | p->gr_name, p->gr_passwd, |