STABLE10-repair-afs-cryptall-20010111

Make it possible for cache manager cryptall code to work

(cherry picked from commit 10892a7bde1c9eb8beac2ecb1d618a67cdea3fdb)

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 16bc447e7e85c091d8dc52c119f1d43f15a80cd4..0e984f0c779533ec14b94bbff220ad99224b9478 100644 (file)
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -220,15 +220,15 @@ struct conn *afs_ConnBySA(struct srvAddr *sap, unsigned short aport,
 
              if (cryptall) {
                level=rxkad_crypt;
-               isec=3;
-             }
-             else {
+             } else {
                level=rxkad_clear;
-               isec=2;
              }
-               /* kerberos tickets on channel 2 */
-               csec = rxkad_NewClientSecurityObject(level, tu->ct.HandShakeKey,
-                       /* kvno */ tu->ct.AuthHandle, tu->stLen, tu->stp);
+             isec=2;
+             /* kerberos tickets on channel 2 */
+             csec = rxkad_NewClientSecurityObject(level, tu->ct.HandShakeKey,
+                                                  /* kvno */ 
+                                                  tu->ct.AuthHandle, 
+                                                  tu->stLen, tu->stp);
        }
        if (isec == 0)
            csec = rxnull_NewClientSecurityObject();