From: Theodore Tso <tytso@mit.edu>
Date: Sat, 11 Feb 1995 00:05:33 +0000 (+0000)
Subject: Add check for libsocket and libnsl (sigh).  krb5_init_ctx drags in
X-Git-Tag: krb5-1.0-beta5~719
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b18fa8cc90c04872530e3ddf0385ea7369bdc06;p=krb5.git

Add check for libsocket and libnsl (sigh).  krb5_init_ctx drags in
cryptoconf.c, which drags in enough of the crypto library that
socket() gets called.  We should to fix this eventually to make klist
smaller, but the fix will be subtle.  Sigh....

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

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 66937e824..356863f3c 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,17 @@
+Fri Feb 10 18:46:17 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that
+		libsocket can be pulled in if necessary.
+
+	* kdestroy.c (main): Call krb5_init_context to initialize the
+		context. 
+
+	* configure.in: Add check for libsocket and libnsl (sigh).
+		krb5_init_ctx drags in cryptoconf.c, which drags in enough
+		of the crypto library that socket() gets called.  We should
+		to fix this eventually to make klist smaller, but the fix
+		will be subtle.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 66289d687..8fa5bb1f4 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,7 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
-ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
@@ -10,7 +9,7 @@ KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 
 kdestroy: kdestroy.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o kdestroy kdestroy.o $(KLIB)
+	$(CC) $(CFLAGS) -o kdestroy kdestroy.o $(KLIB) $(LIBS)
 
 kdestroy.o:	$(srcdir)/kdestroy.c
 
diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index 045b4c864..be0586339 100644
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -4,6 +4,7 @@ AC_SET_BUILDTOP
 AC_PROG_INSTALL
 CONFIG_RULES
 KRB_INCLUDE
-ISODE_INCLUDE
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 25f335560..2b8ff4c73 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -39,7 +39,7 @@ main(argc, argv)
     int argc;
     char **argv;
 {
-	krb5_context kcontext;
+    krb5_context kcontext;
     int c;
     krb5_ccache cache = NULL;
     char *cache_name = NULL;
@@ -47,6 +47,7 @@ main(argc, argv)
     int errflg=0;
     int quiet = 0;	
     
+    krb5_init_context(&kcontext);
     krb5_init_ets(kcontext);
 
     if (strrchr(argv[0], '/'))