[578] in Kerberos-V5-bugs
Kerberos 5 Beta4.1 port diffs for HP-UX 9.03
daemon@ATHENA.MIT.EDU (John Brezak)
Fri Jul 15 10:27:24 1994
To: krb5-bugs@MIT.EDU
Cc: sommerfeld@apollo.hp.com
Date: Fri, 15 Jul 1994 10:26:15 -0400
From: John Brezak <brezak@apollo.hp.com>
Here is the culmative patch for my Kerberos5 port to HP-UX.
Summary of changes:
- Tweeks to aclocal.m4 and a few Makefile.in's to build under ClearCase
environment. Should not affect non-ClearCase makes.
- Add AC_HAVE_LIBRARY(ndbm) to programs that need DBM. HP-UX doesn't have
this in libc.
- Build everything with autoconf except krb524. Includes ksu, gss-sample, bsd
and telnet
- Have admin/edit detect presense of TCL and autoconfigure to use it
- Fix appl/bsd to compile on HP-UX. Autoconfig rlogin and rsh path.
- Fix telnet to build on hpux9.0 and NetBSD-0.9B. telnet even works !
- Fix core dump in telnet/libtelnet/kerberos5.c
- Add utsname code from NetBSD to telnet/telnetd/utility.c - needed to
understand "default" gettytab entry.
- Autoconfig use of utimes(), setsid(), and getcwd()
- Use rand() if random() doesn't exist.
- ISODE compile fixes for HP-UX
- Add daemon.c to lib/krb5/posix and use this in kdc, kadmind, and kpropd
- Be able to build verify and destest programs in lib/crypto/des
- Fix bug in lib/krb5/os/an_to_ln.c having to do with finding the aname
DBM database.
*** ./aclocal.m4@@/main/LATEST Mon Jun 27 14:25:30 1994
--- ./aclocal.m4@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:04:37 1994
***************
*** 46,55 ****
recurse_args=
recur_state=
# ok this stuff really belongs in ac_general.m4, but we'll live :-)
- set foo! "<<<$>>>@"
for arg do
- shift
- shift
if test -z "$recur_state" ; then
case $arg in
*\"*|*\\*|*\<<<$>>>*)
--- 46,52 ----
***************
*** 57,73 ****
;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
recur_state="skip"
;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
;;
esac
# yes this is gross but we need it to make sure that things don't get
scrod
! set foo! "<<<$>>>@" "\"$arg\""
else
recur_state=
fi
done
- shift
for configdir in $1 ; do
if [ -d ${srcdir}/${configdir} ] ; then
--- 54,70 ----
;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
recur_state="skip"
+ continue
;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
;;
esac
# yes this is gross but we need it to make sure that things don't get
scrod
! recurse_args="$recurse_args \"$arg\""
else
recur_state=
fi
done
for configdir in $1 ; do
if [ -d ${srcdir}/${configdir} ] ; then
***************
*** 115,121 ****
### The recursion line is here.
if [ ! -z "${recprog}" ] ; then
! if eval ${config_shell} ${recprog} "<<<$>>>@" ${srcdiroption}; then
true
else
echo Configure in `pwd` failed, exiting. 1>&2
--- 112,118 ----
### The recursion line is here.
if [ ! -z "${recprog}" ] ; then
! if eval ${config_shell} ${recprog} $recurse_args ${srcdiroption}; then
true
else
echo Configure in `pwd` failed, exiting. 1>&2
***************
*** 161,168 ****
dnl
define(CONFIG_RULES,[
AC_WITH([cc],
! echo CC=$withval
! CC=$withval,
if test -z "$CC" ; then CC=cc; fi
echo CC defaults to $CC)dnl
AC_SUBST([CC])dnl
--- 158,165 ----
dnl
define(CONFIG_RULES,[
AC_WITH([cc],
! echo CC=\"$withval\"
! CC="$withval",
if test -z "$CC" ; then CC=cc; fi
echo CC defaults to $CC)dnl
AC_SUBST([CC])dnl
***************
*** 169,177 ****
divert(9)dnl
[
Makefile: $(srcdir)/Makefile.in config.status
! $(SHELL) config.status
config.status: $(srcdir)/configure
! $(SHELL) config.status --recheck
configure: $(srcdir)/configure.in
cd $(srcdir); autoconf
]
--- 166,174 ----
divert(9)dnl
[
Makefile: $(srcdir)/Makefile.in config.status
! $(SHELL) ./config.status
config.status: $(srcdir)/configure
! $(SHELL) ./config.status --recheck
configure: $(srcdir)/configure.in
cd $(srcdir); autoconf
]
*** ./admin/aname/configure.in@@/main/LATEST Mon Jun 27 12:55:21 1994
--- ./admin/aname/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:04:51 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
KRB_INCLUDE
ISODE_INCLUDE
WITH_KRB5ROOT
*** ./admin/convert/configure.in@@/main/LATEST Mon Jun 27 12:55:28 1994
--- ./admin/convert/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:05:02 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
KRB_INCLUDE
ISODE_INCLUDE
WITH_KRB4
*** ./admin/create/configure.in@@/main/LATEST Mon Jun 27 12:55:37 1994
--- ./admin/create/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:05:17 1994
***************
*** 5,10 ****
--- 5,11 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
KRB_INCLUDE
ISODE_INCLUDE
AC_OUTPUT(Makefile,[EXTRA_RULES])
*** ./admin/destroy/configure.in@@/main/LATEST Mon Jun 27 12:55:43 1994
--- ./admin/destroy/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:05:31 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
KRB_INCLUDE
ISODE_INCLUDE
WITH_KRB5ROOT
*** ./admin/edit/Makefile.in@@/main/LATEST Sat Jun 25 00:44:41 1994
--- ./admin/edit/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:05:39 1994
***************
*** 8,14 ****
LIBS = @LIBS@
KRB5ROOT = @KRB5ROOT@
! CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
KRB5MANROOT = $(KRB5ROOT)/man
--- 8,16 ----
LIBS = @LIBS@
KRB5ROOT = @KRB5ROOT@
! TCLINCLUDE = @TCLINCSW@
!
! CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCLINCLUDE)
LDFLAGS = -g
KRB5MANROOT = $(KRB5ROOT)/man
***************
*** 31,36 ****
--- 33,39 ----
ISODELIB=$(TOPLIBD)/libisode.a
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
SSLIB=$(BUILDTOP)/util/ss/libss.a
+ TCLLIB = @TCLLIBSW@ -ltcl -lm
DBMLIB=
KDBLIB=$(TOPLIBD)/libkdb5.a
***************
*** 38,50 ****
all::
! KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(SSLIB)
$(COMERRLIB) $(DBMLIB)
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
! OBJS= kdb5_edit.o kdb5_ed_ct.o util.o dump.o ss_wrapper.o
SRCS= $(srcdir)/kdb5_edit.c $(srcdir)/kdb5_ed_ct.c $(srcdir)/util.c
$(srcdir)/dump.c $(srcdir)/ss_wrapper.c
all:: kdb5_edit
--- 41,57 ----
all::
! UILIB= @UILIB@
! KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(UILIB)
$(COMERRLIB) $(DBMLIB)
DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
! SSOBJS= kdb5_ed_ct.o ss_wrapper.o
! TCLOBJS= tcl_wrapper.o
! UIOBJS= @UIOBJS@
! OBJS= kdb5_edit.o util.o dump.o $(UIOBJS)
SRCS= $(srcdir)/kdb5_edit.c $(srcdir)/kdb5_ed_ct.c $(srcdir)/util.c
$(srcdir)/dump.c $(srcdir)/ss_wrapper.c
all:: kdb5_edit
***************
*** 71,75 ****
clean::
$(RM) kdb5_edit
-
--- 78,81 ----
*** ./admin/edit/configure.in@@/main/LATEST Mon Jun 27 12:55:48 1994
--- ./admin/edit/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:05:50 1994
***************
*** 4,12 ****
--- 4,86 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
AC_HAVE_FUNCS(getcwd)
SS_RULES
KRB_INCLUDE
ISODE_INCLUDE
WITH_KRB5ROOT
+
+ # -----------------------------------------------------------------------
+ # tcl.h
+ # -----------------------------------------------------------------------
+ echo "checking for tcl.h"
+ TCLINCDIR=""
+ places="$PWD/../tcl7.3 \
+ $PWD/../tcl7.2 \
+ $PWD/../tcl7.1 \
+ $PWD/../tcl7.0 \
+ $PWD/../tcl7.0b3 \
+ $prefix/include \
+ $XINCDIR/tk \
+ $XINCDIR \
+ /usr/local/include \
+ /opt/cellar/tcl/tcl7.3/include \
+ /usr/include"
+ for dir in $places; do
+ if test -r $dir/tcl.h ; then
+ TCLINCDIR=$dir
+ break
+ fi
+ done
+
+ if test "$TCLINCDIR" = "/usr/include" ; then
+ TCLINCDIR= "default"
+ fi
+
+ TCLINCSW=""
+ if test "$TCLINCDIR" != "default" -a ! -z "$TCLINCDIR" ; then
+ TCLINCSW="-I$TCLINCDIR"
+ fi
+ AC_SUBST(TCLINCSW)
+
+ # -----------------------------------------------------------------------
+ # libtcl.a
+ # -----------------------------------------------------------------------
+ echo "checking for libtcl.a"
+ TCLLIBDIR=""
+ places="$PWD/../tcl7.3 \
+ $PWD/../tcl7.2 \
+ $PWD/../tcl7.1 \
+ $PWD/../tcl7.0 \
+ $PWD/../tcl7.0b3 \
+ $prefix/lib \
+ /opt/cellar/tcl/tcl7.3/lib \
+ $XLIBDIR \
+ /usr/local/lib \
+ /usr/lib"
+ for dir in $places; do
+ if test -r $dir/libtcl.a ; then
+ TCLLIBDIR=$dir
+ break
+ fi
+ done
+ UIOBJS="\$(TCLOBJS)"
+ UILIB="\$(TCLLIB)"
+ if test -z "$TCLLIBDIR" ; then
+ echo "Cannot locate Tcl; will use ss based intepreter."
+ UIOBJS="\$(SSOBJS)"
+ UILIB="\$(SSLIB)"
+ fi
+ if test "$TCLLIBDIR" = "/usr/lib" ; then
+ TCLLIBDIR= "default"
+ fi
+
+ TCLLIBSW=""
+ if test "$TCLLIBDIR" != "default" ; then
+ TCLLIBSW="-L$TCLLIBDIR"
+ fi
+ AC_SUBST(UIOBJS)
+ AC_SUBST(UILIB)
+ AC_SUBST(TCLLIBSW)
AC_OUTPUT(Makefile,[EXTRA_RULES])
*** ./admin/stash/configure.in@@/main/LATEST Mon Jun 27 12:55:52 1994
--- ./admin/stash/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:06:03 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
KRB_INCLUDE
ISODE_INCLUDE
WITH_KRB5ROOT
*** ./appl/bsd/kcmd.c@@/main/LATEST Mon Jan 17 17:58:13 1994
--- ./appl/bsd/kcmd.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:24 1994
***************
*** 55,60 ****
--- 55,66 ----
#include <netdb.h>
#include <errno.h>
+ #if defined(hpux) || defined(__hpux)
+ #ifndef hpux
+ #define hpux
+ #endif
+ #define SYSV
+ #endif
#include <krb5/krb5.h>
#include <krb5/asn1.h>
*** ./appl/bsd/krcp.c@@/main/LATEST Thu Jun 2 12:17:47 1994
--- ./appl/bsd/krcp.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:30 1994
***************
*** 60,65 ****
--- 60,72 ----
#include <errno.h>
#include <string.h>
+ #if defined(hpux) || defined(__hpux)
+ #ifndef hpux
+ #define hpux
+ #endif
+ #define SYSV
+ #endif
+
#ifdef KERBEROS
#include <krb5/krb5.h>
#include <krb5/asn1.h>
***************
*** 1412,1414 ****
--- 1419,1439 ----
}
#endif /* KERBEROS */
+
+ #if !HAS_UTIMES
+ extern int errno;
+
+ #include <utime.h>
+ #include <sys/time.h>
+
+ utimes(file, tvp)
+ const char *file;
+ struct timeval *tvp;
+ {
+ struct utimbuf times;
+
+ times.actime = tvp[0].tv_sec;
+ times.modtime = tvp[1].tv_sec;
+ return(utime(file, ×));
+ }
+ #endif
*** ./appl/bsd/krlogin.c@@/main/LATEST Wed Jun 15 17:49:31 1994
--- ./appl/bsd/krlogin.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:36
1994
***************
*** 54,59 ****
--- 54,66 ----
#include <stdio.h>
+ #if defined(hpux) || defined(__hpux)
+ #ifndef hpux
+ #define hpux
+ #endif
+ #define SYSV
+ #endif
+
#ifdef SYSV
#ifndef USE_TERMIO
#define USE_TERMIO
***************
*** 114,120 ****
--- 121,129 ----
krb5_creds *cred;
struct sockaddr_in local, foreign;
+ #ifndef UCB_RLOGIN
#define UCB_RLOGIN "/usr/ucb/rlogin"
+ #endif
#ifdef CRAY
#ifndef BITS64
*** ./appl/bsd/krlogind.c@@/main/LATEST Mon Jun 27 22:04:59 1994
--- ./appl/bsd/krlogind.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:43
1994
***************
*** 129,135 ****
#endif
#include <signal.h>
! #ifdef hpux
#include <sys/ptyio.h>
#endif
--- 129,139 ----
#endif
#include <signal.h>
! #if defined(hpux) || defined(__hpux)
! #ifndef hpux
! #define hpux
! #endif
! #define SYSV
#include <sys/ptyio.h>
#endif
***************
*** 809,815 ****
--- 813,823 ----
w.ws_xpixel = ntohs(w.ws_xpixel);
w.ws_ypixel = ntohs(w.ws_ypixel);
(void)ioctl(pty, TIOCSWINSZ, &w);
+ #ifndef hpux
if (ioctl(pty, TIOCGPGRP, &pgrp) >= 0)
+ #else
+ if ((pgrp = tcgetpgrp(0)) > 0)
+ #endif
(void) killpg(pgrp, SIGWINCH);
#endif
return (4+sizeof (w));
*** ./appl/bsd/krsh.c@@/main/LATEST Fri Dec 24 17:45:15 1993
--- ./appl/bsd/krsh.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:51 1994
***************
*** 76,82 ****
--- 76,84 ----
#ifdef KERBEROS
char *krb_realm = (char *)0;
void try_normal();
+ #ifndef UCB_RSH
#define UCB_RSH "/usr/ucb/rsh"
+ #endif
#endif
#ifndef RLOGIN_PROGRAM
*** ./appl/bsd/krshd.c@@/main/LATEST Wed Jun 15 16:58:11 1994
--- ./appl/bsd/krshd.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:57 1994
***************
*** 95,100 ****
--- 95,107 ----
#include <sys/ioctl.h>
#include <sys/param.h>
+ #if defined(hpux) || defined(__hpux)
+ #ifndef hpux
+ #define hpux
+ #endif
+ #define SYSV
+ #endif
+
#if defined(CRAY) || defined(sysvimp) || defined(aux20)
#include <sys/types.h>
#ifndef _TYPES_
***************
*** 111,116 ****
--- 118,125 ----
#include <sys/resource.h>
#include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/ip.h>
#ifndef SYSV
#include <arpa/inet.h>
***************
*** 136,142 ****
#include <udb.h>
#endif /* !NO_UDB */
#include <sys/category.h>
- #include <netinet/ip.h>
#include <sys/tfm.h>
#include <sys/nal.h>
#include <sys/secparm.h>
--- 145,150 ----
***************
*** 448,457 ****
--- 456,471 ----
int non_privileged = 0;
#ifdef IP_TOS
+ #ifdef IPTOS_LOWDELAY
+ int tos = IPTOS_LOWDELAY;
+
+ if (setsockopt(f, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+ #else
struct tosent *tp;
if ((tp = gettosbyname("interactive", "tcp")) &&
(setsockopt(f, IPPROTO_IP, IP_TOS, &tp->t_tos, sizeof(int)) < 0))
+ #endif
#ifdef TOS_WARN
syslog(LOG_NOTICE, "setsockopt (IP_TOS): %m");
#else
*** ./appl/bsd/logutil.c@@/main/LATEST Wed Jun 15 16:58:16 1994
--- ./appl/bsd/logutil.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:07:06
1994
***************
*** 28,33 ****
--- 28,40 ----
#include <sys/time.h>
#include <sys/stat.h>
+ #if defined(hpux) || defined(__hpux)
+ #ifndef hpux
+ #define hpux
+ #endif
+ #define SYSV
+ #endif
+
#ifndef UTMP_FILE
#define UTMP_FILE "/etc/utmp"
#endif
*** ./appl/configure.in@@/main/LATEST Sat Jun 25 00:44:56 1994
--- ./appl/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:06:16 1994
***************
*** 1,7 ****
AC_INIT(configure.in)
WITH_CCOPTS
AC_SET_BUILDTOP
! CONFIG_DIRS(sample simple user_user)
MAKE_SUBDIRS("making",all)
MAKE_SUBDIRS("cleaning",clean)
MAKE_SUBDIRS("installing",install)
--- 1,7 ----
AC_INIT(configure.in)
WITH_CCOPTS
AC_SET_BUILDTOP
! CONFIG_DIRS(sample simple user_user gss-sample telnet bsd)
MAKE_SUBDIRS("making",all)
MAKE_SUBDIRS("cleaning",clean)
MAKE_SUBDIRS("installing",install)
*** ./appl/gss-sample/Makefile.in@@/main/LATEST Wed Jun 15 00:52:04 1994
--- ./appl/gss-sample/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:07:33 1994
***************
*** 1,13 ****
srcdir = @srcdir@
VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
! BUILDTOP=../..
SRCTOP = $(srcdir)/$(BUILDTOP)
TOPLIBD = $(BUILDTOP)/lib
ISODELIB=$(TOPLIBD)/libisode.a
--- 1,31 ----
+ BUILDTOP=@BUILDTOP@
srcdir = @srcdir@
VPATH = @srcdir@
DEFS = @DEFS@
+ CC = @CC@
+ CCOPTS = @CCOPTS@
LIBS = @LIBS@
+ KRB5ROOT = @KRB5ROOT@
CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
! KRB5MANROOT = $(KRB5ROOT)/man
! ADMIN_BINDIR = $(KRB5ROOT)/admin
! SERVER_BINDIR = $(KRB5ROOT)/sbin
! CLIENT_BINDIR = $(KRB5ROOT)/bin
! ADMIN_MANDIR = $(KRB5MANROOT)/man8
! SERVER_MANDIR = $(KRB5MANROOT)/man8
! CLIENT_MANDIR = $(KRB5MANROOT)/man1
! FILE_MANDIR = $(KRB5MANROOT)/man5
! KRB5_LIBDIR = $(KRB5ROOT)/lib
! KRB5_INCDIR = $(KRB5ROOT)/include
! KRB5_INCSUBDIRS = \
! $(KRB5_INCDIR)/krb5 \
! $(KRB5_INCDIR)/asn.1 \
! $(KRB5_INCDIR)/kerberosIV
!
SRCTOP = $(srcdir)/$(BUILDTOP)
TOPLIBD = $(BUILDTOP)/lib
ISODELIB=$(TOPLIBD)/libisode.a
***************
*** 36,43 ****
clean::
! $(RM) kinit.o kinit
install::
! $(INSTALLPROG) kinit ${DESTDIR}$(CLIENT_BINDIR)/kinit
! $(INSTALLPROG) kinit.M ${DESTDIR}$(CLIENT_MANDIR)/kinit.$(CLIENT_MANSUFFIX)
--- 54,60 ----
clean::
! $(RM) *.o gss-server gss-client
install::
! $(INSTALLPROG) gss-client gss-server ${DESTDIR}$(CLIENT_BINDIR)/
*** ./appl/gss-sample/configure.in@@/main/LATEST Wed Jun 15 00:52:16 1994
--- ./appl/gss-sample/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:07:40 1994
***************
*** 1,7 ****
! AC_INIT(klist.c)
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
- CONFIG_RULES
KRB_INCLUDE
ISODE_INCLUDE
AC_OUTPUT(Makefile,[EXTRA_RULES])
--- 1,10 ----
! AC_INIT(gss-client.c)
! WITH_CCOPTS
! CONFIG_RULES
! AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
KRB_INCLUDE
ISODE_INCLUDE
+ WITH_KRB5ROOT
AC_OUTPUT(Makefile,[EXTRA_RULES])
*** ./appl/telnet/Config.generic@@/main/LATEST Fri Jun 10 14:21:24 1994
--- ./appl/telnet/Config.generic@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:45:44 1994
***************
*** 249,277 ****
@echo " dynix3.0.12 dynix3.0.17"
@echo " ultrix3.1 ultrix4.0 ultrix4.1 ultrix4.3 ultrix4.3.auth"
@echo " irix4.0.1"
! @echo " hpux8.0"
@echo " next1.0"
@echo " convex"
4.4bsd:
! make -f Makefile.generic ${WHAT} \
! LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a" \
! LIBPATH="/usr/lib/libc.a /usr/lib/libtermcap.a \
! ../libtelnet/libtelnet.a" \
DEST=${DESTDIR}/usr/bin \
DEFINES=${ODEFS}"-DLINEMODE -DTERMCAP -DKLUDGELINEMODE \
-DDEFAULT_IM='\"\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r\"' \
-DUSE_TERMIO -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON \
! -DHAS_CGETENT" \
! INCLUDES="-I.." \
LIB_OBJ="getent.o" \
LIB_SRC="getent.c" \
AR=ar ARFLAGS=cq RANLIB=ranlib \
LIBEXEC=${DESTDIR}/usr/libexec \
! CC="${CC}" LCCFLAGS="-O"
4.3reno:
! make -f Makefile.generic ${WHAT} \
LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 249,277 ----
@echo " dynix3.0.12 dynix3.0.17"
@echo " ultrix3.1 ultrix4.0 ultrix4.1 ultrix4.3 ultrix4.3.auth"
@echo " irix4.0.1"
! @echo " hpux8.0 hpux9.0 hpux8.0.auth hpux9.0.auth"
@echo " next1.0"
@echo " convex"
4.4bsd:
! ${MAKE} -f Makefile.generic ${WHAT} \
! LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
! LIBPATH="-ltermcap ../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
DEST=${DESTDIR}/usr/bin \
DEFINES=${ODEFS}"-DLINEMODE -DTERMCAP -DKLUDGELINEMODE \
-DDEFAULT_IM='\"\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r\"' \
-DUSE_TERMIO -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON \
! -DHAS_CGETENT -DHAS_UNAME \
! ${AUTH_DEF}" \
! INCLUDES="-I.. ${AUTH_INC}" \
LIB_OBJ="getent.o" \
LIB_SRC="getent.c" \
AR=ar ARFLAGS=cq RANLIB=ranlib \
LIBEXEC=${DESTDIR}/usr/libexec \
! CC="${CC}" LCCFLAGS="-O -g"
4.3reno:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 290,303 ****
4.4bsd.auth 4.3reno.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
! AUTH_LIB="-lkrb -ldes" \
! AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
! AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
4.3tahoe:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 290,304 ----
4.4bsd.auth 4.3reno.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
! AUTH_LIB="../../../lib/libkrb5.a ../../../lib/libcrypto.a
../../../lib/libisode.a ../../../util/et/libcom_err.a" \
! AUTH_LIBPATH="../../../lib" \
! AUTH_INC="-I../../../include" \
! AUTH_DEF="-DAUTHENTICATION -DKRB5 -DFORWARD -DDES_ENCRYPTION"
4.3tahoe:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 315,321 ****
4.3bsd:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 316,322 ----
4.3bsd:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 334,340 ****
CC="${CC}" LCCFLAGS="-O"
bsdi1.0:
! make -f Makefile.generic ${WHAT} \
LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 335,341 ----
CC="${CC}" LCCFLAGS="-O"
bsdi1.0:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lutil -ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 352,358 ****
CC="${CC}" LCCFLAGS="-O"
bsdi1.0.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
--- 353,359 ----
CC="${CC}" LCCFLAGS="-O"
bsdi1.0.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
***************
*** 359,365 ****
AUTH_INC=-I/usr/include/kerberosIV
unicos8.1:
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 360,366 ----
AUTH_INC=-I/usr/include/kerberosIV
unicos8.1:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 376,382 ****
LIB_SRC="getent.c" \
unicos8.0:
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 377,383 ----
LIB_SRC="getent.c" \
unicos8.0:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 394,400 ****
CC="${CC}" LCCFLAGS="-O"
unicos7.C:
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}"\
--- 395,401 ----
CC="${CC}" LCCFLAGS="-O"
unicos7.C:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}"\
***************
*** 413,419 ****
unicos7.0:
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet -lkrb" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a /usr/lib/libkrb.a" \
--- 414,420 ----
unicos7.0:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet -lkrb" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a /usr/lib/libkrb.a" \
***************
*** 435,447 ****
# target instead of "unicos7.0.auth".
unicos8.1.auth unicos8.0.auth unicos7.0.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB=-lkrb AUTH_LIBPATH=/usr/lib/libkrb.a \
AUTH_INC=-I/usr/include/krb \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
unicos7.C.auth unicos7.0.des.auth:
! make -f ../Config.generic `basename $@ .des.auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_INC=-I/usr/include/krb \
--- 436,448 ----
# target instead of "unicos7.0.auth".
unicos8.1.auth unicos8.0.auth unicos7.0.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB=-lkrb AUTH_LIBPATH=/usr/lib/libkrb.a \
AUTH_INC=-I/usr/include/krb \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
unicos7.C.auth unicos7.0.des.auth:
! ${MAKE} -f ../Config.generic `basename $@ .des.auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_INC=-I/usr/include/krb \
***************
*** 448,454 ****
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
unicos6.1:
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
--- 449,455 ----
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
unicos6.1:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
***************
*** 469,475 ****
unicos6.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
--- 470,476 ----
unicos6.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
***************
*** 490,496 ****
unicos5.1:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-lnet -lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
--- 491,497 ----
unicos5.1:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lnet -lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
***************
*** 511,517 ****
unicos5.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-lnet -lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
--- 512,518 ----
unicos5.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-lnet -lcurses -L../libtelnet -ltelnet" \
LIBPATH="/lib/libc.a /usr/lib/libcurses.a \
../libtelnet/libtelnet.a" \
***************
*** 532,538 ****
sun3.5:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 533,539 ----
sun3.5:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 553,559 ****
sun4.0.3c sun4.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 554,560 ----
sun4.0.3c sun4.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 573,579 ****
CC="${CC}" LCCFLAGS="-O"
sun4.1:
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 574,580 ----
CC="${CC}" LCCFLAGS="-O"
sun4.1:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 590,602 ****
CC="${CC}" LCCFLAGS="-O"
sun4.1.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
sol2.2 solaris2.2:
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermlib ../libtelnet/libtelnet.a" \
LIBPATH="/usr/ccs/lib/libtermlib.a ../libtelnet/libtelnet.a \
/usr/lib/libc.a /usr/ucblib/libucb.a \
--- 591,603 ----
CC="${CC}" LCCFLAGS="-O"
sun4.1.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DENCRYPTION -DKRB4 -DDES_ENCRYPTION"
sol2.2 solaris2.2:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermlib ../libtelnet/libtelnet.a" \
LIBPATH="/usr/ccs/lib/libtermlib.a ../libtelnet/libtelnet.a \
/usr/lib/libc.a /usr/ucblib/libucb.a \
***************
*** 615,621 ****
CC="${CC}" LCCFLAGS="-O"
sol2.2.auth solaris2.2.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb" AUTH_LIBPATH="/usr/lib/libkrb.a" \
AUTH_INC=-I/usr/include/kerberos \
AUTH_DEF="-DAUTHENTICATION -DKRB4"
--- 616,622 ----
CC="${CC}" LCCFLAGS="-O"
sol2.2.auth solaris2.2.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb" AUTH_LIBPATH="/usr/lib/libkrb.a" \
AUTH_INC=-I/usr/include/kerberos \
AUTH_DEF="-DAUTHENTICATION -DKRB4"
***************
*** 622,628 ****
dynix3.0.12:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 623,629 ----
dynix3.0.12:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 642,648 ****
CC="${CC}" LCCFLAGS="-O"
dynix3.0.17:
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a -lseq" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a /usr/lib/libseq.a" \
--- 643,649 ----
CC="${CC}" LCCFLAGS="-O"
dynix3.0.17:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a -lseq" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a /usr/lib/libseq.a" \
***************
*** 662,668 ****
ultrix3.1:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 663,669 ----
ultrix3.1:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 683,689 ****
ultrix4.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 684,690 ----
ultrix4.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 703,709 ****
CC="${CC}" LCCFLAGS="-O"
ultrix4.1:
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 704,710 ----
CC="${CC}" LCCFLAGS="-O"
ultrix4.1:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 721,727 ****
CC="${CC}" LCCFLAGS="-O"
ultrix4.3:
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 722,728 ----
CC="${CC}" LCCFLAGS="-O"
ultrix4.3:
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 739,745 ****
CC="${CC}" LCCFLAGS="-g"
ultrix4.3.auth:
! make -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DKRB4"
--- 740,746 ----
CC="${CC}" LCCFLAGS="-g"
ultrix4.3.auth:
! ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
AUTH_LIB="-lkrb -ldes" \
AUTH_LIBPATH="/usr/lib/libkrb.a /usr/lib/libdes.a" \
AUTH_DEF="-DAUTHENTICATION -DKRB4"
***************
*** 746,752 ****
irix4.0.1:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermlib ../libtelnet/libtelnet.a" \
LIBPATH="/usr/lib/libc.a /usr/lib/libtermlib.a \
../libtelnet/libtelnet.a" \
--- 747,753 ----
irix4.0.1:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermlib ../libtelnet/libtelnet.a" \
LIBPATH="/usr/lib/libc.a /usr/lib/libtermlib.a \
../libtelnet/libtelnet.a" \
***************
*** 762,770 ****
LIBEXEC=${DESTDIR}/etc \
CC="${CC}" LCCFLAGS="-O"
hpux8.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
--- 763,778 ----
LIBEXEC=${DESTDIR}/etc \
CC="${CC}" LCCFLAGS="-O"
+ hpux8.0.auth hpux9.0.auth:
+ ${MAKE} -f ../Config.generic `basename $@ .auth` WHAT=${WHAT} \
+ AUTH_LIB="../../../lib/libkrb5.a ../../../lib/libcrypto.a
../../../lib/libisode.a ../../../util/et/libcom_err.a -lndbm" \
+ AUTH_LIBPATH="../../../lib" \
+ AUTH_INC="-I../../../include" \
+ AUTH_DEF="-DAUTHENTICATION -DKRB5 -DFORWARD -DDES_ENCRYPTION"
+
hpux8.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="/lib/libc.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a" \
***************
*** 773,779 ****
-DDEFAULT_IM='\"\r\n\r\nHP-UX 8.0 (%h) (%t)\r\n\r\r\n\r\"' \
-DNO_LOGIN_F -DNO_LOGIN_P -DNO_LOGIN_H \
-DDIAGNOSTICS -DLOGIN_ARGS" \
! INCLUDES="-I.." \
LIB_OBJ="getent.o setenv.o" \
LIB_SRC="getent.c setenv.c" \
AR=ar ARFLAGS=cq RANLIB=NONE \
--- 781,805 ----
-DDEFAULT_IM='\"\r\n\r\nHP-UX 8.0 (%h) (%t)\r\n\r\r\n\r\"' \
-DNO_LOGIN_F -DNO_LOGIN_P -DNO_LOGIN_H \
-DDIAGNOSTICS -DLOGIN_ARGS" \
! INCLUDES="-I.. ${AUTH_INC} " \
! LIB_OBJ="getent.o setenv.o" \
! LIB_SRC="getent.c setenv.c" \
! AR=ar ARFLAGS=cq RANLIB=NONE \
! LIBEXEC=${DESTDIR}/etc \
! CC="${CC}" LCCFLAGS="-O"
!
! hpux9.0:
! ${MAKE} -f Makefile.generic ${WHAT} \
! LIBS="${SOCKS_LIB} -lcurses ../libtelnet/libtelnet.a ${AUTH_LIB} -lBSD " \
! LIBPATH="../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
! DEST=${DESTDIR}/usr/bin \
! DEFINES=${ODEFS}" -Dvfork=fork -DSYSV -DUSE_TERMIO \
! -DDEFAULT_IM='\"\r\nHP-UX %h %r %v %m (%t)\r\n\r\r\n\r\"' \
! -DSETSID -DHAS_UNAME \
! -DKLUDGELINEMODE \
! -DDIAGNOSTICS \
! ${AUTH_DEF}" \
! INCLUDES=${KRB_INC}" -I.. ${AUTH_INC}" \
LIB_OBJ="getent.o setenv.o" \
LIB_SRC="getent.c setenv.c" \
AR=ar ARFLAGS=cq RANLIB=NONE \
***************
*** 782,788 ****
next1.0:
@echo $@ is untested... it may or may not work..."
! make -f Makefile.generic ${WHAT} \
LIBS="../libtelnet/libtelnet.a -ltermcap -lsys_s ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /lib/libsys_s.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
--- 808,814 ----
next1.0:
@echo $@ is untested... it may or may not work..."
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="../libtelnet/libtelnet.a -ltermcap -lsys_s ${AUTH_LIB}" \
LIBPATH="/lib/libc.a /lib/libsys_s.a /usr/lib/libtermcap.a \
../libtelnet/libtelnet.a ${AUTH_LIBPATH}" \
***************
*** 811,817 ****
@echo $@ is untested... it may or may not work..."
ln -s ../../rel_usr/src/lib/libc/posix/tcsetattr.c tcsetattr.c
ln -s ../../rel_usr/src/lib/libc/posix/tcgetattr.c tcgetattr.c
! make -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="../libtelnet/libtelnet.a" \
AR=ar ARFLAGS=cq RANLIB=ranlib \
--- 837,843 ----
@echo $@ is untested... it may or may not work..."
ln -s ../../rel_usr/src/lib/libc/posix/tcsetattr.c tcsetattr.c
ln -s ../../rel_usr/src/lib/libc/posix/tcgetattr.c tcgetattr.c
! ${MAKE} -f Makefile.generic ${WHAT} \
LIBS="-ltermcap ../libtelnet/libtelnet.a" \
LIBPATH="../libtelnet/libtelnet.a" \
AR=ar ARFLAGS=cq RANLIB=ranlib \
***************
*** 826,830 ****
LIB_SRC="getent.c setsid.c strftime.c \
tcsetattr.c tcgetattr.c"
clean cleandir:
! make -f Makefile.generic $@
--- 852,857 ----
LIB_SRC="getent.c setsid.c strftime.c \
tcsetattr.c tcgetattr.c"
+
clean cleandir:
! ${MAKE} -f Makefile.generic $@
*** ./appl/telnet/Makefile.in@@/main/LATEST Tue Jun 21 17:52:57 1994
--- ./appl/telnet/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:45:48 1994
***************
*** 1,24 ****
CC = @CC@
- CC = @CCOPTS@
BUILDTOP=@BUILDTOP@
! TELNET_OPSYS= @TELNET@
all::
! cd libtelnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
! cd telnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
! cd telnetd; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
clean::
! cd libtelnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean
! cd telnet; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean
! cd telnetd; make CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS) clean
install::
! cd libtelnet; make CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
! cd telnet; make CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
! cd telnetd; make CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
--- 1,23 ----
CC = @CC@
BUILDTOP=@BUILDTOP@
! TELNET_OPSYS= @TELNETOS@
all::
! cd libtelnet; ${MAKE} MAKE="${MAKE}" CC="${CC}"
TELNET_OPSYS=$(TELNET_OPSYS)
! cd telnet; ${MAKE} MAKE="${MAKE}" CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
! cd telnetd; ${MAKE} MAKE="${MAKE}" CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
clean::
! cd libtelnet; ${MAKE} MAKE="${MAKE}" CC="${CC}"
TELNET_OPSYS=$(TELNET_OPSYS) clean
! cd telnet; ${MAKE} MAKE="${MAKE}" CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
clean
! cd telnetd; ${MAKE} MAKE="${MAKE}" CC="${CC}" TELNET_OPSYS=$(TELNET_OPSYS)
clean
install::
! cd libtelnet; ${MAKE} MAKE="${MAKE}" CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
! cd telnet; ${MAKE} MAKE="${MAKE}" CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
! cd telnetd; ${MAKE} MAKE="${MAKE}" CC="${CC}" DESTDIR=$(DESTDIR) \
TELNET_OPSYS=$(TELNET_OPSYS) install
*** ./appl/telnet/configure.in@@/main/LATEST Fri Jun 17 03:04:00 1994
--- ./appl/telnet/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:45:53 1994
***************
*** 2,5 ****
--- 2,27 ----
AC_SET_BUILDTOP
CONFIG_DIRS(libtelnet telnet telnetd)
CONFIG_RULES
+
+ AC_PROGRAM_CHECK(uname_found, uname, 1, 0)
+ [ TELNETOS="all"
+ if test $uname_found -eq 1 ; then
+ system=`uname -s`-`uname -r`
+ case $system in
+ SunOS-4*)
+ TELNETOS="sun4.0"
+ ;;
+ HP-UX-*.09.*)
+ TELNETOS="hpux9.0.auth"
+ ;;
+ HP-UX-*.08.*)
+ TELNETOS="hpux8.0"
+ ;;
+ NetBSD-*)
+ TELNETOS="4.4bsd.auth"
+ ;;
+ esac
+ fi ]
+ AC_SUBST(TELNETOS)
+
AC_OUTPUT(Makefile,[EXTRA_RULES])
*** ./appl/telnet/libtelnet/Makefile.in@@/main/LATEST Tue Jun 21 17:53:03 1994
--- ./appl/telnet/libtelnet/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul
15 08:45:58 1994
***************
*** 25,41 ****
# Everything happens in ../Makefile.config and Makefile.generic
#
! all:
@-if [ -f ../Config.local ]; \
then \
! echo make -f ../Config.local WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \
! make -f ../Config.local WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \
else \
! echo make -f ../Config.generic WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \
! make -f ../Config.generic WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \
fi
--- 25,41 ----
# Everything happens in ../Makefile.config and Makefile.generic
#
! all::
@-if [ -f ../Config.local ]; \
then \
! echo ${MAKE} -f ../Config.local WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \
! ${MAKE} -f ../Config.local WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)"; \
else \
! echo ${MAKE} -f ../Config.generic WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \
! ${MAKE} -f ../Config.generic WHAT="" CC="${CC}" \
KLIB="$(KLIB)" DEPKLIB="$(DEPKLIB)" $(TELNET_OPSYS); \
fi
***************
*** 42,55 ****
.DEFAULT:
@-if [ -f ../Config.local ]; \
then \
! echo make -f ../Config.local WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
! make -f ../Config.local WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
else \
! echo make -f ../Config.generic WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
! make -f ../Config.generic WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
fi
--- 42,55 ----
.DEFAULT:
@-if [ -f ../Config.local ]; \
then \
! echo ${MAKE} -f ../Config.local WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
! ${MAKE} -f ../Config.local WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
else \
! echo ${MAKE} -f ../Config.generic WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
! ${MAKE} -f ../Config.generic WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
fi
*** ./appl/telnet/libtelnet/kerberos5.c@@/main/LATEST Wed Jun 15 16:58:34 1994
--- ./appl/telnet/libtelnet/kerberos5.c@@/main/brezak_hpux_port/LATEST Fri Jul
15 08:46:04 1994
***************
*** 1,7 ****
/*
! * $Source: /mit/krb5/.cvsroot/src/appl/telnet/libtelnet/kerberos5.c,v $
! * $Author: eichin $
! * $Id: kerberos5.c,v 5.7 1994/06/15 20:58:34 eichin Exp $
*/
#if !defined(lint) && !defined(SABER)
--- 1,7 ----
/*
! * $Source: /u1/CVS/local/krb5/appl/telnet/libtelnet/kerberos5.c,v $
! * $Author: brezak $
! * $Id: kerberos5.c,v 1.1.1.1 1994/06/30 02:12:15 brezak Exp $
*/
#if !defined(lint) && !defined(SABER)
***************
*** 9,15 ****
#ifdef __STDC__
const
#endif
! char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 5.7 1994/06/15 20:58:34
eichin Exp $";
#endif /* lint */
/*-
--- 9,15 ----
#ifdef __STDC__
const
#endif
! char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 1.1.1.1 1994/06/30 02:12:15
brezak Exp $";
#endif /* lint */
/*-
***************
*** 320,326 ****
#ifdef ENCRYPTION
Session_Key skey;
#endif
! char *name;
char *getenv();
krb5_data inbuf;
--- 320,326 ----
#ifdef ENCRYPTION
Session_Key skey;
#endif
! char *name = NULL;
char *getenv();
krb5_data inbuf;
***************
*** 354,359 ****
--- 354,360 ----
printf("%s\r\n", errbuf);
return;
}
+ if (name)
free(name);
if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
/* do ap_rep stuff here */
*** ./appl/telnet/telnet/commands.c@@/main/LATEST Wed Jun 15 16:58:45 1994
--- ./appl/telnet/telnet/commands.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:46:09 1994
***************
*** 747,759 ****
0,
&showoptions,
"show option processing" },
! #if defined(unix)
{ "termdata",
"(debugging) toggle printing of hexadecimal terminal data",
0,
&termdata,
"print hexadecimal representation of terminal traffic" },
! #endif /* defined(unix) */
{ "?",
0,
togglehelp },
--- 747,759 ----
0,
&showoptions,
"show option processing" },
! #if defined(unix) || defined(__hpux)
{ "termdata",
"(debugging) toggle printing of hexadecimal terminal data",
0,
&termdata,
"print hexadecimal representation of terminal traffic" },
! #endif /* defined(unix) || defined(__hpux) */
{ "?",
0,
togglehelp },
***************
*** 1403,1414 ****
* Fire up the shell in the child.
*/
register char *shellp, *shellname;
- extern char *rindex();
shellp = getenv("SHELL");
if (shellp == NULL)
shellp = "/bin/sh";
! if ((shellname = rindex(shellp, '/')) == 0)
shellname = shellp;
else
shellname++;
--- 1403,1413 ----
* Fire up the shell in the child.
*/
register char *shellp, *shellname;
shellp = getenv("SHELL");
if (shellp == NULL)
shellp = "/bin/sh";
! if ((shellname = strrchr(shellp, '/')) == 0)
shellname = shellp;
else
shellname++;
***************
*** 1690,1699 ****
extern char **environ;
register char **epp, *cp;
register struct env_lst *ep;
- extern char *index();
for (epp = environ; *epp; epp++) {
! if (cp = index(*epp, '=')) {
*cp = '\0';
ep = env_define((unsigned char *)*epp,
(unsigned char *)cp+1);
--- 1689,1697 ----
extern char **environ;
register char **epp, *cp;
register struct env_lst *ep;
for (epp = environ; *epp; epp++) {
! if (cp = strchr(*epp, '=')) {
*cp = '\0';
ep = env_define((unsigned char *)*epp,
(unsigned char *)cp+1);
***************
*** 1710,1716 ****
&& ((*ep->value == ':')
|| (strncmp((char *)ep->value, "unix:", 5) == 0))) {
char hbuf[256+1];
! char *cp2 = index((char *)ep->value, ':');
gethostname(hbuf, 256);
hbuf[256] = '\0';
--- 1708,1714 ----
&& ((*ep->value == ':')
|| (strncmp((char *)ep->value, "unix:", 5) == 0))) {
char hbuf[256+1];
! char *cp2 = strchr((char *)ep->value, ':');
gethostname(hbuf, 256);
hbuf[256] = '\0';
*** ./appl/telnet/telnet/externs.h@@/main/LATEST Fri Jun 10 14:27:22 1994
--- ./appl/telnet/telnet/externs.h@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:46:13 1994
***************
*** 137,149 ****
crmod,
netdata, /* Print out network data flow */
prettydump, /* Print "netdata" output in user readable format */
! #if defined(unix)
#if defined(TN3270)
cursesdata, /* Print out curses data flow */
apitrace, /* Trace API transactions */
#endif /* defined(TN3270) */
termdata, /* Print out terminal data flow */
! #endif /* defined(unix) */
debug; /* Debug level */
extern cc_t escape; /* Escape to command mode */
--- 137,149 ----
crmod,
netdata, /* Print out network data flow */
prettydump, /* Print "netdata" output in user readable format */
! #if defined(unix) || defined(__hpux)
#if defined(TN3270)
cursesdata, /* Print out curses data flow */
apitrace, /* Trace API transactions */
#endif /* defined(TN3270) */
termdata, /* Print out terminal data flow */
! #endif /* defined(unix) || defined(__hpux) */
debug; /* Debug level */
extern cc_t escape; /* Escape to command mode */
*** ./appl/telnet/telnetd/sys_term.c@@/main/LATEST Wed Jun 15 18:36:42 1994
--- ./appl/telnet/telnetd/sys_term.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:46:18 1994
***************
*** 1290,1296 ****
#endif
fatalperror(net, "setsid()");
}
! # ifdef TIOCSCTTY
if (ioctl(t, TIOCSCTTY, (char *)0) < 0)
fatalperror(net, "ioctl(sctty)");
# if defined(CRAY)
--- 1290,1296 ----
#endif
fatalperror(net, "setsid()");
}
! # if defined(TIOCSCTTY) && !defined(__hpux)
if (ioctl(t, TIOCSCTTY, (char *)0) < 0)
fatalperror(net, "ioctl(sctty)");
# if defined(CRAY)
***************
*** 1303,1308 ****
--- 1303,1309 ----
fatalperror(net, "open(/dev/tty)");
# endif
# else
+ #ifndef __hpux
/*
* We get our controlling tty assigned as a side-effect
* of opening up a tty device. But on BSD based systems,
***************
*** 1311,1316 ****
--- 1312,1318 ----
* it out before opening the tty...
*/
(void) setpgrp(0, 0);
+ #endif
close(open(line, O_RDWR));
# endif
if (t != 0)
*** ./appl/telnet/telnetd/utility.c@@/main/LATEST Wed Jun 15 18:36:50 1994
--- ./appl/telnet/telnetd/utility.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
08:46:22 1994
***************
*** 35,40 ****
--- 35,43 ----
static char sccsid[] = "@(#)utility.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint */
+ #ifdef HAS_UNAME
+ #include <sys/utsname.h>
+ #endif
#define PRINTOPTIONS
#include "telnetd.h"
***************
*** 448,453 ****
--- 451,459 ----
char *slash;
time_t t;
char db[100];
+ #ifdef HAS_UNAME
+ struct utsname utsinfo;
+ #endif
#ifdef STREAMSPTY
extern char *index();
#else
***************
*** 454,459 ****
--- 460,468 ----
extern char *rindex();
#endif
+ #ifdef HAS_UNAME
+ uname(&utsinfo);
+ #endif
putlocation = where;
while (*cp) {
***************
*** 489,494 ****
--- 498,520 ----
case '%':
putchr('%');
break;
+ #ifdef HAS_UNAME
+ case 's':
+ putstr(utsinfo.sysname);
+ break;
+
+ case 'm':
+ putstr(utsinfo.machine);
+ break;
+
+ case 'r':
+ putstr(utsinfo.release);
+ break;
+
+ case 'v':
+ puts(utsinfo.version);
+ break;
+ #endif
}
cp++;
}
*** ./clients/configure.in@@/main/LATEST Sat Jun 25 00:45:59 1994
--- ./clients/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:07:54
1994
***************
*** 1,7 ****
AC_INIT(configure.in)
WITH_CCOPTS
AC_SET_BUILDTOP
! CONFIG_DIRS(klist kinit kdestroy)
MAKE_SUBDIRS("making",all)
MAKE_SUBDIRS("cleaning",clean)
MAKE_SUBDIRS("installing",install)
--- 1,7 ----
AC_INIT(configure.in)
WITH_CCOPTS
AC_SET_BUILDTOP
! CONFIG_DIRS(klist kinit kdestroy ksu)
MAKE_SUBDIRS("making",all)
MAKE_SUBDIRS("cleaning",clean)
MAKE_SUBDIRS("installing",install)
*** ./clients/ksu/main.c@@/main/LATEST Thu Jun 16 03:00:54 1994
--- ./clients/ksu/main.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:08:00
1994
***************
*** 945,951 ****
--- 945,955 ----
}else{
free (temp_path);
temp_path = (char *) calloc(MAXPATHLEN, sizeof(char));
+ #ifdef HAS_GETCWD
+ temp_path = (char *) getcwd(temp_path, MAXPATHLEN);
+ #else
temp_path = (char *) getwd(temp_path);
+ #endif
}
return temp_path;
*** ./include/krb5/Makefile.in@@/main/LATEST Sat Jun 25 00:46:52 1994
--- ./include/krb5/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:08 1994
***************
*** 46,52 ****
# indicating some adjustment of the file took place.
autoconf.h: $(srcdir)/autoconf.h.in config.status
! $(SHELL) config.status
clean::
$(RM) autoconf.h
--- 46,52 ----
# indicating some adjustment of the file took place.
autoconf.h: $(srcdir)/autoconf.h.in config.status
! $(SHELL) ./config.status
clean::
$(RM) autoconf.h
*** ./include/krb5/acconfig.h@@/main/LATEST Fri Jun 24 03:17:29 1994
--- ./include/krb5/acconfig.h@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:12 1994
***************
*** 6,11 ****
--- 6,15 ----
#undef HAS_ANSI_VOLATILE
#undef HAS_STDLIB_H
#undef HAS_STRDUP
+ #undef HAS_UTIMES
+ #undef HAS_RANDOM
+ #undef HAS_SETSID
+ #undef HAS_GETCWD
#undef HAS_VOID_TYPE
#undef KRB5_PROVIDE_PROTOTYPES
#undef NEED_SYS_FCNTL_H
*** ./include/krb5/autoconf.h.in@@/main/LATEST Mon Jun 27 23:12:20 1994
--- ./include/krb5/autoconf.h.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:15 1994
***************
*** 12,17 ****
--- 12,21 ----
#undef HAS_ANSI_VOLATILE
#undef HAS_STDLIB_H
#undef HAS_STRDUP
+ #undef HAS_UTIMES
+ #undef HAS_RANDOM
+ #undef HAS_SETSID
+ #undef HAS_GETCWD
#undef HAS_VOID_TYPE
#undef KRB5_PROVIDE_PROTOTYPES
#undef NEED_SYS_FCNTL_H
*** ./include/krb5/configure.in@@/main/LATEST Mon Jun 27 12:56:55 1994
--- ./include/krb5/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:21 1994
***************
*** 5,10 ****
--- 5,14 ----
AC_PROG_LEX
HAVE_YYLINENO
AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
+ AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES))
+ AC_FUNC_CHECK(random,AC_DEFINE(HAS_RANDOM))
+ AC_FUNC_CHECK(setsid,AC_DEFINE(HAS_SETSID))
+ AC_FUNC_CHECK(getcwd,AC_DEFINE(HAS_GETCWD))
CHECK_DIRENT
CHECK_FCNTL
CHECK_WAIT_TYPE
*** ./include/krb5/stock/config.h@@/main/LATEST Sun Jun 12 01:39:27 1994
--- ./include/krb5/stock/config.h@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:26 1994
***************
*** 129,135 ****
#endif
/* SPLIT-HERE */
! #ifdef SYSV
/* Change srandom and random to use rand and srand */
/* Taken from the Sandia changes. XXX We should really just include */
/* srandom and random into Kerberos release, since rand() is a really */
--- 129,135 ----
#endif
/* SPLIT-HERE */
! #ifndef HAS_RANDOM
/* Change srandom and random to use rand and srand */
/* Taken from the Sandia changes. XXX We should really just include */
/* srandom and random into Kerberos release, since rand() is a really */
***************
*** 136,145 ****
/* bad random number generator.... [tytso:19920616.2231EDT] */
#define random() rand()
#define srandom(a) srand(a)
! #ifndef unicos61
! #define utimes(a,b) utime(a,b)
! #endif /* unicos61 */
! #endif /* SYSV */
/* XXX these should be parameterized soon... */
#define PROVIDE_DES_CBC_CRC
--- 136,142 ----
/* bad random number generator.... [tytso:19920616.2231EDT] */
#define random() rand()
#define srandom(a) srand(a)
! #endif /* !HAS_RANDOM */
/* XXX these should be parameterized soon... */
#define PROVIDE_DES_CBC_CRC
*** ./isode/compat/general.c@@/main/LATEST Thu Jun 9 23:27:14 1994
--- ./isode/compat/general.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:10:39 1994
***************
*** 1,13 ****
- /* general.c - general utilities for emulation of 4.2BSD */
-
- #ifndef lint
- static char *rcsid = "$Header: /mit/krb5/.cvsroot/src/isode/compat/general.c,
v 1.1 1994/06/10 03:27:14 eichin Exp $";
- #endif
-
- /*
- * $Header: /mit/krb5/.cvsroot/src/isode/compat/general.c,v 1.1 1994/06/10
03:27:14 eichin Exp $
- *
- *
* $Log: general.c,v $
* Revision 1.1 1994/06/10 03:27:14 eichin
* autoconfed isode for kerberos work
--- 1,3 ----
***************
*** 87,93 ****
/* DUP2 */
! #ifndef BSD42
#ifdef SYS5
#include <fcntl.h>
#endif
--- 77,83 ----
/* DUP2 */
! #if !defined(BSD42) && !defined(__hpux)
#ifdef SYS5
#include <fcntl.h>
#endif
*** ./isode/compat/signals.c@@/main/LATEST Mon Jun 13 17:54:50 1994
--- ./isode/compat/signals.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:10:43 1994
***************
*** 1,13 ****
- /* signals.c - signal handling */
-
- #ifndef lint
- static char *rcsid = "$Header: /mit/krb5/.cvsroot/src/isode/compat/signals.c,
v 1.3 1994/06/13 21:54:50 eichin Exp $";
- #endif
-
- /*
- * $Header: /mit/krb5/.cvsroot/src/isode/compat/signals.c,v 1.3 1994/06/13
21:54:50 eichin Exp $
- *
- *
* $Log: signals.c,v $
* Revision 1.3 1994/06/13 21:54:50 eichin
* rewrite linux hack so it works (should autoconf it)
--- 1,3 ----
***************
*** 98,104 ****
}
/* */
! #ifndef SVR4_UCB
int sigblock (mask)
int mask;
--- 88,94 ----
}
/* */
! #if !defined(SVR4_UCB) && !defined(__hpux)
int sigblock (mask)
int mask;
*** ./isode/h/Makefile.in@@/main/LATEST Fri Jun 24 18:11:53 1994
--- ./isode/h/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:10:48
1994
***************
*** 67,73 ****
##################################################################
all:; -mkdir $(ISODEINCM)
! @for h in $(HEADERS); do cp $(srcdir)/$$h $(ISODEINC)/$$h; done
-@echo copied $(HEADERS)
inst-all:; -mkdir $(INCDIRM)
--- 67,73 ----
##################################################################
all:; -mkdir $(ISODEINCM)
! -@for h in $(HEADERS); do rm -f $(ISODEINC)/$$h && cp $(srcdir)/$$h
$(ISODEINC)/$$h; done
-@echo copied $(HEADERS)
inst-all:; -mkdir $(INCDIRM)
*** ./isode/h/config.h@@/main/LATEST Mon Jun 20 23:11:26 1994
--- ./isode/h/config.h@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:10:51 1994
***************
*** 20,25 ****
--- 20,32 ----
#define BSD42
#endif
+ #if defined(HPUX) || defined(__hpux)
+ #define SYS5
+ #ifndef HPUX
+ #define HPUX
+ #endif
+ #endif
+
#ifdef _AIX
/* SYS5 is also for fcntl.h instead of sys/fcntl.h */
#define SYS5
*** ./kadmin/server/adm_network.c@@/main/LATEST Tue Sep 29 10:50:43 1992
--- ./kadmin/server/adm_network.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:39 1994
***************
*** 67,73 ****
doexit()
{
exit_now = 1;
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) || defined(convex)
return;
#else /* !POSIX */
return(0);
--- 67,73 ----
doexit()
{
exit_now = 1;
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) ||
defined(convex) || defined(hpux) || defined(__hpux)
return;
#else /* !POSIX */
return(0);
***************
*** 100,106 ****
#ifdef SYSV
signal(SIGCHLD, do_child);
#endif
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) || defined(convex)
return;
#else /* !POSIX */
return(0);
--- 100,106 ----
#ifdef SYSV
signal(SIGCHLD, do_child);
#endif
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) ||
defined(convex) || defined(hpux) || defined(__hpux)
return;
#else /* !POSIX */
return(0);
***************
*** 125,131 ****
signal(SIGCHLD, do_child);
#endif
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) || defined(convex)
return;
#else /* !POSIX */
return(0);
--- 125,131 ----
signal(SIGCHLD, do_child);
#endif
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) ||
defined(convex) || defined(hpux) || defined(__hpux)
return;
#else /* !POSIX */
return(0);
***************
*** 139,145 ****
"child %d not in list: termsig %d, retcode %d", pid,
WTERMSIG(status), WEXITSTATUS(status));
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) || defined(convex)
return;
#else /* !POSIX */
return(0);
--- 139,145 ----
"child %d not in list: termsig %d, retcode %d", pid,
WTERMSIG(status), WEXITSTATUS(status));
! #if defined (POSIX) || defined(SYSV) || defined(sun) && !defined(sysvimp) ||
defined(ultrix) || (defined(mips) && defined(SYSTYPE_BSD43)) ||
defined(convex) || defined(hpux) || defined(__hpux)
return;
#else /* !POSIX */
return(0);
*** ./kadmin/server/adm_server.c@@/main/LATEST Fri Jan 14 15:16:26 1994
--- ./kadmin/server/adm_server.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:43 1994
***************
*** 1,6 ****
/*
! * $Source: /mit/krb5/.cvsroot/src/kadmin/server/adm_server.c,v $
! * $Author: tytso $
*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
--- 1,6 ----
/*
! * $Source: /u1/CVS/local/krb5/kadmin/server/adm_server.c,v $
! * $Author: brezak $
*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
***************
*** 18,24 ****
#if !defined(lint) && !defined(SABER)
static char rcsid_adm_server_c[] =
! "$Header: /mit/krb5/.cvsroot/src/kadmin/server/adm_server.c,v 5.4 1994/01/14
20:16:26 tytso Exp $";
#endif /* lint */
/*
--- 18,24 ----
#if !defined(lint) && !defined(SABER)
static char rcsid_adm_server_c[] =
! "$Header: /u1/CVS/local/krb5/kadmin/server/adm_server.c,v 1.1.1.1 1994/06/30
02:14:13 brezak Exp $";
#endif /* lint */
/*
***************
*** 469,475 ****
exit(1);
}
! syslog(LOG_AUTH | LOG_INFO, "Admin Server Commencing Operation");
if (retval = adm5_listen_and_process(argv[0])){
krb5_free_principal(client_server_info.server);
--- 469,478 ----
exit(1);
}
! if (!adm_debug_flag)
! daemon(1, 0);
!
! syslog(LOG_INFO, "Admin Server Commencing Operation");
if (retval = adm5_listen_and_process(argv[0])){
krb5_free_principal(client_server_info.server);
*** ./kadmin/server/configure.in@@/main/LATEST Mon Jun 27 12:57:21 1994
--- ./kadmin/server/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:50 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
AC_TIME_WITH_SYS_TIME
ET_RULES
KRB_INCLUDE
*** ./kadmin/v4server/configure.in@@/main/LATEST Mon Jun 27 12:57:27 1994
--- ./kadmin/v4server/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:08:58 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
CHECK_WAIT_TYPE
CHECK_FCNTL
ET_RULES
*** ./kdc/configure.in@@/main/LATEST Mon Jun 27 12:57:40 1994
--- ./kdc/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:09:06 1994
***************
*** 4,9 ****
--- 4,10 ----
AC_SET_BUILDTOP
AC_HAVE_LIBRARY(socket)
AC_HAVE_LIBRARY(nsl)
+ AC_HAVE_LIBRARY(ndbm)
ET_RULES
KRB_INCLUDE
ISODE_INCLUDE
*** ./kdc/main.c@@/main/LATEST Fri Mar 11 18:10:55 1994
--- ./kdc/main.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:09:08 1994
***************
*** 1,6 ****
/*
! * $Source: /mit/krb5/.cvsroot/src/kdc/main.c,v $
! * $Author: tytso $
*
* Copyright 1990 by the Massachusetts Institute of Technology.
*
--- 1,6 ----
/*
! * $Source: /u1/CVS/local/krb5/kdc/main.c,v $
! * $Author: brezak $
*
* Copyright 1990 by the Massachusetts Institute of Technology.
*
***************
*** 26,32 ****
#if !defined(lint) && !defined(SABER)
static char rcsid_main_c[] =
! "$Id: main.c,v 5.37 1994/03/11 23:10:55 tytso Exp $";
#endif /* !lint & !SABER */
#include <stdio.h>
--- 26,32 ----
#if !defined(lint) && !defined(SABER)
static char rcsid_main_c[] =
! "$Id: main.c,v 1.1.1.1 1994/06/30 02:14:20 brezak Exp $";
#endif /* !lint & !SABER */
#include <stdio.h>
***************
*** 56,61 ****
--- 56,63 ----
#include "extern.h"
#include "kdc5_err.h"
+ krb5_boolean manual = FALSE;
+
static void
kdc_com_err_proc(whoami, code, format, pvar)
const char *whoami;
***************
*** 151,157 ****
char **argv;
{
int c;
- krb5_boolean manual = FALSE;
int keytypedone = 0;
char *db_realm = 0;
char *mkey_name = 0;
--- 153,158 ----
***************
*** 383,388 ****
--- 384,390 ----
return (krb5_db_fini());
}
+
/*
outline:
***************
*** 415,420 ****
--- 417,423 ----
{
krb5_error_code retval;
int errout = 0;
+ FILE *pidfile;
if (strrchr(argv[0], '/'))
argv[0] = strrchr(argv[0], '/')+1;
***************
*** 437,442 ****
--- 440,460 ----
finish_args(argv[0]);
return 1;
}
+
+ #if 0
+ if (!manual)
+ daemon(1, 0);
+ #endif
+
+ #ifdef PID_FILE
+ if ((pidfile = fopen(PID_FILE, "w")) != NULL) {
+ fprintf(pidfile, "%d\n", getpid());
+ fclose(pidfile);
+ } else
+ com_err(argv[0], errno,
+ "while opening pid file %s for writing", PID_FILE);
+ #endif
+
syslog(LOG_INFO, "commencing operation");
if (retval = listen_and_process(argv[0])){
com_err(argv[0], retval, "while processing network requests");
***************
*** 454,457 ****
finish_args(argv[0]);
return errout;
}
-
--- 472,474 ----
*** ./lib/crypto/des/Makefile.in@@/main/LATEST Wed Jun 22 21:12:23 1994
--- ./lib/crypto/des/Makefile.in@@/main/brezak_hpux_port/LATEST Thu Jul 14
15:09:38 1994
***************
*** 16,21 ****
--- 16,22 ----
CP = cp
SRCTOP = $(srcdir)/$(BUILDTOP)
+ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
all:: $(OBJS)
***************
*** 62,85 ****
all::
depend:: $(SRCS)
! clean::
! $(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
!
! EXT_LIB = $(TOP)/lib/krb5/error_tables/krb5_err.o \
! $(TOP)/lib/krb5/error_tables/isode_err.o \
! $(TOP)/lib/crypto/cryptoconf.o \
! $(TOP)/lib/crypto/crc-32/libcrc32.a \
! libdes.a $(OSLIB) $(COMERRLIB)
! verify: verify.o libdes.o
! $(RM) verify.o
$(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB)
clean::
$(RM) verify
! destest: destest.o libdes.o
! $(RM) destest.o
$(CC) -o $@ destest.o $(LDFLAGS) $(EXT_LIB)
clean::
--- 63,80 ----
all::
depend:: $(SRCS)
! EXT_LIB = $(BUILDTOP)/lib/krb5/error_tables/krb5_err.o \
! $(BUILDTOP)/lib/krb5/error_tables/isode_err.o \
! $(BUILDTOP)/lib/libcrypto.a \
! $(OSLIB) $(COMERRLIB)
! verify: verify.o
$(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB)
clean::
$(RM) verify
! destest: destest.o
$(CC) -o $@ destest.o $(LDFLAGS) $(EXT_LIB)
clean::
*** ./lib/crypto/des/destest.c@@/main/LATEST Tue Aug 31 23:05:00 1993
--- ./lib/crypto/des/destest.c@@/main/brezak_hpux_port/LATEST Thu Jul 14
15:10:26 1994
***************
*** 42,48 ****
#include <com_err.h>
extern int errno;
! extern krb5_cryptosystem_entry mit_des_cryptosystem_entry;
extern mit_des_ecb_encrypt();
#endif
--- 42,48 ----
#include <com_err.h>
extern int errno;
! extern krb5_cs_table_entry krb5_des_cst_entry;
extern mit_des_ecb_encrypt();
#endif
***************
*** 73,79 ****
/* do some initialisation */
initialize_krb5_error_table();
! eblock.crypto_entry = &mit_des_cryptosystem_entry;
keyblock.keytype = KEYTYPE_DES;
keyblock.length = sizeof (mit_des_cblock);
keyblock.contents = (krb5_octet *)key;
--- 73,79 ----
/* do some initialisation */
initialize_krb5_error_table();
! eblock.crypto_entry = krb5_des_cst_entry.system;
keyblock.keytype = KEYTYPE_DES;
keyblock.length = sizeof (mit_des_cblock);
keyblock.contents = (krb5_octet *)key;
*** ./lib/crypto/des/verify.c@@/main/LATEST Tue Aug 31 23:05:47 1993
--- ./lib/crypto/des/verify.c@@/main/brezak_hpux_port/LATEST Thu Jul 14
15:11:03 1994
***************
*** 37,48 ****
#include <krb5/krb5.h>
#include <krb5/ext-proto.h>
#include <krb5/mit-des.h>
- #include "des_int.h"
#include <stdio.h>
#include <com_err.h>
extern int errno;
! extern krb5_cryptosystem_entry mit_des_cryptosystem_entry;
char *progname;
int nflag = 2;
--- 37,47 ----
#include <krb5/krb5.h>
#include <krb5/ext-proto.h>
#include <krb5/mit-des.h>
#include <stdio.h>
#include <com_err.h>
extern int errno;
! extern krb5_cs_table_entry krb5_des_cst_entry;
char *progname;
int nflag = 2;
***************
*** 148,154 ****
/* do some initialisation */
initialize_krb5_error_table();
! eblock.crypto_entry = &mit_des_cryptosystem_entry;
keyblock.keytype = KEYTYPE_DES;
keyblock.length = sizeof (mit_des_cblock);
--- 147,153 ----
/* do some initialisation */
initialize_krb5_error_table();
! eblock.crypto_entry = krb5_des_cst_entry.system;
keyblock.keytype = KEYTYPE_DES;
keyblock.length = sizeof (mit_des_cblock);
*** ./lib/kdb/kdb_dbm.c@@/main/LATEST Fri Dec 24 17:46:53 1993
--- ./lib/kdb/kdb_dbm.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:09:29 1994
***************
*** 1348,1350 ****
--- 1348,1368 ----
non_blocking = mode;
return old;
}
+
+ #ifndef HAS_UTIMES
+ extern int errno;
+
+ #include <utime.h>
+ #include <sys/time.h>
+
+ utimes(file, tvp)
+ char *file;
+ struct timeval *tvp;
+ {
+ struct utimbuf times;
+
+ times.actime = tvp[0].tv_sec;
+ times.modtime = tvp[1].tv_sec;
+ return(utime(file, ×));
+ }
+ #endif
*** ./lib/krb5/os/an_to_ln.c@@/main/LATEST Wed Dec 1 17:14:59 1993
--- ./lib/krb5/os/an_to_ln.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:09:55 1994
***************
*** 70,84 ****
const int lnsize;
char *lname;
{
! struct stat statbuf;
! if (!stat(krb5_lname_file,&statbuf))
! return dbm_an_to_ln(aname, lnsize, lname);
if (krb5_lname_username_fallback)
return username_an_to_ln(aname, lnsize, lname);
! return KRB5_LNAME_CANTOPEN;
}
/*
* Implementation: This version uses a DBM database, indexed by aname,
* to generate a lname.
--- 70,87 ----
const int lnsize;
char *lname;
{
! krb5_error_code retval = KRB5_LNAME_CANTOPEN;
! #ifdef USE_DBM_LNAME
! if (!(retval = dbm_an_to_ln(aname, lnsize, lname)))
! return retval;
! #endif
if (krb5_lname_username_fallback)
return username_an_to_ln(aname, lnsize, lname);
! return retval;
}
+ #ifdef USE_DBM_LNAME
/*
* Implementation: This version uses a DBM database, indexed by aname,
* to generate a lname.
***************
*** 128,133 ****
--- 131,137 ----
(void) dbm_close(db);
return retval;
}
+ #endif
/*
* Implementation: This version checks the realm to see if it is the local
*** ./lib/krb5/posix/configure.in@@/main/LATEST Tue Jun 21 02:28:27 1994
--- ./lib/krb5/posix/configure.in@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:10:03 1994
***************
*** 6,11 ****
KRB_INCLUDE
ISODE_INCLUDE
AC_CONST
! AC_REPLACE_FUNCS(vfprintf vsprintf strdup strerror memmove)
AC_FUNC_CHECK(vsyslog, ,[LIBOBJS="[$]LIBOBJS syslog.o"])
AC_OUTPUT(Makefile,[EXTRA_RULES])
--- 6,12 ----
KRB_INCLUDE
ISODE_INCLUDE
AC_CONST
! AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
! AC_REPLACE_FUNCS(vfprintf vsprintf strdup strerror memmove daemon)
AC_FUNC_CHECK(vsyslog, ,[LIBOBJS="[$]LIBOBJS syslog.o"])
AC_OUTPUT(Makefile,[EXTRA_RULES])
*** ./lib/krb5/posix/daemon.c@@/main/LATEST Thu Jul 14 17:57:56 1994
--- ./lib/krb5/posix/daemon.c@@/main/brezak_hpux_port/LATEST Fri Jul 15
09:10:06 1994
***************
*** 0 ****
--- 1,93 ----
+ /*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+ #include <sys/fcntl.h>
+ #include <sys/file.h>
+ #include <unistd.h>
+ #ifdef HAS_PATHS_H
+ #include <paths.h>
+ #endif
+ #include <krb5/autoconf.h>
+
+ #ifndef _PATH_DEVNULL
+ #define _PATH_DEVNULL "/dev/null"
+ #endif
+
+ daemon(nochdir, noclose)
+ int nochdir, noclose;
+ {
+ int cpid;
+
+ if ((cpid = fork()) == -1)
+ return (-1);
+ if (cpid)
+ exit(0);
+ #ifdef HAS_SETSID
+ (void) setsid();
+ #else
+ #ifndef TIOCNOTTY
+ setpgrp();
+ #else
+ {
+ int n;
+
+ /*
+ * The open below may hang on pseudo ttys if the person
+ * who starts named logs out before this point. Thus,
+ * the need for the timer.
+ */
+ alarm(120);
+ n = open("/dev/tty", O_RDWR);
+ alarm(0);
+ if (n > 0) {
+ (void) ioctl(n, TIOCNOTTY, (char *)NULL);
+ (void) close(n);
+ }
+ }
+ #endif
+ #endif
+ if (!nochdir)
+ (void) chdir("/");
+ if (!noclose) {
+ int devnull = open(_PATH_DEVNULL, O_RDWR, 0);
+
+ if (devnull != -1) {
+ (void) dup2(devnull, 0);
+ (void) dup2(devnull, 1);
+ (void) dup2(devnull, 2);
+ if (devnull > 2)
+ (void) close(devnull);
+ }
+ }
+ return (0);
+ }
*** ./slave/kpropd.c@@/main/LATEST Fri Jun 24 03:12:57 1994
--- ./slave/kpropd.c@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:19:59 1994
***************
*** 98,104 ****
void PRS();
void do_standalone();
void doit();
- void detach_process();
void kerberos_authenticate();
krb5_boolean authorized_principal();
void recv_database();
--- 98,103 ----
***************
*** 135,140 ****
--- 134,140 ----
struct sockaddr_in sin, frominet;
struct servent *sp;
int finet, fromlen, s;
+ FILE *pidfile;
finet = socket(AF_INET, SOCK_STREAM, 0);
if (finet < 0) {
***************
*** 155,161 ****
exit(1);
}
if (!debug)
! detach_process();
#ifdef PID_FILE
if ((pidfile = fopen(PID_FILE, "w")) != NULL) {
fprintf(pidfile, "%d\n", getpid());
--- 155,161 ----
exit(1);
}
if (!debug)
! daemon(1, 0);
#ifdef PID_FILE
if ((pidfile = fopen(PID_FILE, "w")) != NULL) {
fprintf(pidfile, "%d\n", getpid());
***************
*** 440,482 ****
}
strcpy(temp_file_name, file);
strcat(temp_file_name, tmp);
- }
-
- void
- detach_process()
- {
- int n;
-
- #if defined(BSD) && BSD >= 199006
- daemon(1, 0);
- #else
- if (fork() > 0)
- exit(0);
- n = open("/dev/null", O_RDONLY);
- (void) dup2(n, 0);
- (void) dup2(n, 1);
- (void) dup2(n, 2);
- if (n > 2)
- (void) close(n);
- #ifdef SYSV
- setpgrp();
- #else
- {
- /*
- * The open below may hang on pseudo ttys if the person
- * who starts named logs out before this point. Thus,
- * the need for the timer.
- */
- alarm(120);
- n = open("/dev/tty", O_RDWR);
- alarm(0);
- if (n > 0) {
- (void) ioctl(n, TIOCNOTTY, (char *)NULL);
- (void) close(n);
- }
- }
- #endif /* SYSV */
- #endif /* BSD > 199006 */
}
/*
--- 440,445 ----
*** ./util/ss/Makefile.in@@/main/LATEST Thu Jun 23 00:25:30 1994
--- ./util/ss/Makefile.in@@/main/brezak_hpux_port/LATEST Fri Jul 15 09:10:25
1994
***************
*** 92,103 ****
includes:: mk_cmds ss_err.h
-$(RM) -rf $(TOP)/include/ss
! mkdir $(TOP)/include/ss
! cp $(srcdir)/ss.h $(TOP)/include/ss
! cp $(srcdir)/mit-sipb-copyright.h $(TOP)/include/ss
! cp $(srcdir)/copyright.h $(TOP)/include/ss
! cp ss_err.h $(TOP)/include/ss
! cp $(srcdir)/ss_internal.h $(TOP)/include/ss
install:: $(HFILES) copyright.h
--- 92,103 ----
includes:: mk_cmds ss_err.h
-$(RM) -rf $(TOP)/include/ss
! -mkdir $(TOP)/include/ss
! -(rm -f $(TOP)/include/ss/ss.h && cp -f $(srcdir)/ss.h $(TOP)/include/ss)
! -(rm -f $(TOP)/include/ss/mit-sipb-copyright.h && cp -f
$(srcdir)/mit-sipb-copyright.h $(TOP)/include/ss)
! -(rm -f $(TOP)/include/ss/copyright.h && cp $(srcdir)/copyright.h
$(TOP)/include/ss)
! -(rm -f $(TOP)/include/ss/ss_err.h && cp ss_err.h $(TOP)/include/ss)
! -(rm -f $(TOP)/include/ss/ss_internal.h && cp $(srcdir)/ss_internal.h
$(TOP)/include/ss)
install:: $(HFILES) copyright.h
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
John Brezak UUCP: uunet!apollo.hp!brezak
Hewlett Packard/Apollo Internet: brezak@ch.hp.com
300 Apollo Drive Phone: (508) 436-4915
Chelmsford, Massachusetts Fax: (508) 436-5122
