diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-05-24 04:51:38 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-05-24 04:51:38 +0000 |
| commit | 40711cc106681561609b6035c9c3eb613b3efa24 (patch) | |
| tree | 2ffccfe7a7776262ac3a6b45a5228bbf2edf1444 /src/appl/bsd | |
| parent | 188ed4838183688c58e0e45d9b959f083e58b51d (diff) | |
| download | krb5-40711cc106681561609b6035c9c3eb613b3efa24.tar.gz krb5-40711cc106681561609b6035c9c3eb613b3efa24.tar.xz krb5-40711cc106681561609b6035c9c3eb613b3efa24.zip | |
Big step towards integrating libkrb524 into libkrb5:
Move libkrb524 code, including error table, into libkrb5. Now libkrb5
initialization pulls in the krb524 error table, so krb524_init_ets is
gone; all calls deleted.
Move krb4 life/time conversion functions into libkrb5 under new names,
using accessor hooks to get at them from libkrb4.
Move declarations from krb524.h into krb5.h, k5-int.h, or krb524d.h;
the last doesn't get copied into the include directory. Changed
inclusions of krb524.h to the appropriate files, if any were needed.
Rebuilt dependencies in Makefiles.
These changes are likely to break the Windows build; I'll look into
that soon.
ticket: 1491
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15491 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/bsd')
| -rw-r--r-- | src/appl/bsd/ChangeLog | 6 | ||||
| -rw-r--r-- | src/appl/bsd/Makefile.in | 2 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 3 | ||||
| -rw-r--r-- | src/appl/bsd/login.c | 7 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 274d2bdfb7..3a096e1077 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,9 @@ +2003-05-23 Ken Raeburn <raeburn@mit.edu> + + * configure.in: Don't use libkrb524.a any more. + * login.c: Don't include krb524.h. + (try_convert524): Don't call krb524_init_ets. + 2003-05-09 Tom Yu <tlyu@mit.edu> * krcp.c (main): Rename getlocalsubkey -> getsendsubkey. diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index 58289837fb..1be6b0b372 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -143,7 +143,7 @@ $(OUTPRE)login.$(OBJEXT): login.c $(BUILDTOP)/include/libpty.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(KRB524_H_DEP) $(KRB524_ERR_H_DEP) loginpaths.h + loginpaths.h $(OUTPRE)krshd.$(OBJEXT): krshd.c $(BUILDTOP)/include/libpty.h \ $(SRCTOP)/include/syslog.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) loginpaths.h $(SRCTOP)/include/kerberosIV/krb.h \ diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 8f4a16bd61..7bfc68e3bb 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -62,8 +62,7 @@ if test $withval = no; then V4RCP= V4RCPO= else - AC_MSG_RESULT(Adding in krb4 support) - LOGINLIBS="../../krb524/libkrb524.a $LOGINLIBS" + AC_MSG_RESULT(Adding in krb4 rcp support) V4RCP=v4rcp V4RCPO=v4rcp.o fi diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c index 5b5603793d..8259046d60 100644 --- a/src/appl/bsd/login.c +++ b/src/appl/bsd/login.c @@ -181,10 +181,6 @@ typedef sigtype (*handler)(); #include <arpa/resolv.h> #endif /* BIND_HACK */ -#ifdef KRB4_CONVERT -#include <krb524.h> -#endif - /* Hacks to maintain compatability with Athena libkrb*/ #ifndef HAVE_KRB_SAVE_CREDENTIALS #define krb_save_credentials save_credentials @@ -654,9 +650,6 @@ try_convert524(kctx, me, use_ccache) CREDENTIALS v4creds; - /* or do this directly with krb524_convert_creds_kdc */ - krb524_init_ets(kctx); - /* If we have forwarded v5 tickets, retrieve the credentials from * the cache; otherwise, the v5 credentials are in my_creds. */ |