Vendor import of Heimdal 0.2nvendor/heimdal/0.2n

3 files changed, 20 insertions, 14 deletions

diff --git a/crypto/heimdal/kuser/kinit.1 b/crypto/heimdal/kuser/kinit.1
index d779365b7574..749798a18d4f 100644
--- a/crypto/heimdal/kuser/kinit.1
+++ b/crypto/heimdal/kuser/kinit.1
@@ -1,14 +1,15 @@
-.\" $Id: kinit.1,v 1.3 1999/05/14 14:02:49 assar Exp $
+.\" $Id: kinit.1,v 1.4 2000/02/01 14:12:13 joda Exp $
 .\"
 .Dd May 29, 1998
-.Dt KAUTH 1
+.Dt KINIT 1
 .Os HEIMDAL
 .Sh NAME
+.Nm kinit ,
 .Nm kauth
 .Nd
 acquire initial tickets
 .Sh SYNOPSIS
-.Nm
+.Nm kinit
 .Op Fl 4
 .Op Fl -524init
 .Op Fl -afslog
@@ -40,7 +41,7 @@ acquire initial tickets
 .Op Fl e
 .Op Fl -enctypes= Ns Ar enctypes
 .Op Fl -fcache-version= Ns Ar version
-.Op Fl -noaddresses
+.Op Fl -no-addresses
 .Op Fl -version
 .Op Fl -help
 .Op Ar principal
@@ -130,14 +131,19 @@ Request tickets with this particular enctype.
 Create a credentials cache of version
 .Nm version .
 .It Xo
-.Fl -noaddresses
+.Fl -no-addresses
 .Xc
 Request a ticket with no addresses.
 .El
 
 The following options are only available if
 .Nm 
-has been compiled with support for Kerberos 4.
+has been compiled with support for Kerberos 4. The 
+.Nm kauth
+program is identical to
+.Nm kinit ,
+but has these options enabled by
+default.
 .Bl -tag -width Ds
 .It Xo
 .Fl 4 Ns ,
diff --git a/crypto/heimdal/kuser/kinit.c b/crypto/heimdal/kuser/kinit.c
index 328a334d2652..35b493a084a4 100644
--- a/crypto/heimdal/kuser/kinit.c
+++ b/crypto/heimdal/kuser/kinit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -32,7 +32,7 @@
  */
 
 #include "kuser_locl.h"
-RCSID("$Id: kinit.c,v 1.59 1999/12/02 17:05:01 joda Exp $");
+RCSID("$Id: kinit.c,v 1.60 2000/02/01 14:06:33 joda Exp $");
 
 int forwardable		= 0;
 int proxiable		= 0;
@@ -41,7 +41,7 @@ int renew_flag		= 0;
 int validate_flag	= 0;
 int version_flag	= 0;
 int help_flag		= 0;
-int no_addrs_flag	= 0;
+int addrs_flag		= 1;
 char *lifetime 		= NULL;
 char *renew_life	= NULL;
 char *server		= NULL;
@@ -106,7 +106,7 @@ struct getargs args[] = {
     { "fcache-version", 0,   arg_integer, &fcache_version,
       "file cache version to create" },
 
-    { "noaddresses",	0,   arg_flag,	&no_addrs_flag,
+    { "addresses",	0,   arg_negative_flag,	&addrs_flag,
       "request a ticket with no addresses" },
 
     { "version", 	0,   arg_flag, &version_flag },
@@ -267,7 +267,7 @@ main (int argc, char **argv)
     krb5_get_init_creds_opt_set_forwardable (&opt, forwardable);
     krb5_get_init_creds_opt_set_proxiable (&opt, proxiable);
 
-    if (no_addrs_flag) {
+    if (!addrs_flag) {
 	no_addrs.len = 0;
 	no_addrs.val = NULL;
 
diff --git a/crypto/heimdal/kuser/klist.c b/crypto/heimdal/kuser/klist.c
index 9135d293895f..180e9f3ce752 100644
--- a/crypto/heimdal/kuser/klist.c
+++ b/crypto/heimdal/kuser/klist.c
@@ -33,7 +33,7 @@
 
 #include "kuser_locl.h"
 
-RCSID("$Id: klist.c,v 1.52 1999/12/02 17:05:01 joda Exp $");
+RCSID("$Id: klist.c,v 1.53 2000/02/06 08:15:40 assar Exp $");
 
 static char*
 printable_time(time_t t)
@@ -58,7 +58,7 @@ print_cred(krb5_context context, krb5_creds *cred)
 {
     char *str;
     krb5_error_code ret;
-    int32_t sec;
+    krb5_timestamp sec;
 
     krb5_timeofday (context, &sec);
 
@@ -85,7 +85,7 @@ print_cred_verbose(krb5_context context, krb5_creds *cred)
     char *str;
     krb5_error_code ret;
     int first_flag;
-    int32_t sec;
+    krb5_timestamp sec;
 
     krb5_timeofday (context, &sec);