svn rev #22962: trunk/src/kdc/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22962
Commit By: lhoward
Log Message:
simplify logic fix introduced in r22960 for S4U2Self


Changed Files:
U   trunk/src/kdc/do_tgs_req.c
Modified: trunk/src/kdc/do_tgs_req.c
===================================================================
--- trunk/src/kdc/do_tgs_req.c	2009-10-21 16:03:40 UTC (rev 22961)
+++ trunk/src/kdc/do_tgs_req.c	2009-10-21 17:24:37 UTC (rev 22962)
@@ -468,16 +468,14 @@
             /*
              * Forwardable flag is propagated along referral path.
              */
-            else if (is_referral &&
-                !isflagset(header_enc_tkt->flags, TKT_FLG_FORWARDABLE))
+            else if (!isflagset(header_enc_tkt->flags, TKT_FLG_FORWARDABLE))
                 clear(enc_tkt_reply.flags, TKT_FLG_FORWARDABLE);
             /*
              * OK_TO_AUTH_AS_DELEGATE must be set on the service requesting
              * S4U2Self in order for forwardable tickets to be returned.
              */
             else if (!is_referral &&
-                (!isflagset(header_enc_tkt->flags, TKT_FLG_FORWARDABLE) ||
-                 !isflagset(server.attributes, KRB5_KDB_OK_TO_AUTH_AS_DELEGATE)))
+                !isflagset(server.attributes, KRB5_KDB_OK_TO_AUTH_AS_DELEGATE))
                 clear(enc_tkt_reply.flags, TKT_FLG_FORWARDABLE);
         }
     }