DEVEL15-windows-testcellconf-20090617
authorJeffrey Altman <jaltman@secure-endpoints.com>
Fri, 19 Jun 2009 04:16:13 +0000 (04:16 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Fri, 19 Jun 2009 04:16:13 +0000 (04:16 +0000)
LICENSE MIT

make testcellconf work on Windows

(cherry picked from commit f310847d2dfa924aaeff2924cfbc885d1cd58a31)

src/auth/test/NTMakefile
src/auth/test/testcellconf.c

index 59ba59b..b4e5a04 100644 (file)
@@ -20,10 +20,11 @@ CELL_EXELIBS =\
        $(DESTDIR)\lib\afsrx.lib \
        $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\afs\afsutil.lib \
-       $(DESTDIR)\lib\afs\afsreg.lib
+       $(DESTDIR)\lib\afs\afsreg.lib \
+        $(DESTDIR)\lib\libafsconf.lib
 
 $(CELL_EXEFILE): $(CELL_EXEOBJS)  $(CELL_EXELIBS)
-       $(EXECONLINK)
+       $(EXECONLINK) dnsapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
         $(CODESIGN_USERLAND)
@@ -41,7 +42,7 @@ KTC_EXELIBS =\
        $(DESTDIR)\lib\afs\afspioctl.lib
 
 $(KTC_EXEFILE): $(KTC_EXEOBJS)  $(KTC_EXELIBS)
-       $(EXECONLINK)
+       $(EXECONLINK) dnsapi.lib shell32.lib mpr.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
         $(CODESIGN_USERLAND)
index 1bc9cae..c790ece 100644 (file)
@@ -67,6 +67,12 @@ main(argc, argv)
     register long code;
     char *dirName;
 
+#ifdef AFS_NT40_ENV
+    WSADATA WSAjunk;
+    /* Start up sockets */
+    WSAStartup(0x0101, &WSAjunk);
+#endif /* AFS_NT40_ENV */
+
     if (argc < 2) {
        printf
            ("usage: testcellconfig <conf-dir-name> [<cell-to-display>]*\n");