#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
+#include <roken.h>
+#include <afs/opr.h>
-#include <afs/stds.h>
-#include <afs/pthread_glock.h>
-#include <sys/types.h>
#ifdef AFS_NT40_ENV
-#include <winsock2.h>
#include <sys/utime.h>
-#include <io.h>
#include <WINNT/afssw.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/file.h>
-#include <sys/time.h>
+#endif
+
#include <ctype.h>
-#include <arpa/nameser.h>
+
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
#include <arpa/nameser_compat.h>
#endif
-#include <resolv.h>
-#endif /* AFS_NT40_ENV */
+
+#include <afs/pthread_glock.h>
#include <afs/afsint.h>
-#include <errno.h>
-#include <ctype.h>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include <rx/rxkad.h>
#include <rx/rx.h>
#include <afs/afsutil.h>
-#include "cellconfig.h"
#include "keys.h"
+#include "cellconfig.h"
+#include "internal.h"
+
#ifdef AFS_NT40_ENV
#include <cm.h>
#include <cm_config.h>
/* Prototypes */
static int TrimLine(char *abuffer, int abufsize);
-static int IsClientConfigDirectory(const char *path);
#ifdef AFS_NT40_ENV
static int GetCellNT(struct afsconf_dir *adir);
#endif
-static int afsconf_Check(struct afsconf_dir *adir);
-static int afsconf_Touch(struct afsconf_dir *adir);
static int GetCellUnix(struct afsconf_dir *adir);
-static int afsconf_OpenInternal(struct afsconf_dir *adir, char *cell,
- char clones[]);
+static int LoadConfig(struct afsconf_dir *adir);
static int ParseHostLine(char *aline, struct sockaddr_in *addr,
- char *aname, char *aclone);
+ char *aname, char *aclone /* boolean */);
static int ParseCellLine(char *aline, char *aname,
char *alname);
-static int afsconf_CloseInternal(struct afsconf_dir *adir);
+static int UnloadConfig(struct afsconf_dir *adir);
static int afsconf_Reopen(struct afsconf_dir *adir);
-static int SaveKeys(struct afsconf_dir *adir);
#ifndef T_AFSDB
#define T_AFSDB 18 /* per RFC1183 section 1 */
iop->buffer = malloc(BUFFER);
if (iop->buffer == NULL) {
(void) close(fd);
- free((void *) iop);
+ free(iop);
errno = ENOMEM;
return NULL;
}
return 0;
}
close(iop->_file);
- free((void *)iop->buffer);
- free((void *)iop);
+ free(iop->buffer);
+ free(iop);
return 0;
}
if (aname == NULL || aname[0] == '\0')
return -1;
-#if defined(AFS_OSF_ENV)
- ts = getservbyname(aname, "");
-#else
ts = (struct servent *) getservbyname(aname, NULL);
-#endif
if (ts) {
/* we found it in /etc/services, so we use this value */
return ts->s_port; /* already in network byte order */
#else /* AFS_NT40_ENV */
#define IS_SEP(x) ((x) == '/')
#endif /* AFS_NT40_ENV */
-static int
-IsClientConfigDirectory(const char *path)
+int
+_afsconf_IsClientConfigDirectory(const char *path)
{
const char *cdir = AFSDIR_CLIENT_ETC_DIRPATH;
int i, cc, pc;
return 1;
}
-
-static int
-afsconf_Check(struct afsconf_dir *adir)
-{
- char tbuffer[256];
#ifdef AFS_NT40_ENV
+static void
+_afsconf_CellServDBPath(const char *dirname, char **path)
+{
char *p;
-#endif
- struct stat tstat;
- afs_int32 code;
-#ifdef AFS_NT40_ENV
/* NT client CellServDB has different file name than NT server or Unix */
- if (IsClientConfigDirectory(adir->name)) {
+ if (_afsconf_IsClientConfigDirectory(dirname)) {
if (!afssw_GetClientCellServDBDir(&p)) {
- strcompose(tbuffer, sizeof(tbuffer), p, "/",
- AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL);
+ if (asprintf(path, "%s/%s", p, AFSDIR_CELLSERVDB_FILE_NTCLIENT) < 0)
+ *path = NULL;
free(p);
} else {
- int len;
- strncpy(tbuffer, adir->name, sizeof(tbuffer));
- len = (int)strlen(tbuffer);
- if (tbuffer[len - 1] != '\\' && tbuffer[len - 1] != '/') {
- strncat(tbuffer, "\\", sizeof(tbuffer));
- }
- strncat(tbuffer, AFSDIR_CELLSERVDB_FILE_NTCLIENT,
- sizeof(tbuffer));
- tbuffer[sizeof(tbuffer) - 1] = '\0';
+ if (asprintf(path, "%s/%s", dirname,
+ AFSDIR_CELLSERVDB_FILE_NTCLIENT) < 0)
+ *path = NULL;
}
} else {
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE,
- NULL);
+ if (asprintf(path, "%s/%s", dirname, AFSDIR_CELLSERVDB_FILE) < 0)
+ *path = NULL;
}
+ return;
+}
#else
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL);
+static void
+_afsconf_CellServDBPath(const char *dirname, char **path)
+{
+ if (asprintf(path, "%s/%s", dirname, AFSDIR_CELLSERVDB_FILE) < 0)
+ *path = NULL;
+}
#endif /* AFS_NT40_ENV */
- code = stat(tbuffer, &tstat);
- if (code < 0) {
- return code;
+int
+_afsconf_UpToDate(struct afsconf_dir *adir)
+{
+ struct stat tstat;
+ int code;
+ time_t now = time(0);
+
+ if (adir->timeRead && (adir->timeCheck == now)) {
+ return 1; /* stat no more than once a second */
}
+ adir->timeCheck = now;
+
+ if (adir->cellservDB == NULL)
+ return 0;
+
+ code = stat(adir->cellservDB, &tstat);
+ if (code < 0)
+ return 0; /* Can't throw the error, so just say we're not up to date */
+
/* did file change? */
- if (tstat.st_mtime == adir->timeRead) {
+ if (tstat.st_mtime == adir->timeRead)
+ return 1;
+
+ /* otherwise file has changed */
+ return 0;
+}
+
+int
+afsconf_UpToDate(void *rock)
+{
+ int code;
+
+ LOCK_GLOBAL_MUTEX;
+ code = _afsconf_UpToDate(rock);
+ UNLOCK_GLOBAL_MUTEX;
+
+ return code;
+}
+
+int
+_afsconf_Check(struct afsconf_dir *adir)
+{
+ /* did configuration change? */
+ if (_afsconf_UpToDate(adir))
return 0;
- }
+
/* otherwise file has changed, so reopen it */
return afsconf_Reopen(adir);
}
/* set modtime on file */
-static int
-afsconf_Touch(struct afsconf_dir *adir)
+int
+_afsconf_Touch(struct afsconf_dir *adir)
{
- char tbuffer[256];
+ int code;
#ifndef AFS_NT40_ENV
struct timeval tvp[2];
-#else
- char *p;
#endif
adir->timeRead = 0; /* just in case */
+ adir->timeCheck = 0;
+
+ if (adir->cellservDB == NULL)
+ return ENOMEM;
#ifdef AFS_NT40_ENV
- /* NT client CellServDB has different file name than NT server or Unix */
+ code = _utime(adir->cellservDB, NULL);
+#else
+ gettimeofday(&tvp[0], NULL);
+ tvp[1] = tvp[0];
+ code = utimes(adir->cellservDB, tvp);
+#endif /* AFS_NT40_ENV */
- if (IsClientConfigDirectory(adir->name)) {
- if (!afssw_GetClientCellServDBDir(&p)) {
- strcompose(tbuffer, sizeof(tbuffer), p, "/",
- AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL);
- free(p);
- } else {
- int len = (int)strlen(tbuffer);
- if (tbuffer[len - 1] != '\\' && tbuffer[len - 1] != '/') {
- strncat(tbuffer, "\\", sizeof(tbuffer));
- }
- strncat(tbuffer, AFSDIR_CELLSERVDB_FILE_NTCLIENT,
- sizeof(tbuffer));
- tbuffer[sizeof(tbuffer) - 1] = '\0';
+ return code;
+}
+
+/**
+ * Read a single line from a file.
+ *
+ * Retreive the first line of a file if present. The trailing new
+ * line is stripped.
+ *
+ * @note The returned string must be freed by the caller.
+ *
+ * @param[in] pathname pathname to the file
+ * @param[out] aline address of a string
+ *
+ * @return 0 success
+ * ENOENT unable to open file
+ * EIO empty file or read error
+ * ENOMEM unable to allocate output
+ * ENAMETOOLONG first line of file exceeds MAXPATHLEN
+ */
+static int
+ReadFirstLine(const char *pathname, char **aline)
+{
+ char *line = NULL;
+ char buffer[MAXPATHLEN + 2]; /* Extra char for truncation check. */
+ afsconf_FILE *fp;
+ size_t len = 0;
+
+ fp = fopen(pathname, "r");
+ if (!fp)
+ return ENOENT;
+ if (fgets(buffer, sizeof(buffer), fp) != NULL)
+ len = strlen(buffer);
+ fclose(fp);
+ if (len == 0)
+ return EIO;
+ /* Trim the trailing newline, if one. */
+ if (buffer[len - 1] == '\n') {
+ buffer[len - 1] = '\0';
+ len--;
+ }
+ /* Truncation check. */
+ if (len > MAXPATHLEN)
+ return ENAMETOOLONG;
+ line = strdup(buffer);
+ if (line == NULL)
+ return ENOMEM;
+ *aline = line;
+ return 0;
+}
+
+/**
+ * Find an alternative path to the configuration directory.
+ *
+ * Attempt to find an alternative configuration directory pathname. First
+ * check for the presence of the AFSCONF environment variable, then check for
+ * the contents of the $HOME/.AFSCONF file, then check for the contents of the
+ * /.AFSCONF file.
+ *
+ * The AFSCONF environment, or contents of $HOME/.AFSCONF, or /.AFSCONF will be
+ * typically set to something like /afs/<cell>/common/etc where, by convention,
+ * the default files for ThisCell and CellServDB will reside. Note that a major
+ * drawback is that a given afs client on that cell may NOT contain the same
+ * contents.
+ *
+ * @param[out] aconfdir pointer to an allocated string if a path was found
+ *
+ * @return 0 on success
+ *
+ * @note The returned string in pathp must be freed by the caller.
+ */
+static int
+GetAlternatePath(char **aconfdir)
+{
+ int code;
+ char *confdir = NULL;
+ char *afsconf_path = getenv("AFSCONF");
+
+ if (afsconf_path) {
+ confdir = strdup(afsconf_path);
+ if (!confdir)
+ return ENOMEM;
+ }
+
+ if (!confdir) {
+ char *home_dir = getenv("HOME");
+ if (home_dir) {
+ char *pathname = NULL;
+ int r = asprintf(&pathname, "%s/%s", home_dir, ".AFSCONF");
+ if (r < 0 || !pathname)
+ return ENOMEM;
+ code = ReadFirstLine(pathname, &confdir);
+ free(pathname);
+ pathname = NULL;
+ if (code && code != ENOENT)
+ return code;
}
- } else {
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE,
- NULL);
}
- return _utime(tbuffer, NULL);
+ if (!confdir) {
+ code = ReadFirstLine("/.AFSCONF", &confdir);
+ if (code && code != ENOENT)
+ return code;
+ }
-#else
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL);
- gettimeofday(&tvp[0], NULL);
- tvp[1] = tvp[0];
- return utimes(tbuffer, tvp);
-#endif /* AFS_NT40_ENV */
+ if (!confdir)
+ return ENOENT;
+
+ *aconfdir = confdir;
+ return 0;
}
struct afsconf_dir *
afs_int32 code;
LOCK_GLOBAL_MUTEX;
- /* zero structure and fill in name; rest is done by internal routine */
- tdir = (struct afsconf_dir *)malloc(sizeof(struct afsconf_dir));
- memset(tdir, 0, sizeof(struct afsconf_dir));
+ /* Zero structure and fill in name, the rest is done by LoadConfig. */
+ tdir = calloc(1, sizeof(*tdir));
+ if (!tdir)
+ goto fail;
tdir->name = strdup(adir);
+ if (!tdir->name)
+ goto fail;
- code = afsconf_OpenInternal(tdir, 0, 0);
+ code = LoadConfig(tdir);
if (code) {
- char *afsconf_path, afs_confdir[128];
-
free(tdir->name);
- /* Check global place only when local Open failed for whatever reason */
- if (!(afsconf_path = getenv("AFSCONF"))) {
- /* The "AFSCONF" environment (or contents of "/.AFSCONF") will be typically set to something like "/afs/<cell>/common/etc" where, by convention, the default files for "ThisCell" and "CellServDB" will reside; note that a major drawback is that a given afs client on that cell may NOT contain the same contents... */
- char *home_dir;
- afsconf_FILE *fp;
- size_t len;
-
- if (!(home_dir = getenv("HOME"))) {
- /* Our last chance is the "/.AFSCONF" file */
- fp = fopen("/.AFSCONF", "r");
- if (fp == 0) {
- free(tdir);
- UNLOCK_GLOBAL_MUTEX;
- return (struct afsconf_dir *)0;
- }
- fgets(afs_confdir, 128, fp);
- fclose(fp);
- } else {
- char pathname[256];
-
- sprintf(pathname, "%s/%s", home_dir, ".AFSCONF");
- fp = fopen(pathname, "r");
- if (fp == 0) {
- /* Our last chance is the "/.AFSCONF" file */
- fp = fopen("/.AFSCONF", "r");
- if (fp == 0) {
- free(tdir);
- UNLOCK_GLOBAL_MUTEX;
- return (struct afsconf_dir *)0;
- }
- }
- fgets(afs_confdir, 128, fp);
- fclose(fp);
- }
- len = strlen(afs_confdir);
- if (len == 0) {
- free(tdir);
- UNLOCK_GLOBAL_MUTEX;
- return (struct afsconf_dir *)0;
- }
- if (afs_confdir[len - 1] == '\n') {
- afs_confdir[len - 1] = 0;
- }
- afsconf_path = afs_confdir;
- }
- tdir->name = strdup(afsconf_path);
- code = afsconf_OpenInternal(tdir, 0, 0);
+ tdir->name = NULL;
+ code = GetAlternatePath(&tdir->name);
+ if (code)
+ goto fail;
+ code = LoadConfig(tdir);
if (code) {
- free(tdir->name);
- free(tdir);
- UNLOCK_GLOBAL_MUTEX;
- return (struct afsconf_dir *)0;
+ goto fail;
}
}
UNLOCK_GLOBAL_MUTEX;
return tdir;
+
+fail:
+ if (tdir)
+ free(tdir->name);
+ free(tdir);
+ UNLOCK_GLOBAL_MUTEX;
+ return NULL;
}
static int
char *start, *p;
afsconf_FILE *fp;
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_THISCELL_FILE, NULL);
+ strcompose(tbuffer, 256, adir->name, "/", AFSDIR_THISCELL_FILE,
+ (char *)NULL);
fp = fopen(tbuffer, "r");
if (fp == 0) {
return -1;
static int
GetCellNT(struct afsconf_dir *adir)
{
- if (IsClientConfigDirectory(adir->name)) {
+ if (_afsconf_IsClientConfigDirectory(adir->name)) {
/* NT client config dir; ThisCell is in registry (no file). */
return afssw_GetClientCellName(&adir->cellName);
} else {
}
#endif /* AFS_NT40_ENV */
-
+/**
+ * Load the cell configuration into memory.
+ *
+ * Read the cell configuration into a newly allocated or cleared afsconf_dir
+ * structure. Reads the CellServDB file, and if present, the cell alias file,
+ * the key files, and kerberos related files.
+ *
+ * If the configuration cannot be loaded for any reason, any partial changes
+ * are freed. The name member is preserved.
+ *
+ * @param[in,out] adir pointer to the cell configuration
+ * the name member must be set to the pathname of the
+ * cell configuration to be loaded. All other members
+ * must be unassigned.
+ *
+ * @returns 0 on success
+ */
static int
-afsconf_OpenInternal(struct afsconf_dir *adir, char *cell,
- char clones[])
+LoadConfig(struct afsconf_dir *adir)
{
afsconf_FILE *tf;
char *tp, *bp;
struct afsconf_aliasentry *curAlias;
afs_int32 code;
afs_int32 i;
- char tbuffer[256], tbuf1[256];
+ char tbuffer[256];
struct stat tstat;
+
#ifdef AFS_NT40_ENV
cm_enumCellRegistry_t enumCellRegistry = {0, 0};
#endif /* AFS_NT40_ENV */
+ /* init the keys queue before any call to UnloadConfig() */
+ _afsconf_InitKeys(adir);
+
/* figure out the local cell name */
#ifdef AFS_NT40_ENV
i = GetCellNT(adir);
/* now parse the individual lines */
curEntry = 0;
-#ifdef AFS_NT40_ENV
- /* NT client/server have a CellServDB that is the same format as Unix.
- * However, the NT client uses a different file name
- */
- if (IsClientConfigDirectory(adir->name)) {
- /* NT client config dir */
- char *p;
+ _afsconf_CellServDBPath(adir->name, &adir->cellservDB);
+#ifdef AFS_NT40_ENV
+ if (_afsconf_IsClientConfigDirectory(adir->name))
enumCellRegistry.client = 1;
-
- if (!afssw_GetClientCellServDBDir(&p)) {
- strcompose(tbuffer, sizeof(tbuffer), p, "/",
- AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL);
- free(p);
- } else {
- int len;
- strncpy(tbuffer, adir->name, sizeof(tbuffer));
- len = (int)strlen(tbuffer);
- if (tbuffer[len - 1] != '\\' && tbuffer[len - 1] != '/') {
- strncat(tbuffer, "\\", sizeof(tbuffer));
- }
- strncat(tbuffer, AFSDIR_CELLSERVDB_FILE_NTCLIENT,
- sizeof(tbuffer));
- tbuffer[sizeof(tbuffer) - 1] = '\0';
- }
- } else {
- /* NT server config dir */
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE,
- NULL);
- }
-#else
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL);
#endif /* AFS_NT40_ENV */
- if (!stat(tbuffer, &tstat)) {
+ if (!stat(adir->cellservDB, &tstat)) {
adir->timeRead = tstat.st_mtime;
} else {
adir->timeRead = 0;
}
- strlcpy(tbuf1, tbuffer, sizeof tbuf1);
- tf = fopen(tbuffer, "r");
+ tf = fopen(adir->cellservDB, "r");
if (!tf) {
return -1;
}
adir->entries = curEntry;
curEntry = 0;
}
- curEntry =
- (struct afsconf_entry *)malloc(sizeof(struct afsconf_entry));
- memset(curEntry, 0, sizeof(struct afsconf_entry));
+ curEntry = calloc(1, sizeof(struct afsconf_entry));
code =
ParseCellLine(tbuffer, curEntry->cellInfo.name, linkedcell);
if (code) {
- afsconf_CloseInternal(adir);
+ UnloadConfig(adir);
fclose(tf);
free(curEntry);
return -1;
} else {
/* new host in the current cell */
if (!curEntry) {
- afsconf_CloseInternal(adir);
+ UnloadConfig(adir);
fclose(tf);
return -1;
}
i = curEntry->cellInfo.numServers;
if (i < MAXHOSTSPERCELL) {
- if (cell && !strcmp(cell, curEntry->cellInfo.name))
- code =
- ParseHostLine(tbuffer,
- &curEntry->cellInfo.hostAddr[i],
- curEntry->cellInfo.hostName[i],
- &clones[i]);
- else
- code =
- ParseHostLine(tbuffer,
- &curEntry->cellInfo.hostAddr[i],
- curEntry->cellInfo.hostName[i], 0);
-
+ code = ParseHostLine(tbuffer,
+ &curEntry->cellInfo.hostAddr[i],
+ curEntry->cellInfo.hostName[i],
+ &curEntry->cellInfo.clone[i]);
if (code) {
if (code == AFSCONF_SYNTAX) {
for (bp = tbuffer; *bp != '\n'; bp++) { /* Take out the <cr> from the buffer */
*bp = '\0';
fprintf(stderr,
"Can't properly parse host line \"%s\" in configuration file %s\n",
- tbuffer, tbuf1);
+ tbuffer, adir->cellservDB);
}
free(curEntry);
fclose(tf);
- afsconf_CloseInternal(adir);
+ UnloadConfig(adir);
return -1;
}
curEntry->cellInfo.numServers = ++i;
} else {
fprintf(stderr,
"Too many hosts for cell %s in configuration file %s\n",
- curEntry->cellInfo.name, tbuf1);
+ curEntry->cellInfo.name, adir->cellservDB);
}
}
}
#endif /* AFS_NT40_ENV */
/* Read in the alias list */
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLALIAS_FILE, NULL);
+ strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLALIAS_FILE,
+ (char *)NULL);
tf = fopen(tbuffer, "r");
while (tf) {
tp++;
tp[0] = '\0';
- curAlias = malloc(sizeof(*curAlias));
- memset(curAlias, 0, sizeof(*curAlias));
+ curAlias = calloc(1, sizeof(*curAlias));
strlcpy(curAlias->aliasInfo.aliasName, aliasPtr, sizeof curAlias->aliasInfo.aliasName);
strlcpy(curAlias->aliasInfo.realName, tbuffer, sizeof curAlias->aliasInfo.realName);
if (tf != NULL)
fclose(tf);
+
/* now read the fs keys, if possible */
- adir->keystr = (struct afsconf_keys *)0;
- afsconf_IntGetKeys(adir);
+ code = _afsconf_LoadKeys(adir);
+ if (code) {
+ return code;
+ }
+ code = _afsconf_LoadRealms(adir);
- return 0;
+ return code;
}
/* parse a line of the form
*/
static int
ParseHostLine(char *aline, struct sockaddr_in *addr, char *aname,
- char *aclone)
+ char *aclone /* boolean */)
{
- int c1, c2, c3, c4;
+ int i;
+ int c[4];
afs_int32 code;
char *tp;
if (aclone)
*aclone = 1;
/* FIXME: length of aname unknown here */
- code = sscanf(aline, "[%d.%d.%d.%d] #%s", &c1, &c2, &c3, &c4, aname);
+ code = sscanf(aline, "[%d.%d.%d.%d] #%s", &c[0], &c[1], &c[2], &c[3],
+ aname);
} else {
if (aclone)
*aclone = 0;
/* FIXME: length of aname unknown here */
- code = sscanf(aline, "%d.%d.%d.%d #%s", &c1, &c2, &c3, &c4, aname);
+ code = sscanf(aline, "%d.%d.%d.%d #%s", &c[0], &c[1], &c[2], &c[3],
+ aname);
}
if (code != 5)
return AFSCONF_SYNTAX;
+ for(i = 0; i < 4; ++i) {
+ if (c[i] < 0 || c[i] > 255) {
+ fprintf(stderr, "Illegal IP address %d.%d.%d.%d\n", c[0], c[1],
+ c[2], c[3]);
+ return AFSCONF_SYNTAX;
+ }
+ }
addr->sin_family = AF_INET;
addr->sin_port = 0;
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
addr->sin_len = sizeof(struct sockaddr_in);
#endif
tp = (char *)&addr->sin_addr;
- *tp++ = c1;
- *tp++ = c2;
- *tp++ = c3;
- *tp++ = c4;
+ *tp++ = c[0];
+ *tp++ = c[1];
+ *tp++ = c[2];
+ *tp++ = c[3];
return 0;
}
char clones[])
{
afs_int32 code;
- char *cell;
+ int i;
code = afsconf_GetCellInfo(adir, acellName, aservice, acellInfo);
if (code)
return code;
- if (acellName)
- cell = acellName;
- else
- cell = (char *)&acellInfo->name;
-
- code = afsconf_OpenInternal(adir, cell, clones);
+ for (i = 0; i < acellInfo->numServers; i++) {
+ clones[i] = acellInfo->clone[i];
+ }
return code;
}
int
afsconf_LookupServer(const char *service, const char *protocol,
const char *cellName, unsigned short afsdbPort,
- int *cellHostAddrs, char cellHostNames[][MAXHOSTCHARS],
+ afs_uint32 *cellHostAddrs, char cellHostNames[][MAXHOSTCHARS],
unsigned short ports[], unsigned short ipRanks[],
int *numServers, int *ttl, char **arealCellName)
{
int code = 0;
+ int r;
int len;
- unsigned char answer[1024];
+ unsigned char answer[4096];
unsigned char *p;
- char *dotcellname;
+ char *dotcellname = NULL;
char *realCellName;
- int cellnamelength, fullnamelength;
char host[256];
int server_num = 0;
int minttl = 0;
if (strchr(cellName,'.'))
pass += 2;
- cellnamelength=strlen(cellName); /* _ ._ . . \0 */
- fullnamelength=cellnamelength+strlen(protocol)+strlen(IANAname)+6;
- dotcellname=malloc(fullnamelength);
- if (!dotcellname)
- return AFSCONF_NOTFOUND; /* service not found */
-
#ifdef HAVE_RES_RETRANSRETRY
if ((_res.options & RES_INIT) == 0 && res_init() == -1)
return (0);
#endif
retryafsdb:
+ r = -1;
switch (pass) {
case 0:
dnstype = T_SRV;
- code = snprintf(dotcellname, fullnamelength, "_%s._%s.%s.",
- IANAname, protocol, cellName);
+ r = asprintf(&dotcellname, "_%s._%s.%s.", IANAname, protocol, cellName);
break;
case 1:
dnstype = T_AFSDB;
- code = snprintf(dotcellname, fullnamelength, "%s.",
- cellName);
+ r = asprintf(&dotcellname, "%s.", cellName);
break;
case 2:
dnstype = T_SRV;
- code = snprintf(dotcellname, fullnamelength, "_%s._%s.%s",
- IANAname, protocol, cellName);
+ r = asprintf(&dotcellname, "_%s._%s.%s", IANAname, protocol, cellName);
break;
case 3:
dnstype = T_AFSDB;
- code = snprintf(dotcellname, fullnamelength, "%s",
- cellName);
+ r = asprintf(&dotcellname, "%s", cellName);
break;
}
- if ((code < 0) || (code >= fullnamelength))
+ if (r < 0 || dotcellname == NULL)
goto findservererror;
+
LOCK_GLOBAL_MUTEX;
len = res_search(dotcellname, C_IN, dnstype, answer, sizeof(answer));
UNLOCK_GLOBAL_MUTEX;
+ if (dotcellname != NULL) {
+ free(dotcellname);
+ dotcellname = NULL;
+ }
+
if (len < 0) {
if (try_init < 1) {
try_init++;
if ((afsdb_type == 1) && (server_num < MAXHOSTSPERCELL) &&
/* Do we want to get TTL data for the A record as well? */
(he = gethostbyname(host))) {
- afs_int32 ipaddr;
- memcpy(&ipaddr, he->h_addr, he->h_length);
- cellHostAddrs[server_num] = ipaddr;
- ports[server_num] = afsdbPort;
- ipRanks[server_num] = 0;
- strncpy(cellHostNames[server_num], host,
- sizeof(cellHostNames[server_num]));
- server_num++;
-
- if (!minttl || ttl < minttl)
- minttl = ttl;
+ if (he->h_addrtype == AF_INET) {
+ afs_uint32 ipaddr;
+ memcpy(&ipaddr, he->h_addr, sizeof(ipaddr));
+ cellHostAddrs[server_num] = ipaddr;
+ ports[server_num] = afsdbPort;
+ ipRanks[server_num] = 0;
+ strncpy(cellHostNames[server_num], host,
+ sizeof(cellHostNames[server_num]));
+ server_num++;
+ if (!minttl || ttl < minttl)
+ minttl = ttl;
+ }
}
}
if (type == T_SRV) {
if ((server_num < MAXHOSTSPERCELL) &&
/* Do we want to get TTL data for the A record as well? */
(he = gethostbyname(host))) {
- afs_int32 ipaddr;
- memcpy(&ipaddr, he->h_addr, he->h_length);
- cellHostAddrs[server_num] = ipaddr;
- ipRanks[server_num] = (p[0] << 8) | p[1];
- ports[server_num] = (p[4] << 8) | p[5];
- /* weight = (p[2] << 8) | p[3]; */
- strncpy(cellHostNames[server_num], host,
- sizeof(cellHostNames[server_num]));
- server_num++;
-
- if (!minttl || ttl < minttl)
- minttl = ttl;
+ if (he->h_addrtype == AF_INET) {
+ afs_uint32 ipaddr;
+
+ memcpy(&ipaddr, he->h_addr, sizeof(ipaddr));
+ cellHostAddrs[server_num] = ipaddr;
+ ipRanks[server_num] = (p[0] << 8) | p[1];
+ ports[server_num] = htons((p[4] << 8) | p[5]);
+ /* weight = (p[2] << 8) | p[3]; */
+ strncpy(cellHostNames[server_num], host,
+ sizeof(cellHostNames[server_num]));
+ server_num++;
+
+ if (!minttl || ttl < minttl)
+ minttl = ttl;
+ }
}
}
findservererror:
if (code && realCellName)
free(realCellName);
- free(dotcellname);
return code;
}
afsconf_GetAfsdbInfo(char *acellName, char *aservice,
struct afsconf_cell *acellInfo)
{
- afs_int32 cellHostAddrs[AFSMAXCELLHOSTS];
+ afs_uint32 cellHostAddrs[AFSMAXCELLHOSTS];
char cellHostNames[AFSMAXCELLHOSTS][MAXHOSTCHARS];
unsigned short ipRanks[AFSMAXCELLHOSTS];
unsigned short ports[AFSMAXCELLHOSTS];
ports, ipRanks, &numServers, &ttl,
&realCellName);
+ /* If we couldn't find an entry for the requested service
+ * and that service happens to be the prservice or kaservice
+ * then fallback to searching for afs3-vlserver and assigning
+ * the port number here. */
+ if (code < 0 && (afsdbport == htons(7002) || afsdbport == htons(7004))) {
+ code = afsconf_LookupServer("afs3-vlserver", "udp",
+ (const char *)acellName, afsdbport,
+ cellHostAddrs, cellHostNames,
+ ports, ipRanks, &numServers, &ttl,
+ &realCellName);
+ if (code >= 0) {
+ for (i = 0; i < numServers; i++)
+ ports[i] = afsdbport;
+ }
+ }
if (code == 0) {
acellInfo->timeout = ttl;
acellInfo->numServers = numServers;
int tservice = afsconf_FindService(aservice); /* network byte order */
const char *ianaName = afsconf_FindIANAName(aservice);
struct afsconf_entry DNSce;
- afs_int32 cellHostAddrs[AFSMAXCELLHOSTS];
+ afs_uint32 cellHostAddrs[AFSMAXCELLHOSTS];
char cellHostNames[AFSMAXCELLHOSTS][MAXHOSTCHARS];
unsigned short ipRanks[AFSMAXCELLHOSTS];
unsigned short ports[AFSMAXCELLHOSTS]; /* network byte order */
* and that service happens to be the prservice or kaservice
* then fallback to searching for afs3-vlserver and assigning
* the port number here. */
- if (rc < 0 && tservice == htons(7002) || tservice == htons(7004)) {
+ if (rc < 0 && (tservice == htons(7002) || tservice == htons(7004))) {
rc = getAFSServer("afs3-vlserver", "udp", acellName, tservice,
cellHostAddrs, cellHostNames, ports, ipRanks, &numServers,
&ttl);
for (i = 0; i < numServers; i++) {
memcpy(&acellInfo->hostAddr[i].sin_addr.s_addr, &cellHostAddrs[i],
- sizeof(long));
+ sizeof(afs_uint32));
memcpy(acellInfo->hostName[i], cellHostNames[i], MAXHOSTCHARS);
acellInfo->hostAddr[i].sin_family = AF_INET;
if (aservice)
LOCK_GLOBAL_MUTEX;
if (adir)
- afsconf_Check(adir);
+ _afsconf_Check(adir);
if (acellName) {
tcell = acellName;
cnLen = (int)(strlen(tcell) + 1);
* queries from other server queries, only perform gethostbyname()
* lookup on the specified hostnames for the client CellServDB files.
*/
- if (IsClientConfigDirectory(adir->name) &&
+ if (_afsconf_IsClientConfigDirectory(adir->name) &&
!(acellInfo->flags & AFSCONF_CELL_FLAG_DNS_QUERIED)) {
int j;
short numServers=0; /*Num active servers for the cell */
struct sockaddr_in hostAddr[MAXHOSTSPERCELL]; /*IP addresses for cell's servers */
char hostName[MAXHOSTSPERCELL][MAXHOSTCHARS]; /*Names for cell's servers */
+ char clone[MAXHOSTSPERCELL]; /*Indicates which ones are clones. */
memset(&hostAddr, 0, sizeof(hostAddr));
memset(&hostName, 0, sizeof(hostName));
+ memset(&clone, 0, sizeof(clone));
for ( j=0; j<acellInfo->numServers && numServers < MAXHOSTSPERCELL; j++ ) {
struct hostent *he = gethostbyname(acellInfo->hostName[j]);
for (i=0 ; he->h_addr_list[i] && numServers < MAXHOSTSPERCELL; i++) {
/* check to see if this is a new address; if so insert it into the list */
int k, dup;
+ afs_uint32 addr;
+ memcpy(&addr, he->h_addr_list[i], sizeof(addr));
for (k=0, dup=0; !dup && k < numServers; k++) {
- if (hostAddr[k].sin_addr.s_addr == *(u_long *)he->h_addr_list[i])
+ if (hostAddr[k].sin_addr.s_addr == addr) {
dup = 1;
+ }
}
if (dup)
continue;
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
hostAddr[numServers].sin_len = sizeof(struct sockaddr_in);
#endif
- memcpy(&hostAddr[numServers].sin_addr.s_addr, he->h_addr_list[i], sizeof(long));
+ memcpy(&hostAddr[numServers].sin_addr.s_addr, he->h_addr_list[i], sizeof(afs_uint32));
strcpy(hostName[numServers], acellInfo->hostName[j]);
+ clone[numServers] = acellInfo->clone[j];
foundAddr = 1;
numServers++;
}
if (!foundAddr) {
hostAddr[numServers] = acellInfo->hostAddr[j];
strcpy(hostName[numServers], acellInfo->hostName[j]);
+ clone[numServers] = acellInfo->clone[j];
numServers++;
}
}
for (i=0; i<numServers; i++) {
acellInfo->hostAddr[i] = hostAddr[i];
strcpy(acellInfo->hostName[i], hostName[i]);
+ acellInfo->clone[i] = clone[i];
}
acellInfo->numServers = numServers;
acellInfo->flags |= AFSCONF_CELL_FLAG_DNS_QUERIED;
}
}
+/**
+ * Get the current localcell name.
+ *
+ * Internal function to get a pointer to the local cell name.
+ * This function must be called with the global afsconf lock held.
+ *
+ * @param[in] adir afsconf object
+ * @param[out] aname address to a char pointer
+ * @param[in] check always perform a config check, even if the
+ * the AFSCELL name is set.
+ *
+ * @return status
+ * @retval 0 success
+ * @retval AFSCONF_NOCELLNAME cannot determine local cell name
+ *
+ * @internal
+ */
int
-afsconf_GetLocalCell(struct afsconf_dir *adir, char *aname,
- afs_int32 alen)
+_afsconf_GetLocalCell(struct afsconf_dir *adir, char **pname, int check)
{
static int afsconf_showcell = 0;
char *afscell_path;
afs_int32 code = 0;
- LOCK_GLOBAL_MUTEX;
/*
* If a cell switch was specified in a command, then it should override the
* AFSCELL variable. If a cell was specified, then the afsconf_SawCell flag
* is set and the cell name in the adir structure is used.
* Read the AFSCELL var each time: in case it changes (unsetenv AFSCELL).
+ * Optionally, check the configuration, even if using the environment variable.
*/
if (!afsconf_SawCell && (afscell_path = getenv("AFSCELL"))) {
+ if (check) {
+ _afsconf_Check(adir);
+ }
if (!afsconf_showcell) {
fprintf(stderr, "Note: Operation is performed on cell %s\n",
afscell_path);
afsconf_showcell = 1;
}
- strncpy(aname, afscell_path, alen);
+ *pname = afscell_path;
} else {
- afsconf_Check(adir);
+ _afsconf_Check(adir);
if (adir->cellName) {
- strncpy(aname, adir->cellName, alen);
+ *pname = adir->cellName;
} else
- code = AFSCONF_UNKNOWN;
+ code = AFSCONF_NOCELLNAME;
}
+ return code;
+}
+
+int
+afsconf_GetLocalCell(struct afsconf_dir *adir, char *aname, afs_int32 alen)
+{
+ afs_int32 code = 0;
+ char *cellname = NULL;
+ LOCK_GLOBAL_MUTEX;
+ code = _afsconf_GetLocalCell(adir, &cellname, 0);
+ if (!code && cellname) {
+ strlcpy(aname, cellname, alen);
+ }
UNLOCK_GLOBAL_MUTEX;
return (code);
}
int
afsconf_Close(struct afsconf_dir *adir)
{
+ if (adir == NULL) {
+ return 0;
+ }
+
LOCK_GLOBAL_MUTEX;
- afsconf_CloseInternal(adir);
+ UnloadConfig(adir);
if (adir->name)
free(adir->name);
free(adir);
return 0;
}
+/**
+ * Free members of a cell configuration, except the name.
+ *
+ * Free all of the memory allocated by the LoadConfig function and
+ * reset the afsconf_dir to zeros. The pathname to the configuration
+ * is preserved to allow for a subquent call the LoadConfig to load
+ * a new configuration.
+ *
+ * @param[in,out] adir pointer to the cell configuration
+ *
+ * @returns 0 on success
+ */
static int
-afsconf_CloseInternal(struct afsconf_dir *adir)
+UnloadConfig(struct afsconf_dir *adir)
{
struct afsconf_entry *td, *nd;
struct afsconf_aliasentry *ta, *na;
char *tname;
+ if (adir == NULL) {
+ return 0;
+ }
+
tname = adir->name; /* remember name, since that's all we preserve */
/* free everything we can find */
if (adir->cellName)
free(adir->cellName);
+ if (adir->cellservDB)
+ free(adir->cellservDB);
for (td = adir->entries; td; td = nd) {
nd = td->next;
if (td->cellInfo.linkedCell)
na = ta->next;
free(ta);
}
- if (adir->keystr)
- free(adir->keystr);
+
+ _afsconf_FreeAllKeys(adir);
+ _afsconf_FreeRealms(adir);
/* reinit */
memset(adir, 0, sizeof(struct afsconf_dir));
afsconf_Reopen(struct afsconf_dir *adir)
{
afs_int32 code;
- code = afsconf_CloseInternal(adir);
+ code = UnloadConfig(adir);
if (code)
return code;
- code = afsconf_OpenInternal(adir, 0, 0);
+ code = LoadConfig(adir);
return code;
}
-/* called during opening of config file */
-int
-afsconf_IntGetKeys(struct afsconf_dir *adir)
+static int
+VerifyEntries(struct afsconf_cell *aci)
{
- char tbuffer[256];
- int fd;
- struct afsconf_keys *tstr;
- afs_int32 code;
-
-#ifdef AFS_NT40_ENV
- /* NT client config dir has no KeyFile; don't risk attempting open
- * because there might be a random file of this name if dir is shared.
- */
- if (IsClientConfigDirectory(adir->name)) {
- adir->keystr = ((struct afsconf_keys *)
- malloc(sizeof(struct afsconf_keys)));
- adir->keystr->nkeys = 0;
- return 0;
- }
-#endif /* AFS_NT40_ENV */
-
- LOCK_GLOBAL_MUTEX;
- /* compute the key name and other setup */
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_KEY_FILE, NULL);
- tstr = (struct afsconf_keys *)malloc(sizeof(struct afsconf_keys));
- adir->keystr = tstr;
-
- /* read key file */
- fd = open(tbuffer, O_RDONLY);
- if (fd < 0) {
- tstr->nkeys = 0;
- UNLOCK_GLOBAL_MUTEX;
- return 0;
- }
- code = read(fd, tstr, sizeof(struct afsconf_keys));
- close(fd);
- if (code < sizeof(afs_int32)) {
- tstr->nkeys = 0;
- UNLOCK_GLOBAL_MUTEX;
- return 0;
- }
-
- /* convert key structure to host order */
- tstr->nkeys = ntohl(tstr->nkeys);
-
- if (code < sizeof(afs_int32) + (tstr->nkeys*sizeof(struct afsconf_key))) {
- tstr->nkeys = 0;
- UNLOCK_GLOBAL_MUTEX;
- return 0;
+ int i;
+ struct hostent *th;
+
+ for (i = 0; i < aci->numServers; i++) {
+ if (aci->hostAddr[i].sin_addr.s_addr == 0) {
+ /* no address spec'd */
+ if (*(aci->hostName[i]) != 0) {
+ int code;
+ struct addrinfo hints;
+ struct addrinfo *result;
+ struct addrinfo *rp;
+
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_DGRAM;
+
+ code = getaddrinfo(aci->hostName[i], NULL, &hints, &result);
+ if (code) {
+ printf("Host %s not found in host database...\n",
+ aci->hostName[i]);
+ return AFSCONF_FAILURE;
+ }
+ for (rp = result; rp != NULL; rp = rp->ai_next) {
+ struct sockaddr_in *sa = (struct sockaddr_in *)rp->ai_addr;
+ if (!rx_IsLoopbackAddr(ntohl(sa->sin_addr.s_addr))) {
+ aci->hostAddr[i].sin_addr.s_addr = sa->sin_addr.s_addr;
+ break;
+ }
+ }
+ freeaddrinfo(result);
+ if (aci->hostAddr[i].sin_addr.s_addr == 0) {
+ printf("No non-loopback addresses found for host %s\n",
+ aci->hostName[i]);
+ return AFSCONF_FAILURE;
+ }
+ }
+ /* otherwise we're deleting this entry */
+ } else {
+ /* address spec'd, perhaps no name known */
+ if (aci->hostName[i][0] != 0)
+ continue; /* name known too */
+ /* figure out name, if possible */
+ th = gethostbyaddr((char *)(&aci->hostAddr[i].sin_addr), 4,
+ AF_INET);
+ if (!th) {
+ strcpy(aci->hostName[i], "UNKNOWNHOST");
+ } else {
+ if (strlcpy(aci->hostName[i],
+ th->h_name,
+ sizeof(aci->hostName[i]))
+ >= sizeof(aci->hostName[i])) {
+ strcpy(aci->hostName[i], "UNKNOWNHOST");
+ }
+ }
+ }
}
-
- for (fd = 0; fd < tstr->nkeys; fd++)
- tstr->key[fd].kvno = ntohl(tstr->key[fd].kvno);
-
- UNLOCK_GLOBAL_MUTEX;
return 0;
}
-/* get keys structure */
+/**
+ * Set cell information (deprecated)
+ *
+ * Write ThisCell and CellServDB containing exactly one cell's info specified
+ * by acellInfo param. Useful only on the server (which describes only one
+ * cell).
+ *
+ * @param adir cell configuation data; may be NULL
+ * @param apath cell configuration path
+ * @param acellInfo cell information
+ *
+ * @note This interface was changed at some point to optionally accept the
+ * afsconf_dir data structure. This is a handle to the internal cache
+ * that is maintained by the bosserver.
+ *
+ * @return 0 on success
+ */
int
-afsconf_GetKeys(struct afsconf_dir *adir, struct afsconf_keys *astr)
+afsconf_SetCellInfo(struct afsconf_dir *adir, const char *apath,
+ struct afsconf_cell *acellInfo)
{
afs_int32 code;
- LOCK_GLOBAL_MUTEX;
- code = afsconf_Check(adir);
- if (code) {
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_FAILURE;
- }
- memcpy(astr, adir->keystr, sizeof(struct afsconf_keys));
- UNLOCK_GLOBAL_MUTEX;
- return 0;
+ code = afsconf_SetExtendedCellInfo(adir, apath, acellInfo, NULL);
+ return code;
}
-/* get latest key */
-afs_int32
-afsconf_GetLatestKey(struct afsconf_dir * adir, afs_int32 * avno,
- struct ktc_encryptionKey *akey)
+/**
+ * Set cell information
+ *
+ * Write ThisCell and CellServDB containing exactly one cell's info specified
+ * by acellInfo param. Useful only on the server (which describes only one
+ * cell).
+ *
+ * @param adir cell configuation data; may be NULL
+ * @param apath cell configuration path
+ * @param acellInfo cell information
+ * @param clones array of booleans to indicate which hosts are clones
+ *
+ * @return 0 on success
+ */
+int
+afsconf_SetExtendedCellInfo(struct afsconf_dir *adir,
+ const char *apath,
+ struct afsconf_cell *acellInfo, char clones[])
{
- int i;
- int maxa;
- struct afsconf_key *tk;
- afs_int32 best;
- struct afsconf_key *bestk;
afs_int32 code;
+ int fd;
+ char tbuffer[1024];
+ FILE *tf;
+ afs_int32 i;
+
+ opr_Assert(apath);
+ opr_Assert(acellInfo);
LOCK_GLOBAL_MUTEX;
- code = afsconf_Check(adir);
- if (code) {
+ /* write ThisCell file */
+ strcompose(tbuffer, 1024, apath, "/", AFSDIR_THISCELL_FILE, (char *)NULL);
+
+ fd = open(tbuffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
+ if (fd < 0) {
UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_FAILURE;
+ return errno;
}
- maxa = adir->keystr->nkeys;
-
- best = -1; /* highest kvno we've seen yet */
- bestk = (struct afsconf_key *)0; /* ptr to structure providing best */
- for (tk = adir->keystr->key, i = 0; i < maxa; i++, tk++) {
- if (tk->kvno == 999)
- continue; /* skip bcrypt keys */
- if (tk->kvno > best) {
- best = tk->kvno;
- bestk = tk;
- }
+ i = (int)strlen(acellInfo->name);
+ code = write(fd, acellInfo->name, i);
+ if (code != i) {
+ close(fd);
+ UNLOCK_GLOBAL_MUTEX;
+ return AFSCONF_FAILURE;
}
- if (bestk) { /* found any */
- if (akey)
- memcpy(akey, bestk->key, 8); /* copy out latest key */
- if (avno)
- *avno = bestk->kvno; /* and kvno to caller */
+ if (close(fd) < 0) {
UNLOCK_GLOBAL_MUTEX;
- return 0;
+ return errno;
}
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_NOTFOUND; /* didn't find any keys */
-}
-/* get a particular key */
-int
-afsconf_GetKey(void *rock, int avno, struct ktc_encryptionKey *akey)
-{
- struct afsconf_dir *adir = (struct afsconf_dir *) rock;
- int i, maxa;
- struct afsconf_key *tk;
- afs_int32 code;
-
- LOCK_GLOBAL_MUTEX;
- code = afsconf_Check(adir);
+ /* make sure we have both name and address for each host, looking up other
+ * if need be */
+ code = VerifyEntries(acellInfo);
if (code) {
UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_FAILURE;
+ return code;
}
- maxa = adir->keystr->nkeys;
- for (tk = adir->keystr->key, i = 0; i < maxa; i++, tk++) {
- if (tk->kvno == avno) {
- memcpy(akey, tk->key, 8);
- UNLOCK_GLOBAL_MUTEX;
- return 0;
- }
+ /* write CellServDB */
+ if (adir) {
+ tf = fopen(adir->cellservDB, "w");
+ } else {
+ char *cellservDB = NULL;
+ _afsconf_CellServDBPath(apath, &cellservDB);
+ if (cellservDB)
+ tf = fopen(cellservDB, "w");
+ else
+ tf = NULL;
+ free(cellservDB);
}
-
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_NOTFOUND;
-}
-
-/* save the key structure in the appropriate file */
-static int
-SaveKeys(struct afsconf_dir *adir)
-{
- struct afsconf_keys tkeys;
- int fd;
- afs_int32 i;
- char tbuffer[256];
-
- memcpy(&tkeys, adir->keystr, sizeof(struct afsconf_keys));
-
- /* convert it to net byte order */
- for (i = 0; i < tkeys.nkeys; i++)
- tkeys.key[i].kvno = htonl(tkeys.key[i].kvno);
- tkeys.nkeys = htonl(tkeys.nkeys);
-
- /* rewrite keys file */
- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_KEY_FILE, NULL);
- fd = open(tbuffer, O_RDWR | O_CREAT | O_TRUNC, 0600);
- if (fd < 0)
- return AFSCONF_FAILURE;
- i = write(fd, &tkeys, sizeof(tkeys));
- if (i != sizeof(tkeys)) {
- close(fd);
- return AFSCONF_FAILURE;
+ if (!tf) {
+ UNLOCK_GLOBAL_MUTEX;
+ return AFSCONF_NOTFOUND;
}
- if (close(fd) < 0)
+ fprintf(tf, ">%s #Cell name\n", acellInfo->name);
+ for (i = 0; i < acellInfo->numServers; i++) {
+ code = acellInfo->hostAddr[i].sin_addr.s_addr; /* net order */
+ if (code == 0)
+ continue; /* delete request */
+ code = ntohl(code); /* convert to host order */
+ if (clones && clones[i])
+ fprintf(tf, "[%d.%d.%d.%d] #%s\n", (code >> 24) & 0xff,
+ (code >> 16) & 0xff, (code >> 8) & 0xff, code & 0xff,
+ acellInfo->hostName[i]);
+ else
+ fprintf(tf, "%d.%d.%d.%d #%s\n", (code >> 24) & 0xff,
+ (code >> 16) & 0xff, (code >> 8) & 0xff, code & 0xff,
+ acellInfo->hostName[i]);
+ }
+ if (ferror(tf)) {
+ fclose(tf);
+ UNLOCK_GLOBAL_MUTEX;
return AFSCONF_FAILURE;
- return 0;
-}
-
-int
-afsconf_AddKey(struct afsconf_dir *adir, afs_int32 akvno, char akey[8],
- afs_int32 overwrite)
-{
- struct afsconf_keys *tk;
- struct afsconf_key *tkey;
- afs_int32 i;
- int foundSlot;
-
- LOCK_GLOBAL_MUTEX;
- tk = adir->keystr;
-
- if (akvno != 999) {
- if (akvno < 0 || akvno > 255) {
- UNLOCK_GLOBAL_MUTEX;
- return ERANGE;
- }
- }
- foundSlot = 0;
- for (i = 0, tkey = tk->key; i < tk->nkeys; i++, tkey++) {
- if (tkey->kvno == akvno) {
- if (!overwrite) {
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_KEYINUSE;
- }
- foundSlot = 1;
- break;
- }
- }
- if (!foundSlot) {
- if (tk->nkeys >= AFSCONF_MAXKEYS) {
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_FULL;
- }
- tkey = &tk->key[tk->nkeys++];
}
- tkey->kvno = akvno;
- memcpy(tkey->key, akey, 8);
- i = SaveKeys(adir);
- afsconf_Touch(adir);
- UNLOCK_GLOBAL_MUTEX;
- return i;
-}
+ code = fclose(tf);
-/* this proc works by sliding the other guys down, rather than using a funny
- kvno value, so that callers can count on getting a good key in key[0].
-*/
-int
-afsconf_DeleteKey(struct afsconf_dir *adir, afs_int32 akvno)
-{
- struct afsconf_keys *tk;
- struct afsconf_key *tkey;
- int i;
- int foundFlag = 0;
-
- LOCK_GLOBAL_MUTEX;
- tk = adir->keystr;
-
- for (i = 0, tkey = tk->key; i < tk->nkeys; i++, tkey++) {
- if (tkey->kvno == akvno) {
- foundFlag = 1;
- break;
- }
- }
- if (!foundFlag) {
- UNLOCK_GLOBAL_MUTEX;
- return AFSCONF_NOTFOUND;
- }
+ /* Reset the timestamp in the cache, so that
+ * the CellServDB is read into the cache next time.
+ * Resolves the lost update problem due to an inconsistent cache
+ */
+ if (adir)
+ adir->timeRead = 0;
- /* otherwise slide the others down. i and tkey point at the guy to delete */
- for (; i < tk->nkeys - 1; i++, tkey++) {
- tkey->kvno = (tkey + 1)->kvno;
- memcpy(tkey->key, (tkey + 1)->key, 8);
- }
- tk->nkeys--;
- i = SaveKeys(adir);
- afsconf_Touch(adir);
UNLOCK_GLOBAL_MUTEX;
- return i;
+ if (code == EOF)
+ return AFSCONF_FAILURE;
+ return 0;
}