summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appl/gss-sample/ChangeLog5
-rw-r--r--src/appl/gss-sample/Makefile.in4
-rw-r--r--src/appl/gssftp/ftp/ChangeLog5
-rw-r--r--src/appl/gssftp/ftp/Makefile.in2
-rw-r--r--src/clients/klist/ChangeLog5
-rw-r--r--src/clients/klist/Makefile.in2
-rw-r--r--src/krb524/ChangeLog4
-rw-r--r--src/krb524/Makefile.in2
-rw-r--r--src/lib/ChangeLog4
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/windows/cns/ChangeLog4
-rw-r--r--src/windows/cns/Makefile.in2
-rw-r--r--src/windows/gina/ChangeLog4
-rw-r--r--src/windows/gina/Makefile.in2
-rw-r--r--src/windows/gss/ChangeLog4
-rw-r--r--src/windows/gss/Makefile.in2
-rw-r--r--src/windows/wintel/ChangeLog4
-rw-r--r--src/windows/wintel/Makefile.in2
18 files changed, 49 insertions, 10 deletions
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 90a6c06c97..b466bae615 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in ($(OUTPRE)gss-server.exe, $(OUTPRE)gss-server.exe):
+ Use ws2_32.lib instead of wsock32.lib.
+
2002-04-30 Sam Hartman <hartmans@mit.edu>
* gss-server.c (server_establish_context): Same here.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index debb007606..42519e9221 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -21,10 +21,10 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
$(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
- link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+ link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
$(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
- link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+ link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
clean-unix::
$(RM) gss-server gss-client
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 51d11450a5..7953c77824 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in ($(OUTPRE)ftp.exe): Use ws2_32.lib instead of
+ wsock32.lib.
+
2002-04-11 Sam Hartman <hartmans@mit.edu>
* radix.c : Initialize c and D to suppress warning; code was already correct
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index cc5de00a2e..909dc265c9 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -37,7 +37,7 @@ ftp: $(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
$(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB)
- link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib advapi32.lib
+ link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib
clean-unix::
$(RM) ftp
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index ac23aa3790..947e4492e5 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in ($(OUTPRE)klist.exe): Use ws2_32.lib instead of
+ wsock32.lib.
+
2002-06-13 Jen Selby <jenselby@mit.edu>
* klist.M: updated the manpage to show new ticket flags
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 4e067eaa84..dda5023605 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -15,7 +15,7 @@ klist: klist.o $(KRB4COMPAT_DEPLIBS)
$(CC_LINK) -o $@ klist.o $(KRB4COMPAT_LIBS)
$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(KLIB) $(CLIB)
- link $(EXE_LINKOPTS) -out:$@ $** wsock32.lib
+ link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
clean-unix::
$(RM) klist.o klist
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 2ad2efa6f8..02109c0b4e 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
2002-06-04 Ken Raeburn <raeburn@mit.edu>
* sendmsg.c: Include fake-addrinfo.h. Don't include
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 2916d4e577..09e9c10a5b 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -48,7 +48,7 @@ KRB524_LIB = libkrb524.a
K524LIB = $(OUTPRE)krb524.lib
K524DEP = $(K524LIB)
K524DEF = krb524.def
-WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \
+WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
version.lib advapi32.lib gdi32.lib
LOCALINCLUDES= $(KRB4_INCLUDES) -I. -I$(srcdir)
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 852411e5d7..4218a325f4 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
2001-11-16 Sam Hartman <hartmans@mit.edu>
* krb5_32.def: Export krb5_set_default_tgs_enctypes
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index db4bf7bf24..b6a69b2554 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -51,7 +51,7 @@ K4DEF = krb4_32.def
KRB5RC = krb5.rc
VERSIONRC = $(BUILDTOP)\windows\version.rc
-WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \
+WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
version.lib advapi32.lib gdi32.lib
WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 2cd2ee87aa..fe7d3ae743 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
2002-06-11 Danilo Almeida <dalmeida@mit.edu>
* cns.c: Do not use krb_get_notification_message() or
diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 095b46cba2..2a1aa60b2e 100644
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -47,7 +47,7 @@ CVTRES = cvtres
##### Linker
LINK = link
LIBS = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib
-SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib
LFLAGS = /nologo $(LOPTS)
all:: Makefile $(OUTPRE)$(NAME).exe
diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog
index d2e378bbf8..e318692e37 100644
--- a/src/windows/gina/ChangeLog
+++ b/src/windows/gina/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
1999-12-03 Danilo Almeida <dalmeida@mit.edu>
* Makefile.in: Windows fix for updated win-pre.in.
diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index 6cdda3d8ab..3d630e12da 100644
--- a/src/windows/gina/Makefile.in
+++ b/src/windows/gina/Makefile.in
@@ -7,7 +7,7 @@ OBJS= $(OUTPRE)ginastub.$(OBJEXT)
LOCALINCLUDES = -I$(BUILDTOP)\include
WINLIBS = advapi32.lib comctl32.lib \
- libc.lib kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib
+ libc.lib kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib
WINDLLFLAGS = /nodefaultlib /incremental:no /release \
/nologo /base:0x1c000000 /dll $(LOPTS)
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index cefca162c2..b426555a37 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* gss.c, gss.h: Don't declare functions FAR any more.
diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index 306f7c79a5..b545599aeb 100644
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -17,7 +17,7 @@ RCFLAGS = $(RFLAGS) -D_WIN32 -DGSS_APP
##### Linker
LINK = link
LIBS = $(GLIB) $(CLIB) $(WLIB)
-SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
LFLAGS = /nologo $(LOPTS)
all:: Makefile $(OUTPRE)gss.exe
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index cd37a3f9d0..a741cfd547 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
2001-10-10 Danilo Almeida <dalmeida@mit.edu>
* intern.c (ScreenInsChar): Return BOOL.
diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
index 56cddb188d..f1cdbc2690 100644
--- a/src/windows/wintel/Makefile.in
+++ b/src/windows/wintel/Makefile.in
@@ -27,7 +27,7 @@ RCFLAGS = $(RFLAGS) -D_WIN32 -DTELNET_APP
##### Linker
LINK = link
LIBS = $(KLIB) $(CLIB) $(WLIB)
-SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
LFLAGS = /nologo $(LOPTS)
all:: Makefile $(OUTPRE)telnet.exe