From: Sam Hartman Date: Thu, 30 Jul 1998 18:21:24 +0000 (+0000) Subject: Update major versions of libraries depending on libkrb5. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfeb114d741964a6c23e772835a9f2d4a48d9f2a;p=thirdparty%2Fkrb5.git Update major versions of libraries depending on libkrb5. Also, fix typo in tf_util.c that prevents krb524init from working and include test for sa_len so localaddr works on NetBSD. git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10766 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 922fb34edc..42aef12370 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -429,7 +429,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_c_keyed_checksum_types KRB5_PROTOTYPE((krb5_context context, krb5_enctype enctype, - unsigned int count, krb5_cksumtypes *cksumtypes)); + unsigned int count, krb5_cksumtype *cksumtypes)); #define KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS 1 diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 541a516e61..f19fc2bd31 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -14,7 +14,7 @@ PROG_RPATH=$(KRB5_LIBDIR) RUN_SETUP=@KRB5_RUN_ENV@ LIB=des425 -LIBMAJOR=2 +LIBMAJOR=3 LIBMINOR=0 RELDIR=des425 # Depends on libk5crypto and libkrb5 diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 6835596f79..8432071335 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -9,7 +9,7 @@ LOCAL_SUBDIRS= generic krb5 MAC_SUBDIRS = generic krb5 LIB=gssapi_krb5 -LIBMAJOR=1 +LIBMAJOR=2 LIBMINOR=1 STOBJLISTS=generic/OBJS.ST krb5/OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index e1e761ce53..63a914a70d 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 26 18:11:56 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): bump libmajor + Wed Apr 15 18:05:57 1998 Tom Yu * Makefile.in (SHLIB_EXPDEPS): diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 662bc76019..b125ea7a1a 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -3,7 +3,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 LIB=kadm5clnt -LIBMAJOR=2 +LIBMAJOR=3 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 04011541b1..e3ef6450b1 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 26 18:09:55 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): bump libmajor + Wed Apr 15 18:06:14 1998 Tom Yu * Makefile.in (SHLIB_EXPDEPS): diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index ff6552bd72..53e4698635 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 @HESIOD_DEFS@ ##DOSLIBNAME = libkadm5srv.lib LIB=kadm5srv -LIBMAJOR=2 +LIBMAJOR=3 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index ec0b38457c..883794a2b6 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 26 18:12:22 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): bump libmajor + 1998-05-06 Theodore Ts'o * t_kdb.c (main): POSIX states that getopt returns -1 diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 9ec4b23d48..c774b3407d 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -7,7 +7,7 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) LIB=kdb5 -LIBMAJOR=2 +LIBMAJOR=3 LIBMINOR=0 RELDIR=kdb # Depends on libk5crypto and libkrb5 diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index e260fd5984..45d3d925dd 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 30 13:13:30 1998 Sam Hartman + + * tf_util.c (tf_init): s/,/= so getuid() actually gets called + +Sun Jul 26 17:51:24 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): Bump libmajor + Thu Jul 9 19:35:01 1998 Matthew D Hancher * tf_util.c (tf_init): Fixed a potential race condition in the opening diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index f75a6327bf..af2dca43c5 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -8,7 +8,7 @@ DEFINES=-I$(srcdir)/../../include/kerberosIV ##DOS##OBJFILE=krb4.lst LIB=krb4 -LIBMAJOR=1 +LIBMAJOR=2 LIBMINOR=0 RELDIR=krb4 diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c index 79884f3a06..e5f70aca4c 100644 --- a/src/lib/krb4/tf_util.c +++ b/src/lib/krb4/tf_util.c @@ -182,7 +182,7 @@ int tf_init(tf_name, rw) int rw; { int wflag; - uid_t me, getuid(); + uid_t me= getuid(); struct stat stat_buf, stat_buffd; #ifdef TKT_SHMEM char shmidname[MAXPATHLEN]; diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index f7922150e9..f1e1e81f93 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 30 13:12:57 1998 Sam Hartman + + * configure.in: Test for sa_len so localaddr works on NetBSD. + +Sun Jul 26 17:46:47 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): bump to 2 + Wed Apr 15 18:07:20 1998 Tom Yu * Makefile.in (SHLIB_EXPDEPS): diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 4864a2f94f..12ce18512b 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -28,8 +28,8 @@ LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \ #SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ LIB=krb5 -LIBMAJOR=1 -LIBMINOR=2 +LIBMAJOR=2 +LIBMINOR=1 STOBJLISTS= \ error_tables/OBJS.ST \ diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 5c0ad1a6a9..d34555d5a3 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,7 @@ +Thu Jul 30 13:12:30 1998 Sam Hartman + + * ccbase.c: Enable memory ccache (merge adapted from Kerbnet) + 1998-05-27 Theodore Ts'o * Makefile.in: Add ccache/memory as a directory to be recursively diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index 4570f8053c..ae89334a0f 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -31,7 +31,11 @@ struct krb5_cc_typelist krb5_cc_ops *ops; struct krb5_cc_typelist *next; }; -static struct krb5_cc_typelist *cc_typehead = 0; +extern krb5_cc_ops krb5_mcc_ops; + +static struct krb5_cc_typelist cc_entry = { &krb5_mcc_ops, NULL }; + +static struct krb5_cc_typelist *cc_typehead = &cc_entry; /* * Register a new credentials cache type diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 1f924319a5..b42fbf0cee 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -12,6 +12,7 @@ AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv gete AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog) KRB5_AC_REGEX_FUNCS dnl +KRB5_SOCKADDR_SA_LEN KRB5_BUILD_LIBRARY_WITH_DEPS KRB5_BUILD_LIBOBJS KRB5_BUILD_PROGRAM diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index 7db8539231..7ee603dacc 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 26 18:13:39 1998 Sam Hartman + + * Makefile.in (LIBMAJOR): bump libmajor + Wed Apr 15 18:07:38 1998 Tom Yu * Makefile.in (SHLIB_EXPDEPS): diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 1340d3ffd4..a03ef026f0 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 ##DOSLIBNAME=libgssrpc.lib LIB=gssrpc -LIBMAJOR=2 +LIBMAJOR=3 LIBMINOR=0 STOBJLISTS=OBJS.ST SHLIB_EXPDEPS= \