mountd: Fix missing varialble assignment in auth_unix_gid

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 1d6e95325c489e35b6b4f05490327a84a2dd5364..68cccdfddb70535f58c248798839fff5338ba656 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -64,6 +64,7 @@ enum nfsd_fsid {
  */
 static int cache_export_ent(char *domain, struct exportent *exp, char *p);
 
+#define INITIAL_MANAGED_GROUPS 100
 
 char *lbuf  = NULL;
 int lbuflen = 0;
@@ -134,11 +135,23 @@ static void auth_unix_gid(FILE *f)
         */
        uid_t uid;
        struct passwd *pw;
-       gid_t glist[100], *groups = glist;
-       int ngroups = 100;
+       static gid_t *groups = NULL;
+       static int groups_len = 0;
+       gid_t *more_groups;
+       int ngroups;
        int rv, i;
        char *cp;
 
+       if (groups_len == 0) {
+               groups = malloc(sizeof(gid_t) * INITIAL_MANAGED_GROUPS);
+               if (!groups)
+                       return;
+
+               groups_len = INITIAL_MANAGED_GROUPS;
+       }
+
+       ngroups = groups_len;
+
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
@@ -151,13 +164,16 @@ static void auth_unix_gid(FILE *f)
                rv = -1;
        else {
                rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
-               if (rv == -1 && ngroups >= 100) {
-                       groups = malloc(sizeof(gid_t)*ngroups);
-                       if (!groups)
+               if (rv == -1 && ngroups >= groups_len) {
+                       more_groups = realloc(groups, sizeof(gid_t)*ngroups);
+                       if (!more_groups)
                                rv = -1;
-                       else
+                       else {
+                               groups = more_groups;
+                               groups_len = ngroups;
                                rv = getgrouplist(pw->pw_name, pw->pw_gid,
                                                  groups, &ngroups);
+                       }
                }
        }
        qword_printuint(f, uid);
@@ -169,9 +185,6 @@ static void auth_unix_gid(FILE *f)
        } else
                qword_printuint(f, 0);
        qword_eol(f);
-
-       if (groups != glist)
-               free(groups);
 }
 
 #if USE_BLKID
@@ -814,12 +827,13 @@ struct {
        char *cache_name;
        void (*cache_handle)(FILE *f);
        FILE *f;
+       char vbuf[RPC_CHAN_BUF_SIZE];
 } cachelist[] = {
-       { "auth.unix.ip", auth_unix_ip, NULL},
-       { "auth.unix.gid", auth_unix_gid, NULL},
-       { "nfsd.export", nfsd_export, NULL},
-       { "nfsd.fh", nfsd_fh, NULL},
-       { NULL, NULL, NULL }
+       { "auth.unix.ip", auth_unix_ip, NULL, ""},
+       { "auth.unix.gid", auth_unix_gid, NULL, ""},
+       { "nfsd.export", nfsd_export, NULL, ""},
+       { "nfsd.fh", nfsd_fh, NULL, ""},
+       { NULL, NULL, NULL, ""}
 };
 
 extern int manage_gids;
@@ -837,6 +851,10 @@ void cache_open(void)
                        continue;
                sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
                cachelist[i].f = fopen(path, "r+");
+               if (cachelist[i].f != NULL) {
+                       setvbuf(cachelist[i].f, cachelist[i].vbuf, _IOLBF, 
+                               RPC_CHAN_BUF_SIZE);
+               }
        }
 }