[560] in Kerberos-V5-bugs
patches
daemon@ATHENA.MIT.EDU (David Carrel)
Mon Jul 4 16:08:22 1994
To: krb5-bugs@MIT.EDU
Date: Mon, 04 Jul 1994 13:08:07 -0700
From: David Carrel <carrel@cisco.com>
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Here are some patches for beta4.1. The first three are common to all
platforms, the fourth is sun (and maybe SunOS 4.1) sepcific. The fifth is
common. Other than these, things look good.
Dave
----------------------------------------------------------------------------
David Carrel | E-mail: carrel@cisco.com
Security Development, cisco Systems | phone: (415) 324-5207
P.O. Box 3075, 1525 O'Brien Dr. | fax: (415) 428-5080
Menlo Park, Ca, 94025-1435 |
----------------------------------------------------------------------------
1) src/appl/simple/client/Makefile.in needs definitions for CLIENT_BINDIR
2) kadmin/v4server/Makefile.in tries to install the v4kadmind as krb5kdc
Patch is below.
3) kadmin/server/Makefile.in installs kadmind in the CLIENT_BINDIR instead of
the SERVER_BINDIR. Patch is below.
4) Under SunOS 4.1 kadmind dumps core in signal(2). The problem is is that
libisode.a has sigblock() and sigsetmask() functions and in the same .o
file it defines a sigvec() function which is then used by SunOS's signal
and kablewey. The fix is to make sure that BSDSIGS gets defined in
manifest.h. A patch is included below. It works, but is probably not the
most elegant or proper solution.
5) DESTDIR is not used everywhere. Patches below:
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
*** kadmin/v4server/Makefile.in~ Fri Jun 24 21:47:41 1994
--- kadmin/v4server/Makefile.in Sun Jul 3 13:41:16 1994
***************
*** 76,82 ****
$(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(KRB4LIB) $(LIBS)
install::
! cp v4kadmind ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
clean::
$(RM) kadm_err.h kadm_err.c
--- 76,82 ----
$(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(KRB4LIB) $(LIBS)
install::
! cp v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind
clean::
$(RM) kadm_err.h kadm_err.c
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
*** kadmin/server/Makefile.in~ Sun Jul 3 14:26:09 1994
--- kadmin/server/Makefile.in Sun Jul 3 14:26:08 1994
***************
*** 82,89 ****
$(CC) $(CFLAGS) -o kadmind $(OBJS) $(KDBLIB) $(K4LIB) $(KLIB) $(LIBS)
install::
! cp kadmind ${DESTDIR}$(CLIENT_BINDIR)/kadmind
! cp kadmind.M ${DESTDIR}$(CLIENT_MANDIR)/kadmind.1
clean::
$(RM) kadmind
--- 82,89 ----
$(CC) $(CFLAGS) -o kadmind $(OBJS) $(KDBLIB) $(K4LIB) $(KLIB) $(LIBS)
install::
! cp kadmind ${DESTDIR}$(SERVER_BINDIR)/kadmind
! cp kadmind.M ${DESTDIR}$(SERVER_MANDIR)/kadmind.1
clean::
$(RM) kadmind
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
*** isode/h/manifest.h~ Thu Jun 9 20:29:26 1994
--- isode/h/manifest.h Sun Jul 3 15:45:10 1994
***************
*** 57,62 ****
--- 57,67 ----
*/
+
+ #ifdef sun
+ #define BSDSIGS
+ #endif
+
#ifdef BSD42
#undef SYS5NLY
#define BSDSIGS
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
*** ./include/kerberosIV/Makefile.in~ Fri Jun 24 21:46:41 1994
--- ./include/kerberosIV/Makefile.in Mon Jul 4 12:23:00 1994
***************
*** 16,20 ****
install:: $(KRB4_HEADERS)
@set -x; for f in $(KRB4_HEADERS) ; \
! do cp $$f $(KRB5_INCDIR)/kerberosIV/$$f ; \
done
--- 16,20 ----
install:: $(KRB4_HEADERS)
@set -x; for f in $(KRB4_HEADERS) ; \
! do cp $$f $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/$$f ; \
done
*** ./include/krb5/Makefile.in~ Fri Jun 24 21:46:52 1994
--- ./include/krb5/Makefile.in Mon Jul 4 12:22:11 1994
***************
*** 59,65 ****
install:: $(KRB5_HEADERS) config.h osconf.h autoconf.h
@set -x; for f in $(KRB5_HEADERS) config.h osconf.h ; \
! do cp $$f $(KRB5_INCDIR)/krb5/$$f ; \
done
PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
--- 59,65 ----
install:: $(KRB5_HEADERS) config.h osconf.h autoconf.h
@set -x; for f in $(KRB5_HEADERS) config.h osconf.h ; \
! do cp $$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \
done
PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
*** ./lib/des425/Makefile.in~ Fri Jun 24 21:48:10 1994
--- ./lib/des425/Makefile.in Mon Jul 4 12:27:46 1994
***************
*** 84,92 ****
$(RANLIB) $(BUILDTOP)/lib/libdes425.a
install:: libdes425.a
! $(RM) $(KRB5_LIBDIR)/libdes425.a
! $(CP) libdes425.a $(KRB5_LIBDIR)/libdes425.a
! $(RANLIB) $(KRB5_LIBDIR)/libdes425.a
clean::
$(RM) $(OBJS)
--- 84,92 ----
$(RANLIB) $(BUILDTOP)/lib/libdes425.a
install:: libdes425.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
! $(CP) libdes425.a $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
clean::
$(RM) $(OBJS)
*** ./lib/gssapi/Makefile.in~ Fri Jun 24 21:48:16 1994
--- ./lib/gssapi/Makefile.in Mon Jul 4 12:29:32 1994
***************
*** 39,47 ****
$(RANLIB) $@
install:: libgssapi_krb5.a
! $(RM) $(KRB5_LIBDIR)/libgssapi_krb5.a
! $(CP) libgssapi_krb5.a $(KRB5_LIBDIR)/libgssapi_krb5.a
! $(RANLIB) $(KRB5_LIBDIR)/libgssapi_krb5.a
clean::
$(RM) libgssapi_krb5.a
--- 39,47 ----
$(RANLIB) $@
install:: libgssapi_krb5.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
! $(CP) libgssapi_krb5.a $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
clean::
$(RM) libgssapi_krb5.a
*** ./lib/kdb/Makefile.in~ Fri Jun 24 21:48:24 1994
--- ./lib/kdb/Makefile.in Mon Jul 4 12:26:57 1994
***************
*** 67,75 ****
$(RANLIB) $(BUILDTOP)/lib/libkdb5.a
install:: libkdb5.a
! $(RM) $(KRB5_LIBDIR)/libkdb5.a
! $(CP) libkdb5.a $(KRB5_LIBDIR)/libkdb5.a
! $(RANLIB) $(KRB5_LIBDIR)/libkdb5.a
clean::
$(RM) $(OBJS)
--- 67,75 ----
$(RANLIB) $(BUILDTOP)/lib/libkdb5.a
install:: libkdb5.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkdb5.a
! $(CP) libkdb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkdb5.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkdb5.a
clean::
$(RM) $(OBJS)
*** ./lib/krb5/Makefile.in~ Fri Jun 24 21:48:34 1994
--- ./lib/krb5/Makefile.in Mon Jul 4 12:26:08 1994
***************
*** 51,59 ****
$(RANLIB) $@
install:: libkrb5.a
! $(RM) $(KRB5_LIBDIR)/libkrb5.a
! $(CP) libkrb5.a $(KRB5_LIBDIR)/libkrb5.a
! $(RANLIB) $(KRB5_LIBDIR)/libkrb5.a
clean::
$(RM) libkrb5.a
--- 51,59 ----
$(RANLIB) $@
install:: libkrb5.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
! $(CP) libkrb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
clean::
$(RM) libkrb5.a
*** ./lib/crypto/Makefile.in~ Fri Jun 24 21:48:00 1994
--- ./lib/crypto/Makefile.in Mon Jul 4 12:28:43 1994
***************
*** 54,59 ****
$(RANLIB) $@
install:: libcrypto.a
! $(RM) $(KRB5_LIBDIR)/libcrypto.a
! $(CP) libcrypto.a $(KRB5_LIBDIR)/libcrypto.a
! $(RANLIB) $(KRB5_LIBDIR)/libcrypto.a
--- 54,59 ----
$(RANLIB) $@
install:: libcrypto.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
! $(CP) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
*** ./lib/Makefile.in~ Wed Jun 22 22:15:10 1994
--- ./lib/Makefile.in Mon Jul 4 12:25:06 1994
***************
*** 24,37 ****
all::
install:: libkrb425.a
! $(RM) $(KRB5_LIBDIR)/libkrb425.a
! $(CP) libkrb425.a $(KRB5_LIBDIR)/libkrb425.a
! $(RANLIB) $(KRB5_LIBDIR)/libkrb425.a
install:: libdes425.a
! $(RM) $(KRB5_LIBDIR)/libdes425.a
! $(CP) libdes425.a $(KRB5_LIBDIR)/libdes425.a
! $(RANLIB) $(KRB5_LIBDIR)/libdes425.a
clean::
$(RM) libkrb5.a libcrypto.a libgssapi_krb5.a libdes425.a libkrb425.a
--- 24,37 ----
all::
install:: libkrb425.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
! $(CP) libkrb425.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
install:: libdes425.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
! $(CP) libdes425.a $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
clean::
$(RM) libkrb5.a libcrypto.a libgssapi_krb5.a libdes425.a libkrb425.a
*** ./Makefile.in~ Fri Jun 24 21:43:55 1994
--- ./Makefile.in Mon Jul 4 12:50:57 1994
***************
*** 54,64 ****
SUBDIRS = @SUBDIRS@
! INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
! $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
! $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \
! $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \
! $(KRB5_INCSUBDIRS)
install:: install-mkdirs
--- 54,67 ----
SUBDIRS = @SUBDIRS@
! INSTALLMKDIRS = $(DESTDIR)$(KRB5ROOT) $(DESTDIR)$(KRB5MANROOT) \
! $(DESTDIR)$(KRB5OTHERMKDIRS) $(DESTDIR)$(ADMIN_BINDIR) \
! $(DESTDIR)$(SERVER_BINDIR) $(DESTDIR)$(CLIENT_BINDIR) \
! $(DESTDIR)$(ADMIN_MANDIR) $(DESTDIR)$(SERVER_MANDIR) \
! $(DESTDIR)$(CLIENT_MANDIR) $(DESTDIR)$(FILE_MANDIR) \
! $(DESTDIR)$(KRB5_LIBDIR) $(DESTDIR)$(KRB5_INCDIR) \
! $(DESTDIR)$(KRB5_INCDIR)/krb5 $(DESTDIR)$(KRB5_INCDIR)/asn.1\
! $(DESTDIR)$(KRB5_INCDIR)/kerberosIV
install:: install-mkdirs
*** ./lib/krb425/Makefile.in~ Fri Jun 24 21:48:30 1994
--- ./lib/krb425/Makefile.in Mon Jul 4 12:55:57 1994
***************
*** 100,108 ****
$(RANLIB) $(BUILDTOP)/lib/libkrb425.a
install:: libkrb425.a
! $(RM) $(KRB5_LIBDIR)/libkrb425.a
! $(CP) libkrb425.a $(KRB5_LIBDIR)/libkrb425.a
! $(RANLIB) $(KRB5_LIBDIR)/libkrb425.a
clean::
$(RM) $(OBJS)
--- 100,108 ----
$(RANLIB) $(BUILDTOP)/lib/libkrb425.a
install:: libkrb425.a
! $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
! $(CP) libkrb425.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
! $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb425.a
clean::
$(RM) $(OBJS)
------- =_aaaaaaaaaa0--
