aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/appl/telnet/telnetd/ChangeLog5
-rw-r--r--src/appl/telnet/telnetd/configure.in2
-rw-r--r--src/appl/telnet/telnetd/defs.h2
-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
-rw-r--r--src/lib/crypto/ChangeLog5
-rw-r--r--src/lib/crypto/configure.in2
-rw-r--r--src/lib/crypto/nfold.c2
-rw-r--r--src/lib/gssapi/ChangeLog5
-rw-r--r--src/lib/gssapi/configure.in2
-rw-r--r--src/lib/gssapi/generic/ChangeLog5
-rw-r--r--src/lib/gssapi/generic/util_token.c2
-rw-r--r--src/lib/gssapi/krb5/ChangeLog7
-rw-r--r--src/lib/gssapi/krb5/accept_sec_context.c2
-rw-r--r--src/lib/gssapi/krb5/gssapiP_krb5.h2
-rw-r--r--src/lib/gssapi/krb5/init_sec_context.c2
-rw-r--r--src/lib/gssapi/krb5/k5unseal.c2
-rw-r--r--src/lib/gssapi/krb5/util_cksum.c2
-rw-r--r--src/lib/gssapi/krb5/util_crypt.c2
-rw-r--r--src/lib/gssapi/krb5/util_seed.c2
-rw-r--r--src/lib/kadm5/ChangeLog6
-rw-r--r--src/lib/kadm5/chpass_util.c2
-rw-r--r--src/lib/kadm5/clnt/ChangeLog6
-rw-r--r--src/lib/kadm5/clnt/client_init.c2
-rw-r--r--src/lib/kadm5/clnt/client_principal.c2
-rw-r--r--src/lib/kadm5/clnt/client_rpc.c2
-rw-r--r--src/lib/kadm5/configure.in2
-rw-r--r--src/lib/kadm5/server_internal.h2
-rw-r--r--src/lib/kadm5/srv/ChangeLog6
-rw-r--r--src/lib/kadm5/srv/adb_free.c6
-rw-r--r--src/lib/kadm5/srv/adb_xdr.c2
-rw-r--r--src/lib/kadm5/srv/server_dict.c2
-rw-r--r--src/lib/krb5/ChangeLog5
-rw-r--r--src/lib/krb5/configure.in2
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/fwd_tgt.c2
40 files changed, 123 insertions, 5 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index dd99616..800c9f8 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * configure.in, defs.h: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-03-20 Ken Raeburn <raeburn@mit.edu>
Jeffrey Altman <jaltman@watsun.cc.columbia.edu>
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index e11b270..2c37a2e 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -22,7 +22,7 @@ if test -z "$ac_sysv_termio"; then
fi
fi
AC_HEADER_TIME
-AC_CHECK_HEADERS(string.h arpa/nameser.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/filio.h sys/stream.h sys/utsname.h)
+AC_CHECK_HEADERS(string.h arpa/nameser.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/filio.h sys/stream.h sys/utsname.h memory.h)
AC_CHECK_FUNCS(gettosbyname)
dnl Make our operating system-specific security checks and definitions for
dnl login.
diff --git a/src/appl/telnet/telnetd/defs.h b/src/appl/telnet/telnetd/defs.h
index 2337431..482c25c 100644
--- a/src/appl/telnet/telnetd/defs.h
+++ b/src/appl/telnet/telnetd/defs.h
@@ -154,7 +154,9 @@ typedef unsigned char cc_t;
# endif /* FD_ZERO */
# endif /* CRAY1 */
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#endif /* CRAY */
#ifdef __hpux
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index b0cfc60..87457c7 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 5148b26..979a372 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 051bd10..1aa379e 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 4e2d09b..6cecac7 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 c8d52e7..cbf49a1 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 5d9e8c3..8e78bcc 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>
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ccc416c..f451cbe 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * configure.in, nfold.c: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-01-24 Tom Yu <tlyu@mit.edu>
* crypto_libinit.c: Add terminating newline; use 0 and 1 instead
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 0dfa334..18ac537 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -5,6 +5,8 @@ AC_PROG_ARCHIVE_ADD
AC_PROG_RANLIB
AC_PROG_INSTALL
+AC_CHECK_HEADERS(memory.h)
+
KRB5_RUN_FLAGS
KRB5_BUILD_PROGRAM
KRB5_BUILD_LIBOBJS
diff --git a/src/lib/crypto/nfold.c b/src/lib/crypto/nfold.c
index 3b1f5a0..9c1fe26 100644
--- a/src/lib/crypto/nfold.c
+++ b/src/lib/crypto/nfold.c
@@ -25,7 +25,9 @@
*/
#include "k5-int.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
n-fold(k-bits):
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 1e0213f..7dc9b00 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/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>]
+
Tue Feb 22 10:23:19 2000 Ezra Peisach <epeisach@mit.edu>
* Makefile.in (clean-unix): Add clean-libobjs.
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index ed1f09f..1ed12a1 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -7,7 +7,7 @@ AC_PROG_ARCHIVE_ADD
AC_PROG_AWK
AC_PROG_INSTALL
AC_PROG_RANLIB
-AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h)
+AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h memory.h)
AC_SIZE_T
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index de71a50..78e0e4d 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * util_token.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/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 9e186a1..38d1fb1 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -21,7 +21,9 @@
*/
#include "gssapiP_generic.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
* $Id$
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 3f7d995..ccb16f4 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * accept_sec_context.c, gssapiP_krb5.h, init_sec_context.c,
+ k5unseal.c, util_cksum.c, util_crypt.c, util_seed.c: Check for
+ existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-5-19 Alexandra Ellwood <lxs@mit.edu>
* acquire_cred.c: Changed to use krb5int_cc_default. This function
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index fc920ec..075d0e4 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -48,7 +48,9 @@
#include "k5-int.h"
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
* $Id$
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index e344b4f..a22cd8d 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -28,7 +28,9 @@
*/
#include <krb5.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/* work around sunos braindamage */
#ifdef major
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index d0c8bc9..8baad8c 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -47,7 +47,9 @@
*/
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <stdlib.h>
/*
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 64a9539..da5966f 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -47,7 +47,9 @@
*/
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
* $Id$
diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c
index 10e6b65..61fbc66 100644
--- a/src/lib/gssapi/krb5/util_cksum.c
+++ b/src/lib/gssapi/krb5/util_cksum.c
@@ -25,7 +25,9 @@
*/
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
krb5_error_code
kg_checksum_channel_bindings(context, cb, cksum, bigend)
diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
index 93d4694..8792e5f 100644
--- a/src/lib/gssapi/krb5/util_crypt.c
+++ b/src/lib/gssapi/krb5/util_crypt.c
@@ -48,7 +48,9 @@
#include "k5-int.h"
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
* $Id$
diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
index 206ee68..24ae7f3 100644
--- a/src/lib/gssapi/krb5/util_seed.c
+++ b/src/lib/gssapi/krb5/util_seed.c
@@ -21,7 +21,9 @@
*/
#include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/*
* $Id$
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6df8c2f..b8dedb2 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * configure.in, chpass_util.c, server_internal.h: Check for
+ existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-02-26 Tom Yu <tlyu@mit.edu>
* kadm_rpc_xdr.c (xdr_cprinc3_arg): Don't XDR the nonexistent
diff --git a/src/lib/kadm5/chpass_util.c b/src/lib/kadm5/chpass_util.c
index dbf610c..367d8f2 100644
--- a/src/lib/kadm5/chpass_util.c
+++ b/src/lib/kadm5/chpass_util.c
@@ -8,7 +8,9 @@
#include <stdio.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <time.h>
#include <kadm5/admin.h>
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 4864b0f..1672942 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * client_init.c, client_principal.c, client_rpc.c: Check for
+ existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-02-26 Tom Yu <tlyu@mit.edu>
* client_principal.c (kadm5_create_principal_3): Remove keepold
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index a3d2613..53d6e15 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -36,7 +36,9 @@ static char *rcsid = "$Header$";
#include <stdio.h>
#include <netdb.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <string.h>
#include <com_err.h>
#include <sys/types.h>
diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c
index cd2bdf0..18ac452 100644
--- a/src/lib/kadm5/clnt/client_principal.c
+++ b/src/lib/kadm5/clnt/client_principal.c
@@ -11,7 +11,9 @@ static char *rcsid = "$Header$";
#include <gssrpc/rpc.h>
#include <kadm5/admin.h>
#include <kadm5/kadm_rpc.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include "client_internal.h"
kadm5_ret_t
diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 7c55ab4..8f309bb 100644
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -2,7 +2,9 @@
#include <kadm5/kadm_rpc.h>
#include <krb5.h>
#include <kadm5/admin.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/* Default timeout can be changed using clnt_control() */
static struct timeval TIMEOUT = { 25, 0 };
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
index 1225a09..6c1bef9 100644
--- a/src/lib/kadm5/configure.in
+++ b/src/lib/kadm5/configure.in
@@ -6,7 +6,7 @@ AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LEX
AC_PROG_AWK
-AC_CHECK_HEADERS(syslog.h)
+AC_CHECK_HEADERS(syslog.h memory.h)
AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
KRB5_AC_REGEX_FUNCS
dnl
diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h
index f808126..598ae45 100644
--- a/src/lib/kadm5/server_internal.h
+++ b/src/lib/kadm5/server_internal.h
@@ -13,7 +13,9 @@
#ifndef __KADM5_SERVER_INTERNAL_H__
#define __KADM5_SERVER_INTERNAL_H__
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <stdlib.h>
#include "k5-int.h"
#include <krb5/kdb.h>
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 2d1cb42..1864a73 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * adb_free.c, adb_xdr.c, server_dict.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/lib/kadm5/srv/adb_free.c b/src/lib/kadm5/srv/adb_free.c
index 5cd4617..cfc107d 100644
--- a/src/lib/kadm5/srv/adb_free.c
+++ b/src/lib/kadm5/srv/adb_free.c
@@ -4,6 +4,10 @@
* $Header$
*
* $Log$
+ * Revision 1.3 2000/06/01 02:02:03 tritan
+ * Check for existance of <memory.h>.
+ * (from Nathan Neulinger <nneul@umr.edu>)
+ *
* Revision 1.2 1996/10/18 19:45:49 bjaspan
* * svr_misc_free.c, server_dict.c, adb_policy.c, adb_free.c:
* include stdlib.h instead of malloc.h [krb5-admin/35]
@@ -52,7 +56,9 @@ static char *rcsid = "$Header$";
#endif
#include "adb.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <stdlib.h>
void
diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c
index 5d1fd13..b6ea89c 100644
--- a/src/lib/kadm5/srv/adb_xdr.c
+++ b/src/lib/kadm5/srv/adb_xdr.c
@@ -13,7 +13,9 @@ static char *rcsid = "$Header$";
#include <gssrpc/rpc.h>
#include "adb.h"
#include "admin_xdr.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
bool_t
xdr_krb5_key_data(XDR *xdrs, krb5_key_data *objp)
diff --git a/src/lib/kadm5/srv/server_dict.c b/src/lib/kadm5/srv/server_dict.c
index 8cec441..c1f2f62 100644
--- a/src/lib/kadm5/srv/server_dict.c
+++ b/src/lib/kadm5/srv/server_dict.c
@@ -17,7 +17,9 @@ static char *rcsid = "$Header$";
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
#include <syslog.h>
#include "server_internal.h"
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index a2ab81a..89f7f2e 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/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>]
+
2000-03-14 Ken Raeburn <raeburn@mit.edu>
* configure.in: Check for gethostbyname2.
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 9b0c29d..9e944db 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -7,7 +7,7 @@ AC_CONST
AC_TYPE_UID_T
HAS_ANSI_VOLATILE
AC_HEADER_STDARG
-AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h)
+AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h)
AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid gethostbyname2)
AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
KRB5_AC_REGEX_FUNCS
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index f2c20ed..14fa9c3 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31 Wilfredo Sanchez <tritan@mit.edu>
+
+ * fwd_tgt.c: Check for existance of <memory.h>.
+ [from Nathan Neulinger <nneul@umr.edu>]
+
2000-5-19 Alexandra Ellwood <lxs@mit.edu>
* sendauth.c, fwd_tgt.c: Changed to use krb5int_cc_default. This function
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 769b20b..925071f 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -26,7 +26,9 @@
#define NEED_SOCKETS
#include "k5-int.h"
+#ifdef HAVE_MEMORY_H
#include <memory.h>
+#endif
/* helper function: convert flags to necessary KDC options */
#define flags2options(flags) (flags & KDC_TKT_COMMON_MASK)