auth: Use the UserListFileName function more
authorSimon Wilkinson <sxw@your-file-system.com>
Sun, 13 Mar 2011 17:13:49 +0000 (17:13 +0000)
committerDerrick Brashear <shadow@dementia.org>
Mon, 14 Mar 2011 18:27:06 +0000 (11:27 -0700)
The function UserListFileName exists to abstract the process of
producing a full pathname for the userlist. Modify the rest of
userok.c so that it uses it.

Change-Id: Iac90e159dd8dc8344943e424615bf2aba1b31db3
Reviewed-on: http://gerrit.openafs.org/4215
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

src/auth/userok.c

index a8ee672..b8552b6 100644 (file)
@@ -481,8 +481,7 @@ afsconf_IsSuperIdentity(struct afsconf_dir *adir,
     int match;
     afs_int32 code;
 
-    strcompose(tbuffer, sizeof tbuffer, adir->name, "/", AFSDIR_ULIST_FILE,
-              NULL);
+    UserListFileName(adir, tbuffer, sizeof tbuffer);
     bp = BufioOpen(tbuffer, O_RDONLY, 0);
     if (!bp)
        return 0;
@@ -519,8 +518,7 @@ afsconf_AddIdentity(struct afsconf_dir *adir, struct rx_identity *user)
        return EEXIST;          /* already in the list */
     }
 
-    strcompose(tbuffer, sizeof tbuffer, adir->name, "/", AFSDIR_ULIST_FILE,
-              NULL);
+    UserListFileName(adir, tbuffer, sizeof tbuffer);
     tf = fopen(tbuffer, "a+");
     if (!tf) {
        UNLOCK_GLOBAL_MUTEX;