Changeset 1598 for trunk/server/common/oursrc

Timestamp:

Aug 21, 2010, 3:09:23 AM (14 years ago)

Author:

geofft

Message:

admof: Always check system:scripts-root -c athena, not in the locker's cell

Also rename us from OVERLORDS to SYSADMINS

File:

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

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

@@ -40 +40 @@
 #define STR(x) _STR(x)
 
-#define OVERLORDS "system:scripts-root"
+#define SYSADMINS "system:scripts-root"
+#define SYSADMIN_CELL "athena.mit.edu"
 
 static bool
@@ -243 +244 @@
     int rights = parse_rights(nplus, &p, user);
     rights &= ~parse_rights(nminus, &p, user);
-#ifdef OVERLORDS
-    if (~rights & PRSFS_ADMINISTER && ismember(user, OVERLORDS)) {
-        openlog("admof", 0, LOG_AUTHPRIV);
-        syslog(LOG_NOTICE, "giving %s admin rights on %s", user, locker);
-        closelog();
-        rights |= PRSFS_ADMINISTER;
+    pr_End();
+
+#ifdef SYSADMINS
+    if (~rights & PRSFS_ADMINISTER) {
+        strncpy(cell, SYSADMIN_CELL, MAXCELLCHARS - 1);
+        if (pr_Initialize(secLevel, (char *)AFSDIR_CLIENT_ETC_DIRPATH, cell) == 0) {
+            if (ismember(user, SYSADMINS)) {
+                openlog("admof", 0, LOG_AUTHPRIV);
+                syslog(LOG_NOTICE, "giving %s admin rights on %s", user, locker);
+                closelog();
+                rights |= PRSFS_ADMINISTER;
+            }
+            pr_End();
+        }
+        /* If not, that's okay -- the normal codepath ran fine, so don't error */
     }
 #endif
-
-    pr_End();
 
     /* Output whether the user is an administrator. */