summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/ChangeLog5
-rw-r--r--src/kadmin/configure.in2
-rw-r--r--src/kadmin/dbutil/ChangeLog5
-rw-r--r--src/kadmin/dbutil/ovload.c2
-rw-r--r--src/kadmin/server/ChangeLog5
-rw-r--r--src/kadmin/server/kadm_rpc_svc.c2
6 files changed, 20 insertions, 1 deletions
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index b0cfc603b9..87457c7fcf 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * configure.in: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 5148b262f3..979a372c24 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -3,7 +3,7 @@ CONFIG_RULES
AC_PROG_INSTALL
AC_PROG_YACC
AC_PROG_AWK
-AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h alloca.h sys/time.h sys/select.h)
+AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h alloca.h sys/time.h sys/select.h memory.h)
AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf)
AC_REPLACE_FUNCS([memmove strftime])
AC_HEADER_TIME
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 051bd106fb..1aa379e599 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * ovload.c: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index 4e2d09b567..6cecac7d7c 100644
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -1,7 +1,9 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <kadm5/adb.h>
#include "import_err.h"
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index c8d52e7d1f..cbf49a1621 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * kadm_rpc_svc.c: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-03-16 Ken Raeburn <raeburn@mit.edu>
Matt Crawford <crawdad@fnal.gov>
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index 5d9e8c33ee..8e78bcca8c 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -12,7 +12,9 @@ static char *rcsid = "$Header$";
#include <stdio.h>
#include <gssrpc/rpc.h>
#include <syslog.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <kadm5/kadm_rpc.h>
#include <krb5.h>
#include <kadm5/admin.h>