Changeset 1599 for trunk

Timestamp:

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

Author:

geofft

Message:

admof: Actually AFS likes to edit its input strings.

So drop the const qualifiers (the data is actually mutable, so this was fine,
but the cast was misleading).

Also fix a terminating null issue with the previous commit.

File:

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

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

@@ -44 +44 @@
 
 static bool
-ismember(const char *user, const char *group)
+ismember(char *user, char *group)
 {
     int flag;
-    if (pr_IsAMemberOf((char *)user, (char *)group, &flag) == 0)
+    if (pr_IsAMemberOf(user, group, &flag) == 0)
         return flag;
     else
@@ -55 +55 @@
 /* Parse an ACL of n entries, returning the rights for user. */
 static int
-parse_rights(int n, const char **p, const char *user)
+parse_rights(int n, const char **p, char *user)
 {
     int rights = 0, *trights = malloc(n * sizeof(int)), i;
@@ -248 +248 @@
 #ifdef SYSADMINS
     if (~rights & PRSFS_ADMINISTER) {
-        strncpy(cell, SYSADMIN_CELL, MAXCELLCHARS - 1);
+        snprintf(cell, MAXCELLCHARS, "%s", SYSADMIN_CELL);
         if (pr_Initialize(secLevel, (char *)AFSDIR_CLIENT_ETC_DIRPATH, cell) == 0) {
             if (ismember(user, SYSADMINS)) {