From 76e39391f4f5277f65e87a93e70fdf1fa6035051 Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Mon, 21 Jan 2008 19:12:44 +0000
Subject: no more NOENCRYPTION

---
 server/bdump.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'server/bdump.c')

diff --git a/server/bdump.c b/server/bdump.c
index 4f5b5d5..ced6167 100644
--- a/server/bdump.c
+++ b/server/bdump.c
@@ -114,10 +114,8 @@ static long ticket_time;
 #define TKTLIFETIME	120
 #define tkt_lifetime(val) ((long) val * 5L * 60L)
 
-#ifndef NOENCRYPTION
 extern C_Block	serv_key;
 extern Sched	serv_ksched;
-#endif
 #endif /* HAVE_KRB4 */
 
 static Timer *bdump_timer;
@@ -1030,7 +1028,6 @@ get_tgt(void)
 	    ticket_time = NOW;
 	}
 
-#ifndef NOENCRYPTION
 	retval = read_service_key(SERVER_SERVICE, SERVER_INSTANCE,
 				  ZGetRealm(), 0 /*kvno*/,
 				  srvtab_file, (char *)serv_key);
@@ -1040,7 +1037,6 @@ get_tgt(void)
 	    return 1;
 	}
 	des_key_sched(serv_key, serv_ksched.s);
-#endif /* !NOENCRYPTION */
     }
 #ifdef HAVE_KRB5	
     /* XXX */
@@ -1292,12 +1288,8 @@ bdump_recv_loop(Server *server)
 		    syslog(LOG_ERR,"brl bad cblk read: %s (%s)",
 			   error_message(retval), cp);
 		} else {
-#ifdef NOENCRYPTION
-		    memcpy(cblock, client->session_key, sizeof(C_Block));
-#else
 		    des_ecb_encrypt(cblock, client->session_key, serv_ksched.s,
 				    DES_DECRYPT);
-#endif
 		}
 	    }
 #endif /* HAVE_KRB4 */
-- 
cgit v1.2.3