From da16abb9b3914047a4c6b2f852625ab7b465ebac Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 24 Aug 1997 10:40:38 +0000
Subject: [PATCH] removed `-p'

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3120 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kpasswd/kpasswd.c | 9 ---------
 kuser/kinit.c     | 9 +--------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 48f9b89db..d628602c5 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -39,13 +39,10 @@
 #include "kpasswd_locl.h"
 RCSID("$Id$");
 
-static int preauth = 1;
 static int version_flag;
 static int help_flag;
 
 static struct getargs args[] = {
-    { "preauthentication",	'p', arg_negative_flag, &preauth, 
-      "disable preauthentication", NULL },
     { "version", 		0,   arg_flag, &version_flag, 
       "print version", NULL },
     { "help",			0,   arg_flag, &help_flag, 
@@ -67,7 +64,6 @@ main (int argc, char **argv)
     krb5_error_code ret;
     krb5_context context;
     krb5_principal principal;
-    krb5_preauthtype pre_auth_types[] = {KRB5_PADATA_ENC_TIMESTAMP};
     int optind = 0;
     krb5_get_init_creds_opt opt;
     krb5_creds cred;
@@ -90,11 +86,6 @@ main (int argc, char **argv)
 
     krb5_get_init_creds_opt_init (&opt);
     
-    if (preauth)
-	krb5_get_init_creds_opt_set_preauth_list (&opt,
-						  pre_auth_types,
-						  1);
-
     krb5_get_init_creds_opt_set_tkt_life (&opt, 300);
 
     argc -= optind;
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 4e05bb9d2..cbc85b502 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -40,7 +40,6 @@
 RCSID("$Id$");
 
 int forwardable;
-int preauth = 1;
 int renewable;
 int version_flag = 0;
 int help_flag = 0;
@@ -49,8 +48,6 @@ char *lifetime = NULL;
 struct getargs args[] = {
     { "forwardable",		'f', arg_flag, &forwardable, 
       "get forwardable tickets", NULL },
-    { "preauthentication",	'p', arg_negative_flag, &preauth, 
-      "disable preauthentication", NULL },
     { "renewable",		'r', arg_flag, &renewable, 
       "get renewable tickets", NULL },
     { "lifetime",		'l', arg_string, &lifetime,
@@ -78,7 +75,6 @@ main (int argc, char **argv)
     krb5_ccache  ccache;
     krb5_principal principal;
     krb5_creds cred;
-    krb5_preauthtype pre_auth_types[] = {KRB5_PADATA_ENC_TIMESTAMP};
     int optind = 0;
     krb5_get_init_creds_opt opt;
 
@@ -102,10 +98,7 @@ main (int argc, char **argv)
 	krb5_get_init_creds_opt_set_forwardable (&opt, forwardable);
     if (renewable)
 	krb5_get_init_creds_opt_set_renew_life (&opt, 1 << 30);
-    if (preauth)
-	krb5_get_init_creds_opt_set_preauth_list (&opt,
-						  pre_auth_types,
-						  1);
+
     if (lifetime) {
 	int tmp = parse_time (lifetime, NULL);
 	if (tmp < 0)
-- 
2.11.4.GIT