[1940] in Kerberos-V5-bugs
beta-6 (minus) will not compile w/o krb4 supportn
daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Tue May 28 15:21:21 1996
From: epeisach@MIT.EDU
Date: Tue, 28 May 1996 15:21:09 -0400
To: tytso@MIT.EDU
Cc: krb5-bugs@MIT.EDU
Sam reported this. This conditionalizes the compiling... I think it
should go in as you cannot compile the environment w/o krb4 support
without it. The configure.in part looks ugly and I would want to change
aclocal.m4 to add the support there properly, but not at this late
date...
Ezra
cvs diff: Diffing .
Index: Makefile.in
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/bsd/Makefile.in,v
retrieving revision 5.37
diff -c -r5.37 Makefile.in
*** Makefile.in 1996/05/01 03:16:31 5.37
--- Makefile.in 1996/05/28 19:12:33
***************
*** 3,9 ****
SETENVSRC=@SETENVSRC@
SETENVOBJ=@SETENVOBJ@
! LOGINLIBS = ../../krb524/libkrb524.a @LOGINLIBS@
LIBOBJS=@LIBOBJS@
LOCAL_LIBRARIES=-lpty
--- 3,9 ----
SETENVSRC=@SETENVSRC@
SETENVOBJ=@SETENVOBJ@
! LOGINLIBS =@LOGINLIBS@
LIBOBJS=@LIBOBJS@
LOCAL_LIBRARIES=-lpty
Index: configure.in
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/bsd/configure.in,v
retrieving revision 5.73
diff -c -r5.73 configure.in
*** configure.in 1996/05/01 03:16:35 5.73
--- configure.in 1996/05/28 19:13:04
***************
*** 37,42 ****
--- 37,58 ----
)
;;
esac
+ dnl
+ dnl After beta6 this functionality will be integrated with aclocal.m4
+ AC_ARG_WITH([krb4],
+ [ --without-krb4 don't include Kerberos V4 backwards compatibility
+ --with-krb4 use V4 libraries included with V5 (default)
+ --with-krb4=KRB4DIR use preinstalled V4 libraries],
+ ,
+ withval=yes
+ )dnl
+ if test $withval = no; then
+ AC_MSG_RESULT(no krb4 support)
+ else
+ AC_MSG_RESULT(Adding in krb4 support)
+ LOGINLIBS="../../krb524/libkrb524.a $LOGINLIBS"
+ fi
+ dnl
dnl
AC_SUBST(LOGINLIBS)
dnl
Index: login.c
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/bsd/login.c,v
retrieving revision 5.47
diff -c -r5.47 login.c
*** login.c 1996/05/23 23:29:33 5.47
--- login.c 1996/05/28 19:15:40
***************
*** 256,264 ****
#ifdef KRB4_GET_TICKETS
#define KRB_ENVIRON "KRBTKFILE" /* Ticket file environment variable */
#define KRB_TK_DIR "/tmp/tkt_" /* Where to put the ticket */
#define MAXPWSIZE 128 /* Biggest string accepted for KRB4
passsword */
! #endif /* KRB4_GET_TICKETS */
#ifdef __SVR4
#define NO_MOTD
--- 256,267 ----
#ifdef KRB4_GET_TICKETS
#define KRB_ENVIRON "KRBTKFILE" /* Ticket file environment variable */
#define KRB_TK_DIR "/tmp/tkt_" /* Where to put the ticket */
+ #endif /* KRB4_GET_TICKETS */
+
+ #if defined(KRB4_GET_TICKETS) || defined(KRB5_GET_TICKETS)
#define MAXPWSIZE 128 /* Biggest string accepted for KRB4
passsword */
! #endif
#ifdef __SVR4
#define NO_MOTD
***************
*** 843,851 ****
*
* Returns 1 for confirmation, -1 for failure, 0 for uncertainty.
*/
! int verify_krb_v5_tgt (c, realm)
krb5_context c;
- char *realm;
{
char phost[BUFSIZ];
krb5_ccache ccdef;
--- 846,853 ----
*
* Returns 1 for confirmation, -1 for failure, 0 for uncertainty.
*/
! int verify_krb_v5_tgt (c)
krb5_context c;
{
char phost[BUFSIZ];
krb5_ccache ccdef;
***************
*** 1437,1443 ****
if (lpass_ok)
break;
if (got_v5_tickets
! && verify_krb_v5_tgt(kcontext, realm) != -1)
break; /* we're ok */
#ifdef KRB4_GET_TICKETS
if (login_krb4_get_tickets) {
--- 1439,1445 ----
if (lpass_ok)
break;
if (got_v5_tickets
! && verify_krb_v5_tgt(kcontext) != -1)
break; /* we're ok */
#ifdef KRB4_GET_TICKETS
if (login_krb4_get_tickets) {
***************
*** 1556,1563 ****
}
#endif
! #ifdef KRB5_GET_TICKETS
if (login_krb4_get_tickets || login_krb5_get_tickets) {
/* Fork so that we can call kdestroy */
dofork();
}
--- 1558,1571 ----
}
#endif
! #if defined(KRB5_GET_TICKETS) || defined(KRB4_GET_TICKETS)
! #if defined(KRB5_GET_TICKETS) && defined(KRB4_GET_TICKETS)
if (login_krb4_get_tickets || login_krb5_get_tickets) {
+ #elif defined(KRB4_GET_TICKETS)
+ if (login_krb4_get_tickets) {
+ #else
+ if (login_krb5_get_tickets) {
+ #endif
/* Fork so that we can call kdestroy */
dofork();
}
***************
*** 2223,2229 ****
exit(eval);
}
! #ifdef KRB4_GET_TICKETS
/* call already conditionalized on login_krb4_get_tickets */
/*
* This routine handles cleanup stuff, and the like.
--- 2231,2237 ----
exit(eval);
}
! #if defined(KRB4_GET_TICKETS) || defined(KRB5_GET_TICKETS)
/* call already conditionalized on login_krb4_get_tickets */
/*
* This routine handles cleanup stuff, and the like.
