Attachment 6654 Details for Bug 8276 – A patch for v3-6-test

[patch] A patch for v3-6-test

tmp36.diff (text/plain), 1.22 KB, created by Stefan Metzmacher on 2011-06-30 15:34:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2011-06-30 15:34:50 UTC

Size: 1.22 KB

patch

obsolete

>From e438fc70a361f99a48e2a8af1fb8e6fab89187da Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 30 Jun 2011 10:09:56 +0200
>Subject: [PATCH] s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
>
>metze
>(cherry picked from commit 75e9f2110876137a57632d223248ac51dbfc4569)
>---
> source3/nmbd/nmbd_subnetdb.c |   14 +++++++++++---
> 1 files changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
>index 3a60038..40c985d 100644
>--- a/source3/nmbd/nmbd_subnetdb.c
>+++ b/source3/nmbd/nmbd_subnetdb.c
>@@ -56,13 +56,21 @@ yet and it may be in use by a response record
> 
> void close_subnet(struct subnet_record *subrec)
> {
>+	if (subrec->nmb_sock != -1) {
>+		close(subrec->nmb_sock);
>+		subrec->nmb_sock = -1;
>+	}
>+	if (subrec->nmb_bcast != -1) {
>+		close(subrec->nmb_bcast);
>+		subrec->nmb_bcast = -1;
>+	}
> 	if (subrec->dgram_sock != -1) {
> 		close(subrec->dgram_sock);
> 		subrec->dgram_sock = -1;
> 	}
>-	if (subrec->nmb_sock != -1) {
>-		close(subrec->nmb_sock);
>-		subrec->nmb_sock = -1;
>+	if (subrec->dgram_bcast != -1) {
>+		close(subrec->dgram_bcast);
>+		subrec->dgram_bcast = -1;
> 	}
> 
> 	DLIST_REMOVE(subnetlist, subrec);
>-- 
>1.7.4.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 8276: 6644 | 6645 | 6654 | 6655 | 6656 | 6657