diff -Naur net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
--- net-tools-1.60-orig/hostname.c	2001-04-08 13:04:01.000000000 -0400
+++ net-tools-1.60/hostname.c	2004-09-16 18:16:05.060102008 -0400
@@ -77,7 +77,6 @@
         case EINVAL:
             fprintf(stderr, _("%s: name too long\n"), program_name);
             break;
-        default:
         }
 	exit(1);
     }
@@ -97,7 +96,6 @@
 	case EINVAL:
 	    fprintf(stderr, _("%s: name too long\n"), program_name);
 	    break;
-	default:
 	}
 	exit(1);
     };
@@ -116,7 +114,6 @@
 	case EINVAL:
 	    fprintf(stderr, _("%s: name too long\n"), program_name);
 	    break;
-	default:
 	}
 	exit(1);
     };
@@ -173,7 +170,6 @@
 	    *p = '\0';
 	printf("%s\n", hp->h_name);
 	break;
-    default:
     }
 }
 
diff -Naur net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
--- net-tools-1.60-orig/lib/inet_sr.c	2000-02-20 16:46:23.000000000 -0500
+++ net-tools-1.60/lib/inet_sr.c	2004-09-16 18:16:05.063101552 -0400
@@ -104,7 +104,6 @@
        isnet = 1; break;
     case 2:
        isnet = 0; break;
-    default:
     }
 
     /* Fill in the other fields. */
diff -Naur net-tools-1.60-orig/lib/x25.c net-tools-1.60/lib/x25.c
--- net-tools-1.60-orig/lib/x25.c	2000-05-20 14:53:03.000000000 -0400
+++ net-tools-1.60/lib/x25.c	2004-09-16 18:16:05.066101096 -0400
@@ -119,7 +119,7 @@
   /* All done. */
 #ifdef DEBUG
   fprintf(stderr, "x25_input(%s): ", orig);
-  for (i = 0; i < sizeof(x25_address); i++)
+  for (i = 0; i < sizeof(struct x25_address); i++)
 	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
   fprintf(stderr, "\n");
 #endif
diff -Naur net-tools-1.60-orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
--- net-tools-1.60-orig/lib/x25_sr.c	2000-05-20 09:37:48.000000000 -0400
+++ net-tools-1.60/lib/x25_sr.c	2004-09-16 18:16:05.068100792 -0400
@@ -77,7 +77,7 @@
   rt.sigdigits=sigdigits;
 
   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
 
   while (*args) {
 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {