jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-freelance-import-20041122

Browse Source 
Fix the afs_freelance.ini import code.
Check both the Client install directory and the %WINDIR% directory
for afs_freelance.ini


(cherry picked from commit 50ca88be2a)
This commit is contained in:
Jeffrey Altman 2004-12-07 05:54:43 +00:00 committed by Derrick Brashear
parent 461579482e
commit 93fc7897ec
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/WINNT/afsd/afsd_init.c
View File

@ -108,16 +108,16 @@ void afsd_initUpperCaseTable()
void
afsi_start()
{
char wd[100];
char t[100], u[100], *p, *path;
int zilch;
int code;
char wd[100];
char t[100], u[100], *p, *path;
int zilch;
int code;
DWORD dwLow, dwHigh;
HKEY parmKey;
DWORD dummyLen;
HKEY parmKey;
DWORD dummyLen;
DWORD maxLogSize = 100 * 1024;
afsi_file = INVALID_HANDLE_VALUE;
afsi_file = INVALID_HANDLE_VALUE;
if (getenv("TEMP"))
{
StringCbCopyA(wd, sizeof(wd), getenv("TEMP"));
@ -125,21 +125,22 @@ afsi_start()
else
{
code = GetWindowsDirectory(wd, sizeof(wd));
if (code == 0) return;
if (code == 0)
return;
}
StringCbCatA(wd, sizeof(wd), "\\afsd_init.log");
GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, t, sizeof(t));
afsi_file = CreateFile(wd, GENERIC_WRITE, FILE_SHARE_READ, NULL,
StringCbCatA(wd, sizeof(wd), "\\afsd_init.log");
GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, t, sizeof(t));
afsi_file = CreateFile(wd, GENERIC_WRITE, FILE_SHARE_READ, NULL,
OPEN_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSConfigKeyName,
0, KEY_QUERY_VALUE, &parmKey);
if (code == ERROR_SUCCESS) {
if (code == ERROR_SUCCESS) {
dummyLen = sizeof(maxLogSize);
code = RegQueryValueEx(parmKey, "MaxLogSize", NULL, NULL,
(BYTE *) &maxLogSize, &dummyLen);
RegCloseKey (parmKey);
}
}
if (maxLogSize) {
dwLow = GetFileSize( afsi_file, &dwHigh );

7
src/WINNT/afsd/cm_freelance.c
View File

@ -618,6 +618,13 @@ long cm_InitLocalMountPoints() {
strcat(hdir, AFS_FREELANCE_INI);
// open the ini file for reading
fp = fopen(hdir, "r");
if (!fp) {
/* look in the Windows directory where we used to store the file */
GetWindowsDirectory(hdir, sizeof(hdir));
strcat(hdir,"\\");
strcat(hdir, AFS_FREELANCE_INI);
fp = fopen(hdir, "r");
}
#if !defined(DJGPP)
RegCreateKeyEx( HKEY_LOCAL_MACHINE,