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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c5e5bc879f7ef054a848e1211a753366c4da5931..4d3297153fcb4c40dcc61a0d2a773fd7d7a6058b 100644 (file)
--- 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 008114626a90548441686c8b08bdcf5354f59e37..c76c4142c6d0d6ef73c2968177a7e2df67899dae 100644 (file)
--- 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 a5450b80352e2db31833c5e6c65ec0666f222b82..89fee2c50cb8c0dcec588f5391b38b307374d4b8 100644 (file)
--- 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 6b9ca41f127fedc3ead0124305c715de1f2c9e1f..d32a445465adcc5f81df1c8980f4fa06769d17dc 100644 (file)
--- 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 8b5db1f8a86204ba66774076d21e09f972e5f13f..24694c31c1db5f4a975cc2b346d2aeb52725f46b 100644 (file)
--- 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 372b7127c2fce0757aa94e6144f665a6df2d981c..90ccba05fa471fd187bd3621b3e45ea424a4e45b 100644 (file)
--- 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 69f392c5195ddbf0e0bb4e2ba33dfcbe52a01b8c..68c74ceeaaf7b61d4dc74b28af6c694f068e2a1b 100644 (file)
--- 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 d97acfaeed23abc1b3d5fc077dce663a7c7619fa..0432661d765fec49c64097e6694b6aae2eb57744 100644 (file)
--- 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 7f3efd8491a78bbca087d52cd4356938d4904ac6..f292a17f8692201dfb0a58217601895319817f55 100644 (file)
--- 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 085e2855c0376d8835d3ceac634f2a64780719c5..7aecb227ef9c09a257a71b3ae5ca216543c16eb0 100644 (file)
--- 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 d05057aca89bd2e41288e3c5b74dfb7683d97ac2..84a90b16fe4ee4d1f123f1cc83ead59a06261e90 100644 (file)
--- 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 a31df26523de170da62fec92997f5b396d3c300c..06d067515e7d567bdff2ea1e2faa0d0c3d2dfb3f 100644 (file)
--- 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 63f8b3a969deba8b47a2c7c84d209da83d2bf232..963a8ec0188a00e9d4a5472e1d2c9611a8364d85 100644 (file)
--- 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 049cc1c686c54d4d4104fbcffd8e50248eced191..55a67ea31fa72851739d0fcd91a448133c15035c 100644 (file)
--- 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 7907333e02a740a9a791c74988ef79f0a88b05f0..943aad139bb29304184d057c51cf05af890e2bea 100644 (file)
--- 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 6fb9f7b36af087762dbf578610e47b063a0c2426..c53c2b64454a425e83b09a89fd0158ed63adb1d3 100644 (file)
--- 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 b516614e69234fa8d8ee911d1994a48ef23f8a89..cb9d9c1bc21931a89d32a1d4fb25231f41ee7d3e 100644 (file)
--- 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 742a5345e59f7ad2bda2add78e7b923244dc0efb..4bb3baae77aae3f35c1495aaafb9d374100692f0 100644 (file)
--- 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 4e2c8f04b8232140e36484237784598c19a8e81f..2db2c9e00e06068d316bccc6c0f32b5d3e422a03 100644 (file)
--- 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 3b001c178f5c7779f64591d1462097dfe9ee55c5..e69be67f0f2742bb1c945c3539a7146fd46c8688 100644 (file)
--- 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 51f82e1bd5e876620988fdf73dc96bdb86ae6029..5b563430756da1a98d3149760c0b33f00f533a14 100644 (file)
--- 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 6a60ce46082adad813922458e7d69d842e8c3e38..294be82dbac680b77ae9914df910384053ca7905 100644 (file)
--- 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 078e036fedf9899c54412849edf7c8cb8abf0026..f16a6e3e60d598e33d7bdacf045687f741e2a0e0 100644 (file)
--- 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 81998daab7fe1d841102854bf1ffbb55c7fe4844..c752a4ade475e2585fa53cbc01633663b0f10450 100644 (file)
--- 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 df558b6f2527842e7d5069414fad50512484f10a..1d4e1d3adae65a1452ec1b09daa3cc83a05a90e0 100644 (file)
--- 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 9fa293c83a8f43c8396c3b8fb4491e3864c36630..4164b9a46a4fd93f9b628f25eeae2ee6943cfd73 100644 (file)
--- 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 b3da60866eb954a648de8d6aeff2f33e93fd7aab..c72daa8c954bfb4bbb10b15bd8765b6d8f79e345 100644 (file)
--- 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 d5669cf37ff3402e050ca3c2784c165df9823f89..7978a5dbcf46f1ea6a22443de419534d0c9c5515 100644 (file)
--- 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 aa1b91dbfa92025a4e801abace14d2f1f3797428..f3e86a5042ecd7af9969e86f74f02aa0e6e3c4dc 100644 (file)
--- 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 8dcc057583bd8243107a7b8e88afe76d84f71746..76eb1273dcdb4a1cac3579765aca5b8b738bb7f1 100644 (file)
--- 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 7e0335a42d89b5219668a3d28577900a1611b2f3..b5c8f66ff492860291ac627136ab713afce0bd1f 100644 (file)
--- 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 ff19a535572e8697808beb01a3a7bb81bc04feb5..6ef16ebd0c7b4eb9cee70e4efcc49d33738ecab4 100644 (file)
--- 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 9af5a5ed2811434bb9401a0c9bea2eaaca6b8ede..75953b1f364eaa71a35921038066d012e38801b5 100644 (file)
--- 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 1fafbcaa9a510da4f4ae3291a8444947d54a5134..484c8e8e9f652728a7c1e513f651a36205eb088e 100644 (file)
--- 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 5fe025131f54b16a174e0640e92f46ab74cb138f..2184f72206013a73f902f77afc211a599576159d 100644 (file)
--- 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 372609d860afcdb04335f1cef09b1b0183c1c973..1d07a95d9dc2c41b7f37431cd92be3778df74b58 100644 (file)
--- 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 9d932a453aa5b5f0adeb3e7d9ad456e7a99e16c3..e4981543aa94ac374df081055afa541e4296927b 100644 (file)
--- 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 e5e8b68aee455317d5f075ec01a447e15ae24245..6b5838b85030f0e5704c445484a67fb2456ccc69 100644 (file)
--- 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 4eb5b2e2a107f9c55252a99785cb5735e1b068b8..776502c6d3033726ed07fce30619d44261a72517 100644 (file)
--- 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 eeb586162d1e152b8ca783af1068cf5892f6c9e8..004d80348688b399c2469a90eac10613e7592bcb 100644 (file)
--- 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 599c28515cbeac1ed34d869d059d2b90b67afa53..5b6ec4cfd98c10df3c7c4b0c9c6ce1cb0691be4b 100644 (file)
--- 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 dea1b3c3c2416c445c4497c9ac6147602fd6a3ea..65678c8294b573d06a95fa814dcc4d40f84bc589 100644 (file)
--- 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 dc72fc7605196b9e73e59f89e5826fe2d4cd2c1d..d75a32796def19e5edb4128ae6d8bbd8a5052319 100644 (file)
--- 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 597ce15e6641b801dd6dc9bc8c49fbc3230c18de..79b1d377fed915496f4e9e0792df83ce91e32478 100644 (file)
--- 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 a45b6436068134a05120f0281e61c68ab5f7bb44..9897f731f075b3c7c2ca248b44fbf0afc4997bbd 100644 (file)
--- 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 05b2a8aa7ab2a56e55709fdc57f651322d517be3..4d1800a92095f1d2170c98127f63a48a4b95416c 100644 (file)
--- 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 acd5ebb4f1e4d97db4454129f037f65686cf7120..4320d4c10d028361f5326ffcb29235419193bc37 100644 (file)
--- 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