Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/crypto/dist/heimdal Pull up revision 1.1.1.2 (requested...
details: https://anonhg.NetBSD.org/src/rev/f7c92858862c
branches: netbsd-1-5
changeset: 491138:f7c92858862c
user: he <he%NetBSD.org@localhost>
date: Thu Apr 05 23:23:38 2001 +0000
description:
Pull up revision 1.1.1.2 (requested by assar):
Upgrade Heimdal to version 0.3e.
diffstat:
crypto/dist/heimdal/acconfig.h | 4 +
crypto/dist/heimdal/admin/change.c | 4 +-
crypto/dist/heimdal/admin/ktutil_locl.h | 3 +-
crypto/dist/heimdal/admin/list.c | 132 +-
crypto/dist/heimdal/admin/purge.c | 19 +-
crypto/dist/heimdal/appl/afsutil/ChangeLog | 8 +
crypto/dist/heimdal/appl/ftp/ftp/cmds.c | 13 +-
crypto/dist/heimdal/appl/ftp/ftp/krb4.c | 10 +-
crypto/dist/heimdal/appl/ftp/ftpd/extern.h | 20 +-
crypto/dist/heimdal/appl/login/conf.c | 6 +-
crypto/dist/heimdal/appl/login/login_protos.h | 14 +
crypto/dist/heimdal/appl/login/read_string.c | 8 +-
crypto/dist/heimdal/appl/otp/ChangeLog | 6 +
crypto/dist/heimdal/appl/push/ChangeLog | 25 +
crypto/dist/heimdal/appl/rsh/rsh_locl.h | 6 +-
crypto/dist/heimdal/appl/telnet/telnet/telnet.1 | 8 +-
crypto/dist/heimdal/appl/telnet/telnetd/telnetd.8 | 4 +-
crypto/dist/heimdal/appl/telnet/telnetd/telnetd.h | 12 +-
crypto/dist/heimdal/appl/xnlock/ChangeLog | 4 +
crypto/dist/heimdal/cf/broken.m4 | 9 +-
crypto/dist/heimdal/cf/check-netinet-ip-and-tcp.m4 | 23 +-
crypto/dist/heimdal/cf/find-func-no-libs2.m4 | 12 +-
crypto/dist/heimdal/cf/have-type.m4 | 18 +-
crypto/dist/heimdal/cf/have-types.m4 | 10 +-
crypto/dist/heimdal/cf/krb-sys-nextstep.m4 | 16 +-
crypto/dist/heimdal/cf/mips-abi.m4 | 10 +-
crypto/dist/heimdal/cf/misc.m4 | 28 +-
crypto/dist/heimdal/config.guess | 151 +-
crypto/dist/heimdal/config.sub | 162 +-
crypto/dist/heimdal/doc/ack.texi | 8 +-
crypto/dist/heimdal/doc/intro.texi | 2 +
crypto/dist/heimdal/doc/kerberos4.texi | 59 +-
crypto/dist/heimdal/doc/whatis.texi | 2 +
crypto/dist/heimdal/etc/services.append | 4 +-
crypto/dist/heimdal/include/Makefile.am | 3 +-
crypto/dist/heimdal/kadmin/mod.c | 11 +-
crypto/dist/heimdal/kuser/klist.1 | 68 +-
crypto/dist/heimdal/lib/asn1/gen_encode.c | 302 +-
crypto/dist/heimdal/lib/asn1/gen_length.c | 171 +-
crypto/dist/heimdal/lib/asn1/gen_locl.h | 3 +-
crypto/dist/heimdal/lib/asn1/lex.h | 11 +-
crypto/dist/heimdal/lib/asn1/lex.l | 20 +-
crypto/dist/heimdal/lib/asn1/parse.y | 23 +-
crypto/dist/heimdal/lib/auth/pam/pam.conf.add | 64 +-
crypto/dist/heimdal/lib/com_err/ChangeLog | 8 +
crypto/dist/heimdal/lib/com_err/compile_et.h | 7 +-
crypto/dist/heimdal/lib/com_err/lex.l | 18 +-
crypto/dist/heimdal/lib/com_err/parse.y | 11 +-
crypto/dist/heimdal/lib/des/ChangeLog | 25 +
crypto/dist/heimdal/lib/des/des.h | 2 +-
crypto/dist/heimdal/lib/des/des_locl.h | 2 +-
crypto/dist/heimdal/lib/des/enc_read.c | 6 +-
crypto/dist/heimdal/lib/des/enc_writ.c | 2 +-
crypto/dist/heimdal/lib/des/fcrypt.c | 42 +-
crypto/dist/heimdal/lib/des/rpw.c | 1 +
crypto/dist/heimdal/lib/des/speed.c | 1 +
crypto/dist/heimdal/lib/editline/ChangeLog | 5 +
crypto/dist/heimdal/lib/gssapi/external.c | 37 +-
crypto/dist/heimdal/lib/gssapi/import_sec_context.c | 34 +-
crypto/dist/heimdal/lib/hdb/hdb.asn1 | 6 +-
crypto/dist/heimdal/lib/hdb/hdb.h | 13 +-
crypto/dist/heimdal/lib/kadm5/chpass_c.c | 10 +-
crypto/dist/heimdal/lib/kadm5/create_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/delete_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/dump_log.c | 25 +-
crypto/dist/heimdal/lib/kadm5/get_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/get_princs_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/get_s.c | 4 +-
crypto/dist/heimdal/lib/kadm5/iprop.h | 15 +-
crypto/dist/heimdal/lib/kadm5/kadm5_locl.h | 4 +-
crypto/dist/heimdal/lib/kadm5/log.c | 173 +-
crypto/dist/heimdal/lib/kadm5/modify_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/password_quality.c | 4 +-
crypto/dist/heimdal/lib/kadm5/private.h | 183 +-
crypto/dist/heimdal/lib/kadm5/privs_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/randkey_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/rename_c.c | 6 +-
crypto/dist/heimdal/lib/kadm5/send_recv.c | 4 +-
crypto/dist/heimdal/lib/kafs/ChangeLog | 20 +
crypto/dist/heimdal/lib/kafs/afssys.c | 4 +-
crypto/dist/heimdal/lib/kafs/dlfcn.c | 4 +-
crypto/dist/heimdal/lib/krb5/addr_families.c | 4 +-
crypto/dist/heimdal/lib/krb5/constants.c | 6 +-
crypto/dist/heimdal/lib/krb5/convert_creds.c | 28 +-
crypto/dist/heimdal/lib/krb5/heim_err.et | 20 +-
crypto/dist/heimdal/lib/krb5/init_creds_pw.c | 11 +-
crypto/dist/heimdal/lib/krb5/keytab_keyfile.c | 85 +-
crypto/dist/heimdal/lib/krb5/krb5-private.h | 2 +-
crypto/dist/heimdal/lib/krb5/read_message.c | 42 +-
crypto/dist/heimdal/lib/krb5/store.c | 4 +-
crypto/dist/heimdal/lib/krb5/store_emem.c | 6 +-
crypto/dist/heimdal/lib/krb5/store_mem.c | 6 +-
crypto/dist/heimdal/lib/krb5/time.c | 15 +-
crypto/dist/heimdal/lib/krb5/write_message.c | 40 +-
crypto/dist/heimdal/lib/otp/otp.c | 4 +-
crypto/dist/heimdal/lib/otp/otp.h | 20 +-
crypto/dist/heimdal/lib/otp/otp_md.h | 16 +-
crypto/dist/heimdal/lib/otp/otp_parse.c | 27 +-
crypto/dist/heimdal/lib/otp/otp_verify.c | 8 +-
crypto/dist/heimdal/lib/roken/getaddrinfo-test.c | 6 +-
crypto/dist/heimdal/lib/roken/getaddrinfo.c | 49 +-
crypto/dist/heimdal/lib/roken/getnameinfo_verified.c | 9 +-
crypto/dist/heimdal/lib/roken/getusershell.c | 145 +-
crypto/dist/heimdal/lib/roken/inet_ntop.c | 19 +-
crypto/dist/heimdal/lib/roken/inet_pton.c | 21 +-
crypto/dist/heimdal/lib/roken/resolve.c | 124 +-
crypto/dist/heimdal/lib/roken/signal.c | 7 +-
crypto/dist/heimdal/lib/roken/socket.c | 24 +-
crypto/dist/heimdal/lib/roken/strftime.c | 4 +-
crypto/dist/heimdal/lib/roken/vsyslog.c | 72 +-
crypto/dist/heimdal/lib/roken/warnerr.c | 8 +-
crypto/dist/heimdal/lib/sl/make_cmds.h | 9 +-
crypto/dist/heimdal/lib/sl/parse.y | 9 +-
crypto/dist/heimdal/lib/sl/roken_rename.h | 7 +-
crypto/dist/heimdal/lib/sl/ss.c | 49 +-
crypto/dist/heimdal/lib/sl/ss.h | 6 +-
crypto/dist/heimdal/ltmain.sh | 4386 ++++++++++++-----
crypto/dist/heimdal/missing | 265 +-
118 files changed, 5367 insertions(+), 2410 deletions(-)
diffs (truncated from 11526 to 300 lines):
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/acconfig.h
--- a/crypto/dist/heimdal/acconfig.h Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/acconfig.h Thu Apr 05 23:23:38 2001 +0000
@@ -13,6 +13,10 @@
#undef HAVE_U_INT16_T
#undef HAVE_U_INT32_T
#undef HAVE_U_INT64_T
+#undef HAVE_UINT8_T
+#undef HAVE_UINT16_T
+#undef HAVE_UINT32_T
+#undef HAVE_UINT64_T
#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4)
#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S))
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/admin/change.c
--- a/crypto/dist/heimdal/admin/change.c Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/admin/change.c Thu Apr 05 23:23:38 2001 +0000
@@ -33,7 +33,7 @@
#include "ktutil_locl.h"
-RCSID("$Id: change.c,v 1.1.1.1 2000/06/16 18:31:39 thorpej Exp $");
+RCSID("$Id: change.c,v 1.1.1.1.2.1 2001/04/05 23:23:38 he Exp $");
static void
change_entry (krb5_context context, krb5_keytab_entry *entry,
@@ -158,7 +158,7 @@
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){
- krb5_warn(context, ret, "krb5_kt_start_seq_get");
+ krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1;
}
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/admin/ktutil_locl.h
--- a/crypto/dist/heimdal/admin/ktutil_locl.h Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/admin/ktutil_locl.h Thu Apr 05 23:23:38 2001 +0000
@@ -32,7 +32,7 @@
*/
/*
- * $Id: ktutil_locl.h,v 1.1.1.1 2000/06/16 18:31:39 thorpej Exp $
+ * $Id: ktutil_locl.h,v 1.1.1.1.2.1 2001/04/05 23:23:39 he Exp $
*/
#ifndef __KTUTIL_LOCL_H__
@@ -51,6 +51,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include <parse_time.h>
#include <roken.h>
#include <des.h>
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/admin/list.c
--- a/crypto/dist/heimdal/admin/list.c Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/admin/list.c Thu Apr 05 23:23:38 2001 +0000
@@ -33,7 +33,28 @@
#include "ktutil_locl.h"
-RCSID("$Id: list.c,v 1.1.1.1 2000/06/16 18:31:39 thorpej Exp $");
+RCSID("$Id: list.c,v 1.1.1.1.2.1 2001/04/05 23:23:39 he Exp $");
+
+static int help_flag;
+static int list_keys;
+static int list_timestamp;
+
+static struct getargs args[] = {
+ { "help", 'h', arg_flag, &help_flag },
+ { "keys", 0, arg_flag, &list_keys, "show key value" },
+ { "timestamp", 0, arg_flag, &list_timestamp, "show timestamp" },
+};
+
+static int num_args = sizeof(args) / sizeof(args[0]);
+
+struct key_info {
+ char *version;
+ char *etype;
+ char *principal;
+ char *timestamp;
+ char *key;
+ struct key_info *next;
+};
int
kt_list(int argc, char **argv)
@@ -41,43 +62,102 @@
krb5_error_code ret;
krb5_kt_cursor cursor;
krb5_keytab_entry entry;
+ int optind = 0;
+ struct key_info *ki, **kie = &ki, *kp;
+
+ int max_version = sizeof("Vno") - 1;
+ int max_etype = sizeof("Type") - 1;
+ int max_principal = sizeof("Principal") - 1;
+ int max_timestamp = sizeof("Date") - 1;
+ int max_key = sizeof("Key") - 1;
+
+ if(verbose_flag)
+ list_timestamp = 1;
+
+ if(getarg(args, num_args, argc, argv, &optind)){
+ arg_printusage(args, num_args, "ktutil list", "");
+ return 1;
+ }
+ if(help_flag){
+ arg_printusage(args, num_args, "ktutil list", "");
+ return 0;
+ }
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){
- krb5_warn(context, ret, "krb5_kt_start_seq_get");
+ krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1;
}
- printf("%s", "Version");
- printf(" ");
- printf("%-15s", "Type");
- printf(" ");
- printf("%s", "Principal");
- printf("\n");
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0){
- char *p;
- printf(" %3d ", entry.vno);
- printf(" ");
- ret = krb5_enctype_to_string(context, entry.keyblock.keytype, &p);
+#define CHECK_MAX(F) if(max_##F < strlen(kp->F)) max_##F = strlen(kp->F)
+
+ kp = malloc(sizeof(*kp));
+
+ asprintf(&kp->version, "%d", entry.vno);
+ CHECK_MAX(version);
+ ret = krb5_enctype_to_string(context,
+ entry.keyblock.keytype, &kp->etype);
if (ret != 0)
- asprintf(&p, "unknown (%d)", entry.keyblock.keytype);
- printf("%-15s", p);
- free(p);
- printf(" ");
- krb5_unparse_name(context, entry.principal, &p);
- printf("%s ", p);
- free(p);
- printf("\n");
- if (verbose_flag) {
+ asprintf(&kp->etype, "unknown (%d)", entry.keyblock.keytype);
+ CHECK_MAX(etype);
+ krb5_unparse_name_short(context, entry.principal, &kp->principal);
+ CHECK_MAX(principal);
+ if (list_timestamp) {
char tstamp[256];
- struct tm *tm;
- time_t ts = entry.timestamp;
+
+ krb5_format_time(context, entry.timestamp,
+ tstamp, sizeof(tstamp), FALSE);
- tm = gmtime (&ts);
- strftime (tstamp, sizeof(tstamp), "%Y-%m-%d %H:%M:%S UTC", tm);
- printf(" Timestamp: %s\n", tstamp);
+ kp->timestamp = strdup(tstamp);
+ CHECK_MAX(timestamp);
}
+ if(list_keys) {
+ int i;
+ kp->key = malloc(2 * entry.keyblock.keyvalue.length + 1);
+ for(i = 0; i < entry.keyblock.keyvalue.length; i++)
+ snprintf(kp->key + 2 * i, 3, "%02x",
+ ((unsigned char*)entry.keyblock.keyvalue.data)[i]);
+ CHECK_MAX(key);
+ }
+ kp->next = NULL;
+ *kie = kp;
+ kie = &kp->next;
krb5_kt_free_entry(context, &entry);
}
ret = krb5_kt_end_seq_get(context, keytab, &cursor);
+
+ printf("%-*s %-*s %-*s", max_version, "Vno",
+ max_etype, "Type",
+ max_principal, "Principal");
+ if(list_timestamp)
+ printf(" %-*s", max_timestamp, "Date");
+ if(list_keys)
+ printf(" %s", "Key");
+ printf("\n");
+
+ for(kp = ki; kp; ) {
+ printf("%*s %-*s %-*s", max_version, kp->version,
+ max_etype, kp->etype,
+ max_principal, kp->principal);
+ if(list_timestamp)
+ printf(" %-*s", max_timestamp, kp->timestamp);
+ if(list_keys)
+ printf(" %s", kp->key);
+ printf("\n");
+
+ /* free entries */
+ free(kp->version);
+ free(kp->etype);
+ free(kp->principal);
+ if(list_timestamp)
+ free(kp->timestamp);
+ if(list_keys) {
+ memset(kp->key, 0, strlen(kp->key));
+ free(kp->key);
+ }
+ ki = kp;
+ kp = kp->next;
+ free(ki);
+ }
return 0;
}
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/admin/purge.c
--- a/crypto/dist/heimdal/admin/purge.c Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/admin/purge.c Thu Apr 05 23:23:38 2001 +0000
@@ -33,7 +33,7 @@
#include "ktutil_locl.h"
-RCSID("$Id: purge.c,v 1.1.1.1 2000/06/16 18:31:39 thorpej Exp $");
+RCSID("$Id: purge.c,v 1.1.1.1.2.1 2001/04/05 23:23:39 he Exp $");
/*
* keep track of the highest version for every principal.
@@ -101,9 +101,10 @@
krb5_kt_cursor cursor;
krb5_keytab_entry entry;
int help_flag = 0;
- int age = 7 * 24 * 60 * 60;
+ char *age_str = "1 week";
+ int age;
struct getargs args[] = {
- { "age", 0, arg_integer, NULL, "age to retire" },
+ { "age", 0, arg_string, NULL, "age to retire" },
{ "help", 'h', arg_flag, NULL }
};
int num_args = sizeof(args) / sizeof(args[0]);
@@ -112,7 +113,7 @@
struct e *head = NULL;
time_t judgement_day;
- args[i++].value = &age;
+ args[i++].value = &age_str;
args[i++].value = &help_flag;
if(getarg(args, num_args, argc, argv, &optind)) {
@@ -124,9 +125,15 @@
return 0;
}
+ age = parse_time(age_str, "s");
+ if(age < 0) {
+ krb5_warnx(context, "unparasable time `%s'", age_str);
+ return 0;
+ }
+
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){
- krb5_warn(context, ret, "krb5_kt_start_seq_get");
+ krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1;
}
@@ -140,7 +147,7 @@
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){
- krb5_warn(context, ret, "krb5_kt_start_seq_get");
+ krb5_warn(context, ret, "krb5_kt_start_seq_get, %s", keytab_string);
return 1;
}
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/appl/afsutil/ChangeLog
--- a/crypto/dist/heimdal/appl/afsutil/ChangeLog Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/appl/afsutil/ChangeLog Thu Apr 05 23:23:38 2001 +0000
@@ -1,3 +1,11 @@
+2000-12-31 Assar Westerlund <assar%sics.se@localhost>
+
+ * afslog.c (main): handle krb5_init_context failure consistently
+
+2000-12-25 Assar Westerlund <assar%sics.se@localhost>
+
+ * afslog.c: clarify usage strings
+
1999-08-04 Assar Westerlund <assar%sics.se@localhost>
* pagsh.c (main): use mkstemp to generate temporary file names.
diff -r 85a2144a2142 -r f7c92858862c crypto/dist/heimdal/appl/ftp/ftp/cmds.c
--- a/crypto/dist/heimdal/appl/ftp/ftp/cmds.c Thu Apr 05 23:22:38 2001 +0000
+++ b/crypto/dist/heimdal/appl/ftp/ftp/cmds.c Thu Apr 05 23:23:38 2001 +0000
@@ -36,7 +36,7 @@
*/
#include "ftp_locl.h"
-RCSID("$Id: cmds.c,v 1.1.1.1 2000/06/16 18:31:48 thorpej Exp $");
+RCSID("$Id: cmds.c,v 1.1.1.1.2.1 2001/04/05 23:23:39 he Exp $");
Home |
Main Index |
Thread Index |
Old Index