Index: common-src/dgram.c
===================================================================
RCS file: /cvsroot/amanda/amanda/common-src/dgram.c,v
retrieving revision 1.11.2.4
diff -u -r1.11.2.4 dgram.c
--- common-src/dgram.c	2001/02/28 01:56:20	1.11.2.4
+++ common-src/dgram.c	2001/06/07 17:39:31
@@ -51,7 +51,6 @@
 {
     int s, len;
     struct sockaddr_in name;
-    struct in_addr in_addr;
     int save_errno;
 
     if((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
@@ -118,10 +117,9 @@
     }
     *portp = ntohs(name.sin_port);
     dgram->socket = s;
-    memcpy(&in_addr, &name.sin_addr, sizeof(name.sin_addr));
     dbprintf(("%s: dgram_bind: socket bound to %s.%d\n",
 	      get_pname(),
-	      inet_ntoa(in_addr),
+	      inet_ntoa(name.sin_addr),
 	      *portp));
     return 0;
 }
@@ -133,7 +131,7 @@
 {
     int s;
     int socket_opened;
-    struct in_addr in_addr;
+    struct sockaddr_in addr_save;
     int save_errno;
     int max_wait;
     int wait_count;
@@ -164,7 +162,7 @@
 	return -1;
     }
 
-    memcpy(&in_addr, &addr.sin_addr, sizeof(addr.sin_addr));
+    memcpy(&addr_save, &addr, sizeof(addr));
     max_wait = 300 / 5;				/* five minutes */
     wait_count = 0;
     while(sendto(s,
@@ -178,7 +176,7 @@
 	    sleep(5);
 	    dbprintf(("%s: dgram_send_addr: sendto(%s.%d): retry %d after ECONNREFUSED\n",
 		      get_pname(),
-		      inet_ntoa(in_addr),
+		      inet_ntoa(addr_save.sin_addr),
 		      (int) ntohs(addr.sin_port),
 		      wait_count));
 	    continue;
@@ -187,7 +185,7 @@
 	save_errno = errno;
 	dbprintf(("%s: dgram_send_addr: sendto(%s.%d) failed: %s \n",
 		  get_pname(),
-		  inet_ntoa(in_addr),
+		  inet_ntoa(addr_save.sin_addr),
 		  (int) ntohs(addr.sin_port),
 		  strerror(save_errno)));
 	errno = save_errno;
@@ -198,7 +196,7 @@
 	if(close(s) == -1) {
 	    dbprintf(("%s: dgram_send_addr: close(%s.%d): failed: %s\n",
 		      get_pname(),
-		      inet_ntoa(in_addr),
+		      inet_ntoa(addr_save.sin_addr),
 		      (int) ntohs(addr.sin_port),
 		      strerror(save_errno)));
 	    return -1;
Index: common-src/stream.c
===================================================================
RCS file: /cvsroot/amanda/amanda/common-src/stream.c,v
retrieving revision 1.10.2.7
diff -u -r1.10.2.7 stream.c
--- common-src/stream.c	2001/02/28 00:53:15	1.10.2.7
+++ common-src/stream.c	2001/06/07 17:39:31
@@ -47,7 +47,6 @@
     int r;
 #endif
     struct sockaddr_in server;
-    struct in_addr in_addr;
     int save_errno;
 
     *portp = -1;				/* in case we error exit */
@@ -137,10 +136,9 @@
 #endif
 
     *portp = (int) ntohs(server.sin_port);
-    memcpy(&in_addr, &server.sin_addr, sizeof(server.sin_addr));
     dbprintf(("%s: stream_server: waiting for connection: %s.%d\n",
 	      get_pname(),
-	      inet_ntoa(in_addr),
+	      inet_ntoa(server.sin_addr),
 	      *portp));
     return server_socket;
 }
@@ -155,7 +153,6 @@
     int r;
 #endif
     struct sockaddr_in svaddr, claddr;
-    struct in_addr in_addr;
     struct hostent *hostp;
     int save_errno;
 
@@ -260,15 +257,13 @@
 	return -1;
     }
 
-    memcpy(&in_addr, &svaddr.sin_addr, sizeof(svaddr.sin_addr));
     dbprintf(("%s: stream_client: connected to %s.%d\n",
 	      get_pname(),
-	      inet_ntoa(in_addr),
+	      inet_ntoa(svaddr.sin_addr),
 	      ntohs(svaddr.sin_port)));
-    memcpy(&in_addr, &claddr.sin_addr, sizeof(claddr.sin_addr));
     dbprintf(("%s: stream_client: our side is %s.%d\n",
 	      get_pname(),
-	      inet_ntoa(in_addr),
+	      inet_ntoa(claddr.sin_addr),
 	      ntohs(claddr.sin_port)));
 
     if(sendsize != DEFAULT_SIZE) 
@@ -293,7 +288,6 @@
     struct timeval tv;
     int nfound, connected_socket;
     int save_errno;
-    struct in_addr in_addr;
 
     assert(server_socket >= 0);
 
@@ -344,10 +338,9 @@
 	    errno = save_errno;
 	    return -1;
 	}
-	memcpy(&in_addr, &addr.sin_addr, sizeof(addr.sin_addr));
 	dbprintf(("%s: stream_accept: connection from %s.%d\n",
 	          get_pname(),
-	          inet_ntoa(in_addr),
+	          inet_ntoa(addr.sin_addr),
 	          ntohs(addr.sin_port)));
 	/*
 	 * Make certain we got an inet connection and that it is not