diff options
author | Karl Ramm <kcr@mit.edu> | 2008-01-21 19:53:48 +0000 |
---|---|---|
committer | Karl Ramm <kcr@mit.edu> | 2008-01-21 19:53:48 +0000 |
commit | 7e31ca15867b5fa1ccf7081ece2d8dc7b96f96f1 (patch) | |
tree | ac2b594342ac6a40f3e60f2de28e68066fd70ddd /server | |
parent | 24297e5e21cee3105d221a4cf19fc9037bbedd36 (diff) |
collapse state of some non-debugging #if [01]'d code
Diffstat (limited to 'server')
-rw-r--r-- | server/dispatch.c | 17 | ||||
-rw-r--r-- | server/kstuff.c | 19 |
2 files changed, 1 insertions, 35 deletions
diff --git a/server/dispatch.c b/server/dispatch.c index a17c32a..bd1f8fd 100644 --- a/server/dispatch.c +++ b/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/server/kstuff.c b/server/kstuff.c index c82f962..7642651 100644 --- a/server/kstuff.c +++ b/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 |