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

9 files changed, 62 insertions, 12 deletions

diff --git a/src/mac/ChangeLog b/src/mac/ChangeLog
index 654a0a8d9b..b3be53fc8f 100644
--- a/src/mac/ChangeLog
+++ b/src/mac/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 22 07:54:57 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.tmpl: Use '%' in Makefiles where you really want a '/'
+ 		character in the mpw Makefile.  (Translation in
+ 		src/Makefile.in)
+
+	* version.r: Fix typos, and set version resource for 1.0 release.
+
 Fri Nov  8 17:44:10 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.tmpl: Add in version resource
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index 84ebae4fda..5a42dd4ae6 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -3,11 +3,11 @@ KH68K = {KH}KerberosHeaders68K
 KHCFM-68K = {KH}KerberosHeadersCFM-68K
 KHPPC = {KH}KerberosHeadersPPC
 
-GSSRTLCFM68K = "{MW68KLibraries}ANSI (4i/8d) C.CFM68K.Lib" \
+GSSRTLCFM68K = "{MW68KLibraries}ANSI (4i%8d) C.CFM68K.Lib" \
 	{MW68KLibraries}SIOUX.CFM68K.Lib \
 	{MW68KLibraries}InterfaceLib \
 	{MW68KLibraries}MWCFM68KRuntime.Lib \
-	"{MW68KLibraries}MathLibCFM68K (4i/8d).Lib"
+	"{MW68KLibraries}MathLibCFM68K (4i%8d).Lib"
 
 GSSRTLCFMPPC = "{MWPPCLibraries}ANSI C.PPC.Lib" \
 	{MWPPCLibraries}SIOUX.PPC.Lib {MWPPCLibraries}MWCRuntime.Lib \
@@ -113,7 +113,6 @@ link-68KCFM-SAP :
 	        -sym fullpath -map libgss.68K.MAP -o GSSLibrarySAP.68K \
 		{GSSRTLCFM68K} {GSSOBJS68KCFM-SAP} {GSSOBJS68KCFM}
 	Rez "/mac/SAP/GSSforSAP.r" -a -o GSSLibrarySAP.68K
-	Rez "/mac/version.r" -a -o GSSLibrarySAP.68K
 
 link-PPC-SAP :
 	MWLinkPPC -sharedlibrary -name GSSLibrary -m "" \
@@ -122,7 +121,6 @@ link-PPC-SAP :
 	        -sym fullpath -map libgss.PPC.MAP -o GSSLibrarySAP.PPC \
 		{GSSRTLCFMPPC} {GSSOBJSPPC-SAP} {GSSOBJSPPC}
 	Rez "/mac/SAP/GSSforSAP.r" -a -o GSSLibrarySAP.PPC
-	Rez "/mac/version.r" -a -o GSSLibrarySAP.PPC
 	
 link-CFMFAT-SAP : 
 	Duplicate -y GSSLibrarySAP.68K GSSLibSAP
diff --git a/src/mac/SAP/GSSforSAP.r b/src/mac/SAP/GSSforSAP.r
index ca25a83846..8910dd756b 100644
--- a/src/mac/SAP/GSSforSAP.r
+++ b/src/mac/SAP/GSSforSAP.r
@@ -1,4 +1,17 @@
+#ifdef mw_rez
+#include <SysTypes.r>
+#include <Types.r>
+#else
+#include "SysTypes.r"
 #include "Types.r"
+#endif
+
+resource 'vers' (1) {
+	0x01, 0x00, final, 0x00,
+	verUS,
+	"1.0",
+	"1.0(SAP), Copyright 1996 Massachusetts Institute of Technology"
+};
 
 resource 'DITL' (135, nonpurgeable) {
 	{	/* array DITLarray: 2 elements */
diff --git a/src/mac/gss-sample/ChangeLog b/src/mac/gss-sample/ChangeLog
index 63f0612567..9975f8a929 100644
--- a/src/mac/gss-sample/ChangeLog
+++ b/src/mac/gss-sample/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov 22 15:51: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]
+
+
 Thu 26 12:00:00 1995  John Rivlin <jrivlin@fusion.com>
 
 	* Created GSS Sample program
diff --git a/src/mac/gss-sample/gss-client.c b/src/mac/gss-sample/gss-client.c
index d7dd26ebaa..b2be7c84c0 100644
--- a/src/mac/gss-sample/gss-client.c
+++ b/src/mac/gss-sample/gss-client.c
@@ -336,7 +336,7 @@ SOCKET 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)) == (SOCKET) -1) {
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index 1a8d737a86..4388c5e7f2 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov 23 00:18:20 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* KerberosHeaders.h: Remove DES3 and SHA support for 1.0, since
+	 	what's there isn't the correct final algorithm.  (They
+	 	will be re-added later.)  [PR #231]
+	
 Tue Apr 30 14:53:54 1996    <tytso@rsts-11.mit.edu>
 
 	* KerberosHeaders.h: Removed PROVIDE_SNEFRU (shouldn't be there)
diff --git a/src/mac/libraries/KerberosHeaders.h b/src/mac/libraries/KerberosHeaders.h
index ac4e62da66..a25d001570 100644
--- a/src/mac/libraries/KerberosHeaders.h
+++ b/src/mac/libraries/KerberosHeaders.h
@@ -35,9 +35,9 @@ typedef unsigned int size_t;
 #define PROVIDE_DES_CBC_CRC
 #define PROVIDE_DES_CBC_MD5
 #define PROVIDE_DES_CBC_RAW
-#define PROVIDE_DES3_CBC_MD5
-#define PROVIDE_DES3_CBC_RAW
-
+/* #define PROVIDE_DES3_CBC_MD5 */
+/* #define PROVIDE_DES3_CBC_RAW */
+/* #define PROVIDE_NIST_SHA */
 
 #define NO_SYS_TYPES_H
 #define NO_SYS_STAT_H
diff --git a/src/mac/mkbindirs.sh b/src/mac/mkbindirs.sh
new file mode 100644
index 0000000000..cdc2af202b
--- /dev/null
+++ b/src/mac/mkbindirs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This shell script creates the Macintosh binary hierarchies.
+
+topbin=$1
+shift
+
+for DIR do
+  mkdir $topbin/$DIR
+  for SDIR in `sed -n -e 's/MAC_SUBDIRS.*=//p' $DIR/Makefile.in`; do
+    /bin/sh mac/mkbindirs.sh $topbin $DIR/$SDIR;
+  done
+done
diff --git a/src/mac/version.r b/src/mac/version.r
index 85ece8583e..a83d10ff20 100644
--- a/src/mac/version.r
+++ b/src/mac/version.r
@@ -1,9 +1,14 @@
+#ifdef mw_rez
 #include <SysTypes.r>
 #include <Types.r>
+#else
+#include "SysTypes.r"
+#include "Types.r"
+#endif
 
 resource 'vers' (1) {
-	0x00, 0x07, beta, 0x01,
-	verUS
-	"Beta 7 Build 1",
-	"Beta 7 Build 1, Copyright 1996 Massachusetts Institute of Technology"
+	0x01, 0x00, final, 0x00,
+	verUS,
+	"1.0",
+	"1.0, Copyright 1996 Massachusetts Institute of Technology"
 };