[SCM] Samba Shared Repository - branch v4-0-stable updated
Andrew Bartlett
abartlet at samba.org
Wed Aug 1 03:47:11 MDT 2012
The branch, v4-0-stable has been updated
via 50d6483 VERSION: Mark as the beta5 release
via fb24f47 WHATSNEW: prepare for 4.0 beta5
via 3178741 s4-repl: Add tests for add replication conflicts and use of LostAndFound
via 6d1b8ff s4-dsdb: Replace any existing lastKnownParent attribute during delete
via fcb54ca s4-dsdb: Improve tracing in repl_meta_data
via bc5be09 s4-dsdb: Handle rename conflicts in both directions
via 8208d7b lib/ldb: Ensure rename target does not exist before deleting old record
via 221cd52 s4-dsdb: Request extended DN and show deleted when searching for a possible parent
via eaa381a s3: Fix Coverity ID 710791 Resource leak
via 3bc1f45 s3: Fix Coverity ID 710803 Resource leak
via d1dccfb s3: Fix Coverity ID 710818 Resource leak
via 2ddc3a2 s3: Fix Coverity ID 710827 Resource leak
via c03e976 tevent: Refer to the correct header in testsuite.c
via d2eb26c s3: Make request_timed_out() static
via 35c0f16 s3:smbd: do a clean shutdown during release_ip() after CTDB_SRVID_RELEASE_IP
via d73b793 s3:smbd: use print_sockaddr() instead of client_socket_addr()
via 13de233 s3:smbd: move smbd_register_ips() next to release_ip()
via ec69eb4 s3:dbwrap_ctdb: initialize db_record->db
via cddcaf7 ldb: Add parameter to avoid NULL format string flagged by -Werror=format
via 0e1814c s3-utils: Add cast to fix error found by -Werror=format
via 3aa6f08 build: Add more -Werror flags now the tree is clean of these errors
via d6f47bd s4-torture: Fix format string errors found by -Werror=format
via ea6b8ee lib/tdb: Fix format string errors found by -Werror=format in tdb tests
via 17bddd1 lib/ntdb: Fix format string errors found by -Werror=format in ntdb tests
via 5b4792d lib/ccan: Fix format string errors found by -Werror=format in ccan failtest
via 0f21fe7 auth/kerberos: Do not do pointer arithmatic on a void *
via 2dfb2a4 s4-samba-tool ldapcmp: Fix synopsis
via 14bd5ca s4-samba-tool ldapcmp: Add ridNextRID and rIDPreviousAllocationPool as per-DC attributes
via 13095a9 dfs_server_ad: s/acct/aname as acct() is a function
via 6c21ae7 dfs_server_ad: return STATUS_NOT_FOUND if the client connects to an ip address
via b567d3a s4-dsdb: Fill in lastKnownParent when moving to lostAndFound
via 54b83ce s4-dsdb: Do not strip base components off DN before searching for NC root
via 056b215 s4-dsdb: Change move to lostAndFound to use container in this partiion and add debugging
via 03a75af s4-dsdb: Provide a way to force incoming renames to take priority
via 26eb354 s4-dsdb: Provide a way to handle conflicts due to rename
via fc6d7bf s4-librpc: Fix private context for dcerpc_connect_timeout_handler
via 1547d5f s4-repl: Use ldb_dn_new() to create the rootDSE DN
via de0b902 s4-repl: Use NULL for pointer test when checking for ldb_msg_new() failure
via 9c9df9c s3-libsmbclient: Add missing talloc_stackframe() calls
via 6a37b55 s4-dbcheck: Add lastKnownParent when moving an object to lostAndFound
via dc00df2 lib/param: Rename "socket address" to "nbt client socket address" to clarify role
via b181a0b lib/param: Remove use of lp{cfg,}_socket_address outside the NBT client and server
via ec64f79 lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char *
via ca24820 lib/param: Remove unused "paranoid server security"
via ecb89ce docs: Mark "socket address" as deprecated
via 42e405a param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286
via bc1826a lib/param: Merge parameter tables into a common file
via c4eeda9 lib/param: Merge in source3 parameters into parmeter table
via 081a010 lib/param: Merge "Security Options" section from source3/param
via 8cb47ef lib/param: Merge "Logging Options" section from source3/param
via 2429647 s3-param: Merge "log file" parameter with lib/param
via 08691f7 lib/param: Merge "Protocol Options" section from source3/param
via 97a6447 lib/param: Merge "Tuning Options" section from source3/param
via c5713ac lib/param: Merge "Printing Options" section from source3/param
via a943a9b s3-build: Make recursive waf build a developer build again (to build developer test facilities)
via 9b59590 s3:vlp: fix build on OS X
via 86c2d48 buildtools: use egrep when we need the "-f patternfile" option
via 4f0b8f3 s3/aio_fork: fix build on irix
via 4b914a2 s3: use libreplace in pthreadpooltest to fix some builds
via 96340e6 s3: add Darwin sendfile support and merge with the FreeBSD code
via 887cebf s3:waf: add Darwin sendfile() test
via d347c8d s3:configure: add Darwin sendfile() test
via 115a88e lib/param: Merge "Filename Handling" section from source3/param
via deb9a05 lib/param: Merge "Domain Options" section from source3/param
via 932f0a6 lib/param: Merge "Logon Options" section from source3/param
via b727e70 lib/param: Merge "Browse Options" section from source3/param
via 3f1dfdd lib/param: Merge "WINS Options" section from source3/param
via ebc2cc7 lib/param: Merge "Locking Options" section from source3/param
via 3e9c001 lib/param: Merge "Ldap Options" section from source3/param
via 8d2ba95 lib/param: Merge "EventLog Options" section from source3/param
via a0e08ac lib/param: Merge "Miscellaneous Options" section from source3/param
via a67daa3 s3:smb2_negprot: return the current system time in the SMB2 NEGPROT response
via f6592c4 s3:smbd: fix compiler warnings in notify_internal.c
via 8cb6557 libcli/smb: add basic session->smb2.channel_sequence handling
via fdd9867 libcli/smb: add SMB2_HDR_CHANNEL_SEQUENCE
via ba14bc5 libcli/smb: introduce a smb2cli_session
via df08929 s3:smb2_sesssetup: reject SMB2_SESSION_FLAG_BINDING requests
via 46e08eb s3:libcli/smb: add SMB2_SESSION_FLAG_BINDING
via 859e5be s3:smb2_ioctl: fix GUID_compare() check in FSCTL_VALIDATE_NEGOTIATE_INFO
via 3a85737 s3:smb2_ioctl: allow clients to send padding at the end of FSCTL_VALIDATE_NEGOTIATE_INFO
via 3cce521 s3:smb2_ioctl: remove FSCTL_VALIDATE_NEGOTIATE_INFO_224 implementation
via 5c3a0cb libcli/smb: setup tcon->smb2.should_encrypt in smb2cli_tcon_set_values()
via 0aac3c0 libcli/smb: pass smbXcli_session to smb2cli_tcon_set_values()
via 4d6d783 s4:libcli/smb2: remove unused smb2_session->pid
via bb6761c s3:libsmb: remove unused cli_state->smb2.pid
via e20e84d s4:libcli/smb2: remove unused variable
via 56aa419 libcli/smb: there's no PID field in the SMB2/3 header anymore
via 7de4ae7 libcli/smb: pass smbXcli_tcon to smb2cli_req_create/send()
via 57fda88 s4:libcli/smb2: remove unused elements from smb2_tree
via 56af56d s4:torture/smb2: create temporary smbXcli_tcon/session structures instead of changing them
via 72e047f s4:torture/smb2: use smb2cli_tcon_capabilities()
via a10fe7b libcli/smb: add smb2cli_tcon_capabilities()
via 167d94c s3:libsmb: remove unused tcon specific elements from cli_state->smb2
via d2ba9c3 s3:libsmb: remove cli_state->smb2.tid
via 18bd029 s4:torture: remove unused shm_setup()
via 97b1776 s4:torture: replace shm_setup() with anonymous_shared_allocate()
via b0f1921 s3:torture: remove unused shm_setup()
via e0bc165 s3:torture: replace shm_setup() with anonymous_shared_allocate()
via c66a45d s3:smb2_server: simplify the talloc_pool handling for smbd_smb2_request
via d58aa46 Fix bug 9065: source3/registry/regfio.c: bad call to memcpy Signed-off-by: Jeremy Allison <jra at samba.org>
via 79ccb96 s3:torture/test_smb2: make a copy of smbXcli_tcon
via 20d43a1 libcli/smb: pass smbXcli_tcon to smb2cli_ioctl*()
via 51af8b9 libcli/smb: pass smbXcli_tcon to smb2cli_query_directory*()
via 370e714 libcli/smb: pass smbXcli_tcon to smb2cli_query_info*()
via 6dc701c libcli/smb: pass smbXcli_tcon to smb2cli_set_info*()
via 6612c83 libcli/smb: pass smbXcli_tcon to smb2cli_flush*()
via 86a5ab7 libcli/smb: pass smbXcli_tcon to smb2cli_write*()
via 697b82a libcli/smb: pass smbXcli_tcon to smb2cli_read*()
via 74f9b52 libcli/smb: pass smbXcli_tcon to smb2cli_close*()
via 32b3399 libcli/smb: pass smbXcli_tcon to smb2cli_create*()
via 92efe1a s3:libsmb: setup a smbXcli_tcon for SMB2
via 41538b1 s4:libcli/smb2: setup a smbXcli_tcon for each smb2_tree
via b9100a7 libcli/smb: pass down smbXcli_tcon to smb1cli_req_create/send() and smb1cli_trans*
via 29dc01b s4:libcli/raw: setup a smbXcli_tcon for each smbcli_tree
via ed72628 s3:libsmb: use a smbXcli_tcon instead of uint16_t cli_state->smb1.tid
via 552dda9 libcli/smb: add smbXcli_tcon structure
via 20e4392 s3:libsmb: make use of cli_state_[g|s]et_tid()
via cc0d490 s4:libcli/raw: parse extended SMBtconX responses
via a6e5b98 s4:libcli/raw: fix SMBtconX response parsing
via d00d206 waf: Update to newer upstream snapshot.
via 867de2f s3-pdb: remove unused variables.
via 221a430 lib/param: Merge VFS and MSDFS parameters from source3 into lib/param
via c7df664 lib/param: Merge Winbind parameters from source3 into lib/param
via 19a8867 lib/param: Merge DNS parameters with source3 param
via 9ee084f lib/param: Rearrange AD DC options to make a merge with the source3 table easier
via 222850b lib/param: Re-arrange TLS parameters into their own section
via c1065ff lib/param: Add handler overrides
via 3367fd0 lib/param: Merge handling of security/domain master/domain logons/server role
via b62b031 lib/param: Make lp_usershare_max_shares() a common parameter
via f356242 lib/param: Move all enum declarations to lib/param
via 280d187 lib/param: Rename param_enums.c to param_table.c
via b94ab3c lib/param: Remove 'case insensitive filesystem'
via 8b1a9f3 lib/param: Remove "ntptr providor" and hard-code in s4 spoolss server
via 01f25ad s3-param: Merge parameter varaibles with lib/param
via 7881f4a s3-param: fix indent on cups encrypt
via 2daf120 s3-param: Merge a number of s4 parameters from lib/param to make this table common
via 80d3208 param: Make internal handler for 'server role' common
via 9521cd0 param: Make the 'unicode' parameter common
via 69e98ff Remove unused variable.
via 644d48d Fix compiler warning message.
via b76d574 Fix incorrect use of server as a talloc context.
via 61cec27 Fix unused variable.
via e5a3218 Fix compiler warning.
via 4c1762c Fix debug print warning message.
via 00050a1 build: Add -Werror=address to the developer build
via 43b070d libcli/smb: pass down smbXcli_session to smb1cli_req_create/send() and smb1cli_trans*
via af90c71 s4:libcli/raw: setup a smbXcli_session for each smbcli_session
via cdec0c4 s3:libsmb: use cli_state_{g,s}et_uid instead of smb1.uid directly
via 6bff589 libcli/smb: introduce smb1.session for uid use
via a256d61 s3-winbind: Fix bug #9052 resolving our own "Domain Local" groups.
via 111c215 Fix problem found by Andrew Bartlett - correctly check encrypted flag.
via 4b64ec5 libcli/smb: set should_encrypt = true if we got SMB2_SESSION_FLAG_ENCRYPT_DATA
via 6b93210 libcli/smb: encrypt SMB2 traffic if nedded/desired.
via 6e651df libcli/smb: increment nbt_len, when we have the fully created the SMB2 PDU
via f08adbb libcli/smb: maintain smb2.should_sign on smbXcli_req_state
via 92811c6 libcli/smb: make use of SMB2_HDR_BODY as header size
via be8e33e libcli/smb: parse the SMB2_TRANSFORM header and decrypt the SMB2 pdu
via c2b0a48 libcli/smb: create 4 iovecs per request in smb2cli_inbuf_parse_compound()
via 5863107 libcli/smb: prepare [en|de]cryption_key for SMB3
via d333edb libcli/smb: copy the application_key in smb2cli_session_create_channel()
via 077eb57 libcli/smb: check the buffer length in smbXcli_negprot_dispatch_incoming()
via 1c144b0 libcli/smb: only pass the smb2 buffer to smb2cli_inbuf_parse_compound()
via fd736f7 libcli/smb: add smb2_signing_[en|e]crypt_pdu()
via 7e09824 libcli/smb: construct the signing_key before forming the message
via 5adf63f lib/crypto: add aes_ccm_128
via 4628e28 libcli/smb: add SMB2_SESSION_FLAG_ENCRYPT_DATA
via d728567 libcli/smb: add SMB2_TRANSFORM macros
via a41a1d1 s3:test_smb2: copy the session_channel from the primary channel.
via 88f326a s3:smb2_tcon: reject access to shares mark as "smb encrypt = required"
via 3fe601a s3-winbind: Fix idmap initialization debug message.
via 0b903e1 s3:smbd: if a fsp has fsp->deferred_close, clients shouldn't be able to use it
via e2cea8f s4-classicupgrade: Add unix attributes during upgrade
via e8b3b1c s4 rfc2307 gids mapping fix
via f7b88fb Use ippGet/ippSet (accessors) for IPP API.
via b336b8e Remove source3/lib/pidfile.c
via e8dbf28 Move everything to use the common pidfile functions.
via f58d8fe Fix the configure build - add lib/util/pidfile.o into UTIL_OBJ.
via 0d24370 Make the s3 pidfile use the common code inside lib/util/pidfile.c
via 3e476e1 Add debugs to functions. Add pidfile_unlink().
via 2922fda Move source4/smbd/pidfile into lib/util in preparation for making it in common.
via 03a6137 s3-param: Remove special case for lp_ctdbd_socket(), set CTDB_PATH as default
via 0f57da5 lib/param: bring lp_smb_ports() into common by making it a list everywhere
via cf9bd1d s3-param: Make lp_name_resolve_order() return a list
via 8822b3b s4-param: Remove unused "idmap trusted only"
via d2ae817 lib/param: Add my copyright
via 1cbbd2d lib/param: bring lp_time_server() into common
via 376dc5c s3-auth Use correct RID for domain guests primary group
via 11d7f77 s3-rpc_server: Remove make_server_info_info3() call from make_server_pipes_struct()
via cbc3083 auth/credentials: Remove extra newline
via 9130bbb selftest: Run unix.whomai against the machine acccount as well
via 38a4703 Revert "s3:auth make sure the primary group sid is usable"
via faa9b2e s4-torture: Move check of map-to-guest above SID list check
via 624f11e s4-torture: Allow unix.whoami to test against a member server
via 8825085 s4-torture: Also print GID values in whoami test
via 6305b4b torture: Print SIDs as additional debug output in unix.whoami
via 8ef968a s3-aio: Panic if we try to close a fsp with outstanding aio requests
via a6b5836 s3-smb2: Postpone close_file until all aio is handled
via 3e9f58b s3-smb1: Postpone close_file until all aio is handled
via 3da86cc s3: Add tevent_wait_send/recv
via f79fb44 s3: Slightly simplify reply_close()
via 730d3e8 s3: Compile with pthreadpool by default
via 4a9b5cc config: The AIO engine is indepent of HAVE_AIO now
via d948b1b s3: Add aio_fsync to the aio_linux module
via d6cb302 s3: Add aio_fsync to the aio_fork module
via 38dd5b2 s3-aio-fork: make "read_cmd" an enum
via e3f3c09 s3: Add aio_fsync to the aio_posix module
via ed31e20 s3-aio: Make the strict sync after write async
via 56aae9f s3: Add a _nosync version of smb2_write_complete
via 5d09cec s3-vfs: async fsync
via 3882113 s3: Fix the build
via dc5e3fb s3-libasys: Add asys_fsync() implementation
via fd351b6 s3: Make us survive base-delaywrite with aio enabled
via c4efaab s3: Move the aio_pthread read/write functionality to vfs_default
via 9dc78c9 s3-aio: Remove unused VFS functions and more
via be05dad s3-vfs: Add pwrite_send/recv to vfs modules
via 90461aa s3-vfs: Add pread_send/recv to vfs modules
via 4668398 s3: Convert aio_linux to pread/pwrite_send/recv
via 9e1c873 s3: Convert aio_fork to pread/pwrite_send/recv
via bf8696f s3-aio_fork: Convert get_idle_child from NTSTATUS to errno
via b65ab9d s3-aio_fork: Convert create_aio_child from NTSTATUS to errno
via ff701ce s3: Add vfs_aio_posix
via f9df073 s3: Make smbd/aio.c not depend on aio.h anymore
via 715653a s3:vfs_aio_pthread: Convert to libasys
via 66eb7bc s3: Remove the unused completion handling from aio.c
via f5dc883 s3: Properly handle shutdown with the _send/_recv based aio
via aff6956 s3: Use SMB_VFS_PWRITE_SEND in schedule_smb2_aio_write
via 6df7ba3 s3: Use SMB_VFS_PREAD_SEND in schedule_smb2_aio_read
via 2bad405 s3: Use SMB_VFS_PWRITE_SEND in schedule_aio_write_and_X
via 7c32017 s3: Use SMB_VFS_PREAD_SEND in schedule_aio_read_and_X
via e24aed1 s3-vfs: async pread
via c6e456d s3-vfs: async pwrite
via d44ccdd libasys
via 24f7085 s3:Really ignore unknown special ids in NFSv4 ACLs.
via 9dd0510 docs-xml: document smbstatus --notify
via 35a4a57 docs-xml: document smbstatus --fast
via a01a93a s3:smbstatus add --fast option
via 07412b5 s3:smbstatus don't check if process exists twice
via 36432621 s3:smbstatus rename a function to make its purpose more clear
via 31f0d30 s3:smbstatus fix a compiler warning
via d0d05f8 s4-lib/tls: Try socket_send() multiple times to send partial packets
via 02a356e s4-librpc: Ensure we do not call call the decrpc timeout handler during gensec_update()
via fc36ebf s4-dbcheck: Check for and correct incorrect instanceType values
via e4001a7 dsdb: Allocate new OID to allow updates of a read-only replica
via 5630e25 s4-dsdb: Allow dbcheck to correct an incorrect instanceType
via 96db134 s4-dsdb: Ensure we never write read-only objects onto a read-write replica
via 127352c source4/torture: add talloc_stackframe()
via 06731bc source3/netapi: fix only caller which doesn't set up a talloc_stackframe()
via d54ebd3 source3/passdb/py_passdb.c: wrap all calls in talloc_stackframe()
via 9927233 source3/passdb/py_passdb.c: don't steal from talloc_stackframe().
via 51ec59d source3/torture/pdbtest: allocate talloc_stackframe()
via 1f8b574 talloc_stack: abort in developer me if no stackframe on talloc_tos()
via fe72740 loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *.
via c809eec source3/utils/net_conf.c: fix stackframe leak
via aa2e02e source3/winbindd/winbindd_pam.c: fix stackframe leak
via f3001e8 source3/lib/smbconf/testsuite.c: fix stackframe leak
via 15faffc source3/registry/reg_backend_db.c: fix stackframe leak
via 5716570 source3/winbindd/idmap_tdb_common.c: fix stackframe leak
via 32c69e6 source3/rpc_server/svcctl/srv_svcctl_reg.c: fix stackframe leak
via bdc59fb source3/modules/vfs_xattr_tdb.c: fix stackframe leak
via a620fc0 lib/util/modules.c: fix stackframe leak.
via 2314c60 source3/winbindd/winbindd_util.c: fix stackframe leak
via 7a65910 nt_printing_tdb_migrate(): fix stackframe leak.
via dcec7c1 source3/client/client.c: fix stackframe leak.
via 634a63d smbpasswd: always free frame.
via 84fb37f talloc_stack: report lazy freeing (panic if DEVELOPER).
via f9b51ff talloc_stack: always include the location when creating a talloc_stackframe().
via 311281c talloc_stack: handle more than one talloc_stackframe_pool()
via 4f33187 talloc: don't allow a talloc_pool inside a talloc_pool.
via 8893215 talloc: use a struct for pool headers.
via d1a5a5b s3-linux-aio: Fix error handling
via 254e8c4 Add debug message when SD hash doesn't match.
via 2d1334e s3-autoconf: Fix the build.
via 98b9ef5 Enable AES in winbind.
via 33206b1 s3-rpc_client: Fix updating netlogon credentials.
via 572b549 s3-rpc_client: Add capabilities check for AES encrypted connections.
via 18692b0 s4-auth: Make sure we use the correct credential state.
via 197781a s4-librpc: Add capabilities check for AES encrypted connections.
via a3e8356 s4-torture: Improve samlogon test.
via 2c3dc04 s4-torture: Add DCERPC_SCHANNEL_AES tests.
via 5e25fc6 s3:rpc_server: add support for AES bases netlogon schannel
via 04d770a s4:rpc_server/netlogon: add support for AES based netlogon schannel
via 780006d s4:librpc/rpc: add DCERPC_SCHANNEL_AES support
via a7208de libcli/auth: add support for AES/HMAC-SHA256 to the netlogon schannel sign/seal
via 99e5241 libcli/auth: add support for AES/HMAC-SHA256 schannel session key support
via 9923118 s4:rpc_server/netlogon: only return STRONG_KEYS if the client asked for it
via e48aabc s4:rpc_server/netlogon: implement netr_LogonGetCapabilities
via 342a2e6 s4:librpc/rpc/dcerpc_schannel: just append NETLOGON_NEG_RODC_PASSTHROUGH as rodc
via e7c7a91 s4:librpc/rpc/dcerpc_schannel: rework downgrade logic
via db33ef7 VERSION: Move on to beta5!
from 3a6f1f9 VERSION: Mark as the beta4 release
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 54 +-
auth/credentials/credentials_secrets.c | 2 +-
auth/kerberos/gssapi_pac.c | 2 +-
buildtools/compare_config_h3.sh | 4 +-
buildtools/wafadmin/Tools/python.py | 4 +-
buildtools/wafsamba/samba_autoconf.py | 2 +-
dfs_server/dfs_server_ad.c | 14 +-
docs-xml/manpages-3/smbstatus.1.xml | 18 +
docs-xml/manpages-3/vfs_full_audit.8.xml | 7 -
.../smbdotconf/misc/nbtclientsocketaddress.xml | 19 +
docs-xml/smbdotconf/misc/socketaddress.xml | 20 -
examples/VFS/skel_opaque.c | 100 +-
examples/VFS/skel_transparent.c | 207 +-
lib/ccan/failtest/failtest.c | 4 +-
lib/crypto/aes_ccm_128.c | 170 +
lib/crypto/aes_ccm_128.h | 54 +
lib/crypto/crypto.h | 1 +
lib/crypto/wscript_build | 2 +-
lib/ldb/ABI/{ldb-1.1.6.sigs => ldb-1.1.9.sigs} | 0
...pyldb-util-1.1.2.sigs => pyldb-util-1.1.9.sigs} | 0
lib/ldb/ldb_map/ldb_map.c | 2 +-
lib/ldb/ldb_tdb/ldb_tdb.c | 42 +-
lib/ldb/wscript | 2 +-
lib/ntdb/test/api-check-callback.c | 2 +-
lib/param/loadparm.c | 1316 +------
lib/param/loadparm.h | 85 +
lib/param/param_enums.c | 120 -
lib/param/param_functions.c | 14 +-
lib/param/param_table.c | 4380 ++++++++++++++++++++
lib/replace/libreplace_cc.m4 | 1 +
lib/replace/wscript | 4 +
lib/talloc/talloc.c | 201 +-
lib/talloc/talloc.h | 3 +-
lib/talloc/testsuite.c | 2 +-
lib/tdb/test/run-transaction-expand.c | 8 +-
lib/tevent/testsuite.c | 2 +-
lib/util/debug_s3.c | 2 +-
lib/util/modules.c | 3 +-
lib/util/pidfile.c | 155 +
lib/util/pidfile.h | 27 +
lib/util/talloc_stack.c | 51 +-
lib/util/talloc_stack.h | 9 +-
lib/util/wscript_build | 2 +-
libcli/auth/credentials.c | 66 +-
libcli/auth/credentials.h | 2 -
libcli/auth/schannel_sign.c | 188 +-
libcli/smb/smb1cli_trans.c | 30 +-
libcli/smb/smb2_constants.h | 22 +-
libcli/smb/smb2_signing.c | 132 +
libcli/smb/smb2_signing.h | 9 +
libcli/smb/smb2cli_close.c | 9 +-
libcli/smb/smb2cli_create.c | 12 +-
libcli/smb/smb2cli_flush.c | 12 +-
libcli/smb/smb2cli_ioctl.c | 9 +-
libcli/smb/smb2cli_query_directory.c | 10 +-
libcli/smb/smb2cli_query_info.c | 9 +-
libcli/smb/smb2cli_read.c | 9 +-
libcli/smb/smb2cli_session.c | 6 +-
libcli/smb/smb2cli_set_info.c | 9 +-
libcli/smb/smb2cli_write.c | 12 +-
libcli/smb/smbXcli_base.c | 655 +++-
libcli/smb/smbXcli_base.h | 99 +-
libgpo/gpo_ldap.c | 1 +
librpc/rpc/rpc_common.h | 3 +
script/mks3param.pl | 2 -
selftest/knownfail | 1 +
source3/Makefile-smbtorture4 | 2 +-
source3/Makefile.in | 37 +-
source3/auth/auth_generic.c | 1 +
source3/auth/auth_util.c | 54 +-
source3/auth/pampass.c | 2 +-
source3/auth/user_krb5.c | 1 +
source3/auth/user_util.c | 4 +-
source3/client/client.c | 24 +-
source3/configure.in | 78 +-
source3/groupdb/mapping.c | 20 +-
source3/include/ads.h | 11 -
source3/include/client.h | 13 +-
source3/include/includes.h | 18 +-
source3/include/printing.h | 1 +
source3/include/proto.h | 199 +-
source3/include/smb.h | 61 -
source3/include/vfs.h | 79 +-
source3/include/vfs_macros.h | 55 +-
source3/lib/asys/asys.c | 317 ++
source3/lib/asys/asys.h | 146 +
source3/lib/asys/tests.c | 92 +
source3/lib/asys/wscript_build | 9 +
source3/lib/dbwrap/dbwrap_ctdb.c | 1 +
source3/lib/netapi/netapi.c | 4 +
source3/lib/netapi/serverinfo.c | 4 +-
source3/lib/pidfile.c | 191 -
source3/lib/sendfile.c | 94 +-
source3/lib/smbconf/testsuite.c | 1 +
source3/lib/smbldap.c | 4 +-
source3/lib/sysquotas.c | 4 +-
source3/lib/system.c | 144 -
source3/lib/tevent_wait.c | 83 +
source3/lib/tevent_wait.h | 37 +
source3/lib/util.c | 4 +-
source3/lib/util_sid.c | 9 +-
source3/lib/util_str.c | 1 +
source3/libads/kerberos_util.c | 1 +
source3/libads/ldap.c | 1 +
source3/libads/ldap_utils.c | 1 +
source3/libads/ndr.c | 1 +
source3/libads/sasl.c | 1 +
source3/libnet/libnet_dssync_passdb.c | 4 +-
source3/libnet/libnet_join.c | 1 +
source3/libnet/libnet_samsync_ldif.c | 40 +-
source3/libnet/libnet_samsync_passdb.c | 4 +-
source3/librpc/crypto/gse_krb5.c | 1 +
source3/libsmb/async_smb.c | 8 +-
source3/libsmb/cli_np_tstream.c | 17 +-
source3/libsmb/cliconnect.c | 7 +-
source3/libsmb/clidgram.c | 3 +-
source3/libsmb/clientgen.c | 30 +-
source3/libsmb/clitrans.c | 8 +-
source3/libsmb/dsgetdcname.c | 3 +-
source3/libsmb/libsmb_context.c | 16 +
source3/libsmb/libsmb_xattr.c | 1 +
source3/libsmb/namequery.c | 48 +-
source3/libsmb/namequery_dc.c | 1 +
source3/libsmb/smb2cli_tcon.c | 39 +-
source3/modules/nfs4_acls.c | 1 +
source3/modules/vfs_acl_common.c | 5 +
source3/modules/vfs_aio_fork.c | 666 ++--
source3/modules/vfs_aio_linux.c | 665 +---
source3/modules/vfs_aio_posix.c | 300 ++
source3/modules/vfs_aio_pthread.c | 564 +---
source3/modules/vfs_default.c | 277 +-
source3/modules/vfs_dfs_samba4.c | 2 +-
source3/modules/vfs_expand_msdfs.c | 2 +-
source3/modules/vfs_fileid.c | 2 +-
source3/modules/vfs_full_audit.c | 328 +-
source3/modules/vfs_recycle.c | 2 +-
source3/modules/vfs_time_audit.c | 348 +-
source3/modules/vfs_xattr_tdb.c | 4 +-
source3/modules/wscript_build | 10 +
source3/nmbd/nmbd.c | 11 +-
source3/nmbd/nmbd_sendannounce.c | 7 +-
source3/nmbd/nmbd_serverlistdb.c | 2 +-
source3/nmbd/nmbd_winsserver.c | 2 +-
source3/nmbd/nmbd_workgroupdb.c | 2 +-
source3/param/loadparm.c | 4192 +------------------
source3/param/loadparm_ctx.c | 6 +-
source3/param/service.c | 4 +-
source3/passdb/pdb_interface.c | 8 +-
source3/passdb/pdb_ipa.c | 8 +-
source3/passdb/pdb_ldap.c | 57 +-
source3/passdb/pdb_ldap_util.c | 6 +-
source3/passdb/pdb_smbpasswd.c | 5 +-
source3/passdb/pdb_tdb.c | 3 +-
source3/passdb/py_passdb.c | 1025 +++---
source3/passdb/secrets.c | 2 +-
source3/printing/load.c | 2 +-
source3/printing/notify.c | 16 +-
source3/printing/nt_printing.c | 10 +-
source3/printing/nt_printing_ads.c | 2 +-
source3/printing/nt_printing_migrate_internal.c | 1 +
source3/printing/nt_printing_os2.c | 2 +-
source3/printing/print_cups.c | 219 +-
source3/printing/print_generic.c | 26 +-
source3/printing/print_iprint.c | 268 +-
source3/printing/printing.c | 38 +-
source3/printing/printspoolss.c | 5 +-
source3/printing/spoolssd.c | 12 +-
source3/registry/reg_backend_db.c | 6 +-
source3/registry/regfio.c | 2 +-
source3/rpc_client/cli_pipe.c | 164 +-
source3/rpc_server/epmd.c | 5 +-
source3/rpc_server/lsasd.c | 6 +-
source3/rpc_server/netlogon/srv_netlog_nt.c | 4 +
source3/rpc_server/rpc_server.c | 56 +-
source3/rpc_server/rpc_sock_helper.c | 18 +-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 10 +-
source3/rpc_server/samr/srv_samr_nt.c | 14 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 40 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 97 +-
source3/rpc_server/svcctl/srv_svcctl_reg.c | 1 +
source3/rpc_server/winreg/srv_winreg_nt.c | 10 +-
source3/rpcclient/cmd_fss.c | 4 +-
source3/selftest/tests.py | 14 +-
source3/smbd/aio.c | 1066 +++---
source3/smbd/close.c | 32 +-
source3/smbd/conn_idle.c | 3 +-
source3/smbd/connection.c | 7 +-
source3/smbd/dfree.c | 2 +-
source3/smbd/dosmode.c | 3 +-
source3/smbd/fake_file.c | 4 +-
source3/smbd/files.c | 20 +-
source3/smbd/globals.c | 4 -
source3/smbd/globals.h | 16 +-
source3/smbd/lanman.c | 25 +-
source3/smbd/mangle.c | 2 +-
source3/smbd/mangle_hash.c | 1 +
source3/smbd/message.c | 12 +-
source3/smbd/msdfs.c | 42 +-
source3/smbd/negprot.c | 6 +-
source3/smbd/notify_internal.c | 8 +-
source3/smbd/nttrans.c | 4 +-
source3/smbd/open.c | 6 +-
source3/smbd/password.c | 2 +-
source3/smbd/perfcount.c | 2 +-
source3/smbd/posix_acls.c | 1 +
source3/smbd/process.c | 101 +-
source3/smbd/proto.h | 6 +-
source3/smbd/reply.c | 132 +-
source3/smbd/server.c | 45 +-
source3/smbd/server_exit.c | 3 +-
source3/smbd/server_reload.c | 8 +-
source3/smbd/service.c | 102 +-
source3/smbd/share_access.c | 19 +-
source3/smbd/smb2_close.c | 52 +
source3/smbd/smb2_find.c | 4 +-
source3/smbd/smb2_ioctl.c | 81 +-
source3/smbd/smb2_negprot.c | 3 +-
source3/smbd/smb2_server.c | 40 +-
source3/smbd/smb2_sesssetup.c | 13 +
source3/smbd/smb2_tcon.c | 15 +-
source3/smbd/smb2_write.c | 30 +-
source3/smbd/smbd.h | 1 -
source3/smbd/trans2.c | 40 +-
source3/smbd/uid.c | 15 +-
source3/smbd/vfs.c | 246 +-
source3/torture/cmd_vfs.c | 2 +-
source3/torture/nbio.c | 2 +-
source3/torture/pdbtest.c | 4 +-
source3/torture/proto.h | 1 -
source3/torture/test_smb2.c | 208 +-
source3/torture/torture.c | 61 +-
source3/utils/cclean.c | 4 +-
source3/utils/net_ads.c | 1 +
source3/utils/net_conf.c | 2 +
source3/utils/net_idmap.c | 3 +-
source3/utils/net_sam.c | 15 +-
source3/utils/net_usershare.c | 8 +-
source3/utils/nmblookup.c | 2 +-
source3/utils/ntlm_auth.c | 1 +
source3/utils/smbcontrol.c | 3 +-
source3/utils/smbpasswd.c | 14 +-
source3/utils/status.c | 29 +-
source3/utils/testparm.c | 44 +-
source3/web/startstop.c | 8 +-
source3/web/statuspage.c | 3 +-
source3/web/swat.c | 6 +-
source3/winbindd/idmap.c | 2 +-
source3/winbindd/idmap_ldap.c | 2 +-
source3/winbindd/idmap_tdb_common.c | 1 +
source3/winbindd/nss_info.c | 2 +-
source3/winbindd/winbindd.c | 13 +-
source3/winbindd/winbindd_cm.c | 3 +-
source3/winbindd/winbindd_dual.c | 5 +-
source3/winbindd/winbindd_pam.c | 3 +-
source3/winbindd/winbindd_util.c | 18 +-
source3/wscript | 50 +-
source3/wscript_build | 9 +-
source4/auth/gensec/schannel.c | 7 +-
source4/dsdb/pydsdb.c | 1 +
source4/dsdb/repl/replicated_objects.c | 17 +-
source4/dsdb/samdb/ldb_modules/instancetype.c | 8 +-
source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 12 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 314 ++-
source4/dsdb/samdb/samdb.h | 6 +
source4/ldap_server/ldap_backend.c | 4 +-
source4/lib/socket/interface.c | 10 -
source4/lib/tls/tls.c | 39 +-
source4/libcli/raw/clisession.c | 14 +-
source4/libcli/raw/clitransport.c | 26 +-
source4/libcli/raw/clitree.c | 14 +-
source4/libcli/raw/interfaces.h | 2 +
source4/libcli/raw/libcliraw.h | 2 +
source4/libcli/raw/rawrequest.c | 4 +
source4/libcli/raw/rawtrans.c | 36 +-
source4/libcli/smb2/connect.c | 9 +-
source4/libcli/smb2/request.c | 2 -
source4/libcli/smb2/session.c | 2 -
source4/libcli/smb2/smb2.h | 4 +-
source4/libcli/smb2/tcon.c | 8 +
source4/libcli/smb2/transport.c | 18 +-
source4/librpc/rpc/dcerpc.h | 8 +
source4/librpc/rpc/dcerpc_auth.c | 17 +
source4/librpc/rpc/dcerpc_connect.c | 17 +-
source4/librpc/rpc/dcerpc_schannel.c | 176 +-
source4/param/share_classic.c | 27 +-
source4/rpc_server/netlogon/dcerpc_netlogon.c | 83 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 2 +-
source4/scripting/python/samba/dbchecker.py | 80 +-
source4/scripting/python/samba/netcmd/ldapcmp.py | 3 +-
source4/scripting/python/samba/upgrade.py | 109 +-
source4/setup/schema_samba4.ldif | 1 +
source4/smbd/pidfile.c | 131 -
source4/smbd/server.c | 2 +-
source4/smbd/wscript_build | 8 +-
source4/torture/drs/python/drs_base.py | 8 +
source4/torture/drs/python/replica_sync.py | 301 ++
source4/torture/libnetapi/libnetapi.c | 3 +
source4/torture/nbench/nbio.c | 2 +-
source4/torture/rpc/fsrvp.c | 12 +-
source4/torture/rpc/samlogon.c | 8 +
source4/torture/rpc/schannel.c | 6 +-
source4/torture/smb2/compound.c | 68 +-
source4/torture/smb2/durable_v2_open.c | 8 +-
source4/torture/smb2/lock.c | 4 -
source4/torture/smb2/notify.c | 14 +-
source4/torture/smb2/util.c | 10 +-
source4/torture/unix/whoami.c | 99 +-
source4/torture/util.h | 1 -
source4/torture/util_smb.c | 61 +-
source4/winbind/idmap.c | 21 +-
source4/wrepl_server/wrepl_in_connection.c | 5 +-
312 files changed, 13169 insertions(+), 11473 deletions(-)
create mode 100644 docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
delete mode 100644 docs-xml/smbdotconf/misc/socketaddress.xml
create mode 100644 lib/crypto/aes_ccm_128.c
create mode 100644 lib/crypto/aes_ccm_128.h
copy lib/ldb/ABI/{ldb-1.1.6.sigs => ldb-1.1.9.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.2.sigs => pyldb-util-1.1.9.sigs} (100%)
delete mode 100644 lib/param/param_enums.c
create mode 100644 lib/param/param_table.c
create mode 100644 lib/util/pidfile.c
create mode 100644 lib/util/pidfile.h
create mode 100644 source3/lib/asys/asys.c
create mode 100644 source3/lib/asys/asys.h
create mode 100644 source3/lib/asys/tests.c
create mode 100644 source3/lib/asys/wscript_build
delete mode 100644 source3/lib/pidfile.c
create mode 100644 source3/lib/tevent_wait.c
create mode 100644 source3/lib/tevent_wait.h
create mode 100644 source3/modules/vfs_aio_posix.c
delete mode 100644 source4/smbd/pidfile.c
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 57b1289..a310c84 100644
--- a/VERSION
+++ b/VERSION
@@ -67,7 +67,7 @@ SAMBA_VERSION_ALPHA_RELEASE=
# e.g. SAMBA_VERSION_BETA_RELEASE=1 #
# -> "4.0.0beta1" #
########################################################
-SAMBA_VERSION_BETA_RELEASE=4
+SAMBA_VERSION_BETA_RELEASE=5
########################################################
# For 'pre' releases the version will be #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b7af995..1b08ff3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4.0 beta4
+What's new in Samba 4.0 beta5
=============================
Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
WARNINGS
========
-Samba 4.0 beta4 is not a final Samba release, however we are now making
+Samba 4.0 beta5 is not a final Samba release, however we are now making
good progress towards a Samba 4.0 release, of which this is a preview.
Be aware the this release contains the best of all of Samba's
technology parts, both a file server (that you can reasonably expect
@@ -94,55 +94,61 @@ Python programs to interface to Samba's internals, and many tools and
internal workings of the DC code is now implemented in python.
-CHANGES SINCE beta3
+CHANGES SINCE beta4
=====================
-For a list of changes since beta3, please see the git log.
+For a list of changes since beta4, please see the git log.
$ git clone git://git.samba.org/samba.git
$ cd samba.git
-$ git log samba-4.0.0beta3..samba-4.0.0beta4
+$ git log samba-4.0.0beta4..samba-4.0.0beta5
Some major user-visible changes include:
-- The issue with beta3 being unable to build with a released version of
+- The issue with beta4 being unable to build with a released version of
ldb has been resolved.
-- A new tool 'samba-tool domain dcpromo' has been added to allow the
- promotion of existing domain member accounts to a DC without creating
- a new SID
+- The two parameter tables for our two smb.conf parsing engines have
+ been merged. This removes the ugly (but harmless) "unknown
+ parameter xxx" warnings, particularly from the smbd child process.
-- When provisioning with --use_rfc2307=yes we will populate the
- subtree CN=ypServ30,CN=RpcServices,CN=System,${DOMAINDN}. This makes
- it possible to manipulate the posix attributes via ADUC.
+- Major issues have been fixed in conflict and missing/deleted parent
+ handling in or DRS replication engine.
-- Improved 'samba-tool gpo' subcommands
+- Safety improvements to prevent corruption of read-write replicas
+ by manual replication from a read-only replica.
-- --disable-ntdb now works properly
+- Improvements to dbcheck to correct incorrect instanceType values from
+ the above and to relocate objects with missing parents.
-- Bug 9026 - 3.6.6 upgrade from 3.5.x fails with "Couldn't migrate
- printers tdb file: NT_STATUS_NO_MEMORY" has been resolved
+- smbd no longer places all accounts in the 'Domain Users' of the AD
+ domain to which it is joined
-- Bug 9016 - Connection to outbound trusted domain goes offline has
- been resolved
+- AES support in NETLOGON Schannel
+
+- DCE/RPC timeout handling no longer crashes
+
+- "socket address" is now "nbt client socket address" as it only
+ controls the binding of the NetBIOS client, not other protocols.
+ See 'bind interfaces only = yes'. This parameter is also now depricated.
+
+- nmbd now always binds to it's broadcast sockets explicitly, rather
+ than just relying on the socket address above.
Less visible, but important changes under the hood include:
- Continued work to support SMB2 and SMB3
-- Correct restrictions and permissions on LSA calls over TCP and via
- Schannel have been implemented and tested
-
- Continued work to use async IO to improve file server performance.
+- Patches to ensure that talloc_tos() and talloc_stackframe() are
+ always used correctly.
+
KNOWN ISSUES
============
- This release makes the s3fs file server the default, as this is the
file server combination we will use for the Samba 4.0 release.
- Users should still expect some rough edges: in particular, there are
- warnings about invalid parameters from the two respective parameter
- parsing engines.
- Modifying of group policies by members of the Domain Administrators
group is not possible with the s3fs file server, only with the ntvfs
diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c
index 8206173..ab7f5e8 100644
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -93,7 +93,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
NULL, 0, "%s", filter);
if (ldb_ret != LDB_SUCCESS) {
- *error_string = talloc_asprintf(cred, "Could not find entry to match filter: '%s' base: '%s': %s: %s\n",
+ *error_string = talloc_asprintf(cred, "Could not find entry to match filter: '%s' base: '%s': %s: %s",
filter, base ? base : "",
ldb_strerror(ldb_ret), ldb_errstring(ldb));
/* set anonymous as the fallback, if the machine account won't work */
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index a174052..99181a1 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -266,7 +266,7 @@ NTSTATUS gssapi_get_session_key(TALLOC_CTX *mem_ctx,
gss_maj = gss_release_buffer_set(&gss_min, &set);
return NT_STATUS_OK;
}
- p = set->elements[1].value + gse_sesskeytype_oid.length;
+ p = (uint8_t *)set->elements[1].value + gse_sesskeytype_oid.length;
diflen = set->elements[1].length - gse_sesskeytype_oid.length;
if (diflen <= 0) {
gss_maj = gss_release_buffer_set(&gss_min, &set);
diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh
index a56dd2a..45be1ec 100755
--- a/buildtools/compare_config_h3.sh
+++ b/buildtools/compare_config_h3.sh
@@ -19,8 +19,8 @@ if test "x$DIFF" = "x" ; then
DIFF="comm -23"
fi
-grep "^.define" $NEW_CONFIG | grep -v -f $EXCEPTIONS | sort > waf-config.h
-grep "^.define" $OLD_CONFIG | grep -v -f $EXCEPTIONS | sort > old-config.h
+grep "^.define" $NEW_CONFIG | egrep -v -f $EXCEPTIONS | sort > waf-config.h
+grep "^.define" $OLD_CONFIG | egrep -v -f $EXCEPTIONS | sort > old-config.h
$DIFF old-config.h waf-config.h
rm -f old-config.h waf-config.h
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index 511cf09..c2af312 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -136,8 +136,8 @@ def _get_python_variables(python_exe, variables, imports=['import sys']):
continue
if s == 'None':
return_values.append(None)
- elif s[0] == "'" and s[-1] == "'":
- return_values.append(s[1:-1])
+ elif (s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"'):
+ return_values.append(eval(s))
elif s[0].isdigit():
return_values.append(int(s))
else: break
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index be5e926..cfab476 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -622,7 +622,7 @@ def SAMBA_CONFIG_H(conf, path=None):
if Options.options.developer:
# we add these here to ensure that -Wstrict-prototypes is not set during configure
- conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common',
+ conf.ADD_CFLAGS('-Wall -g -Wshadow -Werror=strict-prototypes -Wstrict-prototypes -Werror=pointer-arith -Wpointer-arith -Wcast-align -Werror=write-strings -Wwrite-strings -Werror-implicit-function-declaration -Werror=format -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common -Werror=address',
testflags=True)
conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
conf.env.DEVELOPER_MODE = True
diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c
index 6b71f70..ceabe05 100644
--- a/dfs_server/dfs_server_ad.c
+++ b/dfs_server/dfs_server_ad.c
@@ -26,6 +26,7 @@
#include "param/param.h"
#include "lib/tsocket/tsocket.h"
#include "dfs_server/dfs_server_ad.h"
+#include "lib/util/util_net.h"
#define MAX_DFS_RESPONSE 56*1024 /* 56 Kb */
@@ -232,15 +233,15 @@ static NTSTATUS get_dcs_insite(TALLOC_CTX *ctx, struct ldb_context *ldb,
NT_STATUS_HAVE_NO_MEMORY_AND_FREE(list->names[list->count], r);
} else {
char *tmp;
- const char *acct = ldb_msg_find_attr_as_string(r2->msgs[0], "sAMAccountName", NULL);
- if (acct == NULL) {
+ const char *aname = ldb_msg_find_attr_as_string(r2->msgs[0], "sAMAccountName", NULL);
+ if (aname == NULL) {
DEBUG(2,(__location__ ": sAMAccountName missing on %s\n",
ldb_dn_get_linearized(dn)));
talloc_free(r);
return NT_STATUS_INTERNAL_ERROR;
}
- tmp = talloc_strdup(list->names, acct);
+ tmp = talloc_strdup(list->names, aname);
NT_STATUS_HAVE_NO_MEMORY_AND_FREE(tmp, r);
/* Netbios name is also the sAMAccountName for
@@ -816,7 +817,14 @@ NTSTATUS dfs_server_ad_get_referrals(struct loadparm_context *lp_ctx,
* handle it here.
*/
return NT_STATUS_NOT_FOUND;
+ }
+ if (is_ipaddress(server_name)) {
+ /*
+ * If it is not domain related do not
+ * handle it here.
+ */
+ return NT_STATUS_NOT_FOUND;
}
if ((strcasecmp_m(server_name, netbios_domain) != 0) &&
diff --git a/docs-xml/manpages-3/smbstatus.1.xml b/docs-xml/manpages-3/smbstatus.1.xml
index 150e3d0..e3bc251 100644
--- a/docs-xml/manpages-3/smbstatus.1.xml
+++ b/docs-xml/manpages-3/smbstatus.1.xml
@@ -27,6 +27,8 @@
<arg choice="opt">-B</arg>
<arg choice="opt">-p</arg>
<arg choice="opt">-S</arg>
+ <arg choice="opt">-N</arg>
+ <arg choice="opt">-f</arg>
<arg choice="opt">-s <configuration file></arg>
<arg choice="opt">-u <username></arg>
</cmdsynopsis>
@@ -95,6 +97,22 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>-N|--notify</term>
+ <listitem><para>causes smbstatus to display registered file
+ notifications</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-f|--fast</term>
+ <listitem><para>causes smbstatus to not check if the status data
+ is valid by checking if the processes that the status data refer to all still
+ exist. This speeds up execution on busy systems and clusters but
+ might display stale data of processes that died without cleaning up properly.</para>
+ </listitem>
+ </varlistentry>
+
&stdarg.help;
<varlistentry>
diff --git a/docs-xml/manpages-3/vfs_full_audit.8.xml b/docs-xml/manpages-3/vfs_full_audit.8.xml
index 8dbceb9..0f0d96d 100644
--- a/docs-xml/manpages-3/vfs_full_audit.8.xml
+++ b/docs-xml/manpages-3/vfs_full_audit.8.xml
@@ -38,13 +38,6 @@
complete set of Samba VFS operations:</para>
<simplelist>
- <member>aio_cancel</member>
- <member>aio_error</member>
- <member>aio_fsync</member>
- <member>aio_read</member>
- <member>aio_return</member>
- <member>aio_suspend</member>
- <member>aio_write</member>
<member>chdir</member>
<member>chflags</member>
<member>chmod</member>
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
new file mode 100644
index 0000000..f6784c3
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -0,0 +1,19 @@
+<samba:parameter name="nbt client socket address"
+ context="G"
+ type="string"
+ developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>This option allows you to control what address Samba
+ will send NBT client packets from, and process replies using,
+ including in nmbd. </para>
+ <para>Setting this option should never be necessary on usual Samba
+ servers running only one nmbd.</para>
+
+ <para>By default Samba will send UDP packets from the OS default address for the destination, and accept replies on 0.0.0.0.</para>
+ <para>This parameter is deprecated. See <smbconfoption name="bind interfaces only">Yes</smbconfoption> and <smbconfoption name="interfaces"></smbconfoption> for the previous behaviour of controlling the normal listening sockets.</para>
+</description>
+
+<value type="default">0.0.0.0</value>
+<value type="example">192.168.2.20</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml
deleted file mode 100644
index 17018ef..0000000
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<samba:parameter name="socket address"
- context="G"
- type="string"
- developer="1"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
- <para>This option allows you to control what
- address Samba will listen for connections on. This is used to
- support multiple virtual interfaces on the one server, each
- with a different configuration.</para>
- <para>Setting this option should never be necessary on usual Samba
- servers running only one nmbd.</para>
-
- <para>By default Samba will accept connections on any
- address.</para>
-</description>
-
-<value type="default"></value>
-<value type="example">192.168.2.20</value>
-</samba:parameter>
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 89d6992..03a5157 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -188,6 +188,21 @@ static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *da
return -1;
}
+static struct tevent_req *skel_pread_send(struct vfs_handle_struct *handle,
+ TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct files_struct *fsp,
+ void *data, size_t n, off_t offset)
+{
+ return NULL;
+}
+
+static ssize_t skel_pread_recv(struct tevent_req *req, int *err)
+{
+ *err = ENOSYS;
+ return -1;
+}
+
static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n)
{
errno = ENOSYS;
@@ -200,6 +215,22 @@ static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const v
return -1;
}
+static struct tevent_req *skel_pwrite_send(struct vfs_handle_struct *handle,
+ TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct files_struct *fsp,
+ const void *data,
+ size_t n, off_t offset)
+{
+ return NULL;
+}
+
+static ssize_t skel_pwrite_recv(struct tevent_req *req, int *err)
+{
+ *err = ENOSYS;
+ return -1;
+}
+
static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence)
{
errno = ENOSYS;
@@ -232,6 +263,20 @@ static int skel_fsync(vfs_handle_struct *handle, files_struct *fsp)
return -1;
}
+static struct tevent_req *skel_fsync_send(struct vfs_handle_struct *handle,
+ TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct files_struct *fsp)
+{
+ return NULL;
+}
+
+static int skel_fsync_recv(struct tevent_req *req, int *err)
+{
+ *err = ENOSYS;
+ return -1;
+}
+
static int skel_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname)
{
errno = ENOSYS;
@@ -710,48 +755,6 @@ static int skel_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, c
return -1;
}
-static int skel_aio_read(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static int skel_aio_write(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static ssize_t skel_aio_return_fn(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static int skel_aio_cancel(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static int skel_aio_error_fn(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static int skel_aio_fsync(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb)
-{
- errno = ENOSYS;
- return -1;
-}
-
-static int skel_aio_suspend(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *ts)
-{
- errno = ENOSYS;
- return -1;
-}
-
static bool skel_aio_force(struct vfs_handle_struct *handle, struct files_struct *fsp)
{
errno = ENOSYS;
@@ -805,13 +808,19 @@ struct vfs_fn_pointers skel_opaque_fns = {
.close_fn = skel_close_fn,
.read_fn = skel_vfs_read,
.pread_fn = skel_pread,
+ .pread_send_fn = skel_pread_send,
+ .pread_recv_fn = skel_pread_recv,
.write_fn = skel_write,
.pwrite_fn = skel_pwrite,
+ .pwrite_send_fn = skel_pwrite_send,
+ .pwrite_recv_fn = skel_pwrite_recv,
.lseek_fn = skel_lseek,
.sendfile_fn = skel_sendfile,
.recvfile_fn = skel_recvfile,
.rename_fn = skel_rename,
.fsync_fn = skel_fsync,
+ .fsync_send_fn = skel_fsync_send,
+ .fsync_recv_fn = skel_fsync_recv,
.stat_fn = skel_stat,
.fstat_fn = skel_fstat,
.lstat_fn = skel_lstat,
@@ -896,13 +905,6 @@ struct vfs_fn_pointers skel_opaque_fns = {
.fsetxattr_fn = skel_fsetxattr,
/* aio operations */
- .aio_read_fn = skel_aio_read,
- .aio_write_fn = skel_aio_write,
- .aio_return_fn = skel_aio_return_fn,
- .aio_cancel_fn = skel_aio_cancel,
- .aio_error_fn = skel_aio_error_fn,
- .aio_fsync_fn = skel_aio_fsync,
- .aio_suspend_fn = skel_aio_suspend,
.aio_force_fn = skel_aio_force,
/* offline operations */
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 8f55d6a..6981b5d 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -23,6 +23,7 @@
#include "../source3/include/includes.h"
+#include "lib/util/tevent_unix.h"
/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
--
Samba Shared Repository
More information about the samba-cvs
mailing list