r4283@bucket (orig r273): kcr | 2008-01-21 14:53:48 -0500

 collapse state of some non-debugging #if [01]'d code

git-svn-id: svn://svn.1ts.org/debian/trunk@345 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/server/dispatch.c b/zephyr/server/dispatch.c
index f765ac8fbb1e1c8520bcae281b1092e3f1e53948..5ac9d45f21f581c27b226d2e35440afc706509ee 100644 (file)
--- a/zephyr/server/dispatch.c
+++ b/zephyr/server/dispatch.c
@@ -223,17 +223,6 @@ handle_packet(void)
        }
     }
 
-#if 0
-    if (whoisit.sin_port != hm_port && whoisit.sin_port != hm_srv_port &&
-       strcasecmp(new_notice.z_class, ZEPHYR_ADMIN_CLASS) != 0 &&
-       whoisit.sin_port != srv_addr.sin_port &&
-       new_notice.z_kind != CLIENTACK) {
-       syslog(LOG_ERR, "bad port %s/%d", inet_ntoa(whoisit.sin_addr),
-              ntohs(whoisit.sin_port));
-       return;
-    }
-#endif
-
     message_notices.val++;
     dispatch(&new_notice, authentic, &whoisit, from_server);
     return;
@@ -273,11 +262,7 @@ dispatch(ZNotice_t *notice,
     }
 
     who2 = *who;
-#if 0
-    if (0 && from_server) {
-       /* incorporate server_dispatch here */
-    }
-#endif
+
     notice_class = make_string(notice->z_class,1);
 
     if (from_server) {

diff --git a/zephyr/server/kstuff.c b/zephyr/server/kstuff.c
index 88b0cb1998d38fb9f1f8c5bae84d6fa780c2551a..7a8932b619c2cee2baff6de296bff8cc1757ae5e 100644 (file)
--- a/zephyr/server/kstuff.c
+++ b/zephyr/server/kstuff.c
@@ -920,24 +920,8 @@ Z_krb5_init_keyblock(krb5_context context,
 #endif
 }
 
-#if 0
-void ZLogKey(char *label, krb5_keyblock *keyblock) {
-   char *p, *buf;
-   unsigned char *k;
-   int i;
-   buf = malloc(5 *Z_keylen(keyblock)+1);
-
-   k=Z_keydata(keyblock);
-   for (i=0,p=buf; i < Z_keylen(keyblock); i++,p+=strlen(p))
-       sprintf(p, " 0x%02x", k[i]);
-   syslog(LOG_ERR, "key %s is type %d, %d bytes, %s", label, Z_enctype(keyblock), Z_keylen(keyblock), buf);
-   free(buf);
-}
-#endif
-
 void
 ZSetSession(krb5_keyblock *keyblock) {
-#if 1
     krb5_error_code result;
 
     if (__Zephyr_keyblock) {
@@ -949,9 +933,6 @@ ZSetSession(krb5_keyblock *keyblock) {
     
     if (result) /*XXX we're out of memory? */
        ;
-#else
-    memcpy(__Zephyr_session, Z_keydata(keyblock), sizeof(C_Block));
-#endif
 }
 #endif
 #ifdef HAVE_KRB4