X-Git-Url: http://git.alex.org.uk

diff --git a/nbd-server.c b/nbd-server.c
index 51b725c..ec5b84f 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -1394,7 +1394,7 @@ int mainloop(CLIENT *client) {
 			err("Not enough magic.");
 		if (len > BUFSIZE - sizeof(struct nbd_reply)) {
 			currlen = BUFSIZE - sizeof(struct nbd_reply);
-			msg("INFO: oversized request (this is not a problem)");
+			msg2(LOG_INFO, "oversized request (this is not a problem)");
 		} else {
 			currlen = len;
 		}
@@ -1745,7 +1745,7 @@ int serveloop(GArray* servers) {
 		memcpy(&rset, &mset, sizeof(fd_set));
 		if(select(max+1, &rset, NULL, NULL, NULL)>0) {
 			int net = 0;
-			SERVER* serve;
+			SERVER* serve=NULL;
 
 			DEBUG("accept, ");
 			if(FD_ISSET(modernsock, &rset)) {
@@ -1757,6 +1757,7 @@ int serveloop(GArray* servers) {
 					close(net);
 					net=0;
 				}
+				serve = client->server;
 			}
 			for(i=0;i<servers->len && !net;i++) {
 				serve=&(g_array_index(servers, SERVER, i));