Check for existance of <memory.h>.

(from Nathan Neulinger <nneul@umr.edu>)

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

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index dd996167432ce684f35fcf8ee195fe21838177d7..800c9f87ad920481f1f4fde9f1f7ddfea2bb51f0 100644 (file)
--- 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 e11b270bb54c7b74331c2ed8c0dbdbe66e8e368e..2c37a2eb39209ed98ef9bc88817aa4d3797f1e10 100644 (file)
--- 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 233743179a60525803a091cf1c3152b3ffdcfd36..482c25c7d0c356ed29acf306bfd3e1f4c08234f4 100644 (file)
--- 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 b0cfc603b98d2268278dd789365f0baa7877164f..87457c7fcf735b3e1b8d7507854a48960576b177 100644 (file)
--- 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 5148b262f325d1c01810535efb41a332f2ef0d8e..979a372c245972e1d808f4e04cb003b62be50dcf 100644 (file)
--- 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 051bd106fb4b91ada0bd4f6d2bb3193bc8265563..1aa379e5999065d703b7f3e3fe0fba7d14d55b74 100644 (file)
--- 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 4e2d09b56779e1246da5bee1d43693298d66c5cc..6cecac7d7c2a1809465823be6fee501cf1e7f751 100644 (file)
--- 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 c8d52e7d1f4eb57dbe663dd2407d941d02ccd89e..cbf49a1621e34142f400cd4a3b868315317ad370 100644 (file)
--- 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 5d9e8c33ee2ccd4422681187a796d772fbe9a70e..8e78bcca8c7e98ba8785a68a4a92e05f1ca2102b 100644 (file)
--- 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 ccc416c91e98c60c1aad9aad50d3d69fc1e3294a..f451cbe0d09eb7c3bbcf0898eec1c2f4000fbb47 100644 (file)
--- 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 0dfa334f3969e978c02a4b337eef099a91e30680..18ac537532aad624873bfaff314dae7dc7f94cf6 100644 (file)
--- 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 3b1f5a0fdcc2614bca2d3040b06daa54cf533199..9c1fe2686df577fa316cdae769f72576c910c837 100644 (file)
--- 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 1e0213f8aeceac4598d868970886731a21d54eae..7dc9b00e7148ee09ec70eef6569e545267f7960f 100644 (file)
--- 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 ed1f09f4f9901934f73b538bbae8e42d44e43e7f..1ed12a17e74d1d2cb0d8686668d6321ea7e158d1 100644 (file)
--- 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 de71a50858284db6d8945e916d86b6dafbe32511..78e0e4d9646f46f80e33018bd878ea6cd970117e 100644 (file)
--- 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 9e186a1538983fcd4b61670478dd66c0a0fe4b27..38d1fb198f5d99b648ac579ae28d7684a845c6e3 100644 (file)
--- 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 3f7d9950920c50a2f5a8148ab1e77541cb6e7b76..ccb16f49a0de59f957fc332ad6e4f3b5e2971d35 100644 (file)
--- 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 fc920ec27001a13aa7aa03b1b25f493e9c80668f..075d0e4c8983fe834f3932b46342284bd2dfc974 100644 (file)
--- 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 e344b4fbb56e6faa512fea8832261b635eedfddc..a22cd8dddcd5105ff10da85d924a6108e7bb4211 100644 (file)
--- 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 d0c8bc944568133b4fa8255dce8090b77389348c..8baad8c058e67ea6b237ed75a3f81a257f2de51a 100644 (file)
--- 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 64a95396bf8840eb555edfd7a882b01908f02c38..da5966f238bac88430d7369cf3a227f3bbdb20bb 100644 (file)
--- 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 10e6b657fd12897e846f197fe883ab21b1cc3f98..61fbc666d719e73210e632e62377ff5089bc8ada 100644 (file)
--- 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 93d46946c1afb74c8e03a55b88b32bd3fd46b610..8792e5fed50404987af8d8fbe843435e88d88ab7 100644 (file)
--- 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 206ee68a7b91f008fb75099f4e22f003e0b77ee7..24ae7f3f4cef8085a510c0ba75e8d313e0b837a7 100644 (file)
--- 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 6df8c2f5c11737b7ea052c0b1cea1d0bc8b499cc..b8dedb2768c1054f8ffed20a0a22fd13d2fe7bfe 100644 (file)
--- 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 dbf610ce302f1daaf67d12d1cac712fc25b07c77..367d8f2010f301c49797e2215a7950c5c09e8970 100644 (file)
--- 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 4864b0f4c9271b04531d449f1ba1c30cbf2381ac..1672942579f8ce63f54f311033b77ddcd422bedf 100644 (file)
--- 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 a3d261306c8e27e81517ac57c93e8db8dce80a45..53d6e15af671fdde6fe18b22b5f8c5405d7637af 100644 (file)
--- 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 cd2bdf042b3fd9dbab742e44563d9f2fdca5a91d..18ac45238236b842ef79c7c671e4b5a4830d35f1 100644 (file)
--- 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 7c55ab46102f367bfd2c781e137059871b84a5dd..8f309bb78e79ea7d35493f752c91201550381c37 100644 (file)
--- 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 1225a09694d0cb940558a08915cec581a017a87d..6c1bef9996dd6a21d3e128b566b6666d50b42c36 100644 (file)
--- 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 f8081260324ac4dcf7cca9cde16a6846078917f5..598ae45a53b8c41578b51f2d763354c9281c45e0 100644 (file)
--- 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 2d1cb4263e47603273670c7d00fd896ce8930b91..1864a733f91ca56d9704b4fd2f65049eb4e4c544 100644 (file)
--- 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 5cd461748a378fead48398a8638b8c340e5dbced..cfc107d06dde444a35b3a7b5ec3ee728f4fed40c 100644 (file)
--- 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 5d1fd1302a222ac39f9ab1bc8cf6326aabf06f1e..b6ea89cfddc0b1ad11bc66ae0ac55ba009eb8587 100644 (file)
--- 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 8cec441b3e9590d7de91fb9d36300f6d3a865793..c1f2f62c37f58f0d9322e82c35789fdd079347e3 100644 (file)
--- 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 a2ab81a2a9fe29f4a3db1f2abac29613c9b493be..89f7f2ea1599f8dfaead02d881df7486fc95262d 100644 (file)
--- 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 9b0c29d54072853588b8318609ad6cd20c06530e..9e944dbbd2bf5e1b24d782b758de825bf6e3ea14 100644 (file)
--- 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 f2c20ed876c05af11af8affc20484ea446624ed0..14fa9c3d8a9c0b1c84c0e800b36f5ed2849b1375 100644 (file)
--- 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 769b20be8674cda75b942496bedf6a8ceec0106e..925071fc2134df6744bdf07bae58e623cad9382d 100644 (file)
--- 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)