From: sibaz <sibaz>
Date: Sun, 29 Sep 2002 23:24:47 +0000 (+0000)
Subject: changed all LOG messages using logtype_default to use logtype_atalkd
X-Git-Tag: point-did-cleanup~4
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=3b71506b3d3d45200fbbffe7cae87a25ef8d085b;p=netatalk.git

changed all LOG messages using logtype_default to use logtype_atalkd
---

diff --git a/etc/atalkd/aep.c b/etc/atalkd/aep.c
index cb476174..bc2cdaaa 100644
--- a/etc/atalkd/aep.c
+++ b/etc/atalkd/aep.c
@@ -1,5 +1,5 @@
 /*
- * $Id: aep.c,v 1.7 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: aep.c,v 1.8 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -32,14 +32,14 @@ int aep_packet( ap, from, data, len )
     end = data + len;
     if ( data + 2 > end || *data != DDPTYPE_AEP ||
 	    *( data + 1 ) != AEPOP_REQUEST ) {
-	LOG(log_info, logtype_default, "aep_packet malformed packet" );
+	LOG(log_info, logtype_atalkd, "aep_packet malformed packet" );
 	return 1;
     }
 
     *( data + 1 ) = AEPOP_REPLY;
     if ( sendto( ap->ap_fd, data, len, 0, (struct sockaddr *)from,
 	    sizeof( struct sockaddr_at )) < 0 ) {
-	LOG(log_error, logtype_default, "aep sendto: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "aep sendto: %s", strerror(errno) );
 	return 1;
     }
 
diff --git a/etc/atalkd/config.c b/etc/atalkd/config.c
index a0927371..d3dce8a2 100644
--- a/etc/atalkd/config.c
+++ b/etc/atalkd/config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.11 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: config.c,v 1.12 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -194,7 +194,7 @@ int writeconf( cf )
     /* check if old conf is writable */
     if ( stat( path, &st ) == 0 ) {
 	if (( st.st_mode & S_IWUSR ) == 0 ) {
-	    LOG(log_info, logtype_default, "%s not writable, won't rewrite", path );
+	    LOG(log_info, logtype_atalkd, "%s not writable, won't rewrite", path );
 	    return( -1 );
 	}
 	 mode = st.st_mode;
@@ -206,16 +206,16 @@ int writeconf( cf )
 	sprintf( newpath, "%.*s/%s", (int)(p - path), path, _PATH_ATALKDTMP );
     }
     if (( fd = open( newpath, O_WRONLY|O_CREAT|O_TRUNC, mode )) < 0 ) {
-	LOG(log_error, logtype_default, "%s: %s", newpath, strerror(errno) );
+	LOG(log_error, logtype_atalkd, "%s: %s", newpath, strerror(errno) );
 	return( -1 );
     }
     if (( newconf = fdopen( fd, "w" )) == NULL ) {
-	LOG(log_error, logtype_default, "fdreopen %s: %s", newpath, strerror(errno) );
+	LOG(log_error, logtype_atalkd, "fdreopen %s: %s", newpath, strerror(errno) );
 	return( -1 );
     }
 
     if (( conf = fopen( path, "r" )) == NULL && cf ) {
-	LOG(log_error, logtype_default, "%s: %s", path, strerror(errno) );
+	LOG(log_error, logtype_atalkd, "%s: %s", path, strerror(errno) );
 	return( -1 );
     }
 
