diff options
Diffstat (limited to 'crypto/heimdal/lib/hdb')
| -rw-r--r-- | crypto/heimdal/lib/hdb/Makefile.am | 4 | ||||
| -rw-r--r-- | crypto/heimdal/lib/hdb/Makefile.in | 34 | ||||
| -rw-r--r-- | crypto/heimdal/lib/hdb/convert_db.c | 4 | ||||
| -rw-r--r-- | crypto/heimdal/lib/hdb/hdb-ldap.c | 4 | ||||
| -rw-r--r-- | crypto/heimdal/lib/hdb/hdb_locl.h | 18 | ||||
| -rw-r--r-- | crypto/heimdal/lib/hdb/libasn1.h | 6 |
6 files changed, 38 insertions, 32 deletions
diff --git a/crypto/heimdal/lib/hdb/Makefile.am b/crypto/heimdal/lib/hdb/Makefile.am index f3aba3b..b860260 100644 --- a/crypto/heimdal/lib/hdb/Makefile.am +++ b/crypto/heimdal/lib/hdb/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.43 2001/01/30 01:49:16 assar Exp $ +# $Id: Makefile.am,v 1.44 2001/05/16 23:50:57 assar Exp $ include $(top_srcdir)/Makefile.am.common @@ -21,7 +21,7 @@ LDADD = libhdb.la \ $(DBLIB) lib_LTLIBRARIES = libhdb.la -libhdb_la_LDFLAGS = -version-info 7:0:0 +libhdb_la_LDFLAGS = -version-info 7:1:0 libhdb_la_SOURCES = \ common.c \ diff --git a/crypto/heimdal/lib/hdb/Makefile.in b/crypto/heimdal/lib/hdb/Makefile.in index ad12e78..4fbaf27 100644 --- a/crypto/heimdal/lib/hdb/Makefile.in +++ b/crypto/heimdal/lib/hdb/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4b from Makefile.am -# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -113,13 +114,13 @@ dpagaix_CFLAGS = @dpagaix_CFLAGS@ dpagaix_LDADD = @dpagaix_LDADD@ install_sh = @install_sh@ -# $Id: Makefile.am,v 1.43 2001/01/30 01:49:16 assar Exp $ +# $Id: Makefile.am,v 1.44 2001/05/16 23:50:57 assar Exp $ # $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $ -# $Id: Makefile.am.common,v 1.23 2000/12/05 09:11:09 joda Exp $ +# $Id: Makefile.am.common,v 1.26 2001/05/21 13:27:48 joda Exp $ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -185,6 +186,8 @@ NROFF_MAN = groff -mandoc -Tascii @KRB5_TRUE@ $(top_builddir)/lib/asn1/libasn1.la @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la +@DCE_TRUE@LIB_kdfs = @DCE_TRUE@$(top_builddir)/lib/kdfs/libkdfs.la + CHECK_LOCAL = $(PROGRAMS) BUILT_SOURCES = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \ @@ -206,7 +209,7 @@ LDADD = libhdb.la \ lib_LTLIBRARIES = libhdb.la -libhdb_la_LDFLAGS = -version-info 7:0:0 +libhdb_la_LDFLAGS = -version-info 7:1:0 libhdb_la_SOURCES = \ common.c \ @@ -272,7 +275,7 @@ OBJECTS = $(am_libhdb_la_OBJECTS) convert_db.$(OBJEXT) all: all-redirect .SUFFIXES: -.SUFFIXES: .1 .3 .5 .8 .c .cat1 .cat3 .cat5 .cat8 .et .h .lo .o .obj .x +.SUFFIXES: .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/hdb/Makefile @@ -392,6 +395,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $$here + mostlyclean-tags: clean-tags: @@ -425,6 +433,9 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am +all-recursive-am: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + install-exec-am: install-libLTLIBRARIES @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook @@ -496,11 +507,12 @@ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \ install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \ maintainer-clean-tags distdir info-am info dvi-am dvi check-local check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-local all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +check-am installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-local all-redirect all-am all \ +install-strip installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean install-suid-programs: diff --git a/crypto/heimdal/lib/hdb/convert_db.c b/crypto/heimdal/lib/hdb/convert_db.c index 1a7ebb4..0b300a5 100644 --- a/crypto/heimdal/lib/hdb/convert_db.c +++ b/crypto/heimdal/lib/hdb/convert_db.c @@ -41,7 +41,7 @@ #include <getarg.h> #include <err.h> -RCSID("$Id: convert_db.c,v 1.11 2001/01/25 12:45:01 assar Exp $"); +RCSID("$Id: convert_db.c,v 1.12 2001/02/20 01:44:53 assar Exp $"); static krb5_error_code update_keytypes(krb5_context context, HDB *db, hdb_entry *entry, void *data) @@ -136,7 +136,7 @@ main(int argc, char **argv) int optind = 0; int master_key_set = 0; - set_progname(argv[0]); + setprogname(argv[0]); if(getarg(args, num_args, argc, argv, &optind)) krb5_std_usage(1, args, num_args); diff --git a/crypto/heimdal/lib/hdb/hdb-ldap.c b/crypto/heimdal/lib/hdb/hdb-ldap.c index 6d264b4..db321cb 100644 --- a/crypto/heimdal/lib/hdb/hdb-ldap.c +++ b/crypto/heimdal/lib/hdb/hdb-ldap.c @@ -32,12 +32,12 @@ #include "hdb_locl.h" -RCSID("$Id: hdb-ldap.c,v 1.7 2001/01/30 16:59:08 assar Exp $"); +RCSID("$Id: hdb-ldap.c,v 1.8 2001/03/26 00:59:37 assar Exp $"); #ifdef OPENLDAP -#include <ldap.h> #include <lber.h> +#include <ldap.h> #include <ctype.h> #include <sys/un.h> diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h index 1c825fa..48017b0 100644 --- a/crypto/heimdal/lib/hdb/hdb_locl.h +++ b/crypto/heimdal/lib/hdb/hdb_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: hdb_locl.h,v 1.14 2000/11/14 06:57:17 assar Exp $ */ +/* $Id: hdb_locl.h,v 1.15 2001/02/15 04:20:54 assar Exp $ */ #ifndef __HDB_LOCL_H__ #define __HDB_LOCL_H__ @@ -56,7 +56,11 @@ #endif #include <roken.h> +#ifdef HAVE_OPENSSL_DES_H +#include <openssl/des.h> +#else #include <des.h> +#endif #include <krb5.h> #include <hdb.h> #include <hdb-private.h> @@ -73,14 +77,4 @@ #include <gdbm/ndbm.h> #endif -int hdb_principal2key(krb5_context, krb5_principal, krb5_data*); -int hdb_key2principal(krb5_context, krb5_data*, krb5_principal); - -krb5_error_code hdb_lock(int, int); -krb5_error_code hdb_unlock(int); - -krb5_error_code _hdb_fetch(krb5_context, HDB*, unsigned, hdb_entry*); -krb5_error_code _hdb_store(krb5_context, HDB*, unsigned, hdb_entry*); -krb5_error_code _hdb_remove(krb5_context, HDB*, hdb_entry*); - #endif /* __HDB_LOCL_H__ */ diff --git a/crypto/heimdal/lib/hdb/libasn1.h b/crypto/heimdal/lib/hdb/libasn1.h index 03d951a..ef02d7c 100644 --- a/crypto/heimdal/lib/hdb/libasn1.h +++ b/crypto/heimdal/lib/hdb/libasn1.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: libasn1.h,v 1.4 1999/12/02 17:05:05 joda Exp $ */ +/* $Id: libasn1.h,v 1.5 2001/04/18 16:21:33 joda Exp $ */ #ifndef __LIBASN1_H__ #define __LIBASN1_H__ @@ -42,7 +42,7 @@ #include <stdlib.h> #include <errno.h> -#include <asn1.h> +#include <krb5_asn1.h> #include <der.h> #include "hdb_asn1.h" #include <asn1_err.h> |
