summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2005-04-13 16:55:43 +0000
committerKen Raeburn <raeburn@mit.edu>2005-04-13 16:55:43 +0000
commit63b30021f66ac282c3814e2da6bf685a36159299 (patch)
tree8ce1008eb59a4d792068ea321ceb38b27757c4db /src
parent398e7a7b0b38da8841c833481adcea0d0ea452f4 (diff)
downloadkrb5-63b30021f66ac282c3814e2da6bf685a36159299.tar.gz
krb5-63b30021f66ac282c3814e2da6bf685a36159299.tar.xz
krb5-63b30021f66ac282c3814e2da6bf685a36159299.zip
Delete definitions of unused macros NEED_SOCKETS and NEED_LOWLEVEL_IO
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17177 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/bsd/ChangeLog4
-rw-r--r--src/appl/bsd/compat_recv.c1
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/k5-int.h6
-rw-r--r--src/kadmin/server/ChangeLog4
-rw-r--r--src/kadmin/server/schpw.c1
-rw-r--r--src/kdc/ChangeLog7
-rw-r--r--src/kdc/dispatch.c1
-rw-r--r--src/kdc/do_as_req.c1
-rw-r--r--src/kdc/do_tgs_req.c1
-rw-r--r--src/kdc/network.c1
-rw-r--r--src/lib/ChangeLog4
-rw-r--r--src/lib/krb5/ccache/ChangeLog4
-rw-r--r--src/lib/krb5/ccache/cc_file.c2
-rw-r--r--src/lib/krb5/keytab/ChangeLog5
-rw-r--r--src/lib/krb5/keytab/kt_file.c1
-rw-r--r--src/lib/krb5/keytab/kt_srvtab.c1
-rw-r--r--src/lib/krb5/krb/ChangeLog6
-rw-r--r--src/lib/krb5/krb/fwd_tgt.c1
-rw-r--r--src/lib/krb5/krb/recvauth.c1
-rw-r--r--src/lib/krb5/krb/sendauth.c1
-rw-r--r--src/lib/krb5/os/ChangeLog24
-rw-r--r--src/lib/krb5/os/accessor.c1
-rw-r--r--src/lib/krb5/os/c_ustime.c1
-rw-r--r--src/lib/krb5/os/changepw.c1
-rw-r--r--src/lib/krb5/os/dnsglue.h1
-rw-r--r--src/lib/krb5/os/full_ipadr.c1
-rw-r--r--src/lib/krb5/os/gen_rname.c1
-rw-r--r--src/lib/krb5/os/genaddrs.c1
-rw-r--r--src/lib/krb5/os/hostaddr.c1
-rw-r--r--src/lib/krb5/os/hst_realm.c1
-rw-r--r--src/lib/krb5/os/krbfileio.c1
-rw-r--r--src/lib/krb5/os/localaddr.c1
-rw-r--r--src/lib/krb5/os/locate_kdc.c1
-rw-r--r--src/lib/krb5/os/mk_faddr.c1
-rw-r--r--src/lib/krb5/os/net_read.c2
-rw-r--r--src/lib/krb5/os/net_write.c2
-rw-r--r--src/lib/krb5/os/port2ip.c1
-rw-r--r--src/lib/krb5/os/read_msg.c1
-rw-r--r--src/lib/krb5/os/send524.c2
-rw-r--r--src/lib/krb5/os/sendto_kdc.c2
-rw-r--r--src/lib/krb5/os/sn2princ.c1
-rw-r--r--src/lib/krb5/os/write_msg.c1
-rw-r--r--src/lib/krb5/rcache/ChangeLog4
-rw-r--r--src/lib/krb5/rcache/rc_io.c2
-rw-r--r--src/lib/win_glue.c1
-rw-r--r--src/mac/MacOSX/Headers/Kerberos5Prefix.h1
47 files changed, 67 insertions, 48 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c5e5bc879f..4d3297153f 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * compat_recv.c (NEED_SOCKETS): Don't define.
+
2005-04-05 Ken Raeburn <raeburn@mit.edu>
* krlogind.c (doit): Change 0 to (char*)NULL in execl* calls.
diff --git a/src/appl/bsd/compat_recv.c b/src/appl/bsd/compat_recv.c
index 008114626a..c76c4142c6 100644
--- a/src/appl/bsd/compat_recv.c
+++ b/src/appl/bsd/compat_recv.c
@@ -36,7 +36,6 @@
* to a V4 sendauth.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#if !defined(_MACINTOSH)
#ifdef KRB5_KRB4_COMPAT
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index a5450b8035..89fee2c50c 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * k5-int.h: Remove disabled code that used to be part of the
+ non-NEED_SOCKETS case.
+
2005-03-25 Ken Raeburn <raeburn@mit.edu>
* configure.in: Don't check for getpwnam_r and getpwuid_r with
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 6b9ca41f12..d32a445465 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -159,14 +159,8 @@ typedef INT64_TYPE krb5_int64;
#include "krb5.h"
#include "profile.h"
-#if 1 /* def NEED_SOCKETS */
#include "port-sockets.h"
#include "socket-utils.h"
-#else
-#ifndef SOCK_DGRAM
-struct sockaddr;
-#endif
-#endif
/* Get mutex support; currently used only for the replay cache. */
#include "k5-thread.h"
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 8b5db1f8a8..24694c31c1 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * schpw.c (NEED_SOCKETS): Don't define.
+
2004-10-28 Tom Yu <tlyu@mit.edu>
* misc.c (check_min_life): Actually return a value on success.
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index 372b7127c2..90ccba05fa 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -1,4 +1,3 @@
-#define NEED_SOCKETS
#include "k5-int.h"
#include <kadm5/admin.h>
#include <syslog.h>
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 69f392c519..68c74ceeaa 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * dispatch.c (NEED_SOCKETS): Don't define.
+ * do_as_req.c (NEED_SOCKETS): Don't define.
+ * do_tgs_req.c (NEED_SOCKETS): Don't define.
+ * network.c (NEED_SOCKETS): Don't define.
+
2004-09-23 Ken Raeburn <raeburn@mit.edu>
* network.c (closedown_network): Free each connection data
diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index d97acfaeed..0432661d76 100644
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -26,7 +26,6 @@
* Dispatch an incoming packet.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include <syslog.h>
#include "kdc_util.h"
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 7f3efd8491..f292a17f86 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -27,7 +27,6 @@
* KDC Routines to deal with AS_REQ's
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "com_err.h"
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index 085e2855c0..7aecb227ef 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -27,7 +27,6 @@
* KDC Routines to deal with TGS_REQ's
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "com_err.h"
diff --git a/src/kdc/network.c b/src/kdc/network.c
index d05057aca8..84a90b16fe 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -26,7 +26,6 @@
* Network code for Kerberos v5 KDC.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "com_err.h"
#include "kdc_util.h"
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index a31df26523..06d067515e 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * win_glue.c (NEED_SOCKETS): Don't define.
+
2005-02-16 Jeffrey Altman <jaltman@mit.edu>
* gssapi32.def: export the missing DATA symbols
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 63f8b3a969..963a8ec018 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * cc_file.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+
2005-01-13 Ken Raeburn <raeburn@mit.edu>
* cc_file.c (struct _krb5_fcc_data): Fields disk_file_lock,
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 049cc1c686..55a67ea31f 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -77,8 +77,6 @@ etc.
*/
#include "k5-int.h"
-#define NEED_SOCKETS /* Only for ntohs, etc. */
-#define NEED_LOWLEVEL_IO
#include <stdio.h>
#include <errno.h>
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 7907333e02..943aad139b 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * kt_file.c (NEED_SOCKETS): Don't define.
+ * kt_srvtab.c (NEED_SOCKETS): Don't define.
+
2004-11-26 Ken Raeburn <raeburn@mit.edu>
* kt_file.c (krb5_ktfile_wresolve): Initialize mutex here too.
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
index 6fb9f7b36a..c53c2b6445 100644
--- a/src/lib/krb5/keytab/kt_file.c
+++ b/src/lib/krb5/keytab/kt_file.c
@@ -25,7 +25,6 @@
*
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include <stdio.h>
diff --git a/src/lib/krb5/keytab/kt_srvtab.c b/src/lib/krb5/keytab/kt_srvtab.c
index b516614e69..cb9d9c1bc2 100644
--- a/src/lib/krb5/keytab/kt_srvtab.c
+++ b/src/lib/krb5/keytab/kt_srvtab.c
@@ -24,7 +24,6 @@
* or implied warranty.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include <stdio.h>
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 742a5345e5..4bb3baae77 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * fwd_tgt.c (NEED_SOCKETS): Don't define.
+ * recvauth.c (NEED_SOCKETS): Don't define.
+ * sendauth.c (NEED_SOCKETS): Don't define.
+
2005-03-22 Tom Yu <tlyu@mit.edu>
* x-deltat.y (wsnum): Add missing semicolon following YYERROR,
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 4e2c8f04b8..2db2c9e00e 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -24,7 +24,6 @@
* or implied warranty.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#ifdef HAVE_MEMORY_H
#include <memory.h>
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index 3b001c178f..e69be67f0f 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -27,7 +27,6 @@
* convenience sendauth/recvauth functions
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "auth_con.h"
#include "com_err.h"
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index 51f82e1bd5..5b56343075 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -27,7 +27,6 @@
* convenience sendauth/recvauth functions
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "com_err.h"
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 6a60ce4608..294be82dba 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,27 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * accessor.c (NEED_SOCKETS): Don't define.
+ * c_ustime.c (NEED_SOCKETS): Don't define.
+ * changepw.c (NEED_SOCKETS): Don't define.
+ * dnsglue.h (NEED_SOCKETS): Don't define.
+ * full_ipadr.c (NEED_SOCKETS): Don't define.
+ * gen_rname.c (NEED_SOCKETS): Don't define.
+ * genaddrs.c (NEED_SOCKETS): Don't define.
+ * hostaddr.c (NEED_SOCKETS): Don't define.
+ * hst_realm.c (NEED_SOCKETS): Don't define.
+ * krbfileio.c (NEED_LOWLEVEL_IO): Don't define.
+ * localaddr.c (NEED_SOCKETS): Don't define.
+ * locate_kdc.c (NEED_SOCKETS): Don't define.
+ * mk_faddr.c (NEED_SOCKETS): Don't define.
+ * net_read.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+ * net_write.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+ * port2ip.c (NEED_SOCKETS): Don't define.
+ * read_msg.c (NEED_SOCKETS): Don't define.
+ * send524.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+ * sendto_kdc.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+ * sn2princ.c (NEED_SOCKETS): Don't define.
+ * write_msg.c (NEED_SOCKETS): Don't define.
+
2005-03-25 Ken Raeburn <raeburn@mit.edu>
* kuserok.c (krb5_kuserok): Use k5_getpwnam_r.
diff --git a/src/lib/krb5/os/accessor.c b/src/lib/krb5/os/accessor.c
index 078e036fed..f16a6e3e60 100644
--- a/src/lib/krb5/os/accessor.c
+++ b/src/lib/krb5/os/accessor.c
@@ -25,7 +25,6 @@
*
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "os-proto.h"
diff --git a/src/lib/krb5/os/c_ustime.c b/src/lib/krb5/os/c_ustime.c
index 81998daab7..c752a4ade4 100644
--- a/src/lib/krb5/os/c_ustime.c
+++ b/src/lib/krb5/os/c_ustime.c
@@ -27,7 +27,6 @@
* krb5_mstimeofday for BSD 4.3
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "k5-thread.h"
diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index df558b6f25..1d4e1d3ada 100644
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -29,7 +29,6 @@
* Added by Paul W. Nelson, Thursby Software Systems, Inc.
*/
-#define NEED_SOCKETS
#include "fake-addrinfo.h"
#include "k5-int.h"
#include "os-proto.h"
diff --git a/src/lib/krb5/os/dnsglue.h b/src/lib/krb5/os/dnsglue.h
index 9fa293c83a..4164b9a46a 100644
--- a/src/lib/krb5/os/dnsglue.h
+++ b/src/lib/krb5/os/dnsglue.h
@@ -45,7 +45,6 @@
#ifdef KRB5_DNS_LOOKUP
-#define NEED_SOCKETS
#include "k5-int.h"
#include "os-proto.h"
#ifdef WSHELPER
diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c
index b3da60866e..c72daa8c95 100644
--- a/src/lib/krb5/os/full_ipadr.c
+++ b/src/lib/krb5/os/full_ipadr.c
@@ -27,7 +27,6 @@
* Take an IP addr & port and generate a full IP address.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#ifdef HAVE_NETINET_IN_H
diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c
index d5669cf37f..7978a5dbcf 100644
--- a/src/lib/krb5/os/gen_rname.c
+++ b/src/lib/krb5/os/gen_rname.c
@@ -28,7 +28,6 @@
* a replay cache tag string.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "os-proto.h"
diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c
index aa1b91dbfa..f3e86a5042 100644
--- a/src/lib/krb5/os/genaddrs.c
+++ b/src/lib/krb5/os/genaddrs.c
@@ -27,7 +27,6 @@
* Take an IP addr & port and generate a full IP address.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "os-proto.h"
diff --git a/src/lib/krb5/os/hostaddr.c b/src/lib/krb5/os/hostaddr.c
index 8dcc057583..76eb1273dc 100644
--- a/src/lib/krb5/os/hostaddr.c
+++ b/src/lib/krb5/os/hostaddr.c
@@ -27,7 +27,6 @@
*
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "fake-addrinfo.h"
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 7e0335a42d..b5c8f66ff4 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -66,7 +66,6 @@
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "os-proto.h"
#include <ctype.h>
diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c
index ff19a53557..6ef16ebd0c 100644
--- a/src/lib/krb5/os/krbfileio.c
+++ b/src/lib/krb5/os/krbfileio.c
@@ -36,7 +36,6 @@
static char *VersionID = "@(#)krbfileio.c 2 - 08/22/91";
#endif
-#define NEED_LOWLEVEL_IO /* Need open(), etc. */
#include "k5-int.h"
#ifdef HAVE_SYS_FILE_H
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 9af5a5ed28..75953b1f36 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -33,7 +33,6 @@
* XNS support is untested, but "Should just work". (Hah!)
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#if !defined(_WIN32)
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 1fafbcaa9a..484c8e8e9f 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -27,7 +27,6 @@
* get socket addresses for KDC.
*/
-#define NEED_SOCKETS
#include "fake-addrinfo.h"
#include "k5-int.h"
#include "os-proto.h"
diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c
index 5fe025131f..2184f72206 100644
--- a/src/lib/krb5/os/mk_faddr.c
+++ b/src/lib/krb5/os/mk_faddr.c
@@ -27,7 +27,6 @@
* Take an IP addr & port and generate a full IP address.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#ifdef HAVE_NETINET_IN_H
diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c
index 372609d860..1d07a95d9d 100644
--- a/src/lib/krb5/os/net_read.c
+++ b/src/lib/krb5/os/net_read.c
@@ -25,8 +25,6 @@
*
*/
-#define NEED_LOWLEVEL_IO
-#define NEED_SOCKETS
#include "k5-int.h"
/*
diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c
index 9d932a453a..e4981543aa 100644
--- a/src/lib/krb5/os/net_write.c
+++ b/src/lib/krb5/os/net_write.c
@@ -25,8 +25,6 @@
*
*/
-#define NEED_LOWLEVEL_IO
-#define NEED_SOCKETS
#include "k5-int.h"
/*
diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index e5e8b68aee..6b5838b850 100644
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -27,7 +27,6 @@
* Take an ADDRPORT address and split into IP addr & port.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#ifdef HAVE_NETINET_IN_H
diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index 4eb5b2e2a1..776502c6d3 100644
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -27,7 +27,6 @@
* Write a message to the network
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include <errno.h>
diff --git a/src/lib/krb5/os/send524.c b/src/lib/krb5/os/send524.c
index eeb586162d..004d803486 100644
--- a/src/lib/krb5/os/send524.c
+++ b/src/lib/krb5/os/send524.c
@@ -26,8 +26,6 @@
*/
/* Grab socket stuff. This might want to go away later. */
-#define NEED_SOCKETS
-#define NEED_LOWLEVEL_IO
#include "fake-addrinfo.h" /* for custom addrinfo if needed */
#include "k5-int.h"
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 599c28515c..5b6ec4cfd9 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -28,8 +28,6 @@
* as necessary.
*/
-#define NEED_SOCKETS
-#define NEED_LOWLEVEL_IO
#include "fake-addrinfo.h"
#include "k5-int.h"
diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c
index dea1b3c3c2..65678c8294 100644
--- a/src/lib/krb5/os/sn2princ.c
+++ b/src/lib/krb5/os/sn2princ.c
@@ -28,7 +28,6 @@
* form.
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include "fake-addrinfo.h"
#include <ctype.h>
diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c
index dc72fc7605..d75a32796d 100644
--- a/src/lib/krb5/os/write_msg.c
+++ b/src/lib/krb5/os/write_msg.c
@@ -27,7 +27,6 @@
* convenience sendauth/recvauth functions
*/
-#define NEED_SOCKETS
#include "k5-int.h"
#include <errno.h>
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 597ce15e66..79b1d377fe 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-13 Ken Raeburn <raeburn@mit.edu>
+
+ * rc_io.c (NEED_SOCKETS, NEED_LOWLEVEL_IO): Don't define.
+
2005-01-15 Jeffrey Altman <jaltman@mit.edu>
* rc_dfl.c: Move the extraction of the struct dfl_data
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index a45b643606..9897f731f0 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -18,8 +18,6 @@
#endif
#define KRB5_RC_VNO 0x0501 /* krb5, rcache v 1 */
-#define NEED_SOCKETS
-#define NEED_LOWLEVEL_IO
#include "krb5.h"
#include <stdio.h> /* for P_tmpdir */
diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c
index 05b2a8aa7a..4d1800a920 100644
--- a/src/lib/win_glue.c
+++ b/src/lib/win_glue.c
@@ -19,7 +19,6 @@
#ifdef KRB4
#include <kerberosIV/krb.h>
#endif
-#define NEED_SOCKETS
#include "k5-int.h"
#ifndef NEED_WINSOCK
diff --git a/src/mac/MacOSX/Headers/Kerberos5Prefix.h b/src/mac/MacOSX/Headers/Kerberos5Prefix.h
index acd5ebb4f1..4320d4c10d 100644
--- a/src/mac/MacOSX/Headers/Kerberos5Prefix.h
+++ b/src/mac/MacOSX/Headers/Kerberos5Prefix.h
@@ -155,7 +155,6 @@
#define LINEMODE 1
#define NEED_DAEMON_PROTO 1
#define NEED_PARSETOS_PROTO 1
-#define NEED_SOCKETS
#define NO_UT_EXIT 1
#define NO_UT_PID 1
#define NO_UT_TYPE 1