[Pvfs2-cvs] commit by nlmills in pvfs2/src/common/misc: pvfs2-util.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv25702/src/common/misc

Modified Files:
      Tag: cu-security-branch
	pvfs2-util.c 
Log Message:
added support for group ids in credential generation


Index: pvfs2-util.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/pvfs2-util.c,v
diff -p -u -r1.100.2.20 -r1.100.2.21
--- pvfs2-util.c	19 Jun 2010 00:01:44 -0000	1.100.2.20
+++ pvfs2-util.c	14 Jul 2010 21:37:28 -0000	1.100.2.21
@@ -162,13 +162,14 @@ void PVFS_util_gen_mntent_release(struct
 
 int PVFS_util_gen_credential_defaults(PVFS_credential *cred)
 {
-    return PVFS_util_gen_credential(NULL, PVFS_DEFAULT_CREDENTIAL_TIMEOUT,
+    return PVFS_util_gen_credential(NULL, NULL, 
+                                    PVFS_DEFAULT_CREDENTIAL_TIMEOUT,
                                     NULL, cred);
 }
 
 
-int PVFS_util_gen_credential(const char *user, unsigned int timeout,
-    const char *keypath, PVFS_credential *cred)
+int PVFS_util_gen_credential(const char *user, const char *group,
+    unsigned int timeout, const char *keypath, PVFS_credential *cred)
 {
     struct sigaction newsa, oldsa;
     pid_t pid;
@@ -202,6 +203,11 @@ int PVFS_util_gen_credential(const char 
         {
             *ptr++ = "-u";
             *ptr++ = (char*)user;
+        }
+        if (group)
+        {
+            *ptr++ = "-g";
+            *ptr++ = (char*)group;
         }
         if (timeout != PVFS_DEFAULT_CREDENTIAL_TIMEOUT)
         {