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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile
index 58f05ef3e70da9b2fca36fbdfff3a1aaa72cbfe6..27d9c2b386de515bce10c96f3bb2563e41dcd601 100644 (file)
--- 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 fe54b551e0fba768a39235f10db41ff6ba3781c1..5874288de422a23b9532bd1d8323c8237dff4bc8 100644 (file)
--- 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 770dbbaef339d5bc01be1a96e8a8da4ff17aa6b5..69ae7d337872084b9b012e732c3fd57298180583 100644 (file)
--- 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 16844ffe73f410e4053fb3ef9f09b8c957411aab..ccf9a07972275d4ed7dc012eaa6e30389b396a89 100644 (file)
--- 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 fa893c530445764f47f8cecd9dbeb3e2d485976d..a5749f6cb8ece502eaf949108dbfae4e2660345b 100644 (file)
--- 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 112983225be871ce899e53d27e66209d0540535d..5372656f6bbdd2842e273b1cf56607c6f33e4a82 100644 (file)
--- 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 400651bde679efa1aab23ed981856b48ee30336c..55898fca0c48bdb03265d12bd0f65c9fffe9c31a 100644 (file)
--- 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 83671e7936c573f6328eb59eea457224ffa357d3..bbd1da0fe29087115da1d1f34f89b552a2cd34a6 100644 (file)
--- 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 7f753d327742a2a898ca003dc23cd41c5aa22053..5d746fcd6ed2c2f4528fb1b98d8f9735260aa3be 100644 (file)
--- 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 a10ca82cbcf69208755aff5f079689004ebd5c3f..f13790800f49715eff4a65f0e36fa6bc6ca1fafc 100644 (file)
--- 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
 
 
 ############################################################################