* login.c (main): Reorder some control flow to avoid security hole

if KRB4_GET_TICKETS is not defined. [pullup from trunk] git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-1@12002 dc483132-0cff-0310-8789-dd5450dbe970
aadamowski · Feb 6, 2000 · 77c4f0f · 77c4f0f
1 parent d530263
commit 77c4f0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-04  Tom Yu  <tlyu@mit.edu>
+
+	* login.c (main): Reorder some control flow to avoid security hole
+	if KRB4_GET_TICKETS is not defined.
+
 1999-12-02  Ken Raeburn  <raeburn@mit.edu>
 
 	* login.c (main, k_init): Call krb5_cc_set_default_name when

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
@@ -1456,11 +1456,10 @@ int main(argc, argv)
 #ifdef KRB5_GET_TICKETS
     if (login_krb5_get_tickets)
 	dofork();
-    else
 #endif
 #ifdef KRB4_GET_TICKETS
-	if (login_krb4_get_tickets)
-	    dofork();
+    else if (login_krb4_get_tickets)
+	dofork();
 #endif
 
 /* If the user's shell does not do job control we should put it in a
@@ -1588,11 +1587,10 @@ int main(argc, argv)
 #ifdef KRB5_GET_TICKETS
     if (forwarded_v5_tickets)
 	destroy_tickets();
-    else
 #endif
 #ifdef KRB4_GET_TICKETS
-	if (got_v4_tickets)
-	    destroy_tickets();
+    else if (got_v4_tickets)
+        destroy_tickets();
 #endif
 
 #ifdef OQUOTA