From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 16 Oct 2007 18:26:08 +0000 (+0000)
Subject: DEVEL15-windows-fs-uuid-20071016
X-Git-Tag: openafs-devel-1_5_26~25
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a33fbacb86d99415117a6db841dab9171926ef26;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-fs-uuid-20071016


do not require afs client administrator access to display the current
Uuid value.


(cherry picked from commit 89c8d7e125a5b46f57081000fcbc698eba9e5daa)
---

diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c
index 5302eb1f8..06a717958 100644
--- a/src/WINNT/afsd/fs.c
+++ b/src/WINNT/afsd/fs.c
@@ -3539,19 +3539,18 @@ UuidCmd(struct cmd_syndesc *asp, char *arock)
     struct ViceIoctl blob;
     char * uuidstring = NULL;
 
+    if (asp->parms[0].items) {
 #ifdef WIN32
-    if ( !IsAdmin() ) {
-        fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
-        return EACCES;
-    }
+        if ( !IsAdmin() ) {
+            fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
+            return EACCES;
+        }
 #else
-    if (geteuid()) {
-        fprintf (stderr, "Permission denied: requires root access.\n");
-        return EACCES;
-    }
+        if (geteuid()) {
+            fprintf (stderr, "Permission denied: requires root access.\n");
+            return EACCES;
+        }
 #endif
-
-    if (asp->parms[0].items) {
         inValue = 1;            /* generate new UUID */
     } else {
         inValue = 0;            /* just show the current UUID */