diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-08-17 02:39:48 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-08-17 02:39:48 +0000 |
| commit | 189ad6c2cc886967795fb8fcaaa882b051c425ea (patch) | |
| tree | e398a70c380d5d71faf69b8fa788d37900b297fc | |
| parent | f22ee5a27541220707d7800a030000c9f786eabe (diff) | |
| download | krb5-189ad6c2cc886967795fb8fcaaa882b051c425ea.tar.gz krb5-189ad6c2cc886967795fb8fcaaa882b051c425ea.tar.xz krb5-189ad6c2cc886967795fb8fcaaa882b051c425ea.zip | |
loginlibs, sys/select
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4167 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/appl/bsd/ChangeLog | 9 | ||||
| -rw-r--r-- | src/appl/bsd/Makefile.in | 3 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 10 | ||||
| -rw-r--r-- | src/appl/bsd/krshd.c | 4 |
4 files changed, 23 insertions, 3 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 74cd3a8e4..158f2f64e 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,7 +1,14 @@ +Tue Aug 16 22:36:29 1994 Mark Eichin (eichin@cygnus.com) + + * configure.in: set LOGINLIBS to -lodm -ls -lcfg if the system has + all three (and is probably an AIX system.) + * Makefile.in: use LOGINLIBS for login.krb5. + * krshd.c: use HAVE_SYS_SELECT_H. + Tue Aug 16 17:58:09 1994 Mark Eichin (eichin@cygnus.com) * krcp.c: check HAVE_VFORK_H - configure.in: use AC_VFORK (runtime test -- consider just using + * configure.in: use AC_VFORK (runtime test -- consider just using fork instead.) Sat Aug 13 02:04:37 1994 Mark Eichin (eichin@perdiem) diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index a0d4faa4a..5ea022a7c 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -6,6 +6,7 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a K4LIB = $(KRB4)/lib/libkrb.a KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) +LOGINLIBS = @LOGINLIBS@ LIBOBJS=@LIBOBJS@ SRCS= krcp.c krlogin.c krsh.c kcmd.c forward.c logutil.c $(SETENVSRC) \ @@ -52,7 +53,7 @@ install:: $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) - $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) $(LOGINLIBS) install:: $(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5 diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 4187b7d60..c79c0e27d 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -10,6 +10,14 @@ AC_HAVE_LIBRARY(nsl) dnl dbm libs for use of an_to_ln AC_HAVE_LIBRARY(-lndbm) AC_HAVE_LIBRARY(-ldbm) +dnl +dnl AIX has them all; SCO might too +AC_HAVE_LIBRARY(-lodm, + AC_HAVE_LIBRARY(-ls, + AC_HAVE_LIBRARY(-lcfg, + LOGINLIBS="-lodm -ls -lcfg" + AC_SUBST(LOGINLIBS)))) +dnl AC_VFORK AC_FUNC_CHECK(strsave,AC_DEFINE(HAS_STRSAVE)) AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES)) @@ -27,7 +35,7 @@ AC_COMPILE_CHECK([sigset_t], [#include <signal.h>], [sigset_t x], AC_DEFINE(POSIX_SIGNALS))) -AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h sys/ptyvar.h lastlog.h) +AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h sys/ptyvar.h lastlog.h sys/select.h) AC_REPLACE_FUNCS(getdtablesize) CHECK_DIRENT CHECK_FCNTL diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index 69688cd3b..2d6b8fbd8 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -92,6 +92,10 @@ static char sccsid[] = "@(#)rshd.c 5.12 (Berkeley) 9/12/88"; #include <sys/socket.h> #include <sys/file.h> #include <sys/time.h> + +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif #ifdef NEED_SYS_FCNTL_H #include <sys/fcntl.h> |