Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*

include the doc subtree!!)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 26 insertions, 4 deletions

diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 3ca9e9607..6526c65e0 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov 23 00:26:44 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (KLIB): Change krb516.dll to krb5_16.dll.  [PR#204]
+
+Wed Nov 20 18:32:06 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in (KLIB): Change libkrb5.dll to be krb516.dll
+
 Wed Jun 12 00:20:08 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* makefile: Renamed to Makefile.in, so that we can do WIN16/WIN32
diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 3fae32b43..6ef265c03 100644
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -23,7 +23,7 @@ XOBJS    =
 !if $(KVERSION) == 5
 BUILDTOP =..\..
 LIBDIR	 = $(BUILDTOP)\lib
-KLIB	 = $(LIBDIR)\libkrb5.lib
+KLIB	 = $(LIBDIR)\krb5_16.lib
 WLIB	 = $(LIBDIR)\winsock.lib
 INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
 XOBJS    = kpasswd.obj
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index 5681c50fa..b2fa4d7b3 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,7 +1,13 @@
+Fri Nov 22 15:52:55 1996  unknown  <bjaspan@mit.edu>
+
+	* gss-client.c (connect_to_server): use sizeof instead of h_length
+ 	to determine number of bytes of addr to copy from DNS response
+ 	[krb5-misc/211]
+
 Tue Oct 29 10:17:25 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* gss-client.c (client_establish_context): Fix typo; service_name
-		really should be nt_service_name.
+ 		really should be nt_service_name.
 
 Thu Jul 25 02:16:56 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
diff --git a/src/windows/gss/gss-client.c b/src/windows/gss/gss-client.c
index 0a98774b4..d5e8972b3 100644
--- a/src/windows/gss/gss-client.c
+++ b/src/windows/gss/gss-client.c
@@ -154,7 +154,7 @@ connect_to_server (char *host, u_short port)
     }
 	 
     saddr.sin_family = hp->h_addrtype;
-    memcpy((char *)&saddr.sin_addr, hp->h_addr, hp->h_length);
+    memcpy((char *)&saddr.sin_addr, hp->h_addr, sizeof(saddr.sin_addr));
     saddr.sin_port = htons(port);
 
     if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index 521c68f58..ea8b75ff9 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov 23 00:27:45 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in (KLIB): Change krb516.dll to krb5_16.dll.  [PR#204]
+
+Wed Nov 20 18:32:26 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in (KLIB): Change libkrb5.dll to be krb516.dll
+
 Wed Jun 12 00:22:02 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* makefile: Renamed to Makefile.in, so that we can do WIN16/WIN32
diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
index 7134945df..5f49bcf6e 100644
--- a/src/windows/wintel/Makefile.in
+++ b/src/windows/wintel/Makefile.in
@@ -24,7 +24,7 @@ XOBJS    =
 !if $(KVERSION) == 5
 BUILDTOP =..\..
 LIBDIR	 = $(BUILDTOP)\lib
-KLIB	 = $(LIBDIR)\libkrb5.lib
+KLIB	 = $(LIBDIR)\krb5_16.lib
 WLIB	 = $(LIBDIR)\winsock.lib
 INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \
 	/I$(BUILDTOP)\lib\crypto\des