@@ -224,7 +224,7 @@ int writeconf( cf )
     while ( conf == NULL || fgets( line, sizeof( line ), conf ) != NULL ) {
 	if ( conf != NULL && ( argv = parseline( line )) == NULL ) {
 	    if ( fputs( line, newconf ) == EOF ) {
-		LOG(log_error, logtype_default, "fputs: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "fputs: %s", strerror(errno) );
 		return( -1 );
 	    }
 	    freeline( argv );
@@ -271,7 +271,7 @@ int writeconf( cf )
     fclose( newconf );
 
     if ( rename( newpath, path ) < 0 ) {
-	LOG(log_error, logtype_default, "rename %s to %s: %s", newpath, path, strerror(errno) );
+	LOG(log_error, logtype_atalkd, "rename %s to %s: %s", newpath, path, strerror(errno) );
 	return( -1 );
     }
     return( 0 );
@@ -790,23 +790,23 @@ int plumb()
 	strcpy( device, "/dev/" );
 	strcat( device, iface->i_name );
 	if (( p = strpbrk( device, "0123456789" )) == NULL ) {
-	    LOG(log_error, logtype_default, "plumb: invalid device: %s", device );
+	    LOG(log_error, logtype_atalkd, "plumb: invalid device: %s", device );
 	    return -1;
 	}
 	ppa = atoi( p );
 	*p = '\0';
 
 	if (( fd = open( device, O_RDWR, 0 )) < 0 ) {
-	    LOG(log_error, logtype_default, "%s: %m", device );
+	    LOG(log_error, logtype_atalkd, "%s: %m", device );
 	    return -1;
 	}
 	if ( ioctl( fd, I_PUSH, "ddp" ) < 0 ) {
-	    LOG(log_error, logtype_default, "I_PUSH: %m" );
+	    LOG(log_error, logtype_atalkd, "I_PUSH: %m" );
 	    close(fd);
 	    return -1;
 	}
 	if ( ioctl( fd, IF_UNITSEL, ppa ) < 0 ) {
-	    LOG(log_error, logtype_default, "IF_UNITSEL: %m" );
+	    LOG(log_error, logtype_atalkd, "IF_UNITSEL: %m" );
 	    close(fd);
 	    return -1;
 	}
@@ -819,7 +819,7 @@ int plumb()
 	  return -1;
 	}
 
-	LOG(log_info, logtype_default, "plumbed %s%d", device, ppa );
+	LOG(log_info, logtype_atalkd, "plumbed %s%d", device, ppa );
     }
 
     return( 0 );
diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index 8abcfc24..34d6f9d1 100644
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.15 2002-09-12 17:21:15 srittau Exp $
+ * $Id: main.c,v 1.16 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -149,7 +149,7 @@ static void atalkd_exit(const int i)
 	continue;
 #endif /* SIOCDIFADDR != SIOCATALKDIFADDR */
 #endif /* SIOCATALKIFADDR */
-      LOG(log_error, logtype_default, "difaddr(%u.%u): %s", 
+      LOG(log_error, logtype_atalkd, "difaddr(%u.%u): %s", 
 	      ntohs(iface->i_addr.sat_addr.s_net), 
 	      iface->i_addr.sat_addr.s_node, strerror(errno));
     }
@@ -195,13 +195,13 @@ static void as_timer(int sig)
 	    if ( iface->i_time < 3 ) {
 		if ( iface->i_flags & IFACE_PHASE1 ) {
 		  if (rtmp_request( iface ) < 0) {
-		      LOG(log_error, logtype_default, "rtmp_request: %s", strerror(errno));
+		      LOG(log_error, logtype_atalkd, "rtmp_request: %s", strerror(errno));
 		      atalkd_exit(1);
 		  }
 		    newrtmpdata = 1;
 		} else {
 		  if (zip_getnetinfo( iface ) < 0) {
-		    LOG(log_error, logtype_default, "zip_getnetinfo: %s", strerror(errno));
+		    LOG(log_error, logtype_atalkd, "zip_getnetinfo: %s", strerror(errno));
 		    atalkd_exit(1);
 		  }
 		  sentzipq = 1;
@@ -215,11 +215,11 @@ static void as_timer(int sig)
 			 * No seed info, and we've got multiple interfaces.
 			 * Wait forever.
 			 */
-			LOG(log_info, logtype_default,
+			LOG(log_info, logtype_atalkd,
 				"as_timer multiple interfaces, no seed" );
-			LOG(log_info, logtype_default, "as_timer can't configure %s",
+			LOG(log_info, logtype_atalkd, "as_timer can't configure %s",
 				iface->i_name );
-			LOG(log_info, logtype_default, "as_timer waiting for router" );
+			LOG(log_info, logtype_atalkd, "as_timer waiting for router" );
 			iface->i_time = 0;
 			continue;
 		    } else {
@@ -231,7 +231,7 @@ static void as_timer(int sig)
 			for ( zt = iface->i_czt; zt; zt = zt->zt_next ) {
 			    if (addzone( iface->i_rt, zt->zt_len, 
 					 zt->zt_name) < 0) {
-			      LOG(log_error, logtype_default, "addzone: %s", strerror(errno));
+			      LOG(log_error, logtype_atalkd, "addzone: %s", strerror(errno));
 			      atalkd_exit(1);
 			    }
 			}
@@ -240,7 +240,7 @@ static void as_timer(int sig)
 			    iface->i_rt->rt_flags |= RTMPTAB_HASZONES;
 			}
 			if ( iface->i_flags & IFACE_PHASE1 ) {
-			    LOG(log_info, logtype_default,
+			    LOG(log_info, logtype_atalkd,
 				    "as_timer configured %s phase 1 from seed",
 				    iface->i_name );
 			    setaddr( iface, IFACE_PHASE1,
@@ -249,13 +249,13 @@ static void as_timer(int sig)
 				    iface->i_caddr.sat_addr.s_net,
 				    iface->i_caddr.sat_addr.s_net );
 			} else {
-			    LOG(log_info, logtype_default,
+			    LOG(log_info, logtype_atalkd,
 				    "as_timer configured %s phase 2 from seed",
 				    iface->i_name );
 			}
 
 			if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
-			    LOG(log_error, logtype_default,
+			    LOG(log_error, logtype_atalkd,
 				    "as_timer: can't route %u.%u to loop: %s",
 				    ntohs( iface->i_addr.sat_addr.s_net ),
 				    iface->i_addr.sat_addr.s_node,
@@ -272,7 +272,7 @@ static void as_timer(int sig)
 		     * Configure for no router operation.  Wait for a route
 		     * to become available in rtmp_packet().
 		     */
-		    LOG(log_info, logtype_default, "config for no router" );
+		    LOG(log_info, logtype_atalkd, "config for no router" );
 		      
 		    if ( iface->i_flags & IFACE_PHASE2 ) {
 			iface->i_rt->rt_firstnet = 0;
@@ -283,7 +283,7 @@ static void as_timer(int sig)
 				0, htons( STARTUP_LASTNET ));
 		    }
 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
-			LOG(log_error, logtype_default,
+			LOG(log_error, logtype_atalkd,
 				"as_timer: can't route %u.%u to loopback: %s",
 				ntohs( iface->i_addr.sat_addr.s_net ),
 				iface->i_addr.sat_addr.s_node,
@@ -318,7 +318,7 @@ static void as_timer(int sig)
 	     * our zone has gone away.
 	     */
 	    if ( ++gate->g_state >= RTMPTAB_BAD ) {
-		LOG(log_info, logtype_default, "as_timer gateway %u.%u down",
+		LOG(log_info, logtype_atalkd, "as_timer gateway %u.%u down",
 			ntohs( gate->g_sat.sat_addr.s_net ),
 			gate->g_sat.sat_addr.s_node );
 		rtmp = gate->g_rt;
@@ -330,7 +330,7 @@ static void as_timer(int sig)
 		    } else {
 			rtmp->rt_hops = RTMPHOPS_POISON;
 			if ((cc = rtmp_replace( rtmp )) < 0) {
-			  LOG(log_error, logtype_default, "rtmp_replace: %s", strerror(errno));
+			  LOG(log_error, logtype_atalkd, "rtmp_replace: %s", strerror(errno));
 			  atalkd_exit(1);
 			}
 			if (cc) {
@@ -371,7 +371,7 @@ static void as_timer(int sig)
 		      gate->g_iface->i_rt->rt_flags &= ~RTMPTAB_HASZONES;
 		    }
 
-		    LOG(log_info, logtype_default, "as_timer last gateway down" );
+		    LOG(log_info, logtype_atalkd, "as_timer last gateway down" );
 
 		    /* Set netrange to 0-fffe.  */
 		    if ( gate->g_iface->i_flags & IFACE_PHASE2 ) {
@@ -426,7 +426,7 @@ static void as_timer(int sig)
 			} else {
 			    rtmp->rt_hops = RTMPHOPS_POISON;
 			    if ((cc = rtmp_replace( rtmp )) < 0) {
-			    	LOG(log_error, logtype_default, "rtmp_replace: %s", strerror(errno));
+			    	LOG(log_error, logtype_atalkd, "rtmp_replace: %s", strerror(errno));
 			    	atalkd_exit(1);
 			    }
 		            if (cc)
@@ -454,7 +454,7 @@ static void as_timer(int sig)
 			if ( sendto( zap->ap_fd, packet, cc, 0,
 				(struct sockaddr *)&sat,
 				sizeof( struct sockaddr_at )) < 0 ) {
-			    LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+			    LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
 			}
 			sentzipq = 1;
 
@@ -473,7 +473,7 @@ static void as_timer(int sig)
 		     * ask about, and warn that we can't get it's zone.
 		     */
 		    if ( rtmp->rt_nzq++ == 3 ) {
-			LOG(log_info, logtype_default, "as_timer can't get zone for %u",
+			LOG(log_info, logtype_atalkd, "as_timer can't get zone for %u",
 				ntohs( rtmp->rt_firstnet ));
 		    }
 		    if ( rtmp->rt_nzq > 3 ) {
@@ -503,7 +503,7 @@ static void as_timer(int sig)
 
 		if ( sendto( zap->ap_fd, packet, cc, 0, (struct sockaddr *)&sat,
 			sizeof( struct sockaddr_at )) < 0 ) {
-		    LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+		    LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
 		}
 	    }
 	}
@@ -582,7 +582,7 @@ static void as_timer(int sig)
 			if ( sendto( rap->ap_fd, packet, data - packet, 0,
 				(struct sockaddr *)&sat,
 				sizeof( struct sockaddr_at )) < 0 ) {
-			    LOG(log_error, logtype_default, "as_timer sendto %u.%u (%u): %s",
+			    LOG(log_error, logtype_atalkd, "as_timer sendto %u.%u (%u): %s",
 				    ntohs( sat.sat_addr.s_net ),
 				    sat.sat_addr.s_node,
 				    ntohs( iface->i_rt->rt_firstnet ),
@@ -622,7 +622,7 @@ static void as_timer(int sig)
 		if ( sendto( rap->ap_fd, packet, data - packet, 0,
 			(struct sockaddr *)&sat,
 			sizeof( struct sockaddr_at )) < 0 ) {
-		    LOG(log_error, logtype_default, "as_timer sendto %u.%u (%u): %s",
+		    LOG(log_error, logtype_atalkd, "as_timer sendto %u.%u (%u): %s",
 			    ntohs( sat.sat_addr.s_net ),
 			    sat.sat_addr.s_node,
 			    ntohs( iface->i_rt->rt_firstnet ),
@@ -653,14 +653,14 @@ static void as_timer(int sig)
 
 	if ( stable && !noparent ) {
 	    noparent = 1;
-	    LOG(log_info, logtype_default, "ready %d/%d/%d", stabletimer, newrtmpdata,
+	    LOG(log_info, logtype_atalkd, "ready %d/%d/%d", stabletimer, newrtmpdata,
 		    sentzipq );
 	    if ( !debug ) {
 		/*
 		 * Seems like we could get here more than once...
 		 */
 		if ( kill( getpid(), SIGSTOP ) < 0 ) {
-		    LOG(log_error, logtype_default, "as_timer: kill-self failed!" );
+		    LOG(log_error, logtype_atalkd, "as_timer: kill-self failed!" );
 		    atalkd_exit( 1 );
 		}
 	    }
@@ -686,7 +686,7 @@ consistency()
 	for ( lr = zt->zt_rt; lr; lr = lr->l_next ) {
 	    rtmp = (struct rtmptab *)lr->l_data;
 	    if ( rtmp->rt_iprev == 0 && rtmp->rt_gate != 0 ) {
-		LOG(log_error, logtype_default, "%.*s has %u-%u (unused)\n",
+		LOG(log_error, logtype_atalkd, "%.*s has %u-%u (unused)\n",
 			zt->zt_len, zt->zt_name, ntohs( rtmp->rt_firstnet ),
 			ntohs( rtmp->rt_lastnet ));
 		atalkd_exit(1);
@@ -697,7 +697,7 @@ consistency()
 		}
 	    }
 	    if ( lz == 0 ) {
-		LOG(log_error, logtype_default, "no map from %u-%u to %.*s\n", 
+		LOG(log_error, logtype_atalkd, "no map from %u-%u to %.*s\n", 
 			ntohs( rtmp->rt_firstnet ),
 			ntohs( rtmp->rt_lastnet ),
 			zt->zt_len, zt->zt_name );
@@ -721,7 +721,7 @@ as_debug()
     FILE		*rtmpdebug;
 
     if (( rtmpdebug = fopen( _PATH_ATALKDEBUG, "w" )) == NULL ) {
-	LOG(log_error, logtype_default, "rtmp: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "rtmp: %s", strerror(errno) );
     }
 
     for ( iface = interfaces; iface; iface = iface->i_next ) {
@@ -826,7 +826,7 @@ as_down()
 	    for ( rt = gate->g_rt; rt; rt = rt->rt_next ) {
 		if ( rt->rt_iprev ) {
 		    if ( gateroute( RTMP_DEL, rt ) < 0 ) {
-			LOG(log_error, logtype_default, "as_down remove %u-%u failed: %s",
+			LOG(log_error, logtype_atalkd, "as_down remove %u-%u failed: %s",
 				ntohs( rt->rt_firstnet ),
 				ntohs( rt->rt_lastnet ),
 				strerror(errno) );
@@ -836,7 +836,7 @@ as_down()
 	}
 	if ( iface->i_flags & IFACE_LOOP ) {
 	  if (looproute( iface, RTMP_DEL )) {
-	    LOG(log_error, logtype_default, "as_down remove %s %u.%u failed: %s",
+	    LOG(log_error, logtype_atalkd, "as_down remove %s %u.%u failed: %s",
 		    iface->i_name, ntohs( iface->i_addr.sat_addr.s_net ),
 		    iface->i_addr.sat_addr.s_node,
 		    strerror(errno) );
@@ -844,7 +844,7 @@ as_down()
 	}
     }
 
-    LOG(log_info, logtype_default, "done" );
+    LOG(log_info, logtype_atalkd, "done" );
     atalkd_exit( 0 );
 }
 
@@ -1084,7 +1084,7 @@ int main( ac, av )
     syslog_setup(log_debug, logtype_default, logoption_pid, logfacility_daemon );
 #endif /* ultrix */
 
-    LOG(log_info, logtype_default, "restart (%s)", version );
+    LOG(log_info, logtype_atalkd, "restart (%s)", version );
 
     /*
      * Socket for use in routing ioctl()s. Can't add routes to our
@@ -1092,16 +1092,16 @@ int main( ac, av )
      */
 #ifdef BSD4_4
     if (( rtfd = socket( PF_ROUTE, SOCK_RAW, AF_APPLETALK )) < 0 ) {
-	LOG(log_error, logtype_default, "route socket: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "route socket: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
     if ( shutdown( rtfd, 0 ) < 0 ) {
-	LOG(log_error, logtype_default, "route shutdown: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "route shutdown: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 #else /* BSD4_4 */
     if (( rtfd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
-	LOG(log_error, logtype_default, "route socket: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "route socket: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 #endif /* BSD4_4 */
@@ -1114,7 +1114,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGTERM, &sv, NULL) < 0 ) {
-	LOG(log_error, logtype_default, "sigterm: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "sigterm: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 
@@ -1125,7 +1125,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGUSR1, &sv, NULL) < 0 ) {
-	LOG(log_error, logtype_default, "sigusr1: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "sigusr1: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 
@@ -1136,7 +1136,7 @@ int main( ac, av )
     sigaddset( &sv.sa_mask, SIGTERM );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGALRM, &sv, NULL) < 0 ) {
-	LOG(log_error, logtype_default, "sigalrm: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "sigalrm: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 
@@ -1145,7 +1145,7 @@ int main( ac, av )
     it.it_value.tv_sec = 10L;
     it.it_value.tv_usec = 0L;
     if ( setitimer( ITIMER_REAL, &it, NULL) < 0 ) {
-	LOG(log_error, logtype_default, "setitimer: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "setitimer: %s", strerror(errno) );
 	atalkd_exit( 1 );
     }
 
@@ -1158,7 +1158,7 @@ int main( ac, av )
 		errno = 0;
 		continue;
 	    } else {
-		LOG(log_error, logtype_default, "select: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "select: %s", strerror(errno) );
 		atalkd_exit( 1 );
 	    }
 	}
@@ -1170,7 +1170,7 @@ int main( ac, av )
 			fromlen = sizeof( struct sockaddr_at );
 			if (( c = recvfrom( ap->ap_fd, Packet, sizeof( Packet ),
 				0, (struct sockaddr *)&sat, &fromlen )) < 0 ) {
-			    LOG(log_error, logtype_default, "recvfrom: %s", strerror(errno) );
+			    LOG(log_error, logtype_atalkd, "recvfrom: %s", strerror(errno) );
 			    continue;
 			}
 #ifdef DEBUG
@@ -1184,7 +1184,7 @@ int main( ac, av )
 #endif /* DEBUG */
 #ifdef __svr4__
 			if ( sighold( SIGALRM ) || sighold( SIGUSR1 )) {
-			    LOG(log_error, logtype_default, "sighold: %s", strerror(errno) );
+			    LOG(log_error, logtype_atalkd, "sighold: %s", strerror(errno) );
 			    atalkd_exit( 1 );
 			}
 #else /* __svr4__ */
@@ -1192,7 +1192,7 @@ int main( ac, av )
 				sigmask( SIGUSR1 ));
 #endif /* __svr4__ */
 			if (( *ap->ap_packet )( ap, &sat, Packet, c ) < 0) {
-			  LOG(log_error, logtype_default, "ap->ap_packet: %s", strerror(errno));
+			  LOG(log_error, logtype_atalkd, "ap->ap_packet: %s", strerror(errno));
 			  atalkd_exit(1);
 			}
 
@@ -1201,7 +1201,7 @@ int main( ac, av )
 #endif /* DEBUG */
 #ifdef __svr4__
 			if ( sigrelse( SIGUSR1 ) || sigrelse( SIGALRM )) {
-			    LOG(log_error, logtype_default, "sigrelse: %s", strerror(errno) );
+			    LOG(log_error, logtype_atalkd, "sigrelse: %s", strerror(errno) );
 			    atalkd_exit( 1 );
 			}
 #else /* __svr4__ */
@@ -1228,7 +1228,7 @@ void bootaddr( iface )
 
     /* consistency */
     if ( iface->i_flags & IFACE_ADDR ) {
-	LOG(log_error, logtype_default, "bootaddr OOPS!" );
+	LOG(log_error, logtype_atalkd, "bootaddr OOPS!" );
 	atalkd_exit(1);
     }
 
@@ -1244,7 +1244,7 @@ void bootaddr( iface )
 	    }
 
 	} else if (rtmp_request( iface ) < 0) {
-	  LOG(log_error, logtype_default, "bootaddr (rtmp_request): %s", strerror(errno));
+	  LOG(log_error, logtype_atalkd, "bootaddr (rtmp_request): %s", strerror(errno));
 	  atalkd_exit(1);
 	}
 
@@ -1261,7 +1261,7 @@ void bootaddr( iface )
 	    }
 	    
 	} else if (zip_getnetinfo( iface ) < 0) {
-	  LOG(log_error, logtype_default, "bootaddr (zip_getnetinfo): %s", strerror(errno));
+	  LOG(log_error, logtype_atalkd, "bootaddr (zip_getnetinfo): %s", strerror(errno));
 	  atalkd_exit(1);
 	}
     }
@@ -1289,13 +1289,13 @@ void setaddr(struct interface *iface,
     if ( iface->i_ports == NULL ) {	/* allocate port structures */
 	for ( i = 0, as = atserv; i < atservNATSERV; i++, as++ ) {
 	    if (( se = getservbyname( as->as_name, "ddp" )) == NULL ) {
-		LOG(log_info, logtype_default, "%s: service unknown", as->as_name );
+		LOG(log_info, logtype_atalkd, "%s: service unknown", as->as_name );
 	    } else {
 		as->as_port = ntohs( se->s_port );
 	    }
 	    if (( ap = (struct atport *)malloc( sizeof( struct atport ))) ==
 		    NULL ) {
-		LOG(log_error, logtype_default, "malloc: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "malloc: %s", strerror(errno) );
 		atalkd_exit( 1 );
 	    }
 	    ap->ap_fd = 0;
@@ -1325,23 +1325,23 @@ void setaddr(struct interface *iface,
     memcpy( iface->i_addr.sat_zero, &nr, sizeof( struct netrange ));
 
     if ( ifconfig( iface->i_name, SIOCSIFADDR, &iface->i_addr )) {
-      LOG(log_error, logtype_default, "setifaddr: %s (%u-%u): %s. try specifying a \
+      LOG(log_error, logtype_atalkd, "setifaddr: %s (%u-%u): %s. try specifying a \
 smaller net range.", iface->i_name, ntohs(first), ntohs(last), strerror(errno));
 	atalkd_exit( 1 );
     }
     if ( ifconfig( iface->i_name, SIOCGIFADDR, &iface->i_addr )) {
-	LOG(log_error, logtype_default, "getifaddr: %s: %s", iface->i_name, strerror(errno) );
+	LOG(log_error, logtype_atalkd, "getifaddr: %s: %s", iface->i_name, strerror(errno) );
 	atalkd_exit( 1 );
     }
 
     /* open ports */
     i = 1; /* enable broadcasts */
 #ifdef __svr4__ 
-    LOG(log_info, logtype_default, "setsockopt incompatible w/ Solaris STREAMS module.");
+    LOG(log_info, logtype_atalkd, "setsockopt incompatible w/ Solaris STREAMS module.");
 #endif /* __svr4__ */
     for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
 	if (( ap->ap_fd = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
-	    LOG(log_error, logtype_default, "socket: %s", strerror(errno) );
+	    LOG(log_error, logtype_atalkd, "socket: %s", strerror(errno) );
 	    atalkd_exit( 1 );
 	}
 #ifndef __svr4__
@@ -1359,7 +1359,7 @@ smaller net range.", iface->i_name, ntohs(first), ntohs(last), strerror(errno));
 
 	if ( bind( ap->ap_fd, (struct sockaddr *)&sat,
 		sizeof( struct sockaddr_at )) < 0 ) {
-	    LOG(log_error, logtype_default, "bind %u.%u:%u: %s",
+	    LOG(log_error, logtype_atalkd, "bind %u.%u:%u: %s",
 		    ntohs( sat.sat_addr.s_net ),
 		    sat.sat_addr.s_node, sat.sat_port, strerror(errno) );
 #ifdef SIOCDIFADDR
diff --git a/etc/atalkd/multicast.c b/etc/atalkd/multicast.c
index c17aa08b..4af0bfaa 100644
--- a/etc/atalkd/multicast.c
+++ b/etc/atalkd/multicast.c
@@ -1,5 +1,5 @@
 /*
- * $Id: multicast.c,v 1.9 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: multicast.c,v 1.10 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -394,7 +394,7 @@ zone_bcast( zt )
 
     if (!zt->zt_bcast &&
 	(zt->zt_bcast = (u_char *) malloc(sizeof( ethermulti ))) == NULL) {
-       LOG(log_error, logtype_default, "zone_bcast malloc: %s", strerror(errno) );
+       LOG(log_error, logtype_atalkd, "zone_bcast malloc: %s", strerror(errno) );
        return -1;
      }
 
diff --git a/etc/atalkd/nbp.c b/etc/atalkd/nbp.c
index 8bfef5ec..3306c14c 100644
--- a/etc/atalkd/nbp.c
+++ b/etc/atalkd/nbp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp.c,v 1.9 2002-01-17 06:08:55 srittau Exp $
+ * $Id: nbp.c,v 1.10 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -64,7 +64,7 @@ void nbp_ack( fd, nh_op, nh_id, to )
     data += SZ_NBPHDR;
     if ( sendto( fd, packet, data - packet, 0, (struct sockaddr *)to,
 	    sizeof( struct sockaddr_at )) < 0 ) {
-	LOG(log_error, logtype_default, "sendto: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "sendto: %s", strerror(errno) );
     }
 }
 
@@ -89,23 +89,23 @@ int nbp_packet( ap, from, data, len )
 
     end = data + len;
     if ( data >= end ) {
-	LOG(log_info, logtype_default, "nbp_packet malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet malformed packet" );
 	return 1;
     }
     if ( *data++ != DDPTYPE_NBP ) {
-	LOG(log_info, logtype_default, "nbp_packet bad ddp type" );
+	LOG(log_info, logtype_atalkd, "nbp_packet bad ddp type" );
 	return 1;
     }
 
     if ( data + SZ_NBPHDR + SZ_NBPTUPLE > end ) {
-	LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
 	return 1;
     }
     memcpy( &nh, data, SZ_NBPHDR );
     nbpop = data;			/* remember for fwd and brrq */
     data += SZ_NBPHDR;
     if ( nh.nh_cnt != 1 ) {
-	LOG(log_info, logtype_default, "nbp_packet: bad tuple count (%d/%d)", nh.nh_cnt,
+	LOG(log_info, logtype_atalkd, "nbp_packet: bad tuple count (%d/%d)", nh.nh_cnt,
 		nh.nh_op );
 	return 1;
     }
@@ -125,7 +125,7 @@ int nbp_packet( ap, from, data, len )
     /* object */
     tmplen = (u_char) *data;
     if ( data >= end || tmplen > 32 || data + tmplen > end ) {
-	LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
 	return 1;
     }
     nn.nn_objlen = tmplen;
@@ -136,7 +136,7 @@ int nbp_packet( ap, from, data, len )
     /* type */
     tmplen = (u_char) *data;
     if ( data >= end || tmplen > 32 || data + tmplen > end ) {
-	LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
 	return 1;
     }
     nn.nn_typelen = tmplen;
@@ -147,7 +147,7 @@ int nbp_packet( ap, from, data, len )
     /* zone */
     tmplen = (u_char) *data;
     if ( data >= end || tmplen > 32 || data + tmplen > end ) {
-	LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
 	return 1;
     }
     zonep = data;			/* remember for fwd */
@@ -157,7 +157,7 @@ int nbp_packet( ap, from, data, len )
     data += nn.nn_zonelen;
 
     if ( data != end ) {
-	LOG(log_info, logtype_default, "nbp_packet: malformed packet" );
+	LOG(log_info, logtype_atalkd, "nbp_packet: malformed packet" );
 	return 1;
     }
 
@@ -213,7 +213,7 @@ int nbp_packet( ap, from, data, len )
 
 	    /* calculate and save multicast address */
 	    if (zone_bcast(zt) < 0) {
-	        LOG(log_error, logtype_default, "nbp_packet: zone_bcast");
+	        LOG(log_error, logtype_atalkd, "nbp_packet: zone_bcast");
 		return -1;
 	    }
 
@@ -225,7 +225,7 @@ int nbp_packet( ap, from, data, len )
 		    if ( zt == (struct ziptab *)l->l_data ) {
 		        /* add multicast */
 		        if (addmulti(iface->i_name, zt->zt_bcast) < 0) {
-			    LOG(log_error, logtype_default, "nbp_packet: addmulti: %s",
+			    LOG(log_error, logtype_atalkd, "nbp_packet: addmulti: %s",
 				    strerror(errno) );
 			    return -1;
 			}
@@ -236,7 +236,7 @@ int nbp_packet( ap, from, data, len )
 
 	if (( ntab = (struct nbptab *)malloc( sizeof( struct nbptab )))
 		== 0 ) {
-	    LOG(log_error, logtype_default, "nbp_packet: malloc: %s", strerror(errno) );
+	    LOG(log_error, logtype_atalkd, "nbp_packet: malloc: %s", strerror(errno) );
 	    return -1;
 	}
 	memcpy( &ntab->nt_nve, &nn, sizeof( struct nbpnve ));
@@ -411,7 +411,7 @@ int nbp_packet( ap, from, data, len )
 
 	    if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)&sat,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "nbp brrq sendto: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "nbp brrq sendto: %s", strerror(errno) );
 	    }
 
 	    locallkup = 1;
@@ -432,7 +432,7 @@ int nbp_packet( ap, from, data, len )
 			}
 		    }
 		    if ( !iface ) {
-			LOG(log_error, logtype_default, "nbp_packet: \
+			LOG(log_error, logtype_atalkd, "nbp_packet: \
 Can't find route's interface!" );
 			return -1;
 		    }
@@ -446,7 +446,7 @@ Can't find route's interface!" );
 		    }
 		}
 		if ( !ap ) {
-		    LOG(log_error, logtype_default, "nbp_packet: Can't find port!" );
+		    LOG(log_error, logtype_atalkd, "nbp_packet: Can't find port!" );
 		    return -1;
 		}
 
@@ -477,7 +477,7 @@ Can't find route's interface!" );
 		if ( sendto( ap->ap_fd, data - len, len, 0,
 			(struct sockaddr *)&sat,
 			sizeof( struct sockaddr_at )) < 0 ) {
-		    LOG(log_error, logtype_default, "nbp brrq sendto %u.%u: %s",
+		    LOG(log_error, logtype_atalkd, "nbp brrq sendto %u.%u: %s",
 			    ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node,
 			    strerror(errno) );
 		    continue;
@@ -499,7 +499,7 @@ Can't find route's interface!" );
 	    from->sat_addr.s_node = ATADDR_BCAST;
 	    if ( sendto( ap->ap_fd, data - len, len, 0, (struct sockaddr *)from,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "nbp fwd sendto %u.%u: %s",
+		LOG(log_error, logtype_atalkd, "nbp fwd sendto %u.%u: %s",
 			ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
 			strerror(errno) );
 		return 0;
@@ -575,7 +575,7 @@ Can't find route's interface!" );
 		if ( sendto( ap->ap_fd, packet, cc, 0,
 			(struct sockaddr *)&nn.nn_sat,
 			sizeof( struct sockaddr_at )) < 0 ) {
-		    LOG(log_error, logtype_default, "nbp lkup sendto %u.%u: %s",
+		    LOG(log_error, logtype_atalkd, "nbp lkup sendto %u.%u: %s",
 			    ntohs( nn.nn_sat.sat_addr.s_net ),
 			    nn.nn_sat.sat_addr.s_node,
 			    strerror(errno) );
@@ -638,7 +638,7 @@ Can't find route's interface!" );
 	    if ( sendto( ap->ap_fd, packet, cc, 0,
 		    (struct sockaddr *)&nn.nn_sat,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "nbp lkup sendto %u.%u: %s",
+		LOG(log_error, logtype_atalkd, "nbp lkup sendto %u.%u: %s",
 			ntohs( nn.nn_sat.sat_addr.s_net ),
 			nn.nn_sat.sat_addr.s_node,
 			strerror(errno) );
@@ -648,7 +648,7 @@ Can't find route's interface!" );
 	break;
 
     default :
-	LOG(log_info, logtype_default, "nbp_packet: bad op (%d)", nh.nh_op );
+	LOG(log_info, logtype_atalkd, "nbp_packet: bad op (%d)", nh.nh_op );
 	return 1;
     }
 
diff --git a/etc/atalkd/rtmp.c b/etc/atalkd/rtmp.c
index 554ba0ed..7e384e5a 100644
--- a/etc/atalkd/rtmp.c
+++ b/etc/atalkd/rtmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rtmp.c,v 1.11 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: rtmp.c,v 1.12 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -109,7 +109,7 @@ static int rtmp_config( rh, iface )
      * configuration with RTMP.
      */
     if ( iface->i_flags & IFACE_PHASE2 ) {
-	LOG(log_info, logtype_default, "rtmp_config ignoring data" );
+	LOG(log_info, logtype_atalkd, "rtmp_config ignoring data" );
 	return 0;
     }
 
@@ -119,7 +119,7 @@ static int rtmp_config( rh, iface )
     if ( rh->rh_net != iface->i_addr.sat_addr.s_net ) {
 	if (( iface->i_flags & IFACE_SEED ) &&
 		rh->rh_net != iface->i_caddr.sat_addr.s_net) {
-	    LOG(log_error, logtype_default, "rtmp_config net mismatch %u != %u",
+	    LOG(log_error, logtype_atalkd, "rtmp_config net mismatch %u != %u",
 		    ntohs( rh->rh_net ),
 		    ntohs( iface->i_addr.sat_addr.s_net ));
 	    return 1;
@@ -142,13 +142,13 @@ static int rtmp_config( rh, iface )
       return -1;
 
     if (cc) {
-	LOG(log_error, logtype_default, "rtmp_config: can't route %u.%u to loopback: %s",
+	LOG(log_error, logtype_atalkd, "rtmp_config: can't route %u.%u to loopback: %s",
 		ntohs( iface->i_addr.sat_addr.s_net ),
 		iface->i_addr.sat_addr.s_node,
 		strerror(errno) );
     }
 
-    LOG(log_info, logtype_default, "rtmp_config configured %s", iface->i_name );
+    LOG(log_info, logtype_atalkd, "rtmp_config configured %s", iface->i_name );
     iface->i_flags |= IFACE_CONFIG;
     if ( iface == ciface ) {
 	ciface = ciface->i_next;
@@ -243,7 +243,7 @@ static int rtmp_copyzones( to, from )
 	    }
 	}
 	if ( lr == NULL ) {
-	    LOG(log_error, logtype_default, "rtmp_copyzones z -> r without r -> z, abort" );
+	    LOG(log_error, logtype_atalkd, "rtmp_copyzones z -> r without r -> z, abort" );
 	    return -1;
 	}
     }
@@ -261,7 +261,7 @@ void rtmp_free( rtmp )
 {
     struct gate		*gate;
 
-    LOG(log_info, logtype_default, "rtmp_free: %u-%u", ntohs(rtmp->rt_firstnet),
+    LOG(log_info, logtype_atalkd, "rtmp_free: %u-%u", ntohs(rtmp->rt_firstnet),
 	   ntohs(rtmp->rt_lastnet));
     if ( rtmp->rt_iprev ) {
 	rtmp_delinuse( rtmp );
@@ -301,7 +301,7 @@ int rtmp_replace( replace )
     struct gate		*gate;
     struct rtmptab	*rtmp, *found = NULL;
 
-    LOG(log_info, logtype_default, "rtmp_replace %u-%u", ntohs(replace->rt_firstnet),
+    LOG(log_info, logtype_atalkd, "rtmp_replace %u-%u", ntohs(replace->rt_firstnet),
 	   ntohs(replace->rt_lastnet));
     for ( iface = interfaces; iface; iface = iface->i_next ) {
         if ((replace->rt_iface != iface) && 
@@ -376,7 +376,7 @@ static int rtmp_new( rtmp )
     if ( i ) {	/* can we get here without r being set? */
 	if ( r->rt_firstnet != rtmp->rt_firstnet ||
 		r->rt_lastnet != rtmp->rt_lastnet ) {
-	    LOG(log_info, logtype_default, "rtmp_new netrange mismatch %u-%u != %u-%u",
+	    LOG(log_info, logtype_atalkd, "rtmp_new netrange mismatch %u-%u != %u-%u",
 		    ntohs( r->rt_firstnet ), ntohs( r->rt_lastnet ),
 		    ntohs( rtmp->rt_firstnet ), ntohs( rtmp->rt_lastnet ));
 	    return 1;
@@ -420,7 +420,7 @@ int rtmp_packet( ap, from, data, len )
     end = data + len;
 
     if ( data >= end ) {
-	LOG(log_info, logtype_default, "rtmp_packet no data" );
+	LOG(log_info, logtype_atalkd, "rtmp_packet no data" );
 	return 1;
     }
 
@@ -438,7 +438,7 @@ int rtmp_packet( ap, from, data, len )
 	 * Response and Data.
 	 */
 	if ( data + sizeof( struct rtmprdhdr ) > end ) {
-	    LOG(log_info, logtype_default, "rtmp_packet no data header" );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet no data header" );
 	    return 1;
 	}
 	memcpy( &rh, data, sizeof( struct rtmprdhdr ));
@@ -446,13 +446,13 @@ int rtmp_packet( ap, from, data, len )
 
 	/* check rh address against from address */
 	if ( rh.rh_nodelen != 8 ) {
-	    LOG(log_info, logtype_default, "rtmp_packet bad node len (%d)", rh.rh_nodelen );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet bad node len (%d)", rh.rh_nodelen );
 	    return 1;
 	}
 	if (( from->sat_addr.s_net != 0 && 
 	      from->sat_addr.s_net != rh.rh_net ) ||
 	      from->sat_addr.s_node != rh.rh_node ) {
-	    LOG(log_info, logtype_default, "rtmp_packet address mismatch" );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet address mismatch" );
 	    return 1;
 	}
 
@@ -460,25 +460,25 @@ int rtmp_packet( ap, from, data, len )
 	    if ( iface->i_flags & IFACE_NOROUTER ) {
 		/* remove addr to loopback route */
   	        if ((cc = looproute( iface, RTMP_DEL )) < 0) {
-		  LOG(log_error, logtype_default, "rtmp_packet: looproute");
+		  LOG(log_error, logtype_atalkd, "rtmp_packet: looproute");
 		  return -1;
 	        } 
 
 		if (cc)
-		  LOG(log_error, logtype_default, "rtmp_packet: can't remove loopback: %s",
+		  LOG(log_error, logtype_atalkd, "rtmp_packet: can't remove loopback: %s",
 			  strerror(errno) );
 
 		iface->i_flags &= ~IFACE_NOROUTER;
 		iface->i_time = 0;
-		LOG(log_info, logtype_default, "rtmp_packet router has become available" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet router has become available" );
 	    }
 	    if ( iface->i_flags & IFACE_PHASE1 ) {
 	      if (rtmp_config( &rh, iface ) < 0) {
-		  LOG(log_error, logtype_default, "rtmp_packet: rtmp_config");
+		  LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_config");
 		  return -1;
 	      }
 	    } else if (zip_getnetinfo( iface ) < 0) {
-	      LOG(log_error, logtype_default, "rtmp_packet: zip_getnetinfo");
+	      LOG(log_error, logtype_atalkd, "rtmp_packet: zip_getnetinfo");
 	      return -1;
 	    }
 	    return 0;
@@ -492,7 +492,7 @@ int rtmp_packet( ap, from, data, len )
 	 * Parse first tuple.  For phase 2, verify that net is correct.
 	 */
 	if ( data + SZ_RTMPTUPLE > end ) {
-	    LOG(log_info, logtype_default, "rtmp_packet missing first tuple" );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet missing first tuple" );
 	    return 1;
 	}
 	memcpy( &rt, data, SZ_RTMPTUPLE );
@@ -500,7 +500,7 @@ int rtmp_packet( ap, from, data, len )
 
 	if ( rt.rt_net == 0 ) {
 	    if ( rt.rt_dist != 0x82 ) {
-		LOG(log_info, logtype_default, "rtmp_packet bad phase 1 version" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet bad phase 1 version" );
 		return 1;
 	    }
 
@@ -510,21 +510,21 @@ int rtmp_packet( ap, from, data, len )
 	     * no extended tuples in this packet.
 	     */
 	    if ( data + SZ_RTMPTUPLE > end ) {
-		LOG(log_info, logtype_default, "rtmp_packet missing second tuple" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet missing second tuple" );
 		return 1;
 	    }
 	    memcpy( &rt, data, SZ_RTMPTUPLE );
 	    data += SZ_RTMPTUPLE;
 	} else if ( rt.rt_dist & 0x80 ) {
 	    if ( data + SZ_RTMPTUPLE > end ) {
-		LOG(log_info, logtype_default, "rtmp_packet missing first range-end" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet missing first range-end" );
 		return 1;
 	    }
 	    memcpy( &xrt, data, SZ_RTMPTUPLE );
 	    data += SZ_RTMPTUPLE;
 
 	    if ( xrt.rt_dist != 0x82 ) {
-		LOG(log_info, logtype_default, "rtmp_packet bad phase 2 version" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet bad phase 2 version" );
 		return 1;
 	    }
 
@@ -533,7 +533,7 @@ int rtmp_packet( ap, from, data, len )
 	     */
 	    if ( rt.rt_net != iface->i_rt->rt_firstnet ||
 		    xrt.rt_net != iface->i_rt->rt_lastnet ) {
-		LOG(log_info, logtype_default, "rtmp_packet interface mismatch" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet interface mismatch" );
 		return 1;
 	    }
 	} else {
@@ -544,12 +544,12 @@ int rtmp_packet( ap, from, data, len )
 	     * might just as well check it.
 	    if ( rt.rt_net != iface->i_rt->rt_firstnet ||
 		    rt.rt_net != iface->i_rt->rt_lastnet ) {
-		LOG(log_info, logtype_default, "rtmp_packet phase 1 interface mismatch" );
+		LOG(log_info, logtype_atalkd, "rtmp_packet phase 1 interface mismatch" );
 		return 1;
 	    }
 	     */
 #else /* PHASE1NET */
-	    LOG(log_info, logtype_default, "rtmp_packet bad first tuple" );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet bad first tuple" );
 	    return 1;
 #endif /* PHASE1NET */
 	}
@@ -565,7 +565,7 @@ int rtmp_packet( ap, from, data, len )
 	}
 	if ( !gate ) {	/* new gateway */
 	    if (( gate = (struct gate *)malloc( sizeof( struct gate ))) == 0 ) {
-		LOG(log_error, logtype_default, "rtmp_packet: malloc: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "rtmp_packet: malloc: %s", strerror(errno) );
 		return -1;
 	    }
 	    gate->g_next = iface->i_gate;
@@ -577,7 +577,7 @@ int rtmp_packet( ap, from, data, len )
 		iface->i_gate->g_prev = gate;
 	    }
 	    iface->i_gate = gate;
-	    LOG(log_info, logtype_default, "rtmp_packet gateway %u.%u up",
+	    LOG(log_info, logtype_atalkd, "rtmp_packet gateway %u.%u up",
 		    ntohs( gate->g_sat.sat_addr.s_net ),
 		    gate->g_sat.sat_addr.s_node );
 	}
@@ -613,29 +613,29 @@ int rtmp_packet( ap, from, data, len )
 		 * ugly.)
 		 */
 		if ( rtmp->rt_firstnet != rt.rt_net ) {
-		    LOG(log_info, logtype_default, "rtmp_packet firstnet mismatch %u!=%u",
+		    LOG(log_info, logtype_atalkd, "rtmp_packet firstnet mismatch %u!=%u",
 			    ntohs( rtmp->rt_firstnet ), ntohs( rt.rt_net ));
 		    return 1;
 		}
 		if ( rt.rt_dist & 0x80 ) {
 		    if (( rtmp->rt_flags & RTMPTAB_EXTENDED ) == 0 ) {
-			LOG(log_info, logtype_default, "rtmp_packet extended mismatch %u",
+			LOG(log_info, logtype_atalkd, "rtmp_packet extended mismatch %u",
 				ntohs( rtmp->rt_firstnet ));
 			return 1;
 		    }
 		    if ( rtmp->rt_lastnet != xrt.rt_net ) {
-			LOG(log_info, logtype_default, "rtmp_packet lastnet mismatch %u!=%u",
+			LOG(log_info, logtype_atalkd, "rtmp_packet lastnet mismatch %u!=%u",
 			    ntohs( rtmp->rt_lastnet ), ntohs( xrt.rt_net ));
 			return 1;
 		    }
 		} else {
 		    if ( rtmp->rt_flags & RTMPTAB_EXTENDED ) {
-			LOG(log_info, logtype_default, "rtmp_packet !extended mismatch %u",
+			LOG(log_info, logtype_atalkd, "rtmp_packet !extended mismatch %u",
 				ntohs( rtmp->rt_firstnet ));
 			return 1;
 		    }
 		    if ( rtmp->rt_lastnet != rt.rt_net ) {
-			LOG(log_info, logtype_default, "rtmp_packet lastnet mismatch %u!=%u",
+			LOG(log_info, logtype_atalkd, "rtmp_packet lastnet mismatch %u!=%u",
 			    ntohs( rtmp->rt_lastnet ), ntohs( rt.rt_net ));
 			return 1;
 		    }
@@ -673,7 +673,7 @@ int rtmp_packet( ap, from, data, len )
 				rtmp->rt_hops = ( rt.rt_dist & 0x7f ) + 1;
 			    }
 			    if (rtmp_replace( rtmp ) < 0) {
-			      LOG(log_error, logtype_default, "rtmp_packet: rtmp_replace");
+			      LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_replace");
 			      return -1;
 			    }
 			}
@@ -681,7 +681,7 @@ int rtmp_packet( ap, from, data, len )
 			rtmp->rt_hops = ( rt.rt_dist & 0x7f ) + 1;
 			if ( rtmp->rt_hops > ( rt.rt_dist & 0x7f ) + 1 ) {
 			  if (rtmp_new( rtmp ) < 0) {
-			      LOG(log_error, logtype_default, "rtmp_packet: rtmp_new");
+			      LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_new");
 			      return -1;
 			  }
 			}
@@ -699,12 +699,12 @@ int rtmp_packet( ap, from, data, len )
 		    rtmp->rt_next = 0;
 		}
 	    } else if (( rt.rt_dist & 0x7f ) + 1 > RTMPHOPS_MAX ) {
-		LOG(log_info, logtype_default, "rtmp_packet bad hop count from %u.%u for %u",
+		LOG(log_info, logtype_atalkd, "rtmp_packet bad hop count from %u.%u for %u",
 			ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
 			ntohs( rt.rt_net ));
 	    } else {		/* new for router */
 		if (( rtmp = newrt(iface)) == NULL ) {
-		    LOG(log_error, logtype_default, "rtmp_packet: newrt: %s", strerror(errno) );
+		    LOG(log_error, logtype_atalkd, "rtmp_packet: newrt: %s", strerror(errno) );
 		    return -1;
 		}
 		rtmp->rt_firstnet = rt.rt_net;
@@ -731,7 +731,7 @@ int rtmp_packet( ap, from, data, len )
 		}
 		
 		if (rtmp_new( rtmp ) < 0) {
-		    LOG(log_error, logtype_default, "rtmp_packet: rtmp_new");
+		    LOG(log_error, logtype_atalkd, "rtmp_packet: rtmp_new");
 		    return -1;
 		}
 	    }
@@ -743,7 +743,7 @@ int rtmp_packet( ap, from, data, len )
 	    data += SZ_RTMPTUPLE;
 	    if ( rt.rt_dist & 0x80 ) {
 		if ( data + SZ_RTMPTUPLE > end ) {
-		    LOG(log_info, logtype_default, "rtmp_packet missing range-end" );
+		    LOG(log_info, logtype_atalkd, "rtmp_packet missing range-end" );
 		    return 1;
 		}
 		memcpy( &xrt, data, SZ_RTMPTUPLE );
@@ -755,7 +755,7 @@ int rtmp_packet( ap, from, data, len )
 	 * Make sure we've processed the whole packet.
 	 */
 	if ( data != end ) {
-	    LOG(log_info, logtype_default, "rtmp_packet length and count mismatch" );
+	    LOG(log_info, logtype_atalkd, "rtmp_packet length and count mismatch" );
 	}
 	break;
 
@@ -791,7 +791,7 @@ int rtmp_packet( ap, from, data, len )
 	    if ( sendto( ap->ap_fd, packet, data - packet, 0,
 		    (struct sockaddr *)from,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "as_timer sendto: %s", strerror(errno) );
+		LOG(log_error, logtype_atalkd, "as_timer sendto: %s", strerror(errno) );
 	    }
 	} else if ( *data == 2 || *data == 3 ) {
 #ifdef DEBUG
@@ -800,13 +800,13 @@ int rtmp_packet( ap, from, data, len )
 		    from->sat_addr.s_node );
 #endif /* DEBUG */
 	} else {
-	    LOG(log_info, logtype_default, "rtmp_packet unknown request from %u.%u\n",
+	    LOG(log_info, logtype_atalkd, "rtmp_packet unknown request from %u.%u\n",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	}
 	break;
 
     default :
-	LOG(log_info, logtype_default, "rtmp_packet bad ddp type from %u.%u",
+	LOG(log_info, logtype_atalkd, "rtmp_packet bad ddp type from %u.%u",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	return 0;
     }
@@ -821,7 +821,7 @@ int rtmp_request( iface )
     struct atport	*ap;
     char		*data, packet[ 2 ];
 
-    LOG(log_info, logtype_default, "rtmp_request for %s", iface->i_name );
+    LOG(log_info, logtype_atalkd, "rtmp_request for %s", iface->i_name );
 
     for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
 	if ( ap->ap_packet == rtmp_packet ) {
@@ -829,7 +829,7 @@ int rtmp_request( iface )
 	}
     }
     if ( ap == 0 ) {
-	LOG(log_error, logtype_default, "rtmp_request can't find rtmp socket!" );
+	LOG(log_error, logtype_atalkd, "rtmp_request can't find rtmp socket!" );
 	return -1;
     }
 
@@ -850,7 +850,7 @@ int rtmp_request( iface )
     sat.sat_port = ap->ap_port;
     if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
 	    sizeof( struct sockaddr_at )) < 0 ) {
-	LOG(log_error, logtype_default, "rtmp_request sendto: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "rtmp_request sendto: %s", strerror(errno) );
 	return -1;
     }
     return 0;
@@ -864,12 +864,12 @@ int looproute( iface, cmd )
     struct sockaddr_at	dst, loop;
 
     if ( cmd == RTMP_DEL && ( iface->i_flags & IFACE_LOOP ) == 0 ) {
-	LOG(log_error, logtype_default, "looproute panic no route" );
+	LOG(log_error, logtype_atalkd, "looproute panic no route" );
 	return -1;
     }
 
     if ( cmd == RTMP_ADD && ( iface->i_flags & IFACE_LOOP )) {
-	LOG(log_error, logtype_default, "looproute panic two routes" );
+	LOG(log_error, logtype_atalkd, "looproute panic two routes" );
 	return -1;
     }
 
@@ -958,7 +958,7 @@ int gateroute( command, rtmp )
 		    (struct sockaddr *) &dst,
 		    (struct sockaddr *) &gate,
 		    RTF_UP | RTF_GATEWAY )) {
-	    LOG(log_error, logtype_default, "route: %u -> %u.%u: %s", net,
+	    LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %s", net,
 		    ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node,
 		    strerror(errno) );
 	    continue;
@@ -968,7 +968,7 @@ int gateroute( command, rtmp )
 		    (struct sockaddr_at *) &dst,
 		    (struct sockaddr_at *) &gate,
 		    RTF_UP | RTF_GATEWAY )) {
-	    LOG(log_error, logtype_default, "route: %u -> %u.%u: %m", net,
+	    LOG(log_error, logtype_atalkd, "route: %u -> %u.%u: %m", net,
 	    	    ntohs( gate.sat_addr.s_net ), gate.sat_addr.s_node );
 	    continue;
 	}
diff --git a/etc/atalkd/zip.c b/etc/atalkd/zip.c
index 4b202afd..a5470184 100644
--- a/etc/atalkd/zip.c
+++ b/etc/atalkd/zip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zip.c,v 1.10 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: zip.c,v 1.11 2002-09-29 23:24:47 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -69,7 +69,7 @@ static int zonecheck( rtmp, iface )
 	    }
 	}
 	if ( l == 0 ) {
-	    LOG(log_error, logtype_default, "zonecheck: %.*s not in zone list", czt->zt_len,
+	    LOG(log_error, logtype_atalkd, "zonecheck: %.*s not in zone list", czt->zt_len,
 		    czt->zt_name );
 	    return( -1 );	/* configured zone not found in net zones */
 	}
@@ -79,7 +79,7 @@ static int zonecheck( rtmp, iface )
 	;
 
     if ( cztcnt != ztcnt ) {
-	LOG(log_error, logtype_default, "zonecheck: %d configured zones, %d zones found",
+	LOG(log_error, logtype_atalkd, "zonecheck: %d configured zones, %d zones found",
 		cztcnt, ztcnt );
 	return( -1 );		/* more net zones than configured zones */
     }
@@ -110,7 +110,7 @@ int zip_packet( ap, from, data, len )
     end = data + len;
 
     if ( data >= end ) {
-	LOG(log_info, logtype_default, "zip_packet malformed packet" );
+	LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 	return 1;
     }
 
@@ -120,7 +120,7 @@ int zip_packet( ap, from, data, len )
     switch( *data++ ) {
     case DDPTYPE_ZIP :
 	if ( data + sizeof( struct ziphdr ) > end ) {
-	    LOG(log_info, logtype_default, "zip_packet malformed packet" );
+	    LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 	    return 1;
 	}
 	memcpy( &zh, data, sizeof( struct ziphdr ));
@@ -182,7 +182,7 @@ int zip_packet( ap, from, data, len )
 			if ( sendto( ap->ap_fd, packet, reply - packet, 0,
 				(struct sockaddr *)from,
 				sizeof( struct sockaddr_at )) < 0 ) {
-			    LOG(log_error, logtype_default, "zip reply sendto: %s",
+			    LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
 				    strerror(errno) );
 			}
 
@@ -202,7 +202,7 @@ int zip_packet( ap, from, data, len )
 				if ( sendto( ap->ap_fd, packet, reply - packet,
 					0, (struct sockaddr *)from,
 					sizeof( struct sockaddr_at )) < 0 ) {
-				    LOG(log_error, logtype_default, "zip reply sendto: %s",
+				    LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
 					    strerror(errno) );
 				}
 
@@ -224,7 +224,7 @@ int zip_packet( ap, from, data, len )
 			    if ( sendto( ap->ap_fd, packet, reply - packet, 0,
 				    (struct sockaddr *)from,
 				    sizeof( struct sockaddr_at )) < 0 ) {
-				LOG(log_error, logtype_default, "zip reply sendto: %s",
+				LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
 					strerror(errno) );
 			    }
 
@@ -252,7 +252,7 @@ int zip_packet( ap, from, data, len )
 		if ( sendto( ap->ap_fd, packet, reply - packet, 0,
 			(struct sockaddr *)from,
 			sizeof( struct sockaddr_at )) < 0 ) {
-		    LOG(log_error, logtype_default, "zip reply sendto: %s",
+		    LOG(log_error, logtype_atalkd, "zip reply sendto: %s",
 			    strerror(errno) );
 		}
 	    }
@@ -267,7 +267,7 @@ int zip_packet( ap, from, data, len )
 		}
 	    }
 	    if ( gate == NULL ) {
-		LOG(log_info, logtype_default, "zip reply from non-gateway %u.%u", 
+		LOG(log_info, logtype_atalkd, "zip reply from non-gateway %u.%u", 
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 		return 1;
 	    }
@@ -276,7 +276,7 @@ int zip_packet( ap, from, data, len )
 
 	    do {
 		if ( data + sizeof( u_short ) + 1 > end ) {	/* + strlen */
-		    LOG(log_info, logtype_default, "zip reply short (%d)", len );
+		    LOG(log_info, logtype_atalkd, "zip reply short (%d)", len );
 		    return 1;
 		}
 		memcpy( &firstnet, data, sizeof( u_short ));
@@ -286,7 +286,7 @@ int zip_packet( ap, from, data, len )
 		    /* XXX */
 		    if ( rtmp->rt_gate == NULL &&
 			    zonecheck( rtmp, gate->g_iface ) != 0 ) {
-			LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+			LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
 			return -1;
 		    }
 		    rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
@@ -314,11 +314,11 @@ int zip_packet( ap, from, data, len )
 
 		zlen = *data++;
 		if ( zlen > 32 || zlen <= 0 ) {
-		    LOG(log_info, logtype_default, "zip reply bad packet" );
+		    LOG(log_info, logtype_atalkd, "zip reply bad packet" );
 		    return 1;
 		}
 		if ( data + zlen > end ) {
-		    LOG(log_info, logtype_default, "zip reply short (%d)", len );
+		    LOG(log_info, logtype_atalkd, "zip reply short (%d)", len );
 		    return 1;
 		}
 		memcpy( zname, data, zlen );
@@ -329,7 +329,7 @@ int zip_packet( ap, from, data, len )
 		 * telling us about the entry.
 		 */
 		if ( rtmp == 0 ) {
-		    LOG(log_info, logtype_default, "zip skip reply %u from %u.%u (no rtmp)",
+		    LOG(log_info, logtype_atalkd, "zip skip reply %u from %u.%u (no rtmp)",
 			    ntohs( firstnet ), ntohs( from->sat_addr.s_net ),
 			    from->sat_addr.s_node );
 		/*
@@ -337,7 +337,7 @@ int zip_packet( ap, from, data, len )
 		 * no good if rtmp is the interface's route).
 		 */
 		} else if ( rtmp->rt_iprev == NULL && rtmp->rt_prev != NULL ) {
-		    LOG(log_info, logtype_default,
+		    LOG(log_info, logtype_atalkd,
 			    "zip skip reply %u-%u from %u.%u (rtmp not in use)",
 			    ntohs( rtmp->rt_firstnet ),
 			    ntohs( rtmp->rt_lastnet ),
@@ -349,7 +349,7 @@ int zip_packet( ap, from, data, len )
 		 * net to verify our interface's zone(s).
 		 */
 		} else if (( rtmp->rt_flags & RTMPTAB_ZIPQUERY ) == 0 ) {
-		    LOG(log_info, logtype_default,
+		    LOG(log_info, logtype_atalkd,
 			    "zip skip reply %u-%u from %u.%u (no query)",
 			    ntohs( rtmp->rt_firstnet ),
 			    ntohs( rtmp->rt_lastnet ),
@@ -357,7 +357,7 @@ int zip_packet( ap, from, data, len )
 			    from->sat_addr.s_node );
 		} else {
 		    if (addzone( rtmp, zlen, zname ) < 0) {
-		        LOG(log_error, logtype_default, "zip_packet: addzone");
+		        LOG(log_error, logtype_atalkd, "zip_packet: addzone");
 			return -1;
 		    }
 		    rtmp->rt_flags |= RTMPTAB_HASZONES;
@@ -368,7 +368,7 @@ int zip_packet( ap, from, data, len )
 		/* XXX */
 		if ( rtmp->rt_gate == 0 &&
 			zonecheck( rtmp, gate->g_iface ) != 0 ) {
-		    LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+		    LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
 		    return -1;
 		}
 		rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
@@ -384,7 +384,7 @@ int zip_packet( ap, from, data, len )
 		}
 	    }
 	    if ( gate == NULL ) {
-		LOG(log_info, logtype_default, "zip ereply from non-gateway %u.%u", 
+		LOG(log_info, logtype_atalkd, "zip ereply from non-gateway %u.%u", 
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 		return 1;
 	    }
@@ -394,7 +394,7 @@ int zip_packet( ap, from, data, len )
 	     * at the top of the do-while loop, below.
 	     */
 	    if ( data + sizeof( u_short ) + 1 > end ) {	/* + strlen */
-		LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+		LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
 		return 1;
 	    }
 	    memcpy( &firstnet, data, sizeof( u_short ));
@@ -409,13 +409,13 @@ int zip_packet( ap, from, data, len )
 		    }
 		}
 		if ( rtmp == NULL ) {
-		    LOG(log_info, logtype_default, "zip ereply %u from %u.%u (no rtmp)",
+		    LOG(log_info, logtype_atalkd, "zip ereply %u from %u.%u (no rtmp)",
 			    ntohs( firstnet ), ntohs( from->sat_addr.s_net ),
 			    from->sat_addr.s_node );
 		    return 1;
 		}
 		if ( rtmp->rt_iprev == 0 ) {
-		    LOG(log_info, logtype_default,
+		    LOG(log_info, logtype_atalkd,
 			    "zip ereply %u-%u from %u.%u (rtmp not in use)",
 			    ntohs( rtmp->rt_firstnet ),
 			    ntohs( rtmp->rt_lastnet ),
@@ -432,7 +432,7 @@ int zip_packet( ap, from, data, len )
 	    }
 
 	    if (( rtmp->rt_flags & RTMPTAB_ZIPQUERY ) == 0 ) {
-		LOG(log_info, logtype_default, "zip ereply %u-%u from %u.%u (no query)",
+		LOG(log_info, logtype_atalkd, "zip ereply %u-%u from %u.%u (no query)",
 			ntohs( rtmp->rt_firstnet ),
 			ntohs( rtmp->rt_lastnet ),
 			ntohs( from->sat_addr.s_net ),
@@ -446,7 +446,7 @@ int zip_packet( ap, from, data, len )
 		 * a big deal, and it makes the end condition cleaner.
 		 */
 		if ( data + sizeof( u_short ) + 1 > end ) {	/* + strlen */
-		    LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+		    LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
 		    return 1;
 		}
 		memcpy( &firstnet, data, sizeof( u_short ));
@@ -454,23 +454,23 @@ int zip_packet( ap, from, data, len )
 
 		/* check route */
 		if ( firstnet != rtmp->rt_firstnet ) {
-		    LOG(log_info, logtype_default, "zip ereply with multiple nets" );
+		    LOG(log_info, logtype_atalkd, "zip ereply with multiple nets" );
 		    return 1;
 		}
 
 		zlen = *data++;
 		if ( zlen > 32 || zlen <= 0 ) {
-		    LOG(log_info, logtype_default, "zip ereply bad zone length (%d)", zlen );
+		    LOG(log_info, logtype_atalkd, "zip ereply bad zone length (%d)", zlen );
 		    return 1;
 		}
 		if ( data + zlen > end ) {
-		    LOG(log_info, logtype_default, "zip ereply short (%d)", len );
+		    LOG(log_info, logtype_atalkd, "zip ereply short (%d)", len );
 		    return 1;
 		}
 		memcpy( zname, data, zlen );
 		data += zlen;
 		if (addzone( rtmp, zlen, zname ) < 0) {
-		    LOG(log_error, logtype_default, "zip_packet: addzone");
+		    LOG(log_error, logtype_atalkd, "zip_packet: addzone");
 		    return -1;
 		}
 	    } while ( data < end );
@@ -486,7 +486,7 @@ int zip_packet( ap, from, data, len )
 		    /* XXX */
 		    if ( rtmp->rt_gate == 0 &&
 			    zonecheck( rtmp, gate->g_iface ) != 0 ) {
-			LOG(log_error, logtype_default, "zip_packet seed zonelist mismatch" );
+			LOG(log_error, logtype_atalkd, "zip_packet seed zonelist mismatch" );
 			return -1;
 		    }
 		    rtmp->rt_flags &= ~RTMPTAB_ZIPQUERY;
@@ -505,7 +505,7 @@ int zip_packet( ap, from, data, len )
 	    }
 
 	    if ( zh.zh_zero != 0 || data + 2 * sizeof( u_short ) > end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 
@@ -514,13 +514,13 @@ int zip_packet( ap, from, data, len )
 	    memcpy( &lastnet, data, sizeof( u_short ));
 	    data += sizeof( u_short );
 	    if ( firstnet != 0 || lastnet != 0 || data >= end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 
 	    zlen = *data++;
 	    if ( zlen < 0 || zlen > 32 ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 	    memcpy( zname, data, zlen );
@@ -569,7 +569,7 @@ int zip_packet( ap, from, data, len )
 	    /* multicast */
 	    *data++ = 6;	/* sizeof ??? */
 	    if (zone_bcast(zt) < 0) {
-	      LOG(log_error, logtype_default, "zip_packet: zone_bcast");
+	      LOG(log_error, logtype_atalkd, "zip_packet: zone_bcast");
 	      return -1;
 	    }
 	    memcpy(data, zt->zt_bcast, 6);
@@ -603,7 +603,7 @@ int zip_packet( ap, from, data, len )
 	    if ( sendto( ap->ap_fd, packet, data - packet, 0,
 		    (struct sockaddr *)from,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "zip gni sendto %u.%u: %s",
+		LOG(log_error, logtype_atalkd, "zip gni sendto %u.%u: %s",
 			ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
 			strerror(errno) );
 		return 1;
@@ -614,18 +614,18 @@ int zip_packet( ap, from, data, len )
 	    /*
 	     * Ignore ZIP GNIReplys which are either late or unsolicited.
 	     */
-	    LOG(log_debug, logtype_default, "zip gnireply from %u.%u (%s %x)",
+	    LOG(log_debug, logtype_atalkd, "zip gnireply from %u.%u (%s %x)",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
 		    iface->i_name, iface->i_flags );
 
 	    if (( iface->i_flags & ( IFACE_CONFIG|IFACE_PHASE1 )) ||
 		    ( iface->i_flags & IFACE_ADDR ) == 0 ) {
-		LOG(log_debug, logtype_default, "zip ignoring gnireply" );
+		LOG(log_debug, logtype_atalkd, "zip ignoring gnireply" );
 		return 1;
 	    }
 
 	    if ( data + 2 * sizeof( u_short ) > end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 	    memcpy( &firstnet, data, sizeof( u_short ));
@@ -638,23 +638,23 @@ int zip_packet( ap, from, data, len )
 	     * default zone is.
 	     */
 	    if ( data >= end || data + *data > end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 	    if ( *data++ != 0 ) {
-		LOG(log_info, logtype_default, "zip_packet unsolicited zone" );
+		LOG(log_info, logtype_atalkd, "zip_packet unsolicited zone" );
 		return 1;
 	    }
 
 	    /* skip multicast (should really check it) */
 	    if ( data >= end || data + *data > end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 	    data += *data + 1;
 
 	    if ( data >= end || data + *data > end ) {
-		LOG(log_info, logtype_default, "zip_packet malformed packet" );
+		LOG(log_info, logtype_atalkd, "zip_packet malformed packet" );
 		return 1;
 	    }
 
@@ -669,18 +669,18 @@ int zip_packet( ap, from, data, len )
 		if ( iface->i_czt->zt_len != *data ||
 			strndiacasecmp( iface->i_czt->zt_name,
 			data + 1, *data ) != 0 ) {
-		    LOG(log_error, logtype_default, "default zone mismatch on %s",
+		    LOG(log_error, logtype_atalkd, "default zone mismatch on %s",
 			    iface->i_name );
-		    LOG(log_error, logtype_default, "%.*s != %.*s",
+		    LOG(log_error, logtype_atalkd, "%.*s != %.*s",
 			    iface->i_czt->zt_len, iface->i_czt->zt_name,
 			    *data, data + 1 );
-		    LOG(log_error, logtype_default, "Seed error! Exiting!" );
+		    LOG(log_error, logtype_atalkd, "Seed error! Exiting!" );
 		    return -1;
 		}
 	    }
 
 	    if (addzone( iface->i_rt, *data, data + 1 ) < 0) {
-	        LOG(log_error, logtype_default, "zip_packet: addzone");
+	        LOG(log_error, logtype_atalkd, "zip_packet: addzone");
 	        return -1;
 	    }
 	    
@@ -692,13 +692,13 @@ int zip_packet( ap, from, data, len )
 	    if ( firstnet != iface->i_rt->rt_firstnet ||
 		    lastnet != iface->i_rt->rt_lastnet ) {
 		if ( iface->i_flags & IFACE_SEED ) {
-		    LOG(log_error, logtype_default, "netrange mismatch on %s",
+		    LOG(log_error, logtype_atalkd, "netrange mismatch on %s",
 			    iface->i_name );
-		    LOG(log_error, logtype_default, "%u-%u != %u-%u",
+		    LOG(log_error, logtype_atalkd, "%u-%u != %u-%u",
 			    ntohs( firstnet ), ntohs( lastnet ),
 			    ntohs( iface->i_rt->rt_firstnet ),
 			    ntohs( iface->i_rt->rt_lastnet ));
-		    LOG(log_error, logtype_default, "Seed error! Exiting!" );
+		    LOG(log_error, logtype_atalkd, "Seed error! Exiting!" );
 		    return -1;
 		}
 
@@ -727,7 +727,7 @@ int zip_packet( ap, from, data, len )
 
 	    /* add addr to loopback route */
 	    if ( looproute( iface, RTMP_ADD )) { /* -1 or 1 */
-		LOG(log_error, logtype_default,
+		LOG(log_error, logtype_atalkd,
 			"zip_packet: can't route %u.%u to loopback: %s",
 			ntohs( iface->i_addr.sat_addr.s_net ),
 			iface->i_addr.sat_addr.s_node,
@@ -735,7 +735,7 @@ int zip_packet( ap, from, data, len )
 		return -1;
 	    }
 
-	    LOG(log_info, logtype_default, "zip_packet configured %s from %u.%u",
+	    LOG(log_info, logtype_atalkd, "zip_packet configured %s from %u.%u",
 		    iface->i_name, ntohs( from->sat_addr.s_net ),
 		    from->sat_addr.s_node );
 	    iface->i_flags |= IFACE_CONFIG;
@@ -753,25 +753,25 @@ int zip_packet( ap, from, data, len )
 	    break;
 
 	default :
-	    LOG(log_info, logtype_default, "zip_packet bad zip op from %u.%u\n",
+	    LOG(log_info, logtype_atalkd, "zip_packet bad zip op from %u.%u\n",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	}
 	break;
 
     case DDPTYPE_ATP :
 	if ( data + sizeof( struct atphdr ) > end ) {
-	    LOG(log_info, logtype_default, "zip atp malformed packet" );
+	    LOG(log_info, logtype_atalkd, "zip atp malformed packet" );
 	    return 1;
 	}
 	memcpy( &ah, data, sizeof( struct atphdr ));
 	data += sizeof( struct atphdr );
 	if ( ah.atphd_ctrlinfo != ATP_TREQ ) {
-	    LOG(log_info, logtype_default, "zip atp bad control" );
+	    LOG(log_info, logtype_atalkd, "zip atp bad control" );
 	    return 1;
 	}
 	ah.atphd_ctrlinfo = ATP_TRESP | ATP_EOM;
 	if ( ah.atphd_bitmap != 1 ) {
-	    LOG(log_error, logtype_default, "zip atp bad bitmap" );
+	    LOG(log_error, logtype_atalkd, "zip atp bad bitmap" );
 	    return 1;
 	}
 	ah.atphd_bitmap = 0;
@@ -782,7 +782,7 @@ int zip_packet( ap, from, data, len )
 	data += sizeof( u_short );
 	index = ntohs( index );
 	if ( data != end ) {
-	    LOG(log_info, logtype_default, "zip atp malformed packet" );
+	    LOG(log_info, logtype_atalkd, "zip atp malformed packet" );
 	    return 1;
 	}
 
@@ -799,7 +799,7 @@ int zip_packet( ap, from, data, len )
 	switch ( zipop ) {
 	case ZIPOP_GETMYZONE :
 	    if ( index != 0 ) {
-		LOG(log_info, logtype_default, "zip atp gmz bad index" );
+		LOG(log_info, logtype_atalkd, "zip atp gmz bad index" );
 		return 1;
 	    }
 
@@ -817,7 +817,7 @@ int zip_packet( ap, from, data, len )
 	    }
 	    zt = (struct ziptab *)iface->i_rt->rt_zt->l_data;
 	    if ( data + 1 + zt->zt_len > end ) {
-		LOG(log_info, logtype_default, "zip atp gmz reply too long" );
+		LOG(log_info, logtype_atalkd, "zip atp gmz reply too long" );
 		return 1;
 	    }
 	    *data++ = zt->zt_len;
@@ -870,7 +870,7 @@ int zip_packet( ap, from, data, len )
 	    break;
 
 	default :
-	    LOG(log_info, logtype_default, "zip atp bad option" );
+	    LOG(log_info, logtype_atalkd, "zip atp bad option" );
 	    return 1;
 	}
 
@@ -881,7 +881,7 @@ int zip_packet( ap, from, data, len )
 	    if ( sendto( ap->ap_fd, packet, data - packet, 0,
 		    (struct sockaddr *)from,
 		    sizeof( struct sockaddr_at )) < 0 ) {
-		LOG(log_error, logtype_default, "zip atp sendto %u.%u: %s",
+		LOG(log_error, logtype_atalkd, "zip atp sendto %u.%u: %s",
 			ntohs( from->sat_addr.s_net ), from->sat_addr.s_node,
 			strerror(errno) );
 		return 1;
@@ -890,7 +890,7 @@ int zip_packet( ap, from, data, len )
 	break;
 
     default :
-	LOG(log_info, logtype_default, "zip_packet bad ddp type from %u.%u\n",
+	LOG(log_info, logtype_atalkd, "zip_packet bad ddp type from %u.%u\n",
 		ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	return 1;
     }
@@ -907,7 +907,7 @@ int zip_getnetinfo( iface )
     char		*data, packet[ 40 ];
     u_short		net;
 
-    LOG(log_info, logtype_default, "zip_getnetinfo for %s", iface->i_name );
+    LOG(log_info, logtype_atalkd, "zip_getnetinfo for %s", iface->i_name );
 
     for ( ap = iface->i_ports; ap; ap = ap->ap_next ) {
 	if ( ap->ap_packet == zip_packet ) {
@@ -915,7 +915,7 @@ int zip_getnetinfo( iface )
 	}
     }
     if ( ap == 0 ) {
-	LOG(log_error, logtype_default, "zip_getnetinfo can't find zip socket!" );
+	LOG(log_error, logtype_atalkd, "zip_getnetinfo can't find zip socket!" );
 	return -1;
     }
 
@@ -949,7 +949,7 @@ int zip_getnetinfo( iface )
 
     if ( sendto( ap->ap_fd, packet, data - packet, 0, (struct sockaddr *)&sat,
 	    sizeof( struct sockaddr_at )) < 0 ) {
-	LOG(log_error, logtype_default, "zip_getnetinfo sendto: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "zip_getnetinfo sendto: %s", strerror(errno) );
 	return -1;
     }
     return 0;
@@ -993,7 +993,7 @@ static int add_list( head, data )
 	}
     }
     if (( l = (struct list *)malloc( sizeof( struct list ))) == NULL ) {
-	LOG(log_error, logtype_default, "add_list malloc: %s", strerror(errno) );
+	LOG(log_error, logtype_atalkd, "add_list malloc: %s", strerror(errno) );
 	return -1;
     }
 
@@ -1028,7 +1028,7 @@ int addzone( rt, len, zone )
     }
     if ( zt == NULL ) {
 	if (( zt = newzt( len, zone )) == NULL ) {
-	    LOG(log_error, logtype_default, "addzone newzt: %s", strerror(errno) );
+	    LOG(log_error, logtype_atalkd, "addzone newzt: %s", strerror(errno) );
 	    return -1;
 	}
 	if ( ziptab == NULL ) {
@@ -1052,7 +1052,7 @@ int addzone( rt, len, zone )
 
     if (cc) {
         if ( !exists ) {
-	    LOG(log_error, logtype_default, "addzone corrupted route/zone mapping" );
+	    LOG(log_error, logtype_atalkd, "addzone corrupted route/zone mapping" );
 	    return -1;
 	}
 	/*
@@ -1063,7 +1063,7 @@ int addzone( rt, len, zone )
 	return 0;
     }
     if ( exists ) {
-	LOG(log_error, logtype_default, "addzone corrupted zone/route mapping" );
+	LOG(log_error, logtype_atalkd, "addzone corrupted zone/route mapping" );
 	return -1;
     }
     return 0;