[src/netbsd-1-5]: src/usr.bin/login Pull up rev. 1.14:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/706775c27356
branches:  netbsd-1-5
changeset: 488998:706775c27356
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Aug 09 17:49:40 2000 +0000

description:
Pull up rev. 1.14:
krb5_get_in_tkt() (called by krb5_get_in_tkt_with_password()) may
eventually call krb5_free_principal() via krb5_free_creds_contents(),
(when it succeeds, in particular).  Check for the creds.server
already being freed, and don't free it again.

diffstat:

 usr.bin/login/k5login.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 195a7b5bb2e4 -r 706775c27356 usr.bin/login/k5login.c
--- a/usr.bin/login/k5login.c   Wed Aug 09 17:41:51 2000 +0000
+++ b/usr.bin/login/k5login.c   Wed Aug 09 17:49:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: k5login.c,v 1.12.2.1 2000/08/02 21:16:03 thorpej Exp $ */
+/*     $NetBSD: k5login.c,v 1.12.2.2 2000/08/09 17:49:40 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)klogin.c   5.11 (Berkeley) 7/12/92";
 #endif
-__RCSID("$NetBSD: k5login.c,v 1.12.2.1 2000/08/02 21:16:03 thorpej Exp $");
+__RCSID("$NetBSD: k5login.c,v 1.12.2.2 2000/08/09 17:49:40 thorpej Exp $");
 #endif /* not lint */
 
 #ifdef KERBEROS5
@@ -299,7 +299,8 @@
                                               ccache,
                                               &my_creds, 0);
 
-       krb5_free_principal(kcontext, server);
+       if (my_creds.server != NULL)
+               krb5_free_principal(kcontext, my_creds.server);
 
        if (chown(&tkt_location[5], pw->pw_uid, pw->pw_gid) < 0)
                syslog(LOG_ERR, "chown tkfile (%s): %m", &tkt_location[5]);