Build without k5-int.h

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

4 files changed, 15 insertions, 5 deletions

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index f2223709d..be7e4d7a5 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-12  Sam Hartman  <hartmans@mit.edu>
+
+	* kerberos5.c forward.c: Build without k5-int.h
+
 2002-03-29  Tom Yu  <tlyu@mit.edu>
 
 	* kerberos.c, kerberos5.c (Data): Reindent to 8 columns. (yes,
diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c
index d161e78dc..01c341c07 100644
--- a/src/appl/telnet/libtelnet/forward.c
+++ b/src/appl/telnet/libtelnet/forward.c
@@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <netdb.h>
  
-#include "k5-int.h"
+#include "krb5.h"
+#include <errno.h>
+
 #include "krb5forw.h"
  
 #if defined(NEED_SETENV) || defined(NEED_SETENV_PROTO)
@@ -53,7 +55,7 @@ rd_and_store_for_creds(context, auth_context, inbuf, ticket)
 	return(retval);
 
     sprintf(ccname, "FILE:/tmp/krb5cc_p%ld", (long) getpid());
-    setenv(KRB5_ENV_CCNAME, ccname, 1);
+    setenv("KRB5CCNAME", ccname, 1);
 
     if ((retval = krb5_cc_resolve(context, ccname, &ccache)))
 	goto cleanup;
diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c
index 847c082b8..2f92ed1dd 100644
--- a/src/appl/telnet/libtelnet/kerberos.c
+++ b/src/appl/telnet/libtelnet/kerberos.c
@@ -716,7 +716,9 @@ kerberos4_cksum(d, n)
 	return(ck);
 }
 #else
-#include "k5-int.h"
+#include <krb5.h>
+#include <errno.h>
+
 #endif
 
 #ifdef notdef
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 70a90074b..486ef7f52 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -63,8 +63,10 @@
 
 #ifdef	KRB5
 #include <arpa/telnet.h>
+#include <errno.h>
 #include <stdio.h>
-#include "k5-int.h"
+#include "krb5.h"
+
 #include "com_err.h"
 #include <netdb.h>
 #include <ctype.h>
@@ -202,7 +204,7 @@ kerberos5_cleanup()
     if (telnet_context == 0)
 	return;
 
-    ccname = getenv(KRB5_ENV_CCNAME);
+    ccname = getenv("KRB5CCNAME");
     if (ccname) {
 	retval = krb5_cc_resolve(telnet_context, ccname, &ccache);
 	if (!retval)