X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fgss%2Fcontext_lucid.c;h=275eed3f093ecac0e9ed6aa09d0c27068abb0762;hb=d89191163324200d1f57a095faef1253c7d9fe11;hp=3b8884be24b9c98f2a905aee328658ae50c0f742;hpb=37e738fbde6220164da7b9c2097065eb323e2da7;p=fs%2Flustre-release.git

diff --git a/lustre/utils/gss/context_lucid.c b/lustre/utils/gss/context_lucid.c
index 3b8884b..275eed3 100644
--- a/lustre/utils/gss/context_lucid.c
+++ b/lustre/utils/gss/context_lucid.c
@@ -2,7 +2,7 @@
  * COPYRIGHT (c) 2006 The Regents of the University of Michigan
  * ALL RIGHTS RESERVED
  *
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  *
  * Permission is granted to use, copy, create derivative works
  * and redistribute this software and such derivative works
@@ -508,27 +508,18 @@ prepare_krb5_rfc4121_buffer(gss_krb5_lucid_context_v1_t *lctx,
 		else
 			keyptr = &lctx->cfx_kd.ctx_key;
 
-#if 0
-		if (lctx->initiate == 1) {
-			sign_usage = KG_USAGE_INITIATOR_SIGN;
-			seal_usage = KG_USAGE_INITIATOR_SEAL;
-		} else {
-			sign_usage = KG_USAGE_ACCEPTOR_SIGN;
-			seal_usage = KG_USAGE_ACCEPTOR_SEAL;
-		}
-#else
 		/* FIXME
-		 * These are from rfc4142, but I don't understand: if we supply
-		 * different 'usage' value for client & server, then the peers
-		 * will have different derived keys. How could this work?
+		 * These are from rfc4142, but I don't understand:
+		 * if we supply different 'usage' value for client &
+		 * server, then the peers will have different derived
+		 * keys. How could this work?
 		 *
-		 * Here we simply use old SIGN/SEAL values until we find the
-		 * answer.  --ericm
+		 * Here we simply use old SIGN/SEAL values until we
+		 * find the answer.  --ericm
 		 * FIXME
 		 */
 		sign_usage = KG_USAGE_SIGN;
 		seal_usage = KG_USAGE_SEAL;
-#endif
 
 		/* derive and send down: Ke, Ki, and Kc */