diff options
author | Jeremy Allison <jra@samba.org> | 1998-03-16 20:59:47 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-03-16 20:59:47 +0000 |
commit | c54af0f8b20e3f93c59da6a817920e1de6c4a870 (patch) | |
tree | b0da64f4bb04846bdf9562ecb445b22fbd6f1885 /source3/client/client.c | |
parent | 14d6ee34de8935cb3ef59820fabf98d588dab11f (diff) | |
download | samba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.tar.gz samba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.tar.bz2 samba-c54af0f8b20e3f93c59da6a817920e1de6c4a870.zip |
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)
Diffstat (limited to 'source3/client/client.c')
-rw-r--r-- | source3/client/client.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index da44f344dd..679114fa2b 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -3500,6 +3500,7 @@ static void usage(char *pname) DEBUG(0,("\t-m max protocol set the max protocol level\n")); DEBUG(0,("\t-L host get a list of shares available on a host\n")); DEBUG(0,("\t-I dest IP use this IP to connect to\n")); + DEBUG(0,("\t-R name resolve order use these name resolution services only\n")); DEBUG(0,("\t-E write messages to stderr instead of stdout\n")); DEBUG(0,("\t-U username set the network username\n")); DEBUG(0,("\t-W workgroup set the workgroup name\n")); @@ -3528,6 +3529,7 @@ static void usage(char *pname) extern char tar_type; static pstring servicesf = CONFIGFILE; pstring term_code; + pstring new_name_resolve_order; char *p; #ifdef KANJI @@ -3539,6 +3541,8 @@ static void usage(char *pname) *query_host = 0; *base_directory = 0; + *new_name_resolve_order = 0; + DEBUGLEVEL = 2; setup_logging(pname,True); @@ -3624,7 +3628,7 @@ static void usage(char *pname) } while ((opt = - getopt(argc, argv,"s:B:O:M:S:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF) + getopt(argc, argv,"s:B:O:R:M:S:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF) switch (opt) { case 'm': @@ -3633,6 +3637,9 @@ static void usage(char *pname) case 'O': strcpy(user_socket_options,optarg); break; + case 'R': + pstrcpy(new_name_resolve_order, optarg); + break; case 'S': strcpy(desthost,optarg); strupper(desthost); @@ -3760,6 +3767,9 @@ static void usage(char *pname) get_myname((*myname)?NULL:myname,NULL); strupper(myname); + if(*new_name_resolve_order) + lp_set_name_resolve_order(new_name_resolve_order); + if (tar_type) { recurse=True; |