Changeset 1347 for trunk

Timestamp:

Nov 8, 2009, 5:23:09 AM (14 years ago)

Author:

geofft

Message:

admof: Add a -noauth flag.

File:

• trunk/server/common/oursrc/accountadm/admof.c (modified) (3 diffs)

trunk/server/common/oursrc/accountadm/admof.c

@@ -8 +8 @@
  * Outputs "yes" and exits with status 33 if the given principal is an
  * administrator of the locker.
+ *
+ * Requires tokens (to authenticate/encrypt the connection to the
+ * ptserver) unless -noauth is given.
  */
 
@@ -78 +81 @@
 {
     /* Get arguments. */
-    if (argc != 3)
-        die("Usage: %s LOCKER PRINCIPAL\n", argv[0]);
-    const char *locker = argv[1], *name = argv[2];
+    const char *locker, *name;
+    afs_int32 secLevel;
+
+    if (argc == 3) {
+        locker = argv[1];
+        name = argv[2];
+        secLevel = 3;
+    } else if (argc == 4 && strcmp("-noauth", argv[1]) == 0) {
+        locker = argv[2];
+        name = argv[3];
+        secLevel = 0;
+    } else {
+        die("Usage: %s [-noauth] LOCKER PRINCIPAL\n", argv[0]);
+    }
 
     /* Convert the locker into a directory. */
@@ -141 +155 @@
         die("internal error: pioctl: %m\n");
 
-    if (pr_Initialize(3, (char *)AFSDIR_CLIENT_ETC_DIRPATH, cell) != 0)
+    if (pr_Initialize(secLevel, (char *)AFSDIR_CLIENT_ETC_DIRPATH, cell) != 0)
         die("internal error: pr_Initialize failed\n");