Add support for 64-bit Windows.
$(OUT)\dynimport.obj \
$(OUT)\krb5common.obj
+!if "$(CPU)" == "AMD64"
+LIBFILES= \
+ $(KFWLIBDIR)\nidmgr64.lib
+!else
LIBFILES= \
$(KFWLIBDIR)\nidmgr32.lib
+!endif
SDKLIBFILES= \
$(DESTDIR)\lib\afsauthent.lib \
static DWORD wait_start = 0;
DWORD status = 0;
DWORD wait_hint = 0;
- int i;
+ unsigned int i;
wchar_t status_strings_csv[1024];
wchar_t status_strings_ms[1024];
khm_size cb;
L"ImagePath",
NULL, NULL,
(LPBYTE) imagepath,
- &cb);
+ (DWORD *)&cb);
if (l != ERROR_SUCCESS)
goto _close_key;
if (!VerQueryValue(ver_info,
L"\\VarFileInfo\\Translation",
(LPVOID*) &translations,
- &cb) ||
+ (PUINT)&cb) ||
cb == 0)
goto _free_buffer;
if (!VerQueryValue(ver_info,
blockname,
(LPVOID*) &value,
- &cb) ||
+ (PUINT)&cb) ||
cb == 0)
goto _free_buffer;
if (!VerQueryValue(ver_info,
blockname,
(LPVOID*) &value,
- &cb) ||
+ (PUINT)&cb) ||
cb == 0)
goto _free_buffer;
#ifndef __KHIMAIRA_AFSCRED_H
#define __KHIMAIRA_AFSCRED_H
+#ifndef _WIN64
#define _USE_32BIT_TIME_T 1
+#endif
+
#define _WINSOCKAPI_
#include<windows.h>
#include<time.h>
&aserver, sizeof(aserver));
if(cell) {
- kcdb_cred_set_attr(cred, afs_attr_cell, cell, KCDB_CBSIZE_AUTO);
+ kcdb_cred_set_attr(cred, afs_attr_cell, cell, (khm_size)KCDB_CBSIZE_AUTO);
}
kcdb_cred_set_attr(cred, KCDB_ATTR_LOCATION,
- location, KCDB_CBSIZE_AUTO);
+ location, (khm_size)KCDB_CBSIZE_AUTO);
kcdb_credset_add_cred(afs_credset, cred, -1);
StringCchCopyA(aserver.cell, MAXKTCREALMLEN, CellName);
memset(&atoken, '\0', sizeof(atoken));
- atoken.kvno = creds.kvno;
+ atoken.kvno = (short)creds.kvno;
atoken.startTime = creds.issue_date;
atoken.endTime = (*pkrb_life_to_time)(creds.issue_date,creds.lifetime);
memcpy(&atoken.sessionKey, creds.session, 8);
static char krbrlm[REALM_SZ+1]="";
krb5_context ctx = 0;
char ** realmlist=NULL;
- krb5_error_code r;
+ krb5_error_code r = 0;
if (!cellconfig)
return 0;
StringCbCopyA(krbrlm, sizeof(krbrlm), p);
else
StringCbCopyA(krbrlm, sizeof(krbrlm), cellconfig->name);
- strupr(krbrlm);
+#if _MSC_VER >= 1400
+ _strupr_s(krbrlm, sizeof(krbrlm));
+#else
+ _strupr(krbrlm);
+#endif
} else {
if ( pkrb5_init_context ) {
r = pkrb5_init_context(&ctx);
StringCbCopyA(krbrlm, sizeof(krbrlm), p);
else
StringCbCopyA(krbrlm, sizeof(krbrlm), cellconfig->name);
- strupr(krbrlm);
+#if _MSC_VER >= 1400
+ _strupr_s(krbrlm, sizeof(krbrlm));
+#else
+ _strupr(krbrlm);
+#endif
}
}
}
kcdb_identity_get_name(identity, idname, &cb);
atsign = wcschr(idname, L'@');
- if (atsign && atsign[1] && !wcsicmp(atsign + 1, wrealm)) {
+ if (atsign && atsign[1] && !_wcsicmp(atsign + 1, wrealm)) {
return TRUE;
} else {
return FALSE;
}
SendDlgItemMessage(hwnd, IDC_NCAFS_CELL,
CB_SELECTSTRING,
- -1, (LPARAM) wbuf);
+ (WPARAM)-1, (LPARAM) wbuf);
}
}
CB_SETITEMDATA, idx, TRUE);
SendDlgItemMessage(hwnd, IDC_NCAFS_REALM,
CB_SELECTSTRING,
- -1, (LPARAM) wbuf);
+ (WPARAM)-1, (LPARAM) wbuf);
}
/* load the LRU realms */
s = buf;
while(*s) {
if(SendDlgItemMessage(hwnd, IDC_NCAFS_REALM,
- CB_FINDSTRINGEXACT, -1,
+ CB_FINDSTRINGEXACT,
+ (WPARAM)-1,
(LPARAM) s) == CB_ERR) {
idx =
(int)
LoadString(hResModule, IDS_NC_REALM_AUTO, wbuf,
ARRAYLENGTH(wbuf));
idx = (int) SendDlgItemMessage(hwnd, IDC_NCAFS_REALM,
- CB_FINDSTRINGEXACT, -1,
+ CB_FINDSTRINGEXACT,
+ (WPARAM) -1,
(LPARAM) wbuf);
SendDlgItemMessage(hwnd, IDC_NCAFS_REALM, CB_SETCURSEL,
idx, 0);
kcdb_cred_set_identity(cred, b->ident);
if(l->rows[i].realm)
kcdb_cred_set_attr(cred, afs_attr_realm, l->rows[i].realm,
- KCDB_CBSIZE_AUTO);
+ (khm_size)KCDB_CBSIZE_AUTO);
else
kcdb_cred_set_attr(cred, afs_attr_realm, NULL, 0);
method = l->rows[i].method;
kcdb_cred_set_attr(cred, afs_attr_method, &method,
- KCDB_CBSIZE_AUTO);
+ (khm_size)KCDB_CBSIZE_AUTO);
break;
}
khm_int32 rv = KHM_ERROR_SUCCESS;
if (msg_subtype == KMSG_ACT_ACTIVATE &&
- uparam == action_id_afs_help) {
+ uparam == (khm_ui_4)action_id_afs_help) {
khui_request_UI_callback(help_launcher, NULL);
LPSTR (*Lerror_message)(long);
LPSTR (*Lerror_table_name)(long);
+#pragma warning (disable: 4213)
void Leash_load_com_err_callback(FARPROC ce,
FARPROC em,
FARPROC etn)
///////////////////////////////////////////////////////////////////////////////
+#ifdef _WIN64
+#define CCAPI_DLL "krbcc64.dll"
+#define KRBCC32_DLL "krbcc64.dll"
+#else
#define CCAPI_DLL "krbcc32.dll"
#define KRBCC32_DLL "krbcc32.dll"
+#endif
#define SERVICE_DLL "advapi32.dll"
#define SECUR32_DLL "secur32.dll"
-#define PROFILE_DLL "xpprof32.dll"
//////////////////////////////////////////////////////////////////////////////