View | Details | Raw Unified | Return to bug 91515
Collapse All | Expand All

(-)nbd-server/Makefile (-2 / +1 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	nbd-server
8
PORTNAME=	nbd-server
9
PORTVERSION=	2.8.2
9
PORTVERSION=	2.8.3
10
PORTREVISION=	1
11
CATEGORIES=	net
10
CATEGORIES=	net
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	nbd
12
MASTER_SITE_SUBDIR=	nbd
(-)nbd-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nbd-2.8.2.tar.bz2) = 2a911e6499d9281b34ff904a446b1049
1
MD5 (nbd-2.8.3.tar.bz2) = 09f97e8f321a3b1a65a6b5aa31409ed1
2
SHA256 (nbd-2.8.2.tar.bz2) = ce45c1c7f587a407061d9e70b6d9b07a52950c0a580d7f7a8bdb4a383ccbabf9
2
SHA256 (nbd-2.8.3.tar.bz2) = e13bc874b987b2ae06c087d8d10349ddf858829a12711cd158c778b0d415c76c
3
SIZE (nbd-2.8.2.tar.bz2) = 137601
3
SIZE (nbd-2.8.3.tar.bz2) = 163461
(-)nbd-server/files/patch-nbd-server.c (-16 / +8 lines)
Lines 1-7 Link Here
1
diff -urN nbd-2.8.2.orig/nbd-server.c nbd-2.8.2/nbd-server.c
1
diff -urN nbd-2.8.3.orig/nbd-server.c nbd-2.8.3/nbd-server.c
2
--- nbd-2.8.2.orig/nbd-server.c	Wed Nov  9 22:38:44 2005
2
--- nbd-2.8.3.orig/nbd-server.c	Thu Dec 22 21:37:20 2005
3
+++ nbd-server.c	Thu Dec 22 16:04:47 2005
3
+++ nbd-server.c	Sun Jan  8 16:45:30 2006
4
@@ -363,11 +363,11 @@
4
@@ -363,12 +363,12 @@
5
  * is severely wrong)
5
  * is severely wrong)
6
  **/
6
  **/
7
 void sigchld_handler(int s) {
7
 void sigchld_handler(int s) {
Lines 9-26 Link Here
9
+        int status;
9
+        int status;
10
 	int* i;
10
 	int* i;
11
 	pid_t pid;
11
 	pid_t pid;
12
 	int done=0;
12
 
13
 
13
-	while((pid=wait(status)) > 0) {
14
-	while(!done && (pid=wait(status)) > 0) {
14
+	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
15
+	while(!done && (pid=wait(&status)) > 0) {
15
 		if(WIFEXITED(status)) {
16
 		if(WIFEXITED(status)) {
16
 			msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status));
17
 			msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status));
17
 		}
18
 			msg3(LOG_INFO, "pid is %d", pid);
18
@@ -684,7 +684,7 @@
19
 
20
 		if (request.magic != htonl(NBD_REQUEST_MAGIC))
21
 			err("Not enough magic.");
22
-		if (len > BUFSIZE)
23
+		if (len > (BUFSIZE-sizeof(struct nbd_reply)))
24
 			err("Request too big!");
25
 #ifdef DODBG
26
 		printf("%s from %Lu (%Lu) len %d, ", request.type ? "WRITE" :

Return to bug 91515