* Makefile.in: Remove redundant definitions from config/pre.in

(clean-mac):  Add.
* asn1_misc.c:  Avoid <malloc.h> and <memory.h> includes, for Mac.
(asn1_krb5_realm_copy):  Use malloc, not calloc, since we're
about to clobber the storage anyway.
* configure.in (WITH_KRB5ROOT):  Remove, not needed.
* krbasn1.h:  Document that <limits.h> is needed for INT_MAX.

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

5 files changed, 16 insertions, 24 deletions

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 33f07a9c5..be09f397c 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar 17 19:05:22 1995  John Gilmore  (gnu at toad.com)
+
+	* Makefile.in:  Remove redundant definitions from config/pre.in
+	(clean-mac):  Add.
+	* asn1_misc.c:  Avoid <malloc.h> and <memory.h> includes, for Mac.
+	(asn1_krb5_realm_copy):  Use malloc, not calloc, since we're
+	about to clobber the storage anyway.
+	* configure.in (WITH_KRB5ROOT):  Remove, not needed.
+	* krbasn1.h:  Document that <limits.h> is needed for INT_MAX.
+
 Fri Mar 10 15:39:24 1995  Theodore Y. Ts'o  (tytso@kenmore)
 
 	* asn1buf.c. asn1buf.h (asn1buf_insert_octet): Make the second
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 19361ec6b..24370fdd6 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,26 +1,9 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
 CFLAGS=$(CCOPTS) $(DEFS)
-LDFLAGS = -g
-
-RM = rm -f
-CP = cp
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
 ##DOS!include $(BUILDTOP)\config\windows.in
 
-PEPSY = @PEPSY@
-PSYFLAGS = @PSYFLAGS@
-
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
-SRCTOP=$(srcdir)/$(BUILDTOP)
-
 EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
 
 SRCS= \
@@ -54,5 +37,8 @@ clean:: clean-$(WHAT)
 clean-unix::
 	$(RM) $(OBJS)
 
+clean-mac::
+	$(RM) $(OBJS)
+
 clean-windows::
 	$(RM) *.obj
diff --git a/src/lib/krb5/asn.1/asn1_misc.c b/src/lib/krb5/asn.1/asn1_misc.c
index 3231a6385..eb6516a31 100644
--- a/src/lib/krb5/asn.1/asn1_misc.c
+++ b/src/lib/krb5/asn.1/asn1_misc.c
@@ -22,17 +22,14 @@
  */
 
 #include "asn1_misc.h"
-#include <malloc.h>
-#include <memory.h>
 
 asn1_error_code INTERFACE asn1_krb5_realm_copy(target, source)
      krb5_principal target;
      krb5_principal source;
 {
   target->realm.length = source->realm.length;
-  target->realm.data = (char*)calloc(target->realm.length,
-					  sizeof(char)); /* copy realm */
-  if(target->realm.data == NULL) return ENOMEM;
+  target->realm.data = (char*)malloc(target->realm.length); /* copy realm */
+  if (target->realm.data == NULL) return ENOMEM;
   memcpy(target->realm.data,source->realm.data, /* to client */
 	 target->realm.length);
   return 0;
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 328a01f3a..11a547e45 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/configure.in
@@ -6,5 +6,4 @@ dnl CONFIG_RULES
 AC_SET_BUILDTOP
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/asn.1/krbasn1.h b/src/lib/krb5/asn.1/krbasn1.h
index faa76fde1..eb63258fc 100644
--- a/src/lib/krb5/asn.1/krbasn1.h
+++ b/src/lib/krb5/asn.1/krbasn1.h
@@ -4,7 +4,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 #include <errno.h>
-#include <limits.h>
+#include <limits.h>		/* For INT_MAX */
 #ifdef HAS_STDLIB_H
 #include <stdlib.h>
 #endif