From: Sam Hartman <hartmans@mit.edu>
Date: Mon, 24 Jun 1996 04:05:09 +0000 (+0000)
Subject: * klogind should do a better job of initializing output flags on tty
X-Git-Tag: krb5-1.0-beta7~334
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3f304fb4a446461e465bc7f1679837a0674ce9b;p=krb5.git

* klogind should do a better job of initializing output flags on tty
* Fix so login.krb5 compiles with Athena Kerberos libs (needed
    for rsaix build)

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index a8f4563a8..daceb9f08 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,21 @@
+Fri Jun 21 21:12:52 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* configure.in : Make sure it works with the built-in libkrb4.a again.
+
+Fri Jun 14 13:19:30 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* login.c: Add define to deal with krb_save_credentials possibly
+ 	being called save_credentials, and to define krb_get_err_text if
+ 	it is not defined by the krb4 library.
+
+	* configure.in :  check for krb_save_credentials and krb_get_err_text
+
+Thu Jun 13 14:24:50 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* krlogind.c (doit): If using vendor login, make sure output flags
+ 	are reasonable.
+
+
 Sat Jun 15 04:03:32 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Cleanup of tests whose results are not longer used
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 7bf583f82..bf8136d37 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -1,5 +1,5 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
-LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
+LOCALINCLUDE=
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
 
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 476046ba7..d8620999f 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -216,4 +216,15 @@ USE_KRB4_LIBRARY
 USE_KRB5UTIL_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
+if test "$krb5_cv_build_krb4_libs" = yes; then
+	AC_DEFINE(HAVE_KRB_GET_ERR_TEXT)
+	AC_DEFINE(HAVE_KRB_SAVE_CREDENTIALS)
+else
+	oldlibs=$LIBS
+	LIBS=" $KRB4_LIB -lkrb5 -lcrypto -lcom_err"
+	AC_CHECK_FUNCS(krb_get_err_text krb_save_credentials)
+	LIBS=$oldlibs
+fi
+
+AC_CHECK_HEADERS(krb4-proto.h)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index f016fcd7b..ac83cccb0 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -620,6 +620,7 @@ int syncpipe[2];
 	new_termio.c_iflag &= ~(IXON|IXANY|BRKINT|INLCR|ICRNL);
 #else
 	new_termio.c_lflag |= (ICANON|ECHO|ISIG|IEXTEN);
+	new_termio.c_oflag |= (ONLCR|OPOST|TAB3);
 	new_termio.c_iflag|= (IXON|IXANY|BRKINT|INLCR|ICRNL);
 #endif /*Do we need binary stream?*/
 	new_termio.c_iflag &= ~(ISTRIP);
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 4a86e5107..86e9eeda5 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -173,12 +173,29 @@ typedef sigtype (*handler)();
 #include <krb.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef HAVE_KRB4_PROTO_H
 #include <krb4-proto.h>
+#endif
 #include <arpa/inet.h>
 #ifdef BIND_HACK
 #include <arpa/nameser.h>
 #include <arpa/resolv.h>
 #endif /* BIND_HACK */
+
+/* Hacks to maintain compatability with Athena libkrb*/
+#ifndef HAVE_KRB_SAVE_CREDENTIALS
+#define krb_save_credentials save_credentials
+#endif /*HAVE_KRB_SAVE_CREDENTIALS*/
+
+#ifndef HAVE_KRB_GET_ERR_TEXT
+
+static const char * krb_get_err_text(kerror)
+  int kerror;
+{
+  return krb_err_txt[kerror];
+}
+
+#endif /*HAVE_KRB_GET_ERR_TEXT*/
 #endif /* KRB4 */
 
 #ifndef __STDC__