The branch, master has been updated via 0e552e0 docs: adjust the defaults for list parameters to include commas to match testparm output via 9893cf6 s3-param: Remove compilation conditional for setting directory name cache size. via 3351acb lib/param: change server max protocol to be consistent with s3 and docs via 0c2dae1 lib/param: change min wins ttl default to be consistent with docs via 0d961e4 lib/param: Fix default of printjob username to match s3 via 9d92e43 lib/param: Fix default of logon path to match s3 via 158ce93 lib/param: Fix default of logon home to match s3 via 4899755 lib/param: Fix default of smb passwd file to match s3 via 6db0015 lib/param: Fix default of panic action to match s3 via eabecda lib/param: Fix default of usershare path to match docs via 2753975 docs: change hard-coded default of nsupdate command to match lib/param via 6a65086 lib/param: change name resolve order to include lmhosts as per the docs via fc77a69 s4-resolve: Add lmhosts support into the source4 name resolve code via 8427c79 lib/param: set default for -valid parameter via 2152c77 param: Rename variable used for lp__server_role server_role via 7ebd3bb param: Rename variable used for lp__security security via 09b8816 param: fixup security default to AUTO to permit server role = domain member via 3e073f1 lib/param: fix a comment for lpcfg_printername via f296e6e param: Rename variable used for lp__printername szPrintername via 19d7ed8 param: remove static functions in param_functions.c via 413e0b6 param: Complete the removal of the "open files database hash size" parameter from 35eb6cb ctdb-doc: Fix usage string for ctdb readkey/writekey
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0e552e03aec56db4ab4a3615386830fd11541ef8 Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Jan 14 10:54:05 2014 +1300 docs: adjust the defaults for list parameters to include commas to match testparm output Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Fri Jan 31 12:57:34 CET 2014 on sn-devel-104 commit 9893cf6c62d972d9d290309ab07257ff06330598 Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Jan 14 11:34:24 2014 +1300 s3-param: Remove compilation conditional for setting directory name cache size. BROKEN_DIRECTORY_HANDLING was originally added in f1041f98ced8ef50373ca37d541d7ca8b1d46638 however, it was never set. Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 3351acb51791529b7f2c25ea728e2ed1d827e7da Author: Garming Sam <garm...@catalyst.net.nz> Date: Wed Jan 8 13:34:49 2014 +1300 lib/param: change server max protocol to be consistent with s3 and docs Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 0c2dae1d3d88327b4636a2c3befa42da5935a206 Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Dec 31 16:38:24 2013 +1300 lib/param: change min wins ttl default to be consistent with docs Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 0d961e43ed93369b162613d97ca790c95fa16e75 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:38:07 2014 +1300 lib/param: Fix default of printjob username to match s3 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 9d92e43db7f9d1d653d7c08d8cce5a3037edaa40 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:37:05 2014 +1300 lib/param: Fix default of logon path to match s3 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 158ce93f4f50f3b10bcadef9eadd613c55bb6cae Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:36:24 2014 +1300 lib/param: Fix default of logon home to match s3 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 48997559a529152e466c8330cb7d8eb19e1907b0 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:34:58 2014 +1300 lib/param: Fix default of smb passwd file to match s3 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 6db0015379037e45cbd012dc78d83d30acd70625 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:33:51 2014 +1300 lib/param: Fix default of panic action to match s3 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit eabecdadaa90bb7368253f208290ed4b33435d32 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:33:15 2014 +1300 lib/param: Fix default of usershare path to match docs Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 275397574bc03205e345a843d4144fdbefafad2c Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 9 13:07:11 2014 +1300 docs: change hard-coded default of nsupdate command to match lib/param Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 6a650868f486785238ed75cc39d9534ff5c04c65 Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Dec 31 17:25:14 2013 +1300 lib/param: change name resolve order to include lmhosts as per the docs Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit fc77a69461be8b31a6e5bdf92f82a9af8e67457c Author: Andrew Bartlett <abart...@samba.org> Date: Tue Jan 14 13:48:32 2014 +1300 s4-resolve: Add lmhosts support into the source4 name resolve code Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 8427c797cecc88d70bdee4f310351ca3d4c310db Author: Garming Sam <garm...@catalyst.net.nz> Date: Wed Jan 8 14:38:09 2014 +1300 lib/param: set default for -valid parameter This parameter isn't used in any of the lib/param code and is being added for consistency Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 2152c77e38a9ef9aa106fff62d381ad4070da1a4 Author: Garming Sam <garm...@catalyst.net.nz> Date: Fri Jan 10 11:28:45 2014 +1300 param: Rename variable used for lp__server_role server_role Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 7ebd3bb3f138ade267c03b1efdcd71d52acc356f Author: Garming Sam <garm...@catalyst.net.nz> Date: Fri Jan 10 11:26:15 2014 +1300 param: Rename variable used for lp__security security Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 09b8816b8f733570f25d3d67365b611767e223ab Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Jan 7 17:55:35 2014 +1300 param: fixup security default to AUTO to permit server role = domain member When this is set to AUTO, it behaves as security = user unless server role = domain member has been set. Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 3e073f1c9253db89558e6e289703777b605c3b2a Author: Garming Sam <garm...@catalyst.net.nz> Date: Fri Jan 10 11:19:56 2014 +1300 lib/param: fix a comment for lpcfg_printername Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit f296e6e768ba0d275b8ba82342047b21990291cf Author: Garming Sam <garm...@catalyst.net.nz> Date: Thu Jan 30 16:54:39 2014 +1300 param: Rename variable used for lp__printername szPrintername Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 19d7ed8de91ceb99a937d2d67c8a50b3179404b3 Author: Garming Sam <garm...@catalyst.net.nz> Date: Fri Jan 10 11:06:17 2014 +1300 param: remove static functions in param_functions.c Only two functions are static and their presence doesn't really gain much, besides impeding auto-generation Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 413e0b68729f468f49a5803b44789dba6db9dd83 Author: Garming Sam <garm...@catalyst.net.nz> Date: Fri Jan 10 15:41:08 2014 +1300 param: Complete the removal of the "open files database hash size" parameter This parameter was originally set for removal in 2007 in 28210588edc39eb2b6cd237f11b488fa4d6b6985 Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/smbdotconf/base/serverservices.xml | 4 +- docs-xml/smbdotconf/domain/nsupdatecommand.xml | 2 +- .../smbdotconf/protocol/dcerpcendpointservers.xml | 2 +- docs-xml/smbdotconf/protocol/nameresolveorder.xml | 4 +- docs-xml/smbdotconf/protocol/smbports.xml | 2 +- docs-xml/smbdotconf/security/security.xml | 2 +- docs-xml/smbdotconf/vfs/ntvfshandler.xml | 2 +- lib/param/loadparm.c | 30 +++++++-- lib/param/param_functions.c | 9 +-- lib/param/param_table.c | 8 +- source3/locking/brlock.c | 2 +- source3/locking/share_mode_lock.c | 2 +- source3/param/loadparm.c | 13 +--- source4/libcli/resolve/{file.c => lmhosts.c} | 69 ++++++-------------- source4/libcli/resolve/resolve_lp.c | 2 + source4/libcli/wscript_build | 2 +- 16 files changed, 68 insertions(+), 87 deletions(-) copy source4/libcli/resolve/{file.c => lmhosts.c} (58%) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml index 503938a..677ae6a 100644 --- a/docs-xml/smbdotconf/base/serverservices.xml +++ b/docs-xml/smbdotconf/base/serverservices.xml @@ -13,6 +13,6 @@ <constant>-</constant>. </para> </description> -<value type="default">s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate dns</value> -<value type="example">-s3fs +smb</value> +<value type="default">s3fs, rpc, nbt, wrepl, ldap, cldap, kdc, drepl, winbind, ntp_signd, kcc, dnsupdate, dns</value> +<value type="example">-s3fs, +smb</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml index 3cf02f1..11c815e 100644 --- a/docs-xml/smbdotconf/domain/nsupdatecommand.xml +++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml @@ -9,5 +9,5 @@ </para> </description> -<value type="default">$prefix/sbin/nsupdate -g</value> +<value type="default">/usr/bin/nsupdate -g</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml index 75a41fc..25ccd23 100644 --- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml +++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml @@ -7,6 +7,6 @@ <para>Specifies which DCE/RPC endpoint servers should be run.</para> </description> -<value type="default">epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver</value> +<value type="default">epmapper, wkssvc, rpcecho, samr, netlogon, lsarpc, spoolss, drsuapi, dssetup, unixinfo, browser, eventlog6, backupkey, dnsserver</value> <value type="example">rpcecho</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml b/docs-xml/smbdotconf/protocol/nameresolveorder.xml index 662c3fb..387bc9d 100644 --- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml +++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml @@ -65,6 +65,6 @@ </description> -<value type="default">lmhosts wins host bcast</value> -<value type="example">lmhosts bcast host</value> +<value type="default">lmhosts, wins, host, bcast</value> +<value type="example">lmhosts, bcast, host</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml index aaf4919..c5bec22 100644 --- a/docs-xml/smbdotconf/protocol/smbports.xml +++ b/docs-xml/smbdotconf/protocol/smbports.xml @@ -7,5 +7,5 @@ <para>Specifies which ports the server should listen on for SMB traffic.</para> </description> -<value type="default">445 139</value> +<value type="default">445, 139</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml index 2f5c3f7..5db1e01 100644 --- a/docs-xml/smbdotconf/security/security.xml +++ b/docs-xml/smbdotconf/security/security.xml @@ -109,6 +109,6 @@ <related>realm</related> <related>encrypt passwords</related> -<value type="default">USER</value> +<value type="default">AUTO</value> <value type="example">DOMAIN</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/vfs/ntvfshandler.xml b/docs-xml/smbdotconf/vfs/ntvfshandler.xml index 92b5c6d..b7c6d15 100644 --- a/docs-xml/smbdotconf/vfs/ntvfshandler.xml +++ b/docs-xml/smbdotconf/vfs/ntvfshandler.xml @@ -25,5 +25,5 @@ </para> </description> -<value type="default">unixuid default</value> +<value type="default">unixuid, default</value> </samba:parameter> diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 933afcb..0904268 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -783,7 +783,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx, /* entry (if/when the 'available' keyword is implemented!). */ /* the printer name is set to the service name. */ - lpcfg_string_set(service, &service->szPrintername, pszPrintername); + lpcfg_string_set(service, &service->_printername, pszPrintername); lpcfg_string_set(service, &service->comment, comment); service->browseable = default_service->browseable; /* Printers cannot be read_only. */ @@ -2063,7 +2063,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) myname = get_myname(lp_ctx); lpcfg_do_global_parameter(lp_ctx, "netbios name", myname); talloc_free(myname); - lpcfg_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast"); + lpcfg_do_global_parameter(lp_ctx, "name resolve order", "lmhosts wins host bcast"); lpcfg_do_global_parameter(lp_ctx, "fstype", "NTFS"); @@ -2112,7 +2112,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "LargeReadwrite", "True"); lpcfg_do_global_parameter(lp_ctx, "server min protocol", "LANMAN1"); - lpcfg_do_global_parameter(lp_ctx, "server max protocol", "NT1"); + lpcfg_do_global_parameter(lp_ctx, "server max protocol", "SMB3"); lpcfg_do_global_parameter(lp_ctx, "client min protocol", "CORE"); lpcfg_do_global_parameter(lp_ctx, "client max protocol", "NT1"); lpcfg_do_global_parameter(lp_ctx, "security", "AUTO"); @@ -2170,7 +2170,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "nt status support", "True"); lpcfg_do_global_parameter(lp_ctx, "max wins ttl", "518400"); /* 6 days */ - lpcfg_do_global_parameter(lp_ctx, "min wins ttl", "10"); + lpcfg_do_global_parameter(lp_ctx, "min wins ttl", "21600"); lpcfg_do_global_parameter(lp_ctx, "tls enabled", "True"); lpcfg_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem"); @@ -2364,6 +2364,22 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "usershare owner only", "yes"); + lpcfg_do_global_parameter(lp_ctx, "-valid", "yes"); + + lpcfg_do_global_parameter_var(lp_ctx, "usershare path", "%s/usershares", get_dyn_STATEDIR()); + +#ifdef DEVELOPER + lpcfg_do_global_parameter_var(lp_ctx, "panic action", "/bin/sleep 999999999"); +#endif + + lpcfg_do_global_parameter(lp_ctx, "smb passwd file", get_dyn_SMB_PASSWD_FILE()); + + lpcfg_do_global_parameter(lp_ctx, "logon home", "\\\\%N\\%U"); + + lpcfg_do_global_parameter(lp_ctx, "logon path", "\\\\%N\\%U\\profile"); + + lpcfg_do_global_parameter(lp_ctx, "printjob username", "%U"); + for (i = 0; parm_table[i].label; i++) { if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) { lp_ctx->flags[i] |= FLAG_DEFAULT; @@ -2649,13 +2665,13 @@ const char *lpcfg_volume_label(struct loadparm_service *service, struct loadparm } /** - * If we are PDC then prefer us as DMB + * Return the correct printer name. */ const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_service *sDefault) { const char *ret; - ret = lp_string((const char *)((service != NULL && service->szPrintername != NULL) ? - service->szPrintername : sDefault->szPrintername)); + ret = lp_string((const char *)((service != NULL && service->_printername != NULL) ? + service->_printername : sDefault->_printername)); if (ret == NULL || (ret != NULL && *ret == '\0')) ret = lpcfg_servicename(service); diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index dfdaf4f..2e8026f 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -63,7 +63,7 @@ FN_LOCAL_STRING(lppausecommand, lppausecommand) FN_LOCAL_STRING(lpresumecommand, lpresumecommand) FN_LOCAL_STRING(queuepausecommand, queuepausecommand) FN_LOCAL_STRING(queueresumecommand, queueresumecommand) -static FN_LOCAL_STRING(_printername, szPrintername) +FN_LOCAL_STRING(_printername, _printername) FN_LOCAL_CONST_STRING(printjob_username, printjob_username) FN_LOCAL_STRING(magicscript, magicscript) FN_LOCAL_STRING(magicoutput, magicoutput) @@ -74,7 +74,7 @@ FN_LOCAL_LIST(readlist, readlist) FN_LOCAL_LIST(writelist, writelist) FN_LOCAL_LIST(vfs_objects, vfs_objects) FN_LOCAL_STRING(msdfs_proxy, msdfs_proxy) -static FN_LOCAL_STRING(volume, volume) +FN_LOCAL_STRING(volume, volume) FN_LOCAL_STRING(veto_files, veto_files) FN_LOCAL_STRING(hide_files, hide_files) FN_LOCAL_STRING(veto_oplocks, veto_oplocks) @@ -322,14 +322,13 @@ FN_GLOBAL_INTEGER(max_xmit, max_xmit) FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl) FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout) FN_GLOBAL_INTEGER(nbt_port, nbt_port) -FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size) FN_GLOBAL_INTEGER(oplock_break_wait_time, oplock_break_wait_time) FN_GLOBAL_INTEGER(os_level, os_level) FN_GLOBAL_INTEGER(passwd_chat_timeout, passwd_chat_timeout) FN_GLOBAL_INTEGER(printcap_cache_time, printcap_cache_time) FN_GLOBAL_INTEGER(restrict_anonymous, restrict_anonymous) -FN_GLOBAL_INTEGER(_security, security) -FN_GLOBAL_INTEGER(_server_role, server_role) +FN_GLOBAL_INTEGER(_security, _security) +FN_GLOBAL_INTEGER(_server_role, _server_role) FN_GLOBAL_INTEGER(server_schannel, server_schannel) FN_GLOBAL_INTEGER(server_signing, server_signing) FN_GLOBAL_INTEGER(smb2_max_read, smb2_max_read) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 0e469a2..f773814 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -409,7 +409,7 @@ static struct parm_struct parm_table[] = { .label = "server role", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(server_role), + .offset = GLOBAL_VAR(_server_role), .special = NULL, .enum_list = enum_server_role, .flags = FLAG_BASIC | FLAG_ADVANCED, @@ -421,7 +421,7 @@ static struct parm_struct parm_table[] = { .label = "security", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(security), + .offset = GLOBAL_VAR(_security), .special = NULL, .enum_list = enum_security, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD, @@ -2294,7 +2294,7 @@ static struct parm_struct parm_table[] = { .label = "printer name", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szPrintername), + .offset = LOCAL_VAR(_printername), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT, @@ -2303,7 +2303,7 @@ static struct parm_struct parm_table[] = { .label = "printer", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szPrintername), + .offset = LOCAL_VAR(_printername), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index c5297dd..e1f0c15 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -326,7 +326,7 @@ void brl_init(bool read_only) } brlock_db = db_open(NULL, lock_path("brlock.tdb"), - lp_open_files_db_hash_size(), tdb_flags, + SMB_OPEN_DATABASE_TDB_HASH_SIZE, tdb_flags, read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644, DBWRAP_LOCK_ORDER_2); if (!brlock_db) { diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 940d125..20756bf 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -64,7 +64,7 @@ static bool locking_init_internal(bool read_only) return True; lock_db = db_open(NULL, lock_path("locking.tdb"), - lp_open_files_db_hash_size(), + SMB_OPEN_DATABASE_TDB_HASH_SIZE, TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, read_only?O_RDONLY:O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_1); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4a9e0d7..ebf4972 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -165,7 +165,7 @@ static struct loadparm_service sDefault = .lpresumecommand = NULL, .queuepausecommand = NULL, .queueresumecommand = NULL, - .szPrintername = NULL, + ._printername = NULL, .printjob_username = NULL, .dontdescend = NULL, .hostsallow = NULL, @@ -271,11 +271,7 @@ static struct loadparm_service sDefault = .aio_read_size = 0, .aio_write_size = 0, .map_readonly = MAP_READONLY_YES, -#ifdef BROKEN_DIRECTORY_HANDLING - .directory_name_cache_size = 0, -#else .directory_name_cache_size = 100, -#endif .smb_encrypt = SMB_SIGNING_DEFAULT, .kernel_share_modes = true, .durable_handles = true, @@ -808,7 +804,7 @@ static void init_globals(bool reinit_globals) Globals.printcap_cache_time = 750; /* 12.5 minutes */ Globals.config_backend = config_backend; - Globals.server_role = ROLE_AUTO; + Globals._server_role = ROLE_AUTO; /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */ /* Discovered by 2 days of pain by Don McCall @ HP :-). */ @@ -823,12 +819,11 @@ static void init_globals(bool reinit_globals) Globals.large_readwrite = true; Globals.max_log_size = 5000; Globals.max_open_files = max_open_files(); - Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE; Globals.srv_maxprotocol = PROTOCOL_SMB3_00; Globals.srv_minprotocol = PROTOCOL_LANMAN1; Globals.cli_maxprotocol = PROTOCOL_NT1; Globals.cli_minprotocol = PROTOCOL_CORE; - Globals.security = SEC_USER; + Globals._security = SEC_AUTO; Globals.encrypted_passwords = true; Globals.client_schannel = Auto; Globals.winbind_sealed_pipes = true; @@ -1826,7 +1821,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService) /* entry (if/when the 'available' keyword is implemented!). */ /* the printer name is set to the service name. */ - string_set(&ServicePtrs[i]->szPrintername, pszPrintername); + string_set(&ServicePtrs[i]->_printername, pszPrintername); string_set(&ServicePtrs[i]->comment, comment); /* set the browseable flag from the gloabl default */ diff --git a/source4/libcli/resolve/file.c b/source4/libcli/resolve/lmhosts.c similarity index 58% copy from source4/libcli/resolve/file.c copy to source4/libcli/resolve/lmhosts.c index 349b2e1..21cc3e4 100644 --- a/source4/libcli/resolve/file.c +++ b/source4/libcli/resolve/lmhosts.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. broadcast name resolution module @@ -6,17 +6,17 @@ Copyright (C) Andrew Tridgell 1994-1998,2005 Copyright (C) Jeremy Allison 2007 Copyright (C) Jelmer Vernooij 2007 - Copyright (C) Andrew Bartlett <abart...@samba.org> 2009-2010 + Copyright (C) Andrew Bartlett <abart...@samba.org> 2009-2014 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -30,13 +30,9 @@ #include "param/param.h" #include "lib/util/util_net.h" #include "libcli/nbt/libnbt.h" +#include "dynconfig.h" -struct resolve_file_data { - const char *lookup_file; - const char *default_domain; -}; - -struct resolve_file_state { +struct resolve_lmhosts_state { struct socket_address **addrs; char **names; }; @@ -47,20 +43,16 @@ struct resolve_file_state { /* general name resolution - async send */ -struct composite_context *resolve_name_file_send(TALLOC_CTX *mem_ctx, +struct composite_context *resolve_name_lmhosts_send(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, void *userdata, uint32_t flags, uint16_t port, struct nbt_name *name) { struct composite_context *c; - struct resolve_file_data *data = talloc_get_type_abort(userdata, struct resolve_file_data); - struct resolve_file_state *state; + struct resolve_lmhosts_state *state; struct sockaddr_storage *resolved_iplist; int resolved_count, i; - const char *dns_name; - - bool srv_lookup = (flags & RESOLVE_NAME_FLAG_DNS_SRV); if (event_ctx == NULL) { return NULL; @@ -69,34 +61,21 @@ struct composite_context *resolve_name_file_send(TALLOC_CTX *mem_ctx, c = composite_create(mem_ctx, event_ctx); if (c == NULL) return NULL; - /* This isn't an NBT layer resolver */ - if (flags & RESOLVE_NAME_FLAG_FORCE_NBT) { - composite_error(c, NT_STATUS_OBJECT_NAME_NOT_FOUND); - return c; - } - if (composite_nomem(c->event_ctx, c)) return c; - state = talloc_zero(c, struct resolve_file_state); + state = talloc_zero(c, struct resolve_lmhosts_state); if (composite_nomem(state, c)) return c; c->private_data = state; - dns_name = name->name; - if (strchr(dns_name, '.') == NULL) { - dns_name = talloc_asprintf(state, "%s.%s", dns_name, data->default_domain); - } - - c->status = resolve_dns_hosts_file_as_sockaddr(data->lookup_file, dns_name, - srv_lookup, state, &resolved_iplist, &resolved_count); + c->status = resolve_lmhosts_file_as_sockaddr(dyn_LMHOSTSFILE, name->name, name->type, + state, &resolved_iplist, &resolved_count); if (!composite_is_ok(c)) return c; for (i=0; i < resolved_count; i++) { state->addrs = talloc_realloc(state, state->addrs, struct socket_address *, i+2); if (composite_nomem(state->addrs, c)) return c; - - if (!(flags & RESOLVE_NAME_FLAG_OVERWRITE_PORT)) { - set_sockaddr_port((struct sockaddr *)&resolved_iplist[i], port); - } + + set_sockaddr_port((struct sockaddr *)&resolved_iplist[i], port); state->addrs[i] = socket_address_from_sockaddr(state->addrs, (struct sockaddr *)&resolved_iplist[i], sizeof(resolved_iplist[i])); if (composite_nomem(state->addrs[i], c)) return c; @@ -107,11 +86,11 @@ struct composite_context *resolve_name_file_send(TALLOC_CTX *mem_ctx, state->names = talloc_realloc(state, state->names, char *, i+2); if (composite_nomem(state->addrs, c)) return c; - state->names[i] = talloc_strdup(state->names, dns_name); + state->names[i] = talloc_strdup(state->names, name->name); if (composite_nomem(state->names[i], c)) return c; state->names[i+1] = NULL; - + i++; } @@ -122,7 +101,7 @@ struct composite_context *resolve_name_file_send(TALLOC_CTX *mem_ctx, /* general name resolution method - recv side */ -NTSTATUS resolve_name_file_recv(struct composite_context *c, +NTSTATUS resolve_name_lmhosts_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, struct socket_address ***addrs, char ***names) @@ -132,7 +111,7 @@ NTSTATUS resolve_name_file_recv(struct composite_context *c, status = composite_wait(c); if (NT_STATUS_IS_OK(status)) { - struct resolve_file_state *state = talloc_get_type(c->private_data, struct resolve_file_state); + struct resolve_lmhosts_state *state = talloc_get_type(c->private_data, struct resolve_lmhosts_state); *addrs = talloc_steal(mem_ctx, state->addrs); if (names) { *names = talloc_steal(mem_ctx, state->names); @@ -144,17 +123,7 @@ NTSTATUS resolve_name_file_recv(struct composite_context *c, } -bool resolve_context_add_file_method(struct resolve_context *ctx, const char *lookup_file, const char *default_domain) -{ - struct resolve_file_data *data = talloc(ctx, struct resolve_file_data); - data->lookup_file = talloc_strdup(data, lookup_file); - data->default_domain = talloc_strdup(data, default_domain); - return resolve_context_add_method(ctx, resolve_name_file_send, resolve_name_file_recv, data); -} - -bool resolve_context_add_file_method_lp(struct resolve_context *ctx, struct loadparm_context *lp_ctx) +bool resolve_context_add_lmhosts_method(struct resolve_context *ctx) { - return resolve_context_add_file_method(ctx, - lpcfg_parm_string(lp_ctx, NULL, "resolv", "host file"), - lpcfg_dnsdomain(lp_ctx)); + return resolve_context_add_method(ctx, resolve_name_lmhosts_send, resolve_name_lmhosts_recv, NULL); } diff --git a/source4/libcli/resolve/resolve_lp.c b/source4/libcli/resolve/resolve_lp.c index 92e11f0..dac9249 100644 --- a/source4/libcli/resolve/resolve_lp.c +++ b/source4/libcli/resolve/resolve_lp.c @@ -41,6 +41,8 @@ struct resolve_context *lpcfg_resolve_context(struct loadparm_context *lp_ctx) } } else if (!strcmp(methods[i], "file")) { resolve_context_add_file_method_lp(ret, lp_ctx); + } else if (!strcmp(methods[i], "lmhosts")) { + resolve_context_add_lmhosts_method(ret); -- Samba Shared Repository