[SCM] Samba Shared Repository - branch v3-6-test updated
Karolin Seeger
kseeger at samba.org
Mon Jul 4 13:53:17 MDT 2011
The branch, v3-6-test has been updated
via 1c8690c s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
from c6d5c7c s3:smbldap: make smbldap_connect_system self contained
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 1c8690c82905ff55ed9eafd02df295edf79e7943
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jun 30 10:09:56 2011 +0200
s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
metze
(cherry picked from commit 75e9f2110876137a57632d223248ac51dbfc4569)
-----------------------------------------------------------------------
Summary of changes:
source3/nmbd/nmbd_subnetdb.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list