initilize ev->maxfd = EVENT_INVALID_MAXFD; before the while() loop.

metze
(This used to be commit 61ec710518469876ccc48d57b5fee5d6ead3d482)

diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index 0938515f485d0cf81500a89aa349d514ce80d55f..54ad6fdcd9ed821dee2f015203fa94c627eb7d32 100644 (file)
--- a/source4/build/pidl/server.pm
+++ b/source4/build/pidl/server.pm
@@ -108,11 +108,22 @@ static NTSTATUS $name\_op_init_server(struct dcesrv_context *dce_ctx, const stru
 
 static BOOL $name\_op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version)
 {
+       if (strcmp($name\_interface.ndr->name, name)==0) {
+               memcpy(iface,&$name\_interface, sizeof(*iface);
+               return True;
+       }
+
        return False;   
 }
 
 static BOOL $name\_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
 {
+       if ($name\_interface.ndr->if_version == if_version &&
+               strcmp($name\_interface.ndr->uuid, uuid)==0) {
+               memcpy(iface,&$name\_interface, sizeof(*iface);
+               return True;
+       }
+
        return False;   
 }
        

diff --git a/source4/lib/events.c b/source4/lib/events.c
index 022674460feb0478b706281140e3495720b675cf..85a2cee70f6e177e6e3c8958cac3485f29d86f36 100644 (file)
--- a/source4/lib/events.c
+++ b/source4/lib/events.c
@@ -255,6 +255,7 @@ int event_loop_wait(struct event_context *ev)
        time_t t;
 
        ZERO_STRUCT(ev->exit);
+       ev->maxfd = EVENT_INVALID_MAXFD;
 
        t = time(NULL);
 

diff --git a/source4/smbd/process.c b/source4/smbd/process.c
index 411ffef717c060b482df07ee4ee06d33b8a4f95a..ae64bc988fb47b097efd877855fc716ab10d470c 100644 (file)
--- a/source4/smbd/process.c
+++ b/source4/smbd/process.c
@@ -21,8 +21,8 @@
 
 #include "includes.h"
 
-SIG_ATOMIC_T reload_after_sighup = 0;
-SIG_ATOMIC_T got_sig_term = 0;
+//SIG_ATOMIC_T reload_after_sighup = 0;
+//SIG_ATOMIC_T got_sig_term = 0;
 
 /*
   send an oplock break request to a client