intermediate commit with inband inband protocol for non-des

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10980 dc483132-0cff-0310-8789-dd5450dbe970

src/appl/bsd/krlogin.c

@@ -600,8 +600,19 @@ main(argc, argv)
 #else
 	try_normal(orig_argv);
 #endif
-    } else
+    } else {
+	krb5_boolean similar;
+
 	rcmd_stream_init_krb5(&cred->keyblock, encrypt_flag, 1);
+
+	if (status = krb5_c_enctype_compare(bsd_context, ENCTYPE_DES_CBC_CRC,
+					    cred->keyblock.enctype, &similar))
+	    try_normal(orig_argv); /* doesn't return */
+
+	if (!similar)
+	    do_inband = 1;
+    }
+
     rem = sock;
 
 #else

src/appl/bsd/krlogind.c

@@ -1455,6 +1455,21 @@ recvauth(valid_checksum)
 
     rcmd_stream_init_krb5(ticket->enc_part2->session, do_encrypt, 1);
 
+    {
+       krb5_boolean similar;
+
+       if (status = krb5_c_enctype_compare(bsd_context, ENCTYPE_DES_CBC_CRC,
+					   ticket->enc_part2->session->enctype,
+					   &similar))
+	  return(status);
+
+       if (!similar) {
+	  do_inband = 1;
+	  fprintf(stderr, "setting do_inband\n");
+       }
+    }
+
+
     getstr(netf, rusername, sizeof(rusername), "remuser");
 
     if ((status = krb5_unparse_name(bsd_context, client, &krusername)))