From d48b0ac2b3ece0a8406a38b354603d0a93d55cc3 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sun, 12 May 1996 15:58:39 +0000 Subject: [PATCH] Use krb_get_default_principal git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@521 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/xnlock/xnlock.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c index 41dae9ed3..adaa0ccf6 100644 --- a/appl/xnlock/xnlock.c +++ b/appl/xnlock/xnlock.c @@ -838,7 +838,7 @@ main (int argc, char **argv) XGCValues gcvalues; srand(getpid()); - for (i = 0; i < STRING_LENGTH - 2; i++) + for (i = 0; i < STRING_LENGTH; i++) STRING[i] = ((unsigned long)rand() % ('~' - ' ')) + ' '; locked_at = time(0); @@ -859,31 +859,7 @@ main (int argc, char **argv) exit(1); } - { - int code = KSUCCESS; - char *file; - strcpy(name, pw->pw_name); /* Unix name is default name */ - if ((file = getenv("KRBTKFILE")) == 0) - file = TKT_FILE; - code = tf_init(file, R_TKT_FIL); - if (code == KSUCCESS) - { - (void) tf_close(); - if ((code = krb_get_tf_realm(file, realm)) == KSUCCESS && - (code = tf_init(file, R_TKT_FIL)) == KSUCCESS && - (code = tf_get_pname(name)) == KSUCCESS && - (code = tf_get_pinst(inst)) == KSUCCESS) - { - (void) tf_close(); /* Alles gut */ - } - } - if (code != KSUCCESS) - { - code = krb_get_lrealm(realm, 1); - if (code != KSUCCESS) - realm[0] = 0; /* No kerberos today */ - } - } + krb_get_default_principal(name, inst, realm); override = XtVaAppInitialize(&app, "XNlock", options, XtNumber(options),