summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-01-22 01:56:31 +0000
committerStefan Metzmacher <metze@samba.org>2004-01-22 01:56:31 +0000
commit55dfa23e4149b8daa9fe007fd1b7fac744bcdf12 (patch)
treeeb985286f38c4d80ad30342d380badf095361d96
parentd8ee9d7a0e8826915900f2bf514886ca3f067fd8 (diff)
downloadsamba-55dfa23e4149b8daa9fe007fd1b7fac744bcdf12.tar.gz
samba-55dfa23e4149b8daa9fe007fd1b7fac744bcdf12.tar.bz2
samba-55dfa23e4149b8daa9fe007fd1b7fac744bcdf12.zip
initilize ev->maxfd = EVENT_INVALID_MAXFD; before the while() loop.
metze (This used to be commit 61ec710518469876ccc48d57b5fee5d6ead3d482)
-rw-r--r--source4/build/pidl/server.pm11
-rw-r--r--source4/lib/events.c1
-rw-r--r--source4/smbd/process.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index 0938515f48..54ad6fdcd9 100644
--- 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 022674460f..85a2cee70f 100644
--- 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 411ffef717..ae64bc988f 100644
--- 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