* directory or online at http://www.openafs.org/dl/license10.html
*/
-#include <afs/param.h>
-#include <afs/stds.h>
-#include <afs/cellconfig.h>
-
-#ifndef DJGPP
#include <windows.h>
#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#endif /* !DJGPP */
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "afsd.h"
#include <WINNT\afssw.h>
#include <WINNT\afsreg.h>
+
+#include <afs/param.h>
+#include <afs/stds.h>
+#include <afs/cellconfig.h>
+
#ifdef AFS_AFSDB_ENV
#include "cm_dns.h"
#include <afs/afsint.h>
#endif
-/* TODO: these should be pulled in from dirpath.h */
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
-#define AFS_THISCELL "ThisCell"
-#endif
-#define AFS_CELLSERVDB_UNIX "CellServDB"
-#define AFS_CELLSERVDB_NT "afsdcell.ini"
-#ifndef AFSDIR_CLIENT_ETC_DIRPATH
-#define AFSDIR_CLIENT_ETC_DIRPATH "c:/afs"
-#endif
-#if defined(DJGPP) || defined(AFS_WIN95_ENV)
-#define AFS_CELLSERVDB AFS_CELLSERVDB_UNIX
-#ifdef DJGPP
-extern char cm_confDir[];
-extern int errno;
-#endif /* DJGPP */
-#else
-#define AFS_CELLSERVDB AFS_CELLSERVDB_UNIX
-#endif /* DJGPP || WIN95 */
-
-static DWORD TraceOption = 0;
-
-/* This really needs to be initialized at DLL Init */
-#define TRACE_OPTION_EVENT 4
-
-#define ISCONFIGTRACE(v) ( ((v) & TRACE_OPTION_EVENT)==TRACE_OPTION_EVENT)
-
-void DebugEvent0_local(char *a)
-{
- HANDLE h; char *ptbuf[1];
- if (!ISCONFIGTRACE(TraceOption))
- return;
- h = RegisterEventSource(NULL, a);
- ptbuf[0] = a;
- ReportEvent(h, EVENTLOG_INFORMATION_TYPE, 0, 0, NULL, 1, 0, (const char **)ptbuf, NULL);
- DeregisterEventSource(h);
-}
-
-#define MAXBUF_ 512
-
-void DebugEvent_local(char *a,char *b,...)
-{
- HANDLE h; char *ptbuf[1],buf[MAXBUF_+1];
- va_list marker;
- if (!ISCONFIGTRACE(TraceOption))
- return;
- h = RegisterEventSource(NULL, a);
- va_start(marker,b);
- _vsnprintf(buf,MAXBUF_,b,marker);
- ptbuf[0] = buf;
- ReportEvent(h, EVENTLOG_INFORMATION_TYPE, 0, 0, NULL, 1, 0, (const char **)ptbuf, NULL);\
- DeregisterEventSource(h);
- va_end(marker);
-}
-
-#define REG_CLIENT_PARMS_KEY TEXT("SYSTEM\\CurrentControlSet\\Services\\TransarcAFSDaemon\\Parameters")
-#define REG_CLIENT_TRACE_OPTION_PARM TEXT("TraceOption")
-
-#ifdef COMMENT
-BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-{
- switch (fdwReason)
- {
- case DLL_PROCESS_ATTACH: {
- DWORD LSPtype, LSPsize;
- HKEY NPKey;
-
- (void) RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, KEY_QUERY_VALUE, &NPKey);
- LSPsize=sizeof(TraceOption);
- RegQueryValueEx(NPKey, REG_CLIENT_TRACE_OPTION_PARM, NULL,
- &LSPtype, (LPBYTE)&TraceOption, &LSPsize);
-
- RegCloseKey (NPKey);
- break;
- }
-
- case DLL_THREAD_ATTACH:
- break;
-
- case DLL_THREAD_DETACH:
- break;
-
- case DLL_PROCESS_DETACH:
- break;
-
- default:
- return FALSE;
- }
-
- return TRUE; // successful DLL_PROCESS_ATTACH
-}
-#endif /* COMMENT */
-
static long cm_ParsePair(char *lineBufferp, char *leftp, char *rightp)
{
- char *tp;
+ char *tp;
char tc;
int sawEquals;
- int sawBracket;
+ int sawBracket;
sawEquals = 0;
- sawBracket = 0;
+ sawBracket = 0;
for(tp = lineBufferp; *tp; tp++) {
tc = *tp;
- if (sawBracket) {
- if (tc == ']')
- sawBracket = 0;
- continue;
- }
+ if (sawBracket) {
+ if (tc == ']')
+ sawBracket = 0;
+ continue;
+ }
- /* comment or line end */
+ /* comment or line end */
if (tc == '#' || tc == '\r' || tc == '\n')
break;
- /* square bracket comment -- look for closing delim */
- if (tc == '[') {
+ /* square bracket comment -- look for closing delim */
+ if (tc == '[') {
sawBracket = 1;
continue;
- }
+ }
- /* space or tab */
+ /* space or tab */
if (tc == ' ' || tc == '\t')
continue;
if (tc == '=') {
sawEquals = 1;
continue;
- }
-
+ }
+
/* now we have a real character, put it in the appropriate bucket */
if (sawEquals == 0) {
- *leftp++ = tc;
- }
- else {
- *rightp++ = tc;
+ *leftp++ = tc;
+ }
+ else {
+ *rightp++ = tc;
}
}
- /* null terminate the strings */
- *leftp = 0;
+ /* null terminate the strings */
+ *leftp = 0;
*rightp = 0;
return 0; /* and return success */
}
+static int
+IsWindowsModule(const char * name)
+{
+ const char * p;
+ int i;
+
+ /* Do not perform searches for probable Windows modules */
+ for (p = name, i=0; *p; p++) {
+ if ( *p == '.' )
+ i++;
+ }
+ p = strrchr(name, '.');
+ if (p) {
+ if (i == 1 &&
+ (!cm_stricmp_utf8N(p,".dll") ||
+ !cm_stricmp_utf8N(p,".exe") ||
+ !cm_stricmp_utf8N(p,".ini") ||
+ !cm_stricmp_utf8N(p,".db") ||
+ !cm_stricmp_utf8N(p,".drv")))
+ return 1;
+ }
+ return 0;
+}
+
/* search for a cell, and either return an error code if we don't find it,
* or return 0 if we do, in which case we also fill in the addresses in
* the cellp field.
* If the caller wants the "real" cell name, it puts a non-null pointer in
* newCellNamep. Anomaly: if cellNamep is ambiguous, we may modify
* newCellNamep but return an error code.
+ *
+ * Linked Cells: the CellServDB format permits linked cells
+ * >cell [linked-cell] #Description
+ *
+ * newCellNamep and linkedNamep are required to be CELL_MAXNAMELEN in size.
*/
long cm_SearchCellFile(char *cellNamep, char *newCellNamep,
cm_configProc_t *procp, void *rockp)
{
- char wdir[257];
+ return cm_SearchCellFileEx(cellNamep, newCellNamep, NULL, procp, rockp);
+}
+
+long cm_SearchCellFileEx(char *cellNamep, char *newCellNamep,
+ char *linkedNamep,
+ cm_configProc_t *procp, void *rockp)
+{
+ char wdir[MAX_PATH]="";
FILE *tfilep = NULL, *bestp, *tempp;
- char *tp;
+ char *tp, *linkp;
char lineBuffer[257];
struct hostent *thp;
char *valuep;
struct sockaddr_in vlSockAddr;
- int inRightCell;
+ int inRightCell = 0;
int foundCell = 0;
long code;
- int tracking = 1, partial = 0;
-#if defined(DJGPP) || defined(AFS_WIN95_ENV)
- char *afsconf_path;
- DWORD dwSize;
-#endif
+ int tracking = 1, partial = 0;
- cm_GetCellServDB(wdir);
- tfilep = fopen(wdir, "r");
-
-#if defined(DJGPP) || defined(AFS_WIN95_ENV)
- if (!tfilep) {
- /* If we are using DJGPP client, cellservdb will be in afsconf dir. */
- /* If we are in Win95 here, we are linking with klog etc. and are
- using DJGPP client even though DJGPP is not defined. So we still
- need to check AFSCONF for location. */
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
- if (!afsconf_path)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(wdir, afsconf_path);
- free(afsconf_path);
- }
- strcat(wdir, "/");
- strcat(wdir, AFS_CELLSERVDB);
- /*fprintf(stderr, "opening cellservdb file %s\n", wdir);*/
+ if ( IsWindowsModule(cellNamep) )
+ return -3;
+
+ cm_GetCellServDB(wdir, sizeof(wdir));
+ if (*wdir)
tfilep = fopen(wdir, "r");
- if (!tfilep) return -2;
- }
-#else
- /* If we are NT or higher, we don't do DJGPP, So just fail */
- if ( !tfilep )
+
+ if (!tfilep)
return -2;
-#endif
- bestp = fopen(wdir, "r");
+ bestp = fopen(wdir, "r");
-#ifdef DEBUG
- DebugEvent_local("AFS- cm_searchfile fopen", "Handle[%x], wdir[%s]", bestp, wdir);
+#ifdef CELLSERV_DEBUG
+ osi_Log2(afsd_logp,"cm_searchfile fopen handle[%p], wdir[%s]", bestp,
+ osi_LogSaveString(afsd_logp,wdir));
#endif
-
- /* have we seen the cell line for the guy we're looking for? */
- inRightCell = 0;
- while (1) {
+ /* have we seen the cell line for the guy we're looking for? */
+ while (1) {
+ linkp = NULL;
tp = fgets(lineBuffer, sizeof(lineBuffer), tfilep);
if (tracking)
- (void) fgets(lineBuffer, sizeof(lineBuffer), bestp);
+ (void) fgets(lineBuffer, sizeof(lineBuffer), bestp);
if (tp == NULL) {
- if (feof(tfilep)) {
- /* hit EOF */
- if (partial) {
- /*
- * found partial match earlier;
- * now go back to it
- */
- tempp = bestp;
- bestp = tfilep;
- tfilep = tempp;
- inRightCell = 1;
- partial = 0;
- continue;
- }
- else {
- fclose(tfilep);
- fclose(bestp);
- return (foundCell? 0 : -3);
- }
- }
- }
+ if (feof(tfilep)) {
+ /* hit EOF */
+ if (partial) {
+ /*
+ * found partial match earlier;
+ * now go back to it
+ */
+ tempp = bestp;
+ bestp = tfilep;
+ tfilep = tempp;
+ inRightCell = 1;
+ partial = 0;
+ continue;
+ }
+ else {
+ fclose(tfilep);
+ fclose(bestp);
+ return (foundCell? 0 : -3);
+ }
+ }
+ }
/* turn trailing cr or lf into null */
- tp = strchr(lineBuffer, '\r');
+ tp = strrchr(lineBuffer, '\r');
if (tp) *tp = 0;
- tp = strchr(lineBuffer, '\n');
+ tp = strrchr(lineBuffer, '\n');
if (tp) *tp = 0;
- /* skip blank lines */
+ /* skip blank lines */
if (lineBuffer[0] == 0) continue;
+ /*
+ * The format is:
+ * >[cell] [linked-cell] #[Description]
+ * where linked-cell and Description are optional
+ */
if (lineBuffer[0] == '>') {
- /* trim off at white space or '#' chars */
- tp = strchr(lineBuffer, ' ');
- if (tp) *tp = 0;
- tp = strchr(lineBuffer, '\t');
- if (tp) *tp = 0;
- tp = strchr(lineBuffer, '#');
- if (tp) *tp = 0;
+ if (inRightCell) {
+ fclose(tfilep);
+ fclose(bestp);
+ return(foundCell ? 0 : -6);
+ }
- /* now see if this is the right cell */
+ /*
+ * terminate the cellname at the first white space
+ * leaving 'tp' pointing to the next string if any
+ */
+ for (tp = &lineBuffer[1]; tp && !isspace(*tp); tp++);
+ if (tp) {
+ *tp = '\0';
+ for (tp++ ;tp && isspace(*tp); tp++);
+ if (*tp != '#') {
+ linkp = tp;
+ for (; tp && !isspace(*tp); tp++);
+ if (tp)
+ *tp = '\0';
+ }
+ }
+
+ /* now see if this is the right cell */
if (stricmp(lineBuffer+1, cellNamep) == 0) {
- /* found the cell we're looking for */
- if (newCellNamep)
- strcpy(newCellNamep, lineBuffer+1);
+ /* found the cell we're looking for */
+ if (newCellNamep) {
+ strncpy(newCellNamep, lineBuffer+1,CELL_MAXNAMELEN);
+ newCellNamep[CELL_MAXNAMELEN-1] = '\0';
+ strlwr(newCellNamep);
+ }
+ if (linkedNamep) {
+ strncpy(linkedNamep, linkp ? linkp : "", CELL_MAXNAMELEN);
+ linkedNamep[CELL_MAXNAMELEN-1] = '\0';
+ strlwr(linkedNamep);
+ }
inRightCell = 1;
- tracking = 0;
-#ifdef DEBUG
- DebugEvent_local("AFS- cm_searchfile is cell", "inRightCell[%x], linebuffer[%s]",
- inRightCell, lineBuffer);
+ tracking = 0;
+#ifdef CELLSERV_DEBUG
+ osi_Log2(afsd_logp, "cm_searchfile is cell inRightCell[%p], linebuffer[%s]",
+ inRightCell, osi_LogSaveString(afsd_logp,lineBuffer));
#endif
- }
- else if (strnicmp(lineBuffer+1, cellNamep,
- strlen(cellNamep)) == 0) {
- /* partial match */
- if (partial) { /* ambiguous */
- fclose(tfilep);
- fclose(bestp);
- return -5;
- }
- if (newCellNamep)
- strcpy(newCellNamep, lineBuffer+1);
- inRightCell = 0;
- tracking = 0;
- partial = 1;
- }
+ }
+ else if (cm_stricmp_utf8(lineBuffer+1, cellNamep) == 0) {
+ /* partial match */
+ if (partial) { /* ambiguous */
+ fclose(tfilep);
+ fclose(bestp);
+ return -5;
+ }
+ if (newCellNamep) {
+ strncpy(newCellNamep, lineBuffer+1,CELL_MAXNAMELEN);
+ newCellNamep[CELL_MAXNAMELEN-1] = '\0';
+ strlwr(newCellNamep);
+ }
+ if (linkedNamep) {
+ strncpy(linkedNamep, linkp ? linkp : "", CELL_MAXNAMELEN);
+ linkedNamep[CELL_MAXNAMELEN-1] = '\0';
+ strlwr(linkedNamep);
+ }
+ inRightCell = 0;
+ tracking = 0;
+ partial = 1;
+ }
else inRightCell = 0;
}
else {
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
valuep = strchr(lineBuffer, '#');
- if (valuep == NULL) {
- fclose(tfilep);
- fclose(bestp);
- return -4;
- }
+ if (valuep == NULL) {
+ fclose(tfilep);
+ fclose(bestp);
+ return -4;
+ }
valuep++; /* skip the "#" */
valuep += strspn(valuep, " \t"); /* skip SP & TAB */
/* strip spaces and tabs in the end. They should not be there according to CellServDB format
- so do this just in case */
+ * so do this just in case
+ */
while (valuep[strlen(valuep) - 1] == ' ' || valuep[strlen(valuep) - 1] == '\t')
valuep[strlen(valuep) - 1] = '\0';
-#endif /* !DJGPP */
- if (inRightCell) {
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
- /* add the server to the VLDB list */
+ if (inRightCell) {
+ /* add the server to the VLDB list */
WSASetLastError(0);
thp = gethostbyname(valuep);
-#ifdef DEBUG
- {
- int iErr = WSAGetLastError();
- DebugEvent_local("AFS- cm_searchfile inRightCell",
- "thp[%x], valuep[%s], WSAGetLastError[%d]",
- thp, valuep, iErr);
- }
+#ifdef CELLSERV_DEBUG
+ osi_Log3(afsd_logp,"cm_searchfile inRightCell thp[%p], valuep[%s], WSAGetLastError[%d]",
+ thp, osi_LogSaveString(afsd_logp,valuep), WSAGetLastError());
#endif
- if (thp) {
- memcpy(&vlSockAddr.sin_addr.s_addr, thp->h_addr,
+ if (thp) {
+ memcpy(&vlSockAddr.sin_addr.s_addr, thp->h_addr,
sizeof(long));
vlSockAddr.sin_family = AF_INET;
/* sin_port supplied by connection code */
- if (procp)
- (*procp)(rockp, &vlSockAddr, valuep);
+ if (procp)
+ (*procp)(rockp, &vlSockAddr, valuep);
foundCell = 1;
- }
-#else
- thp = 0;
-#endif /* !DJGPP */
+ }
if (!thp) {
- long ip_addr;
- int c1, c2, c3, c4;
- char aname[241] = "";
+ afs_uint32 ip_addr;
+ unsigned int c1, c2, c3, c4;
/* Since there is no gethostbyname() data
- * available we will read the IP address
- * stored in the CellServDB file
+ * available we will read the IP address
+ * stored in the CellServDB file
*/
- code = sscanf(lineBuffer, "%d.%d.%d.%d #%s",
- &c1, &c2, &c3, &c4, aname);
- tp = (char *) &ip_addr;
- *tp++ = c1;
- *tp++ = c2;
- *tp++ = c3;
- *tp++ = c4;
- memcpy(&vlSockAddr.sin_addr.s_addr, &ip_addr,
- sizeof(long));
- vlSockAddr.sin_family = AF_INET;
- /* sin_port supplied by connection code */
- if (procp)
- (*procp)(rockp, &vlSockAddr, valuep);
- foundCell = 1;
+ code = sscanf(lineBuffer, " %u.%u.%u.%u",
+ &c1, &c2, &c3, &c4);
+ if (code == 4 && c1<256 && c2<256 && c3<256 && c4<256) {
+ tp = (unsigned char *) &ip_addr;
+ *tp++ = c1;
+ *tp++ = c2;
+ *tp++ = c3;
+ *tp++ = c4;
+ memcpy(&vlSockAddr.sin_addr.s_addr, &ip_addr,
+ sizeof(long));
+ vlSockAddr.sin_family = AF_INET;
+ /* sin_port supplied by connection code */
+ if (procp)
+ (*procp)(rockp, &vlSockAddr, valuep);
+ foundCell = 1;
+ }
}
}
} /* a vldb line */
return (foundCell) ? 0 : -11;
}
+/* newCellNamep is required to be CELL_MAXNAMELEN in size */
long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl,
cm_configProc_t *procp, void *rockp)
{
int numServers;
int i;
struct sockaddr_in vlSockAddr;
-
-#ifdef DEBUG
- DebugEvent_local("AFS SearchCellDNS-","Doing search for [%s]", cellNamep);
+#ifdef CELLSERV_DEBUG
+ osi_Log1(afsd_logp,"SearchCellDNS-Doing search for [%s]", osi_LogSaveString(afsd_logp,cellNamep));
#endif
+ if ( IsWindowsModule(cellNamep) )
+ return -1;
rc = getAFSServer(cellNamep, cellHostAddrs, cellHostNames, &numServers, ttl);
if (rc == 0 && numServers > 0) { /* found the cell */
for (i = 0; i < numServers; i++) {
memcpy(&vlSockAddr.sin_addr.s_addr, &cellHostAddrs[i],
sizeof(long));
- vlSockAddr.sin_family = AF_INET;
- /* sin_port supplied by connection code */
- if (procp)
- (*procp)(rockp, &vlSockAddr, cellHostNames[i]);
- if(newCellNamep)
- strcpy(newCellNamep,cellNamep);
+ vlSockAddr.sin_family = AF_INET;
+ /* sin_port supplied by connection code */
+ if (procp)
+ (*procp)(rockp, &vlSockAddr, cellHostNames[i]);
+ if (newCellNamep) {
+ strncpy(newCellNamep,cellNamep,CELL_MAXNAMELEN);
+ newCellNamep[CELL_MAXNAMELEN-1] = '\0';
+ strlwr(newCellNamep);
+ }
}
return 0; /* found cell */
}
else
return -1; /* not found */
#else
- return -1; /* not found */
+ return -1; /* not found */
#endif /* AFS_AFSDB_ENV */
}
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
-/* look up the CellServDBDir's name in the Registry
- * or use the Client Dirpath value to produce a CellServDB
- * filename
+/* use cm_GetConfigDir() plus AFS_CELLSERVDB to
+ * generate the fully qualified name of the CellServDB
+ * file.
*/
-long cm_GetCellServDB(char *cellNamep)
+long cm_GetCellServDB(char *cellNamep, afs_uint32 len)
{
-#if !defined(DJGPP)
- DWORD code, dummyLen;
- HKEY parmKey;
- int tlen;
-
- code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_OPENAFS_SUBKEY,
- 0, KEY_QUERY_VALUE, &parmKey);
- if (code != ERROR_SUCCESS)
- goto dirpath;
-
- dummyLen = 256;
- code = RegQueryValueEx(parmKey, "CellServDBDir", NULL, NULL,
- cellNamep, &dummyLen);
- RegCloseKey (parmKey);
-
- dirpath:
- if (code != ERROR_SUCCESS || cellNamep[0] == 0)
- strcpy(cellNamep, AFSDIR_CLIENT_ETC_DIRPATH);
+ size_t tlen;
+
+ cm_GetConfigDir(cellNamep, len);
/* add trailing backslash, if required */
- tlen = strlen(cellNamep);
- if (cellNamep[tlen-1] != '\\')
- strcat(cellNamep, "\\");
-#else
- strcpy(cellNamep, cm_confDir);
- strcat(cellNamep,"/");
-#endif /* !DJGPP */
+ tlen = (int)strlen(cellNamep);
+ if (tlen) {
+ if (cellNamep[tlen-1] != '\\') {
+ strncat(cellNamep, "\\", len);
+ cellNamep[len-1] = '\0';
+ }
- strcat(cellNamep, AFS_CELLSERVDB);
- return 0;
+ strncat(cellNamep, AFS_CELLSERVDB, len);
+ cellNamep[len-1] = '\0';
+ }
+ return 0;
}
-/* look up the root cell's name in the Registry */
+/* look up the root cell's name in the Registry
+ * Input buffer must be at least CELL_MAXNAMELEN
+ * in size. (Defined in cm_cell.h)
+ */
long cm_GetRootCellName(char *cellNamep)
{
- DWORD code, dummyLen;
- HKEY parmKey;
+ DWORD code, dummyLen;
+ HKEY parmKey;
- code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, KEY_QUERY_VALUE, &parmKey);
- if (code != ERROR_SUCCESS)
- return -1;
+ code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+ 0, KEY_QUERY_VALUE, &parmKey);
+ if (code != ERROR_SUCCESS)
+ return -1;
- dummyLen = 256;
- code = RegQueryValueEx(parmKey, "Cell", NULL, NULL,
+ dummyLen = CELL_MAXNAMELEN;
+ code = RegQueryValueEx(parmKey, "Cell", NULL, NULL,
cellNamep, &dummyLen);
- RegCloseKey (parmKey);
- if (code != ERROR_SUCCESS || cellNamep[0] == 0)
- return -1;
-
- return 0;
-}
-#else
-/* look up the root cell's name in the THISCELL file */
-long cm_GetRootCellName(char *cellNamep)
-{
- FILE *thisCell;
- char thisCellPath[256];
- char *newline;
- DWORD dwSize;
-
-#ifdef DJGPP
- strcpy(thisCellPath, cm_confDir);
-#else
- /* Win 95 */
- char *afsconf_path;
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
- if (!afsconf_path)
- strcpy(thisCellPath, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(thisCellPath, afsconf_path);
- free(afsconf_path);
- }
-#endif
- strcat(thisCellPath,"/");
-
- strcat(thisCellPath, AFS_THISCELL);
- thisCell = fopen(thisCellPath, "r");
- if (thisCell == NULL)
- return -1;
-
- fgets(cellNamep, 256, thisCell);
- fclose(thisCell);
+ RegCloseKey (parmKey);
+ if (code != ERROR_SUCCESS || cellNamep[0] == 0)
+ return -1;
- newline = strrchr(cellNamep,'\n');
- if (newline) *newline = '\0';
- newline = strrchr(cellNamep,'\r');
- if (newline) *newline = '\0';
-
- return 0;
+ return 0;
}
-#endif /* !DJGPP */
cm_configFile_t *cm_CommonOpen(char *namep, char *rwp)
{
- char wdir[256];
- long tlen;
- FILE *tfilep;
-
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
-
- /* add trailing backslash, if required */
- tlen = strlen(wdir);
- if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
-#else
-#ifdef DJGPP
- strcpy(wdir,cm_confDir);
-#else
- DWORD dwSize;
- char *afsconf_path;
-
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
-
- if (!afsconf_path)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(wdir, afsconf_path);
- free(afsconf_path);
- }
-#endif /* !DJGPP */
- strcat(wdir,"/");
-#endif /* DJGPP || WIN95 */
+ char wdir[MAX_PATH]="";
+ FILE *tfilep = NULL;
- strcat(wdir, namep);
+ cm_GetConfigDir(wdir, sizeof(wdir));
+ if (*wdir) {
+ strncat(wdir, namep, sizeof(wdir));
+ wdir[sizeof(wdir)-1] = '\0';
tfilep = fopen(wdir, rwp);
+ }
+ return ((cm_configFile_t *) tfilep);
+}
- return ((cm_configFile_t *) tfilep);
-}
-
-#ifndef DJGPP
long cm_WriteConfigString(char *labelp, char *valuep)
{
- DWORD code, dummyDisp;
- HKEY parmKey;
-
- code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, "container", 0, KEY_SET_VALUE, NULL,
- &parmKey, &dummyDisp);
- if (code != ERROR_SUCCESS)
- return -1;
-
- code = RegSetValueEx(parmKey, labelp, 0, REG_SZ,
- valuep, strlen(valuep) + 1);
- RegCloseKey (parmKey);
- if (code != ERROR_SUCCESS)
- return -1;
-
- return 0;
+ DWORD code, dummyDisp;
+ HKEY parmKey;
+
+ code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+ 0, "container", 0, KEY_SET_VALUE, NULL,
+ &parmKey, &dummyDisp);
+ if (code != ERROR_SUCCESS)
+ return -1;
+
+ code = RegSetValueEx(parmKey, labelp, 0, REG_SZ,
+ valuep, (DWORD)strlen(valuep) + 1);
+ RegCloseKey (parmKey);
+ if (code != ERROR_SUCCESS)
+ return (long)-1;
+
+ return (long)0;
}
-#endif /* !DJGPP */
-#ifndef DJGPP
long cm_WriteConfigInt(char *labelp, long value)
{
- DWORD code, dummyDisp;
- HKEY parmKey;
-
- code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, "container", 0, KEY_SET_VALUE, NULL,
- &parmKey, &dummyDisp);
- if (code != ERROR_SUCCESS)
- return -1;
-
- code = RegSetValueEx(parmKey, labelp, 0, REG_DWORD,
- (LPBYTE)&value, sizeof(value));
- RegCloseKey (parmKey);
- if (code != ERROR_SUCCESS)
- return -1;
-
- return 0;
+ DWORD code, dummyDisp;
+ HKEY parmKey;
+
+ code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+ 0, "container", 0, KEY_SET_VALUE, NULL,
+ &parmKey, &dummyDisp);
+ if (code != ERROR_SUCCESS)
+ return -1;
+
+ code = RegSetValueEx(parmKey, labelp, 0, REG_DWORD,
+ (LPBYTE)&value, sizeof(value));
+ RegCloseKey (parmKey);
+ if (code != ERROR_SUCCESS)
+ return -1;
+
+ return 0;
}
-#endif /* !DJGPP */
cm_configFile_t *cm_OpenCellFile(void)
{
- cm_configFile_t *cfp;
+ cm_configFile_t *cfp;
- cfp = cm_CommonOpen("afsdcel2.ini", "w");
- return cfp;
+ cfp = cm_CommonOpen(AFS_CELLSERVDB ".new", "w");
+ return cfp;
}
long cm_AppendPrunedCellList(cm_configFile_t *ofp, char *cellNamep)
{
- cm_configFile_t *tfilep; /* input file */
- char *tp;
- char lineBuffer[256];
- char *valuep;
- int inRightCell;
- int foundCell;
-
- tfilep = cm_CommonOpen(AFS_CELLSERVDB, "r");
- if (!tfilep) return -1;
-
- foundCell = 0;
-
- /* have we seen the cell line for the guy we're looking for? */
- inRightCell = 0;
- while (1) {
- tp = fgets(lineBuffer, sizeof(lineBuffer), (FILE *)tfilep);
- if (tp == NULL) {
- if (feof((FILE *)tfilep)) {
- /* hit EOF */
- fclose((FILE *)tfilep);
- return 0;
- }
- }
-
- /* turn trailing cr or lf into null */
- tp = strchr(lineBuffer, '\r');
- if (tp) *tp = 0;
- tp = strchr(lineBuffer, '\n');
- if (tp) *tp = 0;
+ cm_configFile_t *tfilep; /* input file */
+ char *tp;
+ char lineBuffer[256];
+ char *valuep;
+ int inRightCell;
+ int foundCell;
+
+ tfilep = cm_CommonOpen(AFS_CELLSERVDB, "r");
+ if (!tfilep)
+ return -1;
+
+ foundCell = 0;
+
+ /* have we seen the cell line for the guy we're looking for? */
+ inRightCell = 0;
+ while (1) {
+ tp = fgets(lineBuffer, sizeof(lineBuffer), (FILE *)tfilep);
+ if (tp == NULL) {
+ if (feof((FILE *)tfilep)) {
+ /* hit EOF */
+ fclose((FILE *)tfilep);
+ return 0;
+ }
+ }
+
+ /* turn trailing cr or lf into null */
+ tp = strchr(lineBuffer, '\r');
+ if (tp) *tp = 0;
+ tp = strchr(lineBuffer, '\n');
+ if (tp) *tp = 0;
- /* skip blank lines */
- if (lineBuffer[0] == 0) {
- fprintf((FILE *)ofp, "%s\n", lineBuffer);
- continue;
- }
+ /* skip blank lines */
+ if (lineBuffer[0] == 0) {
+ fprintf((FILE *)ofp, "%s\n", lineBuffer);
+ continue;
+ }
- if (lineBuffer[0] == '>') {
- /* trim off at white space or '#' chars */
- tp = strchr(lineBuffer, ' ');
- if (tp) *tp = 0;
- tp = strchr(lineBuffer, '\t');
- if (tp) *tp = 0;
- tp = strchr(lineBuffer, '#');
- if (tp) *tp = 0;
-
- /* now see if this is the right cell */
- if (strcmp(lineBuffer+1, cellNamep) == 0) {
- /* found the cell we're looking for */
- inRightCell = 1;
- }
- else {
- inRightCell = 0;
- fprintf((FILE *)ofp, "%s\n", lineBuffer);
- }
- }
- else {
- valuep = strchr(lineBuffer, '#');
- if (valuep == NULL) return -2;
- valuep++; /* skip the "#" */
- if (!inRightCell) {
- fprintf((FILE *)ofp, "%s\n", lineBuffer);
- }
- } /* a vldb line */
- } /* while loop processing all lines */
-}
+ if (lineBuffer[0] == '>') {
+ /* trim off at white space or '#' chars */
+ tp = strchr(lineBuffer, ' ');
+ if (tp) *tp = 0;
+ tp = strchr(lineBuffer, '\t');
+ if (tp) *tp = 0;
+ tp = strchr(lineBuffer, '#');
+ if (tp) *tp = 0;
+
+ /* now see if this is the right cell */
+ if (strcmp(lineBuffer+1, cellNamep) == 0) {
+ /* found the cell we're looking for */
+ inRightCell = 1;
+ }
+ else {
+ inRightCell = 0;
+ fprintf((FILE *)ofp, "%s\n", lineBuffer);
+ }
+ }
+ else {
+ valuep = strchr(lineBuffer, '#');
+ if (valuep == NULL) return -2;
+ valuep++; /* skip the "#" */
+ if (!inRightCell) {
+ fprintf((FILE *)ofp, "%s\n", lineBuffer);
+ }
+ } /* a vldb line */
+ } /* while loop processing all lines */
+}
long cm_AppendNewCell(cm_configFile_t *filep, char *cellNamep)
{
- fprintf((FILE *)filep, ">%s\n", cellNamep);
- return 0;
+ fprintf((FILE *)filep, ">%s\n", cellNamep);
+ return 0;
}
long cm_AppendNewCellLine(cm_configFile_t *filep, char *linep)
{
- fprintf((FILE *)filep, "%s\n", linep);
- return 0;
+ fprintf((FILE *)filep, "%s\n", linep);
+ return 0;
}
long cm_CloseCellFile(cm_configFile_t *filep)
{
- char wdir[256];
- char sdir[256];
+ char wdir[MAX_PATH];
+ char sdir[MAX_PATH];
long code;
long closeCode;
- int tlen;
-#ifdef AFS_WIN95_ENV
- char *afsconf_path;
- DWORD dwSize;
-#endif
- closeCode = fclose((FILE *)filep);
-
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
-
- /* add trailing backslash, if required */
- tlen = strlen(wdir);
- if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
-#else
-#ifdef DJGPP
- strcpy(wdir,cm_confDir);
-#else
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
- if (!afsconf_path)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(wdir, afsconf_path);
- free(afsconf_path);
- }
-#endif /* !DJGPP */
- strcat(wdir,"/");
-#endif /* DJGPP || WIN95 */
+ closeCode = fclose((FILE *)filep);
+ cm_GetConfigDir(wdir, sizeof(wdir));
strcpy(sdir, wdir);
- if (closeCode != 0) {
- /* something went wrong, preserve original database */
- strcat(wdir, "afsdcel2.ini");
+ if (closeCode != 0) {
+ /* something went wrong, preserve original database */
+ strncat(wdir, AFS_CELLSERVDB ".new", sizeof(wdir));
+ wdir[sizeof(wdir)-1] = '\0';
unlink(wdir);
return closeCode;
}
- strcat(wdir, AFS_CELLSERVDB);
- strcat(sdir, "afsdcel2.ini"); /* new file */
+ strncat(wdir, AFS_CELLSERVDB, sizeof(wdir));
+ wdir[sizeof(wdir)-1] = '\0';
+ strncat(sdir, AFS_CELLSERVDB ".new", sizeof(sdir));/* new file */
+ sdir[sizeof(sdir)-1] = '\0';
- unlink(wdir); /* delete old file */
+ unlink(sdir); /* delete old file */
code = rename(sdir, wdir); /* do the rename */
return code;
}
-void cm_GetConfigDir(char *dir)
+void cm_GetConfigDir(char *dir, afs_uint32 len)
{
- char wdir[256];
- int tlen;
-#ifdef AFS_WIN95_ENV
- char *afsconf_path;
- DWORD dwSize;
-#endif
-
-#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
-
- /* add trailing backslash, if required */
- tlen = strlen(wdir);
- if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
-#else
-#ifdef DJGPP
- strcpy(wdir,cm_confDir);
-#else
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
- if (!afsconf_path)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(wdir, afsconf_path);
- free(afsconf_path);
+ char * dirp = NULL;
+
+ if (!afssw_GetClientCellServDBDir(&dirp)) {
+ strncpy(dir, dirp, len);
+ dir[len-1] = '\0';
+ free(dirp);
+ } else {
+ dir[0] = '\0';
}
-#endif /* !DJGPP */
- strcat(wdir,"\\");
-#endif /* DJGPP || WIN95 */
- strcpy(dir, wdir);
}
git://git.openafs.org / openafs.git / blobdiff