Adding the same change as was added to 1.9.18 branch to add the

"name resolve order" parameter.

source/Makefile: Re-ordered link for name resolve order code.
source/clientgen.c:
source/clientutil.c: Added calls to resolve_name().
source/includes.h: Added HPUX zombie fix.
source/loadparm.c: Added new name resolve order parameter.
source/namequery.c: Re-wrote to include parsing of lmhosts file, new resolve_name()
                    function requested by John.
source/nmbd.c: Tell resolve_name not to do WINS lookups if we are the WINS server.
source/nmbd_lmhosts.c: Call lmhosts parsing functions in namequery.c
source/password.c: Call resolve_name() to lookup security=server name.

source/reply.c:
source/time.c:
source/trans2.c: "fake directory create times" fix from Jim Hague - hague@research.canon.com.au.
source/util.c: Removed isalnum() test in Get_Hostname() that seems to cause
               problems on many systems.

Jeremy.
(This used to be commit 7f118970da7c43eaddcf92dc056d3e849f1e7d5c)

1 files changed, 3 insertions, 0 deletions

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index e757aa46c4..837f98e8bb 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -44,6 +44,8 @@ extern pstring myname;
 extern fstring myworkgroup;
 extern char **my_netbios_names;
 
+extern BOOL global_in_nmbd;
+
 /* are we running as a daemon ? */
 static BOOL is_daemon = False;
 
@@ -552,6 +554,7 @@ int main(int argc,char *argv[])
 
   global_nmb_port = NMB_PORT;
   *host_file = 0;
+  global_in_nmbd = True;
 
   StartupTime = time(NULL);