From c78694fdb76e9606a06cf834b80cbba827b8ff2b Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 13 Mar 2011 17:13:49 +0000 Subject: [PATCH] auth: Use the UserListFileName function more 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 Reviewed-by: Derrick Brashear --- src/auth/userok.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/auth/userok.c b/src/auth/userok.c index a8ee672acf..b8552b6caa 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -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;