From b50b152b3e7c89a337793ac4a32b9b1c88becfe1 Mon Sep 17 00:00:00 2001 From: Richard Basch Date: Mon, 26 Dec 1994 18:54:47 +0000 Subject: [PATCH] Removed the hard-coded paths for the BSD rlogin/rcp/rsh programs. Let "configure" find the programs for us... git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4751 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 10 ++++++++++ src/appl/bsd/Makefile.in | 24 +++++++++++++++--------- src/appl/bsd/configure.in | 10 ++++++++++ src/appl/bsd/krcp.c | 3 +++ src/appl/bsd/krlogin.c | 4 +++- src/appl/bsd/krsh.c | 5 ++++- 6 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index b5fcb796c..c62f96093 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,13 @@ +Mon Dec 26 13:51:20 1994 Richard Basch (probe@tardis) + + * Makefile.in + * configure.in + * krcp.c + * krsh.c + * krlogin.c + Removed the hard-coded paths for the BSD rlogin/rcp/rsh programs. + Let "configure" find the programs for us... + Mon Dec 19 15:09:57 1994 Theodore Y. Ts'o (tytso@dcl) * krcp.c (des_write): diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index 7cf69a0dc..24b9d5de5 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -15,9 +15,15 @@ SRCS= krcp.c krlogin.c krsh.c kcmd.c forward.c logutil.c $(SETENVSRC) \ OBJS= krcp.o krlogin.o krsh.o kcmd.o forward.o logutil.o $(SETENVOBJ) \ login.o krshd.o krlogind.o $(LIBOBJS) +UCB_RLOGIN = @UCB_RLOGIN@ +UCB_RSH = @UCB_RSH@ +UCB_RCP = @UCB_RCP@ + RSH= -DKRB_RLOGIN=\"$(PROGDIR)/rlogin\" +BSD= -DUCB_RLOGIN=\"$(UCB_RLOGIN)\" \ + -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" -DEFINES= $(RSH) $(RPROGS) \ +DEFINES= $(RSH) $(BSD) $(RPROGS) \ -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" all:: rsh rcp rlogin krshd krlogind login.krb5 @@ -25,8 +31,8 @@ all:: rsh rcp rlogin krshd krlogind login.krb5 clean:: $(RM) rsh rcp rlogin krshd krlogind login.krb5 -rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(DEPKLIB) - $(CC) $(CFLAGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(KLIB) $(LIBS) +rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) + $(CC) $(CFLAGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh @@ -39,22 +45,22 @@ install:: $(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp $(INSTALL_DATA) rcp.M ${DESTDIR}$(CLIENT_MANDIR)/rcp.1 -rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(DEPKLIB) - $(CC) $(CFLAGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(KLIB) $(LIBS) +rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) + $(CC) $(CFLAGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin $(INSTALL_DATA) rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1 -krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(DEPKLIB) - $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(KLIB) $(K4LIB) $(LIBS) +krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) + $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(K4LIB) $(LIBS) install:: $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd $(INSTALL_DATA) krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8 -krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(DEPKLIB) - $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(KLIB) $(K4LIB) $(LIBS) +krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) + $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(K4LIB) $(LIBS) install:: $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 0517eb76d..439d2fd71 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -5,6 +5,16 @@ ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL +dnl +dnl Check for where the BSD rlogin, rcp, and rsh programs live. +dnl +save_path=$PATH +PATH=/usr/bsd:/usr/ucb:/bin:/usr/bin +AC_PATH_PROG(UCB_RLOGIN,rlogin,/usr/ucb/rlogin) +AC_PATH_PROG(UCB_RSH,rsh,/usr/ucb/rsh) +AC_PATH_PROG(UCB_RCP,rcp,/usr/ucb/rcp) +PATH=$save_path +dnl AC_CHECK_LIB(socket,main) AC_CHECK_LIB(nsl,main) dnl dbm libs for use of an_to_ln diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c index fad1e559c..e2adb920e 100644 --- a/src/appl/bsd/krcp.c +++ b/src/appl/bsd/krcp.c @@ -97,7 +97,10 @@ int des_write(), des_read(); void send_auth(), answer_auth(); int encryptflag = 0; +#ifndef UCB_RCP #define UCB_RCP "/bin/rcp" +#endif + #else /* !KERBEROS */ #define des_read read #define des_write write diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c index 1739fb2c7..6e4dc0b64 100644 --- a/src/appl/bsd/krlogin.c +++ b/src/appl/bsd/krlogin.c @@ -159,7 +159,9 @@ int fflag = 0, Fflag = 0; krb5_creds *cred; struct sockaddr_in local, foreign; -#define UCB_RLOGIN "/usr/ucb/rlogin" +#ifndef UCB_RLOGIN +#define UCB_RLOGIN "/usr/ucb/rlogin" +#endif #include "rpaths.h" #else /* !KERBEROS */ diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c index aca041da8..175c9716c 100644 --- a/src/appl/bsd/krsh.c +++ b/src/appl/bsd/krsh.c @@ -80,7 +80,10 @@ void try_normal(); #ifdef KERBEROS #define RLOGIN_PROGRAM KRB5_PATH_RLOGIN #else /* KERBEROS */ -#define RLOGIN_PROGRAM "/usr/ucb/rlogin" +#ifndef UCB_RLOGIN +#define UCB_RLOGIN "/usr/ucb/rlogin" +#endif +#define RLOGIN_PROGRAM UCB_RLOGIN #endif /* KERBEROS */ #endif /* !RLOGIN_PROGRAM */ -- 2.26.2