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/param | |
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/param')
-rw-r--r-- | source3/param/loadparm.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 52914ffd5d..1d65030869 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -143,6 +143,7 @@ typedef struct char *szDomainOtherSIDs; char *szDomainGroups; char *szDriverFile; + char *szNameResolveOrder; int max_log_size; int mangled_stack; int max_xmit; @@ -281,6 +282,7 @@ typedef struct BOOL bDeleteVetoFiles; BOOL bDosFiletimes; BOOL bDosFiletimeResolution; + BOOL bFakeDirCreateTimes; char dummy[3]; /* for alignment */ } service; @@ -368,6 +370,7 @@ static service sDefault = False, /* bDeleteVetoFiles */ False, /* bDosFiletimes */ False, /* bDosFiletimeResolution */ + False, /* bFakeDirCreateTimes */ "" /* dummy */ }; @@ -495,6 +498,7 @@ static struct parm_struct parm_table[] = {"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, 0}, {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, 0}, {"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, 0}, + {"name resolve order", P_STRING, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, 0}, {"max packet", P_INTEGER, P_GLOBAL, &Globals.max_packet, NULL, NULL, 0}, {"packet size", P_INTEGER, P_GLOBAL, &Globals.max_packet, NULL, NULL, 0}, {"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, 0}, @@ -642,7 +646,8 @@ static struct parm_struct parm_table[] = {"delete readonly", P_BOOL, P_LOCAL, &sDefault.bDeleteReadonly, NULL, NULL, FLAG_GLOBAL}, {"dos filetimes", P_BOOL, P_LOCAL, &sDefault.bDosFiletimes, NULL, NULL, FLAG_GLOBAL}, {"dos filetime resolution",P_BOOL,P_LOCAL,&sDefault.bDosFiletimeResolution, NULL, NULL, FLAG_GLOBAL}, - + + {"fake directory create times", P_BOOL,P_LOCAL, &sDefault.bFakeDirCreateTimes, NULL, NULL, FLAG_GLOBAL}, {NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0} }; @@ -696,6 +701,8 @@ static void init_globals(void) string_set(&Globals.szLogonHome, "\\\\%N\\%U"); string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile"); + string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast"); + Globals.bLoadPrinters = True; Globals.bUseRhosts = False; Globals.max_packet = 65535; @@ -906,6 +913,7 @@ FN_GLOBAL_STRING(lp_auto_services,&Globals.szAutoServices) FN_GLOBAL_STRING(lp_passwd_program,&Globals.szPasswdProgram) FN_GLOBAL_STRING(lp_passwd_chat,&Globals.szPasswdChat) FN_GLOBAL_STRING(lp_passwordserver,&Globals.szPasswordServer) +FN_GLOBAL_STRING(lp_name_resolve_order,&Globals.szNameResolveOrder) FN_GLOBAL_STRING(lp_workgroup,&Globals.szWorkGroup) FN_GLOBAL_STRING(lp_username_map,&Globals.szUsernameMap) FN_GLOBAL_STRING(lp_character_set,&Globals.szCharacterSet) @@ -1050,6 +1058,7 @@ FN_LOCAL_BOOL(lp_fake_oplocks,bFakeOplocks) FN_LOCAL_BOOL(lp_recursive_veto_delete,bDeleteVetoFiles) FN_LOCAL_BOOL(lp_dos_filetimes,bDosFiletimes) FN_LOCAL_BOOL(lp_dos_filetime_resolution,bDosFiletimeResolution) +FN_LOCAL_BOOL(lp_fake_dir_create_times,bFakeDirCreateTimes) FN_LOCAL_INTEGER(lp_create_mode,iCreate_mask) FN_LOCAL_INTEGER(lp_force_create_mode,iCreate_force_mode) @@ -2478,3 +2487,11 @@ int lp_minor_announce_version(void) return minor_version; } +/*********************************************************** + Set the global name resolution order (used in smbclient). +************************************************************/ + +void lp_set_name_resolve_order(char *new_order) +{ + Globals.szNameResolveOrder = new_order; +} |