[1586] in Kerberos-V5-bugs
Patches to Beta 5-1/2 (24 July snapshot)
daemon@ATHENA.MIT.EDU (Derek Atkins)
Mon Aug 7 16:59:06 1995
Date: Mon, 7 Aug 1995 13:58:22 -0700
From: warlord@mtv4s1.Eng.Sun.COM (Derek Atkins)
To: krb5-bugs@MIT.EDU
Ted and Co.,
Here are the patches I needed to make to get Krb5 to compile here,
plus a couple of bug-fixes. The code fixes are at the front of the
patch. Most of the changes are adding source dependencies to
Makefiles where they didn't exist before.
If you have any questions, please let me know.
-derek
PS: You can disregard my patch about "make check" hanging -- it is a
bug on my fileserver where file locking is broken. I dont know what
the problem is, exactly, but it is a problem on this end. Sorry to
worry you about it.
------- g_pw_in_tkt.c -------
*** /tmp/da003dv Wed Dec 31 16:00:00 1969
--- ./lib/krb4/g_pw_in_tkt.c Wed Jul 26 18:49:35 1995
***************
*** 174,180 ****
char *strcpy();
int strcmp();
#endif
! #ifdef __svr4__
#include <sgtty.h>
#endif
--- 174,180 ----
char *strcpy();
int strcmp();
#endif
! #if defined(__svr4__) || defined(__SVR4)
#include <sgtty.h>
#endif
------- tf_util.c -------
*** /tmp/da003iw Wed Dec 31 16:00:00 1969
--- ./lib/krb4/tf_util.c Wed Jul 26 18:51:01 1995
***************
*** 46,52 ****
#ifdef __SCO__
#include <utime.h>
#endif
! #ifdef __svr4__
#include <utime.h>
#endif
int utimes(path, times)
--- 46,52 ----
#ifdef __SCO__
#include <utime.h>
#endif
! #if defined(__svr4__) || defined(__SVR4)
#include <utime.h>
#endif
int utimes(path, times)
------- in_tkt_ktb.c -------
*** /tmp/da003UT Wed Dec 31 16:00:00 1969
--- ./lib/krb5/krb/in_tkt_ktb.c Wed Jul 26 19:14:25 1995
***************
*** 68,95 ****
if ((retval = krb5_kt_default(context, &kt_id)))
return retval;
! if ((retval = krb5_kt_get_entry(context, kt_id, arg->client,
! 0, /* don't have vno available */
! type, &kt_ent)))
! return retval;
! if ((retval = krb5_copy_keyblock(context, &kt_ent.key, &realkey))) {
(void) krb5_kt_free_entry(context, &kt_ent);
! return retval;
}
-
- if (realkey->keytype != type) {
- (void) krb5_kt_free_entry(context, &kt_ent);
- krb5_free_keyblock(context, realkey);
- return KRB5_PROG_ETYPE_NOSUPP;
- }
! (void) krb5_kt_free_entry(context, &kt_ent);
! if (arg->keytab)
! krb5_kt_close(context, kt_id);
! *key = realkey;
! return 0;
}
/*
--- 68,102 ----
if ((retval = krb5_kt_default(context, &kt_id)))
return retval;
+ do {
+ if ((retval = krb5_kt_get_entry(context, kt_id, arg->client,
+ 0, /* don't have vno available */
+ type, &kt_ent)))
+ break;
! if ((retval = krb5_copy_keyblock(context, &kt_ent.key, &realkey))) {
! (void) krb5_kt_free_entry(context, &kt_ent);
! break;
! }
!
! if (realkey->keytype != type) {
! (void) krb5_kt_free_entry(context, &kt_ent);
! krb5_free_keyblock(context, realkey);
! retval = KRB5_PROG_ETYPE_NOSUPP;
! break;
! }
! } while (0);
!
! if (arg->keytab == NULL)
! krb5_kt_close(context, kt_id);
!
! if (!retval) {
(void) krb5_kt_free_entry(context, &kt_ent);
! *key = realkey;
}
! return retval;
}
/*
------- inq_cred.c -------
*** /tmp/da0039J Wed Dec 31 16:00:00 1969
--- ./lib/gssapi/krb5/inq_cred.c Wed Jul 26 18:46:31 1995
***************
*** 89,95 ****
if (name) {
if (! kg_save_name((gss_name_t) ret_name)) {
! (void)gss_release_oid_set(minor_status, &mechs);
krb5_free_principal(context, ret_name);
*minor_status = (OM_uint32) G_VALIDATE_FAILED;
return(GSS_S_FAILURE);
--- 89,95 ----
if (name) {
if (! kg_save_name((gss_name_t) ret_name)) {
! (void)generic_gss_release_oid_set(minor_status, &mechs);
krb5_free_principal(context, ret_name);
*minor_status = (OM_uint32) G_VALIDATE_FAILED;
return(GSS_S_FAILURE);
------- aclocal.m4 -------
*** /tmp/da002Ex Wed Dec 31 16:00:00 1969
--- ./aclocal.m4 Wed Jul 26 19:16:12 1995
***************
*** 158,164 ****
config.status: $(srcdir)/configure
$(SHELL) config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(SRCTOP)/aclocal.m4
! cd $(srcdir); $(SRCTOP)/util/autoconf/autoconf --localdir=$(BUILDTOP) --macrodir=$(BUILDTOP)/util/autoconf
]
AC_POP_MAKEFILE()dnl
])dnl
--- 158,164 ----
config.status: $(srcdir)/configure
$(SHELL) config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(SRCTOP)/aclocal.m4
! cd $(srcdir); $(SHELL) $(SRCTOP)/util/autoconf/autoconf --localdir=$(BUILDTOP) --macrodir=$(BUILDTOP)/util/autoconf
]
AC_POP_MAKEFILE()dnl
])dnl
***************
*** 230,239 ****
.SUFFIXES: .h .c .et .ct
.ct.c:
! @if [ $< != $}{*.ct ]; then \
! (set -x; cp $< $}{*.ct && $(MAKE_COMMANDS) $}{*.ct && $(RM) $}{*.ct) || exit 1; \
else \
! (set -x; $(MAKE_COMMANDS) $}{*.ct) || exit 1; \
fi
}
--- 230,239 ----
.SUFFIXES: .h .c .et .ct
.ct.c:
! @if [ $< != "$}{*.ct" ]; then \
! (set -x; cp $< "$}{*.ct" && $(MAKE_COMMANDS) "$}{*.ct" && $(RM) "$}{*.ct") || exit 1; \
else \
! (set -x; $(MAKE_COMMANDS) "$}{*.ct") || exit 1; \
fi
}
------- Makefile.in -------
*** /tmp/da002Fq Wed Dec 31 16:00:00 1969
--- ./admin/aname/Makefile.in Wed Jul 26 18:31:14 1995
***************
*** 15,17 ****
--- 15,18 ----
clean::
$(RM) kdb5_anadd kdb5_anadd.o
+ kdb5_anadd.o: kdb5_anadd.c
------- Makefile.in -------
*** /tmp/da002GO Wed Dec 31 16:00:00 1969
--- ./admin/convert/Makefile.in Wed Jul 26 18:31:55 1995
***************
*** 16,18 ****
--- 16,19 ----
clean::
$(RM) kdb5_convert kdb5_convert.o
+ kdb5_convert.o: kdb5_convert.c
------- Makefile.in -------
*** /tmp/da002Gu Wed Dec 31 16:00:00 1969
--- ./admin/create/Makefile.in Wed Jul 26 18:32:36 1995
***************
*** 12,15 ****
clean::
$(RM) kdb5_create kdb5_create.o
!
--- 12,15 ----
clean::
$(RM) kdb5_create kdb5_create.o
! kdb5_create.o: kdb5_create.c
------- Makefile.in -------
*** /tmp/da002HS Wed Dec 31 16:00:00 1969
--- ./admin/destroy/Makefile.in Wed Jul 26 18:33:07 1995
***************
*** 11,13 ****
--- 11,15 ----
clean::
$(RM) kdb5_destroy kdb5_destroy.o
+
+ kdb5_destroy.o: kdb5_destroy.c
------- Makefile.in -------
*** /tmp/da002J7 Wed Dec 31 16:00:00 1969
--- ./admin/stash/Makefile.in Wed Jul 26 18:33:45 1995
***************
*** 11,13 ****
--- 11,15 ----
clean::
$(RM) kdb5_stash kdb5_stash.o
+
+ kdb5_stash.o: kdb5_stash.c
------- Makefile.in -------
*** /tmp/da002Y_ Wed Dec 31 16:00:00 1969
--- ./appl/telnet/libtelnet/Makefile.in Wed Jul 26 18:36:15 1995
***************
*** 83,85 ****
--- 83,95 ----
enc_des.o: key-proto.h
enc_des.o: misc-proto.h
install::
+
+ getent.o: getent.c
+ getopt.o: getopt.c
+ herror.o: herror.c
+ setenv.o: setenv.c
+ setsid.o: setsid.c
+ strcasecmp.o: strcasecmp.c
+ strdup.o: strdup.c
+ strerror.o: strerror.c
+ strftime.o: strftime.c
------- Makefile.in -------
*** /tmp/da002.p Wed Dec 31 16:00:00 1969
--- ./appl/telnet/telnet/Makefile.in Wed Jul 26 18:37:56 1995
***************
*** 26,32 ****
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
! SRCS= commands.c main.c network.c ring.c \
sys_bsd.c telnet.c terminal.c \
utilities.c $(GETOPT_SRC)
ALLHC= $(SRCS) \
--- 26,32 ----
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
! SRCS= authenc.c commands.c main.c network.c ring.c \
sys_bsd.c telnet.c terminal.c \
utilities.c $(GETOPT_SRC)
ALLHC= $(SRCS) \
------- Makefile.in -------
*** /tmp/da002y3 Wed Dec 31 16:00:00 1969
--- ./lib/crypto/des/Makefile.in Wed Jul 26 18:59:12 1995
***************
*** 88,90 ****
--- 88,93 ----
clean-mac::
$(RM) shared/*
clean-windows::
+
+ destest.o: destest.c
+ verify.o: verify.c
------- Makefile.in -------
*** /tmp/da0031F Wed Dec 31 16:00:00 1969
--- ./lib/crypto/md5/Makefile.in Wed Jul 26 19:00:18 1995
***************
*** 48,50 ****
--- 48,52 ----
clean-mac::
$(RM) shared/*
clean-windows::
+
+ t_mddriver.o: t_mddriver.c
------- Makefile.in -------
*** /tmp/da0033j Wed Dec 31 16:00:00 1969
--- ./lib/des425/Makefile.in Wed Jul 26 18:44:41 1995
***************
*** 95,97 ****
--- 95,98 ----
clean::
$(RM) libdes425.$(LIBEXT) libdes425.bak
+ verify.o: verify.c
------- Makefile.in -------
*** /tmp/da003Lh Wed Dec 31 16:00:00 1969
--- ./lib/krb5/error_tables/Makefile.in Wed Jul 26 18:53:46 1995
***************
*** 22,27 ****
--- 22,28 ----
$(CC) $(CFLAGS) -c $*.c
@SHARED_RULE_LOCAL@
+ ETS= asn1_err.et kdb5_err.et krb5_err.et kv5m_err.et adm_err.et
HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h
OBJS= asn1_err.$(OBJEXT) kdb5_err.$(OBJEXT) krb5_err.$(OBJEXT) \
kv5m_err.$(OBJEXT) adm_err.$(OBJEXT) init_ets.$(OBJEXT)
***************
*** 39,44 ****
--- 40,48 ----
mkdir shared
unixmac: $(HDRS) $(SRCS)
+
+ $(HDRS): $(ETS)
+ $(ETSRCS): $(ETS)
awk-windows:
$(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=asn1_err.h asn1_err.et
------- Makefile.in -------
*** /tmp/da003Rg Wed Dec 31 16:00:00 1969
--- ./lib/krb5/krb/Makefile.in Wed Jul 26 18:55:49 1995
***************
*** 188,190 ****
--- 188,193 ----
clean-mac::
$(RM) shared/*
clean-windows::
+
+ t_walk_rtree.o: t_walk_rtree.c
+ t_kerb.o: t_kerb.c
------- Makefile.in -------
*** /tmp/da003XU Wed Dec 31 16:00:00 1969
--- ./lib/krb5/os/Makefile.in Wed Jul 26 18:57:02 1995
***************
*** 131,133 ****
--- 131,134 ----
clean-mac::
clean-windows::
+ t_std_conf.o: t_std_conf.c
------- Makefile.in -------
*** /tmp/da003_t Wed Dec 31 16:00:00 1969
--- ./lib/krb5/posix/Makefile.in Wed Jul 26 18:57:40 1995
***************
*** 27,30 ****
clean-mac::
clean-windows::
!
--- 27,38 ----
clean-mac::
clean-windows::
! daemon.o: daemon.c
! getuid.o: getuid.c
! memmove.o: memmove.c
! strcasecmp.o: strcasecmp.c
! strdup.o: strdup.c
! strerror.o: strerror.c
! syslog.o: syslog.c
! vfprintf.o: vfprintf.c
! vsprintf.o: vsprintf.c
------- Makefile.in -------
*** /tmp/da003c1 Wed Dec 31 16:00:00 1969
--- ./lib/krb4/Makefile.in Wed Jul 26 18:48:25 1995
***************
*** 82,88 ****
$(srcdir)/mk_preauth.c \
$(srcdir)/unix_time.c \
$(CACHESRCS) $(SETENVSRCS) $(STRCASESRCS) $(SHMSRCS) \
! $(LIB_KRB_HOSTSRCS) $(SERVER_KRB_SRCS) $(NETIO_OBJS) $(REALMDBSRCS)
LIB_SUBDIRS= .
--- 82,88 ----
$(srcdir)/mk_preauth.c \
$(srcdir)/unix_time.c \
$(CACHESRCS) $(SETENVSRCS) $(STRCASESRCS) $(SHMSRCS) \
! $(LIB_KRB_HOSTSRCS) $(SERVER_KRB_SRCS) $(NETIO_SRCS) $(REALMDBSRCS)
LIB_SUBDIRS= .
------- Makefile.in -------
*** /tmp/da003la Wed Dec 31 16:00:00 1969
--- ./tests/asn.1/Makefile.in Wed Jul 26 19:01:41 1995
***************
*** 6,16 ****
--- 6,20 ----
LOCALINCLUDES = -I$(srcdir)/../../lib/krb5/asn.1
+ SRCS = $(ENCSRCS) $(DECSRCS)
+
+ ENCSRCS = krb5_encode_test.c ktest.c ktest_equal.c utility.c trval.c
ENCOBJS = krb5_encode_test.o ktest.o ktest_equal.o utility.o trval.o
krb5_encode_test: $(ENCOBJS) $(DEPLIBS)
$(LD) $(LDFLAGS) $(LDARGS) -o krb5_encode_test $(ENCOBJS) $(LIBS)
+ DECSRCS = krb5_decode_test.c ktest.c ktest_equal.c utility.c
DECOBJS = krb5_decode_test.o ktest.o ktest_equal.o utility.o
krb5_decode_test: $(DECOBJS) $(DEPLIBS)
------- reconf -------
*** /tmp/da003rQ Wed Dec 31 16:00:00 1969
--- ./util/reconf Wed Jul 26 19:23:34 1995
***************
*** 1,9 ****
#!/bin/sh
force=
! autoreconf=./util/autoconf/autoreconf
verbose=false
usage="Usage: $0 [--force] [--verbose] [--help]"
for option
do
--- 1,11 ----
#!/bin/sh
force=
! autoreconfprog=./util/autoconf/autoreconf
verbose=false
+ autoreconf="/bin/sh $autoreconfprog"
+
usage="Usage: $0 [--force] [--verbose] [--help]"
for option
do
***************
*** 20,26 ****
done
! if test ! -f $autoreconf ; then
if autoreconf --version | grep -q "version 2.[123456789]" && \
autoconf --version | grep -q "version 2.[123456789]" && \
autoheader --version | grep -q "version 2.[123456789]" ; then
--- 22,28 ----
done
! if test ! -f $autoreconfprog ; then
if autoreconf --version | grep -q "version 2.[123456789]" && \
autoconf --version | grep -q "version 2.[123456789]" && \
autoheader --version | grep -q "version 2.[123456789]" ; then
------- acgeneral.m4 -------
*** /tmp/da003sT Wed Dec 31 16:00:00 1969
--- ./util/autoconf/acgeneral.m4 Wed Jul 26 19:16:59 1995
***************
*** 720,728 ****
if test -z "$ac_aux_dir"; then
AC_MSG_ERROR([can not find install-sh or install.sh in $1])
fi
! ac_config_guess=$ac_aux_dir/config.guess
! ac_config_sub=$ac_aux_dir/config.sub
! ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
])
--- 720,728 ----
if test -z "$ac_aux_dir"; then
AC_MSG_ERROR([can not find install-sh or install.sh in $1])
fi
! ac_config_guess="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/config.guess"
! ac_config_sub="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/config.sub"
! ac_configure="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/configure" # This should be Cygnus configure.
AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
])
------- autoreconf -------
*** /tmp/da003uY Wed Dec 31 16:00:00 1969
--- ./util/autoconf/autoreconf Wed Jul 26 19:27:13 1995
***************
*** 117,123 ****
:
else
test $verbose = yes && echo running autoconf in $dir
! $autoconf $macrodir_opt $localdir_opt
fi
if grep AC_CONFIG_HEADER configure.in >/dev/null; then
--- 117,123 ----
:
else
test $verbose = yes && echo running autoconf in $dir
! /bin/sh $autoconf $macrodir_opt $localdir_opt
fi
if grep AC_CONFIG_HEADER configure.in >/dev/null; then
***************
*** 140,146 ****
:
else
test $verbose = yes && echo running autoheader in $dir
! $autoheader $macrodir_opt $localdir_opt
fi
fi
fi
--- 140,146 ----
:
else
test $verbose = yes && echo running autoheader in $dir
! /bin/sh $autoheader $macrodir_opt $localdir_opt
fi
fi
fi
------- Makefile.in -------
*** /tmp/da003xw Wed Dec 31 16:00:00 1969
--- ./util/profile/Makefile.in Wed Jul 26 19:04:23 1995
***************
*** 99,102 ****
--- 99,104 ----
prof_parse.o: $(srcdir)/prof_parse.c $(srcdir)/prof_int.h prof_err.h
prof_err.o: prof_err.c
prof_init.o: $(srcdir)/prof_init.c $(srcdir)/prof_int.h prof_err.h
+ test_parse.o: test_parse.c
+ test_profile.o: test_profile.c
------- Makefile.in -------
*** /tmp/da0044. Wed Dec 31 16:00:00 1969
--- ./util/et/Makefile.in Wed Jul 26 19:02:53 1995
***************
*** 72,78 ****
# $(INSTALLPROG) compile_et $(DESTDIR)$(PROGDIR)/compile_et
compile_et: $(srcdir)/compile_et.sh $(srcdir)/config_script
! $(srcdir)/config_script $(srcdir)/compile_et.sh $(AWK) $(SED) > compile_et
chmod 755 compile_et
et_c.awk: $(srcdir)/et_c.awk
--- 72,78 ----
# $(INSTALLPROG) compile_et $(DESTDIR)$(PROGDIR)/compile_et
compile_et: $(srcdir)/compile_et.sh $(srcdir)/config_script
! $(SHELL) $(srcdir)/config_script $(srcdir)/compile_et.sh $(AWK) $(SED) > compile_et
chmod 755 compile_et
et_c.awk: $(srcdir)/et_c.awk
------- Makefile.in -------
*** /tmp/da0048T Wed Dec 31 16:00:00 1969
--- ./util/ss/Makefile.in Wed Jul 26 19:05:20 1995
***************
*** 136,142 ****
# $(INSTALLPROG) mk_cmds ${DESTDIR}$(PROGDIR)/mk_cmds
mk_cmds: $(srcdir)/mk_cmds.sh $(srcdir)/config_script
! $(srcdir)/config_script $(srcdir)/mk_cmds.sh . $(AWK) $(SED) > mk_cmds
chmod 755 mk_cmds
ct_c.awk: $(srcdir)/ct_c_awk.in
--- 136,142 ----
# $(INSTALLPROG) mk_cmds ${DESTDIR}$(PROGDIR)/mk_cmds
mk_cmds: $(srcdir)/mk_cmds.sh $(srcdir)/config_script
! $(SHELL) $(srcdir)/config_script $(srcdir)/mk_cmds.sh . $(AWK) $(SED) > mk_cmds
chmod 755 mk_cmds
ct_c.awk: $(srcdir)/ct_c_awk.in
