Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/heimdal merge heimdal 0.4e
details: https://anonhg.NetBSD.org/src/rev/ab98d1b3a37c
branches: trunk
changeset: 515137:ab98d1b3a37c
user: assar <assar%NetBSD.org@localhost>
date: Mon Sep 17 12:32:33 2001 +0000
description:
merge heimdal 0.4e
diffstat:
crypto/dist/heimdal/admin/ktutil.8 | 38 +-
crypto/dist/heimdal/admin/ktutil.c | 31 +-
crypto/dist/heimdal/appl/dceutils/ChangeLog | 5 +
crypto/dist/heimdal/appl/dceutils/Makefile.am | 6 +-
crypto/dist/heimdal/appl/dceutils/Makefile.in | 37 +-
crypto/dist/heimdal/appl/rcp/ChangeLog | 11 +
crypto/dist/heimdal/appl/rcp/Makefile.in | 25 +-
crypto/dist/heimdal/appl/rcp/rcp.c | 70 +-
crypto/dist/heimdal/cf/db.m4 | 2 +-
crypto/dist/heimdal/cf/install-catman.sh | 2 +-
crypto/dist/heimdal/cf/roken-frag.m4 | 47 +-
crypto/dist/heimdal/doc/setup.texi | 30 +-
crypto/dist/heimdal/kadmin/add-random-users.c | 8 +-
crypto/dist/heimdal/kadmin/kadmin.c | 10 +-
crypto/dist/heimdal/kadmin/kadmind.8 | 6 +-
crypto/dist/heimdal/kdc/524.c | 7 +-
crypto/dist/heimdal/kdc/config.c | 21 +-
crypto/dist/heimdal/kdc/connect.c | 13 +-
crypto/dist/heimdal/kdc/hprop.8 | 29 +-
crypto/dist/heimdal/kdc/kdc_locl.h | 12 +-
crypto/dist/heimdal/kdc/kerberos5.c | 6 +-
crypto/dist/heimdal/kdc/kstash.8 | 4 +-
crypto/dist/heimdal/kpasswd/kpasswd-generator.c | 8 +-
crypto/dist/heimdal/kpasswd/kpasswdd.8 | 6 +-
crypto/dist/heimdal/kuser/generate-requests.c | 13 +-
crypto/dist/heimdal/kuser/kinit.1 | 40 +-
crypto/dist/heimdal/kuser/kinit.c | 587 +++++++++++----------
crypto/dist/heimdal/kuser/klist.1 | 6 +-
crypto/dist/heimdal/lib/asn1/gen.c | 6 +-
crypto/dist/heimdal/lib/gssapi/8003.c | 75 +-
crypto/dist/heimdal/lib/gssapi/acquire_cred.c | 22 +-
crypto/dist/heimdal/lib/gssapi/get_mic.c | 12 +-
crypto/dist/heimdal/lib/gssapi/init_sec_context.c | 33 +-
crypto/dist/heimdal/lib/gssapi/unwrap.c | 30 +-
crypto/dist/heimdal/lib/gssapi/verify_mic.c | 18 +-
crypto/dist/heimdal/lib/gssapi/wrap.c | 37 +-
crypto/dist/heimdal/lib/hdb/db3.c | 32 +-
crypto/dist/heimdal/lib/hdb/hdb-protos.h | 2 +-
crypto/dist/heimdal/lib/hdb/mkey.c | 82 ++-
crypto/dist/heimdal/lib/kdfs/Makefile.in | 25 +-
crypto/dist/heimdal/lib/krb5/appdefault.c | 16 +-
crypto/dist/heimdal/lib/krb5/changepw.c | 171 ++---
crypto/dist/heimdal/lib/krb5/context.c | 110 +++-
crypto/dist/heimdal/lib/krb5/crypto.c | 34 +-
crypto/dist/heimdal/lib/krb5/get_addrs.c | 36 +-
crypto/dist/heimdal/lib/krb5/get_cred.c | 9 +-
crypto/dist/heimdal/lib/krb5/krb5-protos.h | 188 +++++-
crypto/dist/heimdal/lib/krb5/krb5.conf.5 | 21 +-
crypto/dist/heimdal/lib/krb5/krb5_appdefault.3 | 3 +-
crypto/dist/heimdal/lib/krb5/krb5_context.3 | 3 +-
crypto/dist/heimdal/lib/krb5/krb5_encrypt.3 | 6 +-
crypto/dist/heimdal/lib/krb5/krb5_init_context.3 | 5 +-
crypto/dist/heimdal/lib/krb5/mcache.c | 6 +-
crypto/dist/heimdal/lib/krb5/principal.c | 45 +-
crypto/dist/heimdal/lib/krb5/send_to_kdc.c | 94 +--
crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8 | 50 +-
crypto/dist/heimdal/lib/roken/getifaddrs.c | 5 +-
crypto/dist/heimdal/lib/roken/roken-common.h | 17 +-
crypto/dist/heimdal/lib/roken/vis.c | 6 +-
crypto/dist/heimdal/lib/vers/ChangeLog | 5 +
crypto/dist/heimdal/lib/vers/Makefile.am | 4 +-
crypto/dist/heimdal/lib/vers/Makefile.in | 27 +-
crypto/dist/heimdal/tools/Makefile.in | 25 +-
63 files changed, 1441 insertions(+), 899 deletions(-)
diffs (truncated from 4741 to 300 lines):
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/admin/ktutil.8
--- a/crypto/dist/heimdal/admin/ktutil.8 Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/admin/ktutil.8 Mon Sep 17 12:32:33 2001 +0000
@@ -1,4 +1,4 @@
-.\" $Id: ktutil.8,v 1.3 2001/06/19 22:39:52 assar Exp $
+.\" $Id: ktutil.8,v 1.4 2001/09/17 12:32:33 assar Exp $
.\"
.Dd December 16, 2000
.Dt KTUTIL 8
@@ -22,7 +22,7 @@
is a program for managing keytabs.
.Ar command
can be one of the following:
-.Bl -tag -width Ds
+.Bl -tag -width srvconvert
.It add Xo
.Op Fl p Ar principal
.Op Fl -principal= Ns Ar principal
@@ -38,7 +38,11 @@
.Op Fl -no-salt
.Xc
Adds a key to the keytab. Options that are not specified will be
-prompted for.
+prompted for. This requires that you know the password of the
+principal to add; if what you really want is to add a new principal to
+the keytab, you should consider the
+.Ar get
+command, which talks to the kadmin server.
.It change Xo
.Op Fl r Ar realm
.Op Fl -realm= Ns Ar realm
@@ -63,21 +67,25 @@
.It get Xo
.Op Fl p Ar admin principal
.Op Fl -principal= Ns Ar admin principal
-.Oo Fl e Ar enctype \*(Ba Xo
-.Fl -enctypes= Ns Ar enctype
-.Xc
-.Oc
+.Op Fl e Ar enctype
+.Op Fl -enctypes= Ns Ar enctype
.Op Fl r Ar realm
.Op Fl -realm= Ns Ar realm
.Op Fl a Ar admin server
.Op Fl -admin-server= Ns Ar admin server
.Op Fl s Ar server port
.Op Fl -server-port= Ns Ar server port
-.Ar principal
+.Ar principal ...
.Xc
-Get a key for
-.Nm principal
-and store it in a keytab.
+For each
+.Ar principal ,
+generate a new key for it (creating it if it doesn't already exist),
+and put that key in the keytab.
+.Pp
+If no
+.Ar realm
+is specified, the realm to operate on is taken from the first
+principal.
.It list Xo
.Op Fl -keys
.Op Fl -timestamp
@@ -96,6 +104,14 @@
removes keys with any version number. Not specifying a
.Ar enctype
removes keys of any type.
+.It rename Xo
+.Ar from-principal
+.Ar to-principal
+.Xc
+Renames all entries in the keytab that match the
+.Ar from-principal
+to
+.Ar to-principal .
.It purge Xo
.Op Fl -age= Ns Ar age
.Xc
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/admin/ktutil.c
--- a/crypto/dist/heimdal/admin/ktutil.c Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/admin/ktutil.c Mon Sep 17 12:32:33 2001 +0000
@@ -34,13 +34,13 @@
#include "ktutil_locl.h"
#include <err.h>
-RCSID("$Id: ktutil.c,v 1.4 2001/06/19 22:39:52 assar Exp $");
+RCSID("$Id: ktutil.c,v 1.5 2001/09/17 12:32:34 assar Exp $");
static int help_flag;
static int version_flag;
int verbose_flag;
char *keytab_string;
-char keytab_buf[256];
+static char keytab_buf[256];
static int help(int argc, char **argv);
@@ -59,6 +59,8 @@
"remove old and superceeded entries" },
{ "remove", kt_remove, "remove",
"remove key from keytab" },
+ { "rename", kt_rename, "rename from to",
+ "rename entry" },
{ "srvconvert", srvconv, "srvconvert [flags]",
"convert v4 srvtab to keytab" },
{ "srv2keytab" },
@@ -108,6 +110,31 @@
krb5_context context;
+krb5_keytab
+ktutil_open_keytab(void)
+{
+ krb5_error_code ret;
+ krb5_keytab keytab;
+ if (keytab_string == NULL) {
+ ret = krb5_kt_default_modify_name (context, keytab_buf,
+ sizeof(keytab_buf));
+ if (ret) {
+ krb5_warn(context, ret, "krb5_kt_default_modify_name");
+ return NULL;
+ }
+ keytab_string = keytab_buf;
+ }
+ ret = krb5_kt_resolve(context, keytab_string, &keytab);
+ if (ret) {
+ krb5_warn(context, ret, "resolving keytab %s", keytab_string);
+ return NULL;
+ }
+ if (verbose_flag)
+ fprintf (stderr, "Using keytab %s\n", keytab_string);
+
+ return keytab;
+}
+
static int
help(int argc, char **argv)
{
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/appl/dceutils/ChangeLog
--- a/crypto/dist/heimdal/appl/dceutils/ChangeLog Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/appl/dceutils/ChangeLog Mon Sep 17 12:32:33 2001 +0000
@@ -1,3 +1,8 @@
+2001-08-24 Assar Westerlund <assar%sics.se@localhost>
+
+ * Makefile.am (dpagaix): make sure of using $(EXEEXT) just to
+ please automake (this is aix-only code)
+
2001-02-07 Assar Westerlund <assar%sics.se@localhost>
* Makefile.am (dpagaix): needs to be linked with ld, add an
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/appl/dceutils/Makefile.am
--- a/crypto/dist/heimdal/appl/dceutils/Makefile.am Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/appl/dceutils/Makefile.am Mon Sep 17 12:32:33 2001 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.3 2001/06/19 22:39:53 assar Exp $
+# $Id: Makefile.am,v 1.4 2001/09/17 12:32:34 assar Exp $
include $(top_srcdir)/Makefile.am.common
@@ -14,8 +14,8 @@
dpagaix_LDFLAGS = @dpagaix_LDFLAGS@
dpagaix_LDADD = @dpagaix_LDADD@
-dpagaix: $(dpagaix_OBJECTS)
- ld -edpagaix -o dpagaix $(dpagaix_OBJECTS) $(srcdir)/dfspag.exp
+dpagaix$(EXEEXT): $(dpagaix_OBJECTS)
+ ld -edpagaix -o dpagaix$(EXEEXT) $(dpagaix_OBJECTS) $(srcdir)/dfspag.exp
LIB_dce = -ldce
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/appl/dceutils/Makefile.in
--- a/crypto/dist/heimdal/appl/dceutils/Makefile.in Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/appl/dceutils/Makefile.in Mon Sep 17 12:32:33 2001 +0000
@@ -69,26 +69,36 @@
CATMAN = @CATMAN@
CATMANEXT = @CATMANEXT@
CC = @CC@
+COMPILE_ET = @COMPILE_ET@
CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DBLIB = @DBLIB@
DEPDIR = @DEPDIR@
+DIR_com_err = @DIR_com_err@
DIR_des = @DIR_des@
DIR_roken = @DIR_roken@
DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
EXEEXT = @EXEEXT@
EXTRA_LIB45 = @EXTRA_LIB45@
GROFF = @GROFF@
INCLUDES_roken = @INCLUDES_roken@
INCLUDE_ = @INCLUDE_@
+INCLUDE_des = @INCLUDE_des@
LEX = @LEX@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LIB_ = @LIB_@
LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+LIB_NDBM = @LIB_NDBM@
+LIB_com_err = @LIB_com_err@
+LIB_com_err_a = @LIB_com_err_a@
+LIB_com_err_so = @LIB_com_err_so@
LIB_des = @LIB_des@
+LIB_des_a = @LIB_des_a@
LIB_des_appl = @LIB_des_appl@
+LIB_des_so = @LIB_des_so@
LIB_kdb = @LIB_kdb@
LIB_otp = @LIB_otp@
LIB_roken = @LIB_roken@
@@ -114,27 +124,25 @@
dpagaix_LDADD = @dpagaix_LDADD@
install_sh = @install_sh@
-# $Id: Makefile.in,v 1.3 2001/06/19 22:39:53 assar Exp $
+# $Id: Makefile.in,v 1.4 2001/09/17 12:32:34 assar Exp $
-# $Id: Makefile.in,v 1.3 2001/06/19 22:39:53 assar Exp $
+# $Id: Makefile.in,v 1.4 2001/09/17 12:32:34 assar Exp $
-# $Id: Makefile.in,v 1.3 2001/06/19 22:39:53 assar Exp $
+# $Id: Makefile.in,v 1.4 2001/09/17 12:32:34 assar Exp $
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign no-dependencies 1.4b
SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
-AM_CFLAGS = $(WFLAGS)
+AM_CFLAGS = $(WFLAGS)
CP = cp
-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
-
buildinclude = $(top_builddir)/include
LIB_XauReadAuth = @LIB_XauReadAuth@
@@ -152,8 +160,8 @@
LIB_logout = @LIB_logout@
LIB_logwtmp = @LIB_logwtmp@
LIB_odm_initialize = @LIB_odm_initialize@
+LIB_openpty = @LIB_openpty@
LIB_pidfile = @LIB_pidfile@
-LIB_readline = @LIB_readline@
LIB_res_search = @LIB_res_search@
LIB_setpcred = @LIB_setpcred@
LIB_setsockopt = @LIB_setsockopt@
@@ -175,6 +183,7 @@
LIB_openldap = @LIB_openldap@
INCLUDE_readline = @INCLUDE_readline@
+LIB_readline = @LIB_readline@
LEXLIB = @LEXLIB@
@@ -238,7 +247,7 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
depcomp =
-DIST_COMMON = ChangeLog Makefile.am Makefile.in compile
+DIST_COMMON = ChangeLog Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -307,11 +316,7 @@
maintainer-clean-libtool:
dpagaix-dpagaix.$(OBJEXT): dpagaix.c
- $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dpagaix_CFLAGS) $(CFLAGS) -c -o dpagaix-dpagaix.$(OBJEXT) `test -f dpagaix.c || echo '$(srcdir)/'`dpagaix.c
-
-dpagaix$(EXEEXT): $(dpagaix_OBJECTS) $(dpagaix_DEPENDENCIES)
- @rm -f dpagaix$(EXEEXT)
- $(LINK) $(dpagaix_LDFLAGS) $(dpagaix_OBJECTS) $(dpagaix_LDADD) $(LIBS)
+ $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dpagaix_CFLAGS) $(CFLAGS) -c -o dpagaix-dpagaix.$(OBJEXT) `test -f ./dpagaix.c || echo '$(srcdir)/'`dpagaix.c
k5dcecon$(EXEEXT): $(k5dcecon_OBJECTS) $(k5dcecon_DEPENDENCIES)
@rm -f k5dcecon$(EXEEXT)
@@ -586,8 +591,8 @@
test "$$failed" -eq 0; \
fi
-dpagaix: $(dpagaix_OBJECTS)
- ld -edpagaix -o dpagaix $(dpagaix_OBJECTS) $(srcdir)/dfspag.exp
+dpagaix$(EXEEXT): $(dpagaix_OBJECTS)
+ ld -edpagaix -o dpagaix$(EXEEXT) $(dpagaix_OBJECTS) $(srcdir)/dfspag.exp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -r 22c0819e421f -r ab98d1b3a37c crypto/dist/heimdal/appl/rcp/ChangeLog
--- a/crypto/dist/heimdal/appl/rcp/ChangeLog Mon Sep 17 12:28:14 2001 +0000
+++ b/crypto/dist/heimdal/appl/rcp/ChangeLog Mon Sep 17 12:32:33 2001 +0000
@@ -1,3 +1,14 @@
Home |
Main Index |
Thread Index |
Old Index