[11] in pc-kerberos
Patches to build WinSock PC Kerberos version at Cygnus
daemon@ATHENA.MIT.EDU (John Gilmore)
Tue May 3 21:07:04 1994
To: pc-kerberos@MIT.EDU, gnu@uunet.UU.NET
Date: Tue, 03 May 1994 18:02:55 -0700
From: John Gilmore <gnu@cygnus.com>
I don't have things completely together, but have gotten past a bunch
of minor problems. Most of the detailed edits to individual #includes
will be replaced soon by moving the random includes out into a
system-specific .h file. But this lets the DLL compile, at least.
John
The include directory needs at least com_err.h and winsock.h added. I
put the matching winsock.def there too, just for completeness.
Winsock.* came from
ftp://sunsite.unc.edu:/pub/micro/pc-stuff/ms-windows/winsock/winsock-1.1
Only in mit-pc2/include: com_err.h
Only in mit-pc2/include: winsock.def
Only in mit-pc2/include: winsock.h
I put leash in a subdir next to include and lib.
The leash dir needs krbdll.dll; it doesn't know how to find it.
Only in mit-pc2/leash: krbdll.dll
In many places I got rid of paths in include file names.
I have lost the email about <vs.h> so am not sure where to get one;
it doesn't compile without one.
diff -r -w MIT-pc/leash/leash.h mit-pc2/leash/leash.h
14c14
< #include <mit\com_err.h>
---
> #include <com_err.h>
19c19
< #include <mit\vs.h>
---
> /* #include <mit\vs.h> */
The Makefile has a recursive definition for leash.obj.
diff -r -w MIT-pc/leash/makefile mit-pc2/leash/makefile
39,41c39,41
< $(PROJNAME).obj: $(PROG).obj
< if exist $(PROJNAME).obj del $(PROJNAME).obj
< copy $(PROG).obj $(PROJNAME).obj
---
> #$(PROJNAME).obj: $(PROG).obj
> # if exist $(PROJNAME).obj del $(PROJNAME).obj
> # copy $(PROG).obj $(PROJNAME).obj
It needs to be told where to find the include files, at least krb.h.
diff -r -w MIT-pc/leash/tmpl.mak mit-pc2/leash/tmpl.mak
30c30
< CCFLAGS = $(STDCCFLAGS) /A$(MODEL) /Zp -Gsw /DWINDOWS /DWINSOCK
---
> CCFLAGS = $(STDCCFLAGS) /A$(MODEL) /Zp -Gsw /DWINDOWS /DWINSOCK /I../include
The location on disk of the C compiler should be parameterized
(or, ideally, eliminated from the Makefiles). At the moment, it appears
all over the place, causing large diffs.
diff -r -w MIT-pc/lib/des/makefile.win mit-pc2/lib/des/makefile.win
18,19c18,19
< INCLUDE=c:\MSVC\include;..\..\include
< #INCLUDE=c:\MSVC\include;\work\krb\include
---
> INCLUDE=c:\C700\include;..\..\include
> #INCLUDE=c:\C700\include;\work\krb\include
344,345c344,345
< keysched.obj: c:\MSVC\include/stdio.h ../../.\include/des.h key_perm.h
< des.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h ../../.\include/des.h
---
> keysched.obj: c:\C700\include/stdio.h ../../.\include/des.h key_perm.h
> des.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h ../../.\include/des.h
348c348
< cbc_encr.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> cbc_encr.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
350c350
< pcbc_enc.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> pcbc_enc.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
354c354
< cksum.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/string.h
---
> cksum.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/string.h
357,358c357,358
< qd_cksum.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
< qd_cksum.obj: c:\MSVC\include/errno.h ../../.\include/des.h des_intn.h
---
> qd_cksum.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
> qd_cksum.obj: c:\C700\include/errno.h ../../.\include/des.h des_intn.h
361c361
< rand_key.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> rand_key.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
366,367c366,367
< rdpasswd.obj: ../../.\include/conf-pc.h c:\MSVC\include/stdio.h c:\MSVC\include/conio.h
< strtokey.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> rdpasswd.obj: ../../.\include/conf-pc.h c:\C700\include/stdio.h c:\C700\include/conio.h
> strtokey.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
370c370
< util.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h ../../.\include/des.h
---
> util.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h ../../.\include/des.h
377c377
< dbg_prt.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> dbg_prt.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
380,381c380,381
< mkkeyprm.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
< mkkeyprm.obj: c:\MSVC\include/errno.h des_intn.h ../../.\include/conf.h
---
> mkkeyprm.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
> mkkeyprm.obj: c:\C700\include/errno.h des_intn.h ../../.\include/conf.h
383c383
< make_ip.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> make_ip.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
386c386
< make_fp.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> make_fp.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
389c389
< make_e.obj: c:\MSVC\include/stdio.h des_intn.h ../../.\include/conf.h
---
> make_e.obj: c:\C700\include/stdio.h des_intn.h ../../.\include/conf.h
392c392
< make_p.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> make_p.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
395c395
< make_s.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> make_s.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
398c398
< mk_s_tab.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> mk_s_tab.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
401c401
< mk_p_tab.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> mk_p_tab.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
404,405c404,405
< make_odd.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
< misc.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h des_intn.h
---
> make_odd.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
> misc.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h des_intn.h
408,410c408,410
< key_test.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
< key_test.obj: c:\MSVC\include/errno.h ../../.\include/des.h
< testit.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
---
> key_test.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
> key_test.obj: c:\C700\include/errno.h ../../.\include/des.h
> testit.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
412c412
< verify.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
---
> verify.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
415,416c415,416
< epc_encr.obj: c:\MSVC\include/stdio.h c:\MSVC\include/string.h
< cbc_noop.obj: ../../.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> epc_encr.obj: c:\C700\include/stdio.h c:\C700\include/string.h
> cbc_noop.obj: ../../.\include/mit_copy.h c:\C700\include/stdio.h
418c418
< enc.obj: ../../.\include/mit_copy.h ../../.\include/des.h c:\MSVC\include/stdio.h
---
> enc.obj: ../../.\include/mit_copy.h ../../.\include/des.h c:\C700\include/stdio.h
This diff already appeared on the net.
diff -r -w MIT-pc/lib/winkrb/g_krbrlm.c mit-pc2/lib/winkrb/g_krbrlm.c
64c64
< if ((cnffile = fopen(KRB_CONF, "r")) == NULL) {
---
> if ((cnffile = fopen(KRB_GET_LREALM_FN, "r")) == NULL) {
There are many files that seem to be including <sys/socket.h> and/or
<netinet/in.h>, which may be available at MIT but aren't generally.
<winsock.h> works fine and includes all the necessary definitions.
There's a dangling MIT copyright include that needs fixing, too.
diff -r -w MIT-pc/lib/winkrb/getadtkt.c mit-pc2/lib/winkrb/getadtkt.c
29c29
< #include <sys/socket.h>
---
> #include <winsock.h>
diff -r -w MIT-pc/lib/winkrb/kadm.c mit-pc2/lib/winkrb/kadm.c
29c29
< #include "mit\com_err.h"
---
> #include "com_err.h"
diff -r -w MIT-pc/lib/winkrb/kadmstr.c mit-pc2/lib/winkrb/kadmstr.c
41c41
< #include <mit\mitcpyrt.h>
---
> #include <mit_copy.h>
diff -r -w MIT-pc/lib/winkrb/krblayer.c mit-pc2/lib/winkrb/krblayer.c
24c24
< #include <mit\com_err.h>
---
> #include <com_err.h>
This fix appeared on the list already.
diff -r -w MIT-pc/lib/winkrb/getphost.c mit-pc2/lib/winkrb/getphost.c
61c61
< phost = (char *)malloc(lstrlen( h->h_name + 1 ));
---
> phost = (char *)malloc(lstrlen( h->h_name) + 1 );
More compiler location crud:
diff -r -w MIT-pc/lib/winkrb/makefile mit-pc2/lib/winkrb/makefile
35c35
< INCLUDE=C:\MSVC\include;c:\net\toolkit\include;..\..\include;c:\MSVC\mfc\include;c:\localh
---
> INCLUDE=C:\c700\include;..\..\include;c:\c700\mfc\include;c:\localh
282c282
< kntoln.obj: c:\MSVC\include/string.h
---
> kntoln.obj: c:\C700\include/string.h
287c287
< crauthre.obj: c:\MSVC\include/string.h
---
> crauthre.obj: c:\C700\include/string.h
292,293c292,293
< cr_death.obj: c:\MSVC\include/string.h
< crerrep.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/sys/types.h
---
> cr_death.obj: c:\C700\include/string.h
> crerrep.obj: ..\..\.\include/mit_copy.h c:\C700\include/sys/types.h
297c297
< crerrep.obj: ..\..\.\include/krb_conf.h c:\MSVC\include/string.h
---
> crerrep.obj: ..\..\.\include/krb_conf.h c:\C700\include/string.h
301,302c301,302
< cr_ciph.obj: c:\MSVC\include/string.h
< crticket.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> cr_ciph.obj: c:\C700\include/string.h
> crticket.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
306c306
< crticket.obj: ..\..\.\include/krb_conf.h c:\MSVC\include/string.h
---
> crticket.obj: ..\..\.\include/krb_conf.h c:\C700\include/string.h
308c308
< decomtkt.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> decomtkt.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
312,313c312,313
< decomtkt.obj: ..\..\.\include/krb_conf.h c:\MSVC\include/string.h
< dest_tkt.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> decomtkt.obj: ..\..\.\include/krb_conf.h c:\C700\include/string.h
> dest_tkt.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
316,320c316,320
< dest_tkt.obj: ..\..\.\include/des.h c:\MSVC\include/sys\types.h
< dest_tkt.obj: c:\MSVC\include/sys\stat.h c:\MSVC\include/errno.h c:\MSVC\include/fcntl.h
< fgetst.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
< getrealm.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/string.h
< getrealm.obj: c:\MSVC\include/stdio.h c:\MSVC\include/ctype.h ..\..\.\include/krb.h
---
> dest_tkt.obj: ..\..\.\include/des.h c:\C700\include/sys\types.h
> dest_tkt.obj: c:\C700\include/sys\stat.h c:\C700\include/errno.h c:\C700\include/fcntl.h
> fgetst.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
> getrealm.obj: ..\..\.\include/mit_copy.h c:\C700\include/string.h
> getrealm.obj: c:\C700\include/stdio.h c:\C700\include/ctype.h ..\..\.\include/krb.h
326c326
< gettfrlm.obj: c:\MSVC\include/string.h
---
> gettfrlm.obj: c:\C700\include/string.h
330c330
< gettfnam.obj: c:\MSVC\include/string.h c:\MSVC\include/stdio.h
---
> gettfnam.obj: c:\C700\include/string.h c:\C700\include/stdio.h
335,337c335,337
< getadtkt.obj: c:\MSVC\include/string.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< getadtkt.obj: ..\..\.\include/timeval.h c:\MSVC\include/sys\types.h
< get_cred.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> getadtkt.obj: c:\C700\include/string.h c:\C700\include/stdio.h c:\C700\include/errno.h
> getadtkt.obj: ..\..\.\include/timeval.h c:\C700\include/sys\types.h
> get_cred.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
345c345
< getkrbhs.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> getkrbhs.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
348,349c348,349
< getkrbhs.obj: ..\..\.\include/des.h c:\MSVC\include/string.h
< g_krbrlm.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> getkrbhs.obj: ..\..\.\include/des.h c:\C700\include/string.h
> g_krbrlm.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
352c352
< g_krbrlm.obj: ..\..\.\include/des.h c:\MSVC\include/string.h
---
> g_krbrlm.obj: ..\..\.\include/des.h c:\C700\include/string.h
355c355
< getphost.obj: c:\MSVC\include/stdio.h c:\MSVC\include/ctype.h c:\net\toolkit\include/netdb.h
---
> getphost.obj: c:\C700\include/stdio.h c:\C700\include/ctype.h
370,374c370,374
< in_tkt.obj: c:\MSVC\include/stdio.h ..\..\.\include/krb.h ..\..\.\include/des.h
< in_tkt.obj: c:\MSVC\include/dos.h c:\MSVC\include/fcntl.h c:\MSVC\include/sys/types.h
< in_tkt.obj: c:\MSVC\include/sys/stat.h
< k_gethst.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/string.h
< klog.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/time.h c:\MSVC\include/stdio.h
---
> in_tkt.obj: c:\C700\include/stdio.h ..\..\.\include/krb.h ..\..\.\include/des.h
> in_tkt.obj: c:\C700\include/dos.h c:\C700\include/fcntl.h c:\C700\include/sys/types.h
> in_tkt.obj: c:\C700\include/sys/stat.h
> k_gethst.obj: ..\..\.\include/mit_copy.h c:\C700\include/string.h
> klog.obj: ..\..\.\include/mit_copy.h c:\C700\include/time.h c:\C700\include/stdio.h
378c378
< knm_pars.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> knm_pars.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
381,382c381,382
< knm_pars.obj: ..\..\.\include/des.h c:\MSVC\include/string.h
< kparse.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/ctype.h
---
> knm_pars.obj: ..\..\.\include/des.h c:\C700\include/string.h
> kparse.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/ctype.h
389,392c389,392
< k_gettkt.obj: c:\MSVC\include/stdio.h c:\MSVC\include/string.h c:\MSVC\include/errno.h
< k_gettkt.obj: c:\MSVC\include/time.h c:\MSVC\include/sys\types.h
< log.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/time.h c:\MSVC\include/stdio.h
< log.obj: c:\MSVC\include/stdarg.h ..\..\.\include/krb.h ..\..\.\include/conf.h
---
> k_gettkt.obj: c:\C700\include/stdio.h c:\C700\include/string.h c:\C700\include/errno.h
> k_gettkt.obj: c:\C700\include/time.h c:\C700\include/sys\types.h
> log.obj: ..\..\.\include/mit_copy.h c:\C700\include/time.h c:\C700\include/stdio.h
> log.obj: c:\C700\include/stdarg.h ..\..\.\include/krb.h ..\..\.\include/conf.h
399,400c399,400
< mk_req.obj: ..\..\.\include/timeval.h c:\MSVC\include/string.h c:\MSVC\include/stdio.h
< mk_err.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/sys/types.h
---
> mk_req.obj: ..\..\.\include/timeval.h c:\C700\include/string.h c:\C700\include/stdio.h
> mk_err.obj: ..\..\.\include/mit_copy.h c:\C700\include/sys/types.h
404,406c404,406
< mk_err.obj: ..\..\.\include/krb_conf.h c:\MSVC\include/string.h
< mk_priv.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< mk_priv.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
---
> mk_err.obj: ..\..\.\include/krb_conf.h c:\C700\include/string.h
> mk_priv.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
> mk_priv.obj: c:\C700\include/sys\types.h
412,413c412,413
< mk_safe.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< mk_safe.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
---
> mk_safe.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
> mk_safe.obj: c:\C700\include/sys\types.h
437,439c437,439
< rd_req.obj: ..\..\.\include/timeval.h c:\MSVC\include/string.h
< rd_err.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< rd_err.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
---
> rd_req.obj: ..\..\.\include/timeval.h c:\C700\include/string.h
> rd_err.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
> rd_err.obj: c:\C700\include/sys\types.h
444,445c444,445
< rd_priv.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< rd_priv.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
---
> rd_priv.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
> rd_priv.obj: c:\C700\include/sys\types.h
451,452c451,452
< rd_safe.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h c:\MSVC\include/errno.h
< rd_safe.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
---
> rd_safe.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h c:\C700\include/errno.h
> rd_safe.obj: c:\C700\include/sys\types.h
461c461
< rdservky.obj: c:\MSVC\include/stdio.h c:\MSVC\include/string.h
---
> rdservky.obj: c:\C700\include/stdio.h c:\C700\include/string.h
465,467c465,467
< recvauth.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
< recvauth.obj: c:\MSVC\include/errno.h c:\MSVC\include/stdio.h c:\MSVC\include/string.h
< savecred.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/stdio.h
---
> recvauth.obj: c:\C700\include/sys\types.h
> recvauth.obj: c:\C700\include/errno.h c:\C700\include/stdio.h c:\C700\include/string.h
> savecred.obj: ..\..\.\include/mit_copy.h c:\C700\include/stdio.h
471c471
< s_cascmp.obj: c:\MSVC\include/sys/types.h
---
> s_cascmp.obj: c:\C700\include/sys/types.h
476,478c476,477
< send_kdc.obj: c:\MSVC\include/stdio.h c:\MSVC\include/errno.h c:\MSVC\include/sys\types.h
< send_kdc.obj: c:\net\toolkit\include/sys\socket.h c:\net\toolkit\include/netinet\in.h
< send_kdc.obj: c:\net\toolkit\include/netdb.h c:\MSVC\include/string.h
---
> send_kdc.obj: c:\C700\include/stdio.h c:\C700\include/errno.h c:\C700\include/sys\types.h
> send_kdc.obj: c:\C700\include/string.h
482,484c481,483
< sendauth.obj: c:\MSVC\include/sys\types.h c:\net\toolkit\include/netinet\in.h
< sendauth.obj: c:\MSVC\include/errno.h c:\MSVC\include/stdio.h c:\MSVC\include/string.h
< stime.obj: ..\..\.\include/mit_copy.h c:\MSVC\include/time.h c:\MSVC\include/stdio.h
---
> sendauth.obj: c:\C700\include/sys\types.h
> sendauth.obj: c:\C700\include/errno.h c:\C700\include/stdio.h c:\C700\include/string.h
> stime.obj: ..\..\.\include/mit_copy.h c:\C700\include/time.h c:\C700\include/stdio.h
487,488c486,487
< tf_util.obj: c:\MSVC\include/stdio.h c:\MSVC\include/errno.h c:\MSVC\include/sys\types.h
< tf_util.obj: c:\MSVC\include/sys\stat.h c:\MSVC\include/dos.h c:\MSVC\include/fcntl.h
---
> tf_util.obj: c:\C700\include/stdio.h c:\C700\include/errno.h c:\C700\include/sys\types.h
> tf_util.obj: c:\C700\include/sys\stat.h c:\C700\include/dos.h c:\C700\include/fcntl.h
490c489
< timeoday.obj: ..\..\.\include/timeval.h c:\MSVC\include/sys\timeb.h
---
> timeoday.obj: ..\..\.\include/timeval.h c:\C700\include/sys\timeb.h
More winsock-replacing-assorted-unix-includes changes:
diff -r -w MIT-pc/lib/winkrb/mk_priv.c mit-pc2/lib/winkrb/mk_priv.c
61c61,62
< #include <windows.h>
---
> /* #include <windows.h> */
> #include <winsock.h>
73c74
< #include <sys\types.h>
---
> /* #include <sys\types.h> */
75c76
< #include <netinet\in.h>
---
> /* #include <netinet\in.h> */
diff -r -w MIT-pc/lib/winkrb/mk_req.c mit-pc2/lib/winkrb/mk_req.c
27c27
< #include <windows.h>
---
> /* #include <windows.h> */
29c29,30
< #include <sys/socket.h>
---
> /* #include <sys/socket.h> */
> #include <winsock.h>
diff -r -w MIT-pc/lib/winkrb/mk_safe.c mit-pc2/lib/winkrb/mk_safe.c
61a62
> #include <winsock.h>
69c70
< #include <sys\types.h>
---
> /* #include <sys\types.h> */
71c72
< #include <netinet\in.h>
---
> /* #include <netinet\in.h> */
diff -r -w MIT-pc/lib/winkrb/pkt_clen.c mit-pc2/lib/winkrb/pkt_clen.c
39c39,40
< #include <sys/socket.h>
---
> /* #include <sys/socket.h> */
> #include <winsock.h>
diff -r -w MIT-pc/lib/winkrb/rd_err.c mit-pc2/lib/winkrb/rd_err.c
58a59
> #include <winsock.h>
65c66
< #include <sys\types.h>
---
> /* #include <sys\types.h> */
67c68
< #include <netinet\in.h>
---
> /* #include <netinet\in.h> */
diff -r -w MIT-pc/lib/winkrb/rd_priv.c mit-pc2/lib/winkrb/rd_priv.c
63c63
< #include <sys/socket.h>
---
> #include <winsock.h>
71c71
< #include <sys\types.h>
---
> /* #include <sys\types.h> */
73c73
< #include <netinet\in.h>
---
> /* #include <netinet\in.h> */
diff -r -w MIT-pc/lib/winkrb/sendauth.c mit-pc2/lib/winkrb/sendauth.c
16c16
< #include <sys/socket.h>
---
> #include <winsock.h>
19,20c19,20
< #include <sys\types.h>
< #include <netinet\in.h>
---
> /* #include <sys\types.h> */
> /* #include <netinet\in.h> */
This also has a change that makes it compile even though CR-LF's
appear rather than LF's. The compiler complained that an un-escaped
newline appeared inside a character string; I guess that \CRLF only
escapes the CR.
diff -r -w MIT-pc/lib/winkrb/rd_safe.c mit-pc2/lib/winkrb/rd_safe.c
65c65,66
< #include <sys\types.h>
---
> #include <winsock.h>
> /* #include <sys\types.h> */
67c68
< #include <netinet\in.h>
---
> /* #include <netinet\in.h> */
167c168
< fprintf(stderr,"\n\
---
> fprintf(stderr,"\nkrb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)");
169,170d169
< krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)");
<
Winsock.def needs to be provided (e.g. from sunsite.unc.edu) and
built into winsock.lib using `implib winsock.lib winsock.def'. This
should probably be a Makefile rule.
Only in mit-pc2/lib/winkrb: winsock.def
Only in mit-pc2/lib/winkrb: winsock.lib
There is a wskrbdll.dll shipped with the sources, but no Makefile
rules for making it.
Only in MIT-pc/lib/winkrb: wskrbdll.dll
John Gilmore
Cygnus Support
PS: I haven't renamed any files in this DOS version yet; I'm still
working on building and testing it before.
