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, 18 insertions, 1 deletions

diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 80e1ddf360..5f95abd3c1 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -1,4 +1,4 @@
-.TH SMBCLIENT 1 "08 Jan 1998" "smbclient 1.9.18"
+.TH SMBCLIENT 1 "19 Feb 1998" "smbclient 1.9.18p3"
 .SH NAME
 smbclient \- ftp-like Lan Manager client program
 .SH SYNOPSIS
@@ -20,6 +20,9 @@ smbclient \- ftp-like Lan Manager client program
 .B \-I
 .I IP number
 ] [
+.B \-R
+.I name resolve order
+] [
 .B \-N
 ] [
 .B \-P
@@ -87,6 +90,11 @@ on the Lan Manager server "lanman", you would use the servicename
 Note that the server name required is NOT necessarily the host name of the
 server! The name required is a Lan Manager server name, which may or may not
 be the same as the hostname of the machine running the server.
+
+With Samba 1.9.18p4 the server name is looked up according to the
+"name resolve order=" parameter in the smb.conf file, allowing an
+administrator to change the order and methods by which server names
+are looked up.
 .RE
 
 .B password
@@ -114,6 +122,15 @@ rejected by these servers.
 Be cautious about including passwords in scripts.
 .RE
 
+.B \-R name resolve order
+
+.RS 3
+This parameter will override the default name resolution order of the
+server listed in the "name resolve order" parameter in smb.conf. This
+is useful to force name resolution to take place by a particular method.
+This command line parameter only exists in Samba 1.9.18p4 and above.
+.RE
+
 .B \-A
 
 .RS 3