I have fixed quite a few important bugs in this commit.

Luke, can you take special note of the bug fixes to nmbd so you can
propogate them to your new code.

- rewrote the code that used to use fromhost(). We now call
gethostbyaddr() only if necessary and a maximum of once per
connection. Calling gethostbyaddr() causes problems on some systems so
avoiding it if possible is a good thing :-)

- added the "fake oplocks" option. See the docs in smb.conf(5) and
Speed.txt

- fixed a serious bug in nmbd where it would try a DNS lookup on
FIND_SELF queries. This caused a lot of unnecessary (and incorrect)
DNS lookups to happen. FIND_SELF queries should only go to the
internal name tables.

- don't set FIND_SELF for name queries if we are a wins proxy, as we
are supposed to be answering queries for other hosts.

- fixed a bug in nmbd which had "if (search | FIND_LOCAL)" instead of
"if (search & FIND_LOCAL)". Luke, this was in nameservreply.c

- the above 3 bugs together meant that DNS queries were being cached,
but the cache wasn't being used, so every query was going to DNS, no
wonder nmbd has been chewing so much CPU time! Another side effect was
that queries on names in lmhosts weren't being answered for bcast
queries with "wins proxy" set.

- ignore the maxxmit for seconday session setups (see CIFS spec)

- close user opened files in a uLogoffX for user level security (see
CIFS spec)

- added uid into the files struct to support the above change
(This used to be commit ea472b7217b7693627a13a7b1e428a0a6a3d8755)

1 files changed, 5 insertions, 6 deletions

diff --git a/source3/nameservreply.c b/source3/nameservreply.c
index b01c2c25b4..62b9ca0c49 100644
--- a/source3/nameservreply.c
+++ b/source3/nameservreply.c
@@ -507,14 +507,13 @@ void reply_name_query(struct packet_struct *p)
   /* directed queries are for WINS server: broadcasts are local SELF queries.
      the exception is Domain Master names.  */
 
-  int search = bcast ? FIND_LOCAL | FIND_SELF : FIND_WINS;
-  
-  if (name_type == 0x1b)
-  {
-    search |= FIND_WINS;
+  int search = bcast ? FIND_LOCAL | FIND_WINS: FIND_WINS;
+
+  if (!lp_wins_proxy()) {
+    search |= FIND_SELF;
   }
 
-  if (search | FIND_LOCAL)
+  if (search & FIND_LOCAL)
   {
     if (!(d = find_req_subnet(p->ip, bcast)))
     {