From 7b6ccc1b9199d3787ea5457860fcb1c873a19a5c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 9 Feb 2010 00:42:41 -0500 Subject: [PATCH] Windows: Permit Windows to build Recent changes added a new dependency of afspioctl.lib to all server binaries. Export new afsconf_ functions from libafsauthent.dll Fix afsconf_* usage in afsio.c Change-Id: I03e377a3d28b4efbea4a799e6ca63606eab699c9 Reviewed-on: http://gerrit.openafs.org/1273 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/bozo/NTMakefile | 3 ++- src/budb/NTMakefile | 5 +++-- src/kauth/NTMakefile | 3 ++- src/libafsauthent/afsauthent.def | 3 +++ src/ptserver/NTMakefile | 3 ++- src/update/NTMakefile | 7 ++++--- src/venus/afsio.c | 10 +++------- src/viced/NTMakefile | 3 ++- src/vlserver/NTMakefile | 3 ++- src/volser/NTMakefile | 3 ++- 10 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile index 58f05ef3e..27d9c2b38 100644 --- a/src/bozo/NTMakefile +++ b/src/bozo/NTMakefile @@ -67,7 +67,8 @@ BOSSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib $(BOSSERVER_EXEFILE): $(BOSSERVER_EXEOBJS) $(BOSSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index fe54b551e..5874288de 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -78,10 +78,11 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) - $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 770dbbaef..69ae7d337 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -115,7 +115,8 @@ KASERVER_OBJS =\ $(OUT)\kaserver.res KASERVER_EXELIBS =\ - $(DESTDIR)\lib\afs\afsprocmgmt.lib + $(DESTDIR)\lib\afs\afsprocmgmt.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib $(KASERVER): $(KASERVER_OBJS) $(AFSLIBS) $(KASERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/libafsauthent/afsauthent.def b/src/libafsauthent/afsauthent.def index 16844ffe7..ccf9a0797 100644 --- a/src/libafsauthent/afsauthent.def +++ b/src/libafsauthent/afsauthent.def @@ -140,3 +140,6 @@ EXPORTS ubik_PR_ListEntries @138 ubik_PR_ListSuperGroups @139 ugen_ClientInit @140 + afsconf_BuildServerSecurityObjects @141 + afsconf_ClientAuthToken @142 + diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index fa893c530..a5749f6cb 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -69,7 +69,8 @@ PTSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afsaudit.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib !IF (("$(SYS_NAME)"!="i386_win95" ) && ("$(SYS_NAME)"!="I386_WIN95" )) PTSERVER_EXELIBS =$(PTSERVER_EXELIBS) $(DESTDIR)\lib\afs\afsprocmgmt.lib diff --git a/src/update/NTMakefile b/src/update/NTMakefile index 112983225..5372656f6 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -22,7 +22,8 @@ LIBS = \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afsrxkad.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib ############################################################################ # Definitions for generating files via RXGEN @@ -51,7 +52,7 @@ USVR_OBJS = \ $(OUT)\upserver.res $(UPSERVER): $(USVR_OBJS) $(LIBS) - $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) @@ -69,7 +70,7 @@ UCLNT_OBJS = \ $(OUT)\upclient.res $(UPCLIENT): $(UCLNT_OBJS) $(LIBS) - $(EXECONLINK) dnsapi.lib iphlpapi.lib shell32.lib + $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) diff --git a/src/venus/afsio.c b/src/venus/afsio.c index 400651bde..55898fca0 100644 --- a/src/venus/afsio.c +++ b/src/venus/afsio.c @@ -277,12 +277,7 @@ afs_int32 HandleLocalAuth(struct rx_securityClass **sc, afs_int32 *scIndex) { static struct afsconf_dir *tdir = NULL; - struct ktc_principal sname; - struct ktc_token ttoken; - int kvno; - struct ktc_encryptionKey key; afs_uint32 host = 0; - char *cell; afs_int32 code; *sc = NULL; @@ -294,7 +289,7 @@ HandleLocalAuth(struct rx_securityClass **sc, afs_int32 *scIndex) AFSDIR_SERVER_ETC_DIRPATH); return -1; } - code = afsconf_ClientAuth(tdir, sc, &scIndex); + code = afsconf_ClientAuth(tdir, sc, scIndex); if (code) { fprintf(stderr,"afsconf_ClientAuth returned %d\n", code); return -1; @@ -1388,6 +1383,7 @@ FindCell(char *cellName) static struct afsconf_dir *tdir; struct ktc_principal sname; struct ktc_token ttoken; + time_t expires; afs_int32 len, code; if (cellName) { @@ -1427,7 +1423,7 @@ FindCell(char *cellName) if (code = VLDBInit(1, &p->info)) fprintf(stderr,"VLDBInit failed for cell %s\n", p->info.name); #endif - code = afsconf_ClientAuthToken(&p->info, 0, &p->sc, &p->scIndex); + code = afsconf_ClientAuthToken(&p->info, 0, &p->sc, &p->scIndex, &expires); if (code) { p->scIndex = RX_SECIDX_NULL; p->sc = rxnull_NewClientSecurityObject(); diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile index 83671e793..bbd1da0fe 100644 --- a/src/viced/NTMakefile +++ b/src/viced/NTMakefile @@ -58,7 +58,8 @@ EXELIBS = \ $(DESTDIR)\lib\afs\afsacl.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ - $(DESTDIR)\lib\afs\afseventlog.lib + $(DESTDIR)\lib\afs\afseventlog.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index 7f753d327..5d746fcd6 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -88,7 +88,8 @@ VLSERVER_EXECLIBS = \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index a10ca82cb..f13790800 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -72,7 +72,8 @@ EXEC_LIBS = \ $(DESTDIR)\lib\afs\afsacl.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afs\afspioctl.lib ############################################################################ -- 2.39.5