pt_util: fix group line check for input files
authorMichael Meffie <mmeffie@sinenomine.net>
Tue, 30 Apr 2013 15:30:15 +0000 (11:30 -0400)
committerStephan Wiesand <stephan.wiesand@desy.de>
Tue, 3 Jun 2014 16:24:00 +0000 (12:24 -0400)
Fix the check for requiring group lines before any membership lines. Do
not clear flag indicating the presence of a group after reading each
line.  (This error was caught by the pt_util-t unit test.)

Fix for commit 12ced70c95fe8efbcec09a372f0af81d819bb8cd

Reviewed-on: http://gerrit.openafs.org/9832
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 9c391e7f7d0e5dfdfe947d385e2db9a8b8ca3610)

Change-Id: I6414f78d7611c61628aaacb4ae41111dbeec0d89
Reviewed-on: http://gerrit.openafs.org/11148
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

src/ptserver/pt_util.c

index 213e5b1..b1c6fe4 100644 (file)
@@ -243,10 +243,10 @@ CommandProc(struct cmd_syndesc *a_as, void *arock)
     if (wflag) {
        struct usr_list *u;
        int id = 0, flags = 0;
+       int seenGroup = 0;
 
        while (fgets(buffer, sizeof(buffer), dfp)) {
            int oid, cid, quota, uid;
-           int seenGroup = 0;
            char name[PR_MAXNAMELEN], mem[PR_MAXNAMELEN];
 
            if (isspace(*buffer)) {