Change approach for getaddrinfo support. Now, only fake-addrinfo.h is

included, no magic macros need to be defined, and no special care needs to be
taken to identify a unique object file used in all builds of a library/program.

All defined functions (if any) are static in each object file, and declared
inline under gcc so they can be more easily eliminated.  Simplifies
maintenance, and worst case should add no more than a few KB to libraries and
programs.

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

7 files changed, 17 insertions, 7 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index f541a00cd9..bbdf547dc9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* defines.h (FAI_PREFIX): Don't define.
+	* kcmd.c (kcmd_connect): Don't include fake-addrinfo.c.
+
 2002-03-20  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in: Remove dependencies on krb524_err.h for login.o. If
diff --git a/src/appl/bsd/defines.h b/src/appl/bsd/defines.h
index d8bf867659..93ef6ec62d 100644
--- a/src/appl/bsd/defines.h
+++ b/src/appl/bsd/defines.h
@@ -69,5 +69,4 @@ krb5_error_code rd_and_store_for_creds(krb5_context context,
 extern int setenv(char *, char *, int);
 #endif
 
-#define FAI_PREFIX bsd
 #include "fake-addrinfo.h"
diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index 402e6ccb9c..e252e03f68 100644
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -188,8 +188,6 @@ restore_sigs (masktype *oldmask)
 #endif /* POSIX_SIGNALS */
 }
 
-#include "fake-addrinfo.c"
-
 static int
 kcmd_connect (int *sp, int *addrfamilyp, struct sockaddr_in *sockinp,
 	      char *hname, char **host_save, unsigned int rport, int *lportp,
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index ce9ed967b1..8973d87750 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* commands.c: Include fake-addrinfo.h, not fake-addrinfo.c.
+	(FAI_PREFIX): Delete.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* commands.c, externs.h, ring.h, telnet.c: Make prototypes
diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index 4f31586a1d..5e693bd1ae 100644
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -119,8 +119,7 @@ int tos = -1;
 static	unsigned long sourceroute(char *, char **, int *);
 #endif	/* defined(IPPROTO_IP) && defined(IP_TOS) */
 
-#define FAI_PREFIX telnet
-#include "fake-addrinfo.c"
+#include "fake-addrinfo.h"
 
 char	*hostname;
 static char _hostname[MAXDNAME];
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 73fd83d04f..5c27eca2ba 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* telnetd.c: Include fake-addrinfo.h, not fake-addrinfo.c.
+	(FAI_PREFIX): Delete.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* defs.h, state.c, sys_term.c, telnetd-ktd.c, telnetd.c: Make
diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index aefcacf9e0..bed4a32948 100644
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -77,8 +77,7 @@ struct	socket_security ss;
 # endif /* SO_SEC_MULTI */
 #endif	/* _SC_CRAY_SECURE_SYS */
 
-#define FAI_PREFIX telnetd
-#include "fake-addrinfo.c"
+#include "fake-addrinfo.h"
 
 #ifdef KRB5
 #include "krb5.h"