[Pkg-samba-maint] [samba] 02/03: Really remove bug_12283_segfault_tevent_internals.patch

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit 13455f233c270c27def91ab0ed9fffbe8782ddcb
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Oct 31 21:40:03 2016 +0100

    Really remove bug_12283_segfault_tevent_internals.patch
---
 source3/nmbd/nmbd_packets.c | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 8739745..de5ae1e 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1683,6 +1683,8 @@ on subnet %s\n", rrec->response_id, inet_ntoa(rrec->packet->ip), subrec->subnet_
 struct socket_attributes {
 	enum packet_type type;
 	bool broadcast;
+	int fd;
+	bool triggered;
 };
 
 static bool create_listen_array(struct socket_attributes **pattrs,
@@ -1714,7 +1716,7 @@ static bool create_listen_array(struct socket_attributes **pattrs,
 		}
 	}
 
-	attrs = talloc_array(NULL, struct socket_attributes, count);
+	attrs = talloc_zero_array(NULL, struct socket_attributes, count);
 	if (attrs == NULL) {
 		DEBUG(1, ("talloc fail for attrs. "
 			  "size %d\n", count));
@@ -1877,32 +1879,6 @@ static void nmbd_fd_handler(struct tevent_context *ev,
 }
 
 /****************************************************************************
- Timeout callback - just notice we timed out.
-***************************************************************************/
-
-static void nmbd_timeout_handler(struct tevent_context *ev,
-			struct tevent_timer *te,
-			struct timeval current_time,
-			void *private_data)
-{
-	bool *got_timeout = private_data;
-	*got_timeout = true;
-}
-
-/****************************************************************************
- fd callback - remember the fd that triggered.
-***************************************************************************/
-
-static void nmbd_fd_handler(struct tevent_context *ev,
-				struct tevent_fd *fde,
-				uint16_t flags,
-				void *private_data)
-{
-	struct socket_attributes *attr = private_data;
-	attr->triggered = true;
-}
-
-/****************************************************************************
   Listens for NMB or DGRAM packets, and queues them.
   return True if the socket is dead
 ***************************************************************************/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git