summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* vfs_streams_xattr: use fsp, not base_fspRalph Boehme2017-02-251-24/+17
| | | | | | | | | | | | | | | | | | | | | The base_fsp's fd is always -1 as it's closed after being openend in create_file_unixpath(). Additionally in streams_xattr_open force using of SMB_VFS_FSETXATTR() by sticking the just created fd into the fsp (and removing it afterwards). Bug: https://bugzilla.samba.org/show_bug.cgi?id=12591 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Feb 22 08:25:46 CET 2017 on sn-devel-144 (cherry picked from commit 021189e32ba507832b5e821e5cda8a2889225955) Autobuild-User(v4-4-test): Stefan Metzmacher <metze@samba.org> Autobuild-Date(v4-4-test): Sat Feb 25 05:08:00 CET 2017 on sn-devel-144
* libcli/auth: use the correct creds value against servers without LogonSamLogonExStefan Metzmacher2017-02-251-2/+17
| | | | | | | | | | | | | If we use the credential chain we need to use the value from netlogon_creds_client_authenticator() to make sure we have the current value to encrypt in logon info. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12586 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 0ed2a65593b5abc9ba7f40992ed0ed8f448f5836)
* librpc/rpc: fix regression in NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE error ↵Stefan Metzmacher2017-02-251-5/+3
| | | | | | | | | | | | | | mapping Commit 1eef70872930fa4f9d3dedd23476b34cae638428 changed the mapping for DCERPC_NCA_S_FAULT_INVALID_TAG from NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE to NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12585 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit c97e39b34fcf260ded42ef1a9efe7ed55e65a1cf)
* krb5_wrap: use our own code to calculate the ENCTYPE_ARCFOUR_HMAC keyStefan Metzmacher2017-02-251-0/+37
| | | | | | | | | | | | | | Our own convert_string_talloc() function handles a wider range of unicode code points than the MIT krb5 or heimdal code. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> Autobuild-User(master): Ralph Böhme <slow@samba.org> Autobuild-Date(master): Tue Feb 21 20:08:16 CET 2017 on sn-devel-144 (similar to commit 10e1b92c288ae27f775debb16c3e122b6063fa21)
* s4:libcli/raw: remove unused DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTHStefan Metzmacher2017-02-251-7/+0
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit e9c184088cbbb47e48d9e96fc753a56c544301dc)
* s3:include: remove unused DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTHStefan Metzmacher2017-02-251-6/+0
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 21cbf8e4db6928a8a3fb712b3750bb50c1201948)
* s3:net_rpc_trust: make use of trust_pw_new_value()Stefan Metzmacher2017-02-251-3/+3
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 13fd543929c72fa5af1ae6e21ca8dda9a57a0f55)
* s3:libnet_join: make use of trust_pw_new_value()Stefan Metzmacher2017-02-251-6/+10
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 77edef9555acd6e0c843582637bc367fa0d2a203)
* s3:libads: use trust_pw_new_value() for krb5 machine passwordsStefan Metzmacher2017-02-252-4/+7
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (similar to commit 00136940757ea6947f97c9c92b25207d9413727b)
* s3:libsmb: use trust_pw_new_value() in trust_pw_change()Stefan Metzmacher2017-02-251-21/+4
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit c21e9981d04fa016ef708941ea82051d0438b7a7)
* s3:libsmb: add trust_pw_new_value() helper functionStefan Metzmacher2017-02-252-0/+59
| | | | | | | | | | | | | This generates a new trust password based on the secure channel type and lp_security(). NT4 really has a limit of 28 UTF16 bytes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 9e26ad86fbd7e6f39f98fb9d037ac86f3146cb11)
* s3:libsmb: let trust_pw_change() verify the new password at the end.Stefan Metzmacher2017-02-251-0/+33
| | | | | | | | | | | | We should notice problems as early as possible, it makes no sense to keep things working for a while and later find out the we lost our trust relationship with our domain. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit a2877541681e07f09aee7d7c21adbe50346755e3)
* s3:libsmb: let trust_pw_change() debug more verbose informationStefan Metzmacher2017-02-251-8/+21
| | | | | | | | | | | Password changes caused much trouble in the past, so we better debug them at log level 0 and may see them also in the syslog. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 4185689dbf0085fcb3840ad8b520df21a33e5d2a)
* lib/util: add generate_random_machine_password() functionStefan Metzmacher2017-02-252-2/+198
| | | | | | | | | | | | | | It generates more random password for the use as machine password, restricted to codepoints <= 0xFFFF in order to be compatible with MIT krb5 and Heimdal. Note: the fallback to ascii if 'unix charset' is not 'utf8'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit ad12cfae42cc592166d6a1c1ee323f1aae82f235)
* libcli/auth: add netlogon_creds_cli_debug_string()Stefan Metzmacher2017-02-252-0/+12
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit abe427775ee8ed1d278d5094ca127f85289ca5a3)
* libcli/auth: check E_md4hash() result in ↵Stefan Metzmacher2017-02-251-1/+5
| | | | | | | | | | | | netlogon_creds_cli_ServerPasswordSet_send() We need to make sure we can convert the given string to an nthash. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12262 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 8a209e5a0ca810d8cf0e5ebc1902fae8c5cb241e)
* ctdb-scripts: Initialise CTDB_NFS_CALLOUT in statd-calloutMartin Schwenke2017-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Some configurations may set CTDB_NFS_CALLOUT to the empty string. They may do this if they allow a choice of NFS implementations. In this case the default call-out for Linux kernel NFS should be used. However, statd-callout does not call nfs_callout_init() to set the default. Therefore, statd-callout is unable to restart the lock manager, so the grace period is never entered. statd-callout must call nfs_callout_init() before trying to restart the lock manager. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12589 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Martin Schwenke <martins@samba.org> Autobuild-Date(master): Thu Feb 16 09:21:03 CET 2017 on sn-devel-144 (cherry picked from commit 5e7ae1b1e2fa8137aaa6a2a2f446156ae61f4c84) Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-4-test): Fri Feb 17 16:02:00 CET 2017 on sn-devel-144
* ctdb-tests: Add more comm testsAmitay Isaacs2017-02-172-36/+283
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12580 Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> (cherry picked from commit 024a2c20d2bcdbcc43d16d492c7cd2d09b93c8f0)
* ctdb-common: Fix use-after-free error in comm_fd_handler()Amitay Isaacs2017-02-171-6/+40
| | | | | | | | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12580 comm_write_send() creates a new tevent_req and adds it to the queue of requests to be processed. If this tevent_req is freed, then the queue entry is not removed causing use-after-free error. If the tevent_req returned by comm_write_send() is freed, then that request should be removed from the queue and any pending actions based on that request should also be removed. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> (cherry picked from commit 9db7785fc6ffbaad434ee189c0f46c488358aab5)
* s3: smbd: Don't loop infinitely on bad-symlink resolution.Jeremy Allison2017-02-171-48/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the FILE_OPEN_IF case we have O_CREAT, but not O_EXCL. Previously we went into a loop trying first ~(O_CREAT|O_EXCL), and if that returned ENOENT try (O_CREAT|O_EXCL). We kept looping indefinately until we got an error, or the file was created or opened. The big problem here is dangling symlinks. Opening without O_NOFOLLOW means both bad symlink and missing path return -1, ENOENT from open(). As POSIX is pathname based it's not possible to tell the difference between these two cases in a non-racy way, so change to try only two attempts before giving up. We don't have this problem for the O_NOFOLLOW case as we just return NT_STATUS_OBJECT_PATH_NOT_FOUND mapped from the ELOOP POSIX error and immediately returned. Unroll the loop logic to two tries instead. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12572 Pair-programmed-with: Ralph Boehme <slow@samba.org> Signed-off-by: Jeremy Allison <jra@samba.org> Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit 10c3e3923022485c720f322ca4f0aca5d7501310)
* s3-vfs: Only walk the directory once in open_and_sort_dir()Andreas Schneider2017-02-171-24/+39
| | | | | | | | | | | On a slow filesystem or network filesystem this can make a huge difference. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12571 Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 6c3aaccd0eb648e31fd2717aaca0187966e125d5)
* s3/rpc_server/mdssvc: add attribute "kMDItemContentType"Ralph Boehme2017-02-171-0/+5
| | | | | | | | | | | | Bug: https://bugzilla.samba.org/show_bug.cgi?id=12545 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Feb 15 06:20:52 CET 2017 on sn-devel-144 (cherry picked from commit e08110ece699eeb1b9ef688c92bf84c69a6fa5fc)
* s3/smbd: check for invalid access_mask smbd_calculate_access_mask()Ralph Boehme2017-02-172-1/+6
| | | | | | | | | | This makes us pass "base.createx_access". Bug: https://bugzilla.samba.org/show_bug.cgi?id=12536 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 326765923f1d384e5cd8b7fda048b459c67a4bf5)
* selftest: also run test base.createx_access against ad_dcRalph Boehme2017-02-172-1/+4
| | | | | | | | | | Fails currently, will be made to work in the next commit. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12536 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit a3781d1cfe7d5e7df20fc65a9a7653937f03808c)
* s3:librpc: remove bigendian argument from dcerpc_pull_ncacn_packet()Stefan Metzmacher2017-02-153-9/+6
| | | | | | | | | | | | | | | | We should get this from the packet itself. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit 1bfba2c5161c0e27f8c27301f258360aedf1b018) BUG: https://bugzilla.samba.org/show_bug.cgi?id=12581 smbclient fails on bad endianess when listing shares from Solaris kernel SMB server on SPARC Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-4-test): Wed Feb 15 15:14:04 CET 2017 on sn-devel-144
* s3: VFS: Don't allow symlink, link or rename on already converted paths.Jeremy Allison2017-02-151-12/+43
| | | | | | | | | | | | | | Snapshot paths are a read-only filesystem. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Mon Jan 30 22:26:29 CET 2017 on sn-devel-144 (backported from commit 0e1deb77f2b310ad7e5dd784174207adacf1c981)
* s3: VFS: shadow_copy2: Fix usage of saved_errno to only set errno on error.Jeremy Allison2017-02-151-72/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale: VFS calls must act like their POSIX equivalents, and the POSIX versions *only* set errno on a failure. There is actually code in the upper smbd layers that depends on errno being correct on a fail return from a VFS call. For a compound VFS module like this, a common pattern is : SMB_VFS_CALL_X() { int ret; syscall1(); ret = syscall2(); syscall3(); return ret; } Where if *any* of the contained syscallX()'s fail, they'll set errno. However, the actual errno we should return is *only* the one returned if syscall2() fails (the others are lstat's checking for existence etc.). So what we should do to correctly return only the errno from syscall2() is: SMB_VFS_CALL_X() { int ret; int saved_errno = 0; syscall1() ret = syscall2(); if (ret == -1) { saved_errno = errno; } syscall3() if (saved_errno != 0) { errno = saved_errno; } return ret; } BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit cda6764f1a8db96182bfd1855440bc6a1ba1abee)
* s3: VFS: shadow_copy2: Fix a memory leak in the connectpath function.Jeremy Allison2017-02-151-0/+17
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 4d339a88851f601fae195ac8ff0691cbd3504f41)
* s3: VFS: shadow_copy2: Fix module to work with variable current working ↵Jeremy Allison2017-02-151-97/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | directory. Completely cleans up the horrible shadow_copy2_strip_snapshot() and adds an explaination of what it's actually trying to do. * This function does two things. * * 1). Checks if an incoming filename is already a * snapshot converted pathname. * If so, it returns the pathname truncated * at the snapshot point which will be used * as the connectpath, and then does an early return. * * 2). Checks if an incoming filename contains an * SMB-layer @GMT- style timestamp. * If so, it strips the timestamp, and returns * both the timestamp and the stripped path * (making it cwd-relative). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 128d5f27cd42b0c7efcbe3d28fe3eee881e0734b)
* s3: VFS: Add utility function check_for_converted_path().Jeremy Allison2017-02-151-0/+108
| | | | | | | | | | Detects an already converted path. Not yet used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit b94dc85d339c9a10496edd07b85bdd7808d2e332)
* s3: VFS: Ensure shadow:format cannot contain a / path separator.Jeremy Allison2017-02-151-0/+9
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit cd4f940162b17e4f7345d392326a31ae478230fa)
* s3: VFS: Allow shadow_copy2_connectpath() to return the cached path derived ↵Jeremy Allison2017-02-151-0/+10
| | | | | | | | | | from $cwd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 42bd1acad75a6b5ea81fe4b30c067dd82623c042)
* s3: VFS: shadow_copy2: Fix chdir to store off the needed private variables.Jeremy Allison2017-02-151-13/+68
| | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 This is not yet used, the users of this will be added later. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 27340df4b52e4341f134667c59d71656a7a1fdae)
* s3: VFS: shadow_copy2: Add two currently unused functions to make pathnames ↵Jeremy Allison2017-02-151-0/+45
| | | | | | | | | | absolute or relative to $cwd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 9d65107b8f2864dba8d41b3316c483b3f36d0697)
* s3: VFS: shadow_copy2: Change a parameter name.Jeremy Allison2017-02-151-1/+2
| | | | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Allows easy substitution later. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 2887465108aef5e2e7c64417437ecb86c7460e16)
* s3: VFS: shadow_copy2: Add a wrapper function to call the original ↵Jeremy Allison2017-02-151-2/+17
| | | | | | | | | | | | shadow_copy2_strip_snapshot(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Allows an extra (currently unused) parameter to be added. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 5aa1ea95157475dfd2d056f0158b14b2b90895a9)
* s3: VFS: shadow_copy2: Add two new variables to the config data. Not yet used.Jeremy Allison2017-02-151-0/+3
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 72fe2b62e3ee7462e5be855b01943f28b26c36c1)
* s3: VFS: shadow_copy2: Fix length comparison to ensure we don't overstep a ↵Jeremy Allison2017-02-151-1/+1
| | | | | | | | | | length. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 37ef8d3f65bd1215717eb51b2e1cdb84a7bed348)
* s3: VFS: shadow_copy2: Ensure pathnames for parameters are correctly ↵Jeremy Allison2017-02-151-0/+5
| | | | | | | | | | relative and terminated. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 979e39252bcc88e8aacb543b8bf322dd6f17fe7f)
* s3: VFS: shadow_copy2: Correctly initialize timestamp and stripped variables.Jeremy Allison2017-02-151-56/+62
| | | | | | | | | | Allow the called functions to be fixed to not touch them on error. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 0a190f4dd950c947d47c42163d11ea4bd6e6e508)
* s3: smbd: Make set_conn_connectpath() call canonicalize_absolute_path().Jeremy Allison2017-02-151-100/+3
| | | | | | | | BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit d650d65488761b30fa34d42cb1ab400618a78c33)
* s3: smbtorture: Add new local test LOCAL-CANONICALIZE-PATHJeremy Allison2017-02-152-0/+45
| | | | | | | | | | Tests new canonicalize_absolute_path() function. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit a51363309a4330b65e34ae941ec99d180bdbab56)
* s3: lib: Fix two old, old bugs in set_conn_connectpath(), now in ↵Jeremy Allison2017-02-151-6/+12
| | | | | | | | | | | | | | | | | canonicalize_absolute_path(). Canonicalizing a path of /foo/bar/../baz would return /foo/barbaz as moving forward 3 characters would delete the / character. Canonicalizing /foo/.. would end up as '\0'. Test to follow. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 82979afc46cc5e466bdd999a94080e7a5df95518)
* s3: lib: Add canonicalize_absolute_path().Jeremy Allison2017-02-152-0/+134
| | | | | | | | | | | | | Resolves any invalid path components (.) (..) in an absolute POSIX path. We will be re-using this in several places. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 02599c39337c3049762a6b0bd6290577817ee5a5)
* s3: smbd: Correctly canonicalize any incoming shadow copy path.Jeremy Allison2017-02-151-0/+150
| | | | | | | | | | | | | | | | | | | | Converts to: @GMT-token/path/last_component from all incoming path types. Allows shadow_copy modules to work when current directory is changed after removing last component. Ultimately when the VFS ABI is changed to add a timestamp to struct smb_filename, this is where the parsing will be done. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> (backported from commit 39678ed6af708fb6f2760bfb51051add11e3c498)
* waf: backport finding of pkg-configUri Simchoni2017-02-151-1/+3
| | | | | | | | | | | | | | | | | | | | Allow the builder to customize the location of pkg-config utility by setting PKGCONFIG environment variable. This is backported from upstream waf. Thanks to Zentaro Kavanagh <zentaro@google.com> for pointing that out and proposing the fix. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12529 Signed-off-by: Uri Simchoni <uri@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Jan 25 04:23:00 CET 2017 on sn-devel-144 (cherry picked from commit 2cf141ed45b4f7b7754cb9525d987ff38495d789)
* s3: VFS: vfs_streams_xattr.c: Make streams_xattr_open() store the same path ↵Jeremy Allison2017-02-071-1/+8
| | | | | | | | | | | | | | | | | | | | | as streams_xattr_recheck(). If the open is changing directories, fsp->fsp_name->base_name will be the full path from the share root, whilst smb_fname will be relative to the $cwd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12546 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Böhme <slow@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Feb 2 01:55:42 CET 2017 on sn-devel-144 (cherry picked from commit a24ba3e4083200ec9885363efc5769f43183fb6b) Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-4-test): Tue Feb 7 13:05:34 CET 2017 on sn-devel-144
* smbd: Fix "map acl inherit" = yesVolker Lendecke2017-02-071-2/+2
| | | | | | | | | | | | | | | | Brown-Paper-Bag bug in f85c2a6852a. The assignment contains a self-reference in get_pai_flags which I missed. Fix an uninitialized read. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12551 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Wed Feb 1 22:06:50 CET 2017 on sn-devel-144 (cherry picked from commit 129bc58eee4b1868b1aaec6194808752520517b4)
* s3: vfs: dirsort doesn't handle opendir of "." correctly.Jeremy Allison2017-02-071-0/+4
| | | | | | | | | | | Needs to store $cwd path for correct sorting. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12499 Back-port from commit e2f34116ab6328e2b872999dc7c4bcda69c03ab2. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org>
* vfs_fruit: checks wrong AAPL config state and so always uses readdirattrRalph Boehme2017-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readdirattr should only be enabled if the client enables it via AAPL negotitiation, not for all clients when vfs_fruit is loaded. Unfortunately the check in fruit_readdir_attr() is if (!config->use_aapl) { return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data); } This uses the wrong config state "use_aapl" which is always true by default (config option "fruit:aapl"). We must use "nego_aapl" instead which is only true if the client really negotiated this feature. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12541 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Jan 28 01:49:11 CET 2017 on sn-devel-144 (cherry picked from commit 9a3b64a24cc21124485b423c9b70b67ff5a96f10) Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-4-test): Wed Feb 1 16:27:14 CET 2017 on sn-devel-144