[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via fe1d45cf1e9 s4:librpc: Add functions converting between bytes and UTF‐16 strings via 5f3f3c0cc3e s4:librpc: Remove trailing whitespace via df19006c782 tests/krb5: Allow creating Group Managed Service Accounts via 7a9ad610226 pidl: Don’t overwrite exception set by PyUnicode_AsEncodedString() via ddb98e7d611 pidl: Remove trailing whitespace via e04f627e4f2 librpc:ndr: Fix comment via 204a46b712c librpc:ndr: Don’t duplicate strings needlessly via e01e6202e60 librpc:ndr: Move call to convert_string_talloc() on to its own line via 2e2b80f895d librpc:ndr: Introduce common out path in ndr_push_string() via 5e580fadeed librpc:ndr: Fix error message via 4b03c6de54b librpc:ndr: Fix code formatting via 939ceb233ef util/charset: Add talloc_utf16_str[n]dup() via b6ff89f6fb3 util/charset: Include missing headers via 3f0809f1eef util/charset: Remove unnecessary cast from 3f908e19a04 s4-scripting: Remove repl_cleartext_pwd.py https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fe1d45cf1e90e9d75f3a47d65b920e2a7e472c97 Author: Joseph Sutton Date: Thu Nov 16 11:20:22 2023 +1300 s4:librpc: Add functions converting between bytes and UTF‐16 strings Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Nov 16 06:23:35 UTC 2023 on atb-devel-224 commit 5f3f3c0cc3ef7ca5237ba1e4865259e02f41a12c Author: Joseph Sutton Date: Wed Nov 8 21:09:14 2023 +1300 s4:librpc: Remove trailing whitespace Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit df19006c7825609c18a6e21d3920696bc0955e70 Author: Joseph Sutton Date: Mon Nov 13 17:07:02 2023 +1300 tests/krb5: Allow creating Group Managed Service Accounts Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 7a9ad610226dfbdb5e645e6fe98fd266a960e2d1 Author: Joseph Sutton Date: Wed Nov 15 12:10:36 2023 +1300 pidl: Don’t overwrite exception set by PyUnicode_AsEncodedString() Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit ddb98e7d611f7c3160af4ea54bb6cf6bdf1ad0a3 Author: Joseph Sutton Date: Thu Nov 9 14:08:19 2023 +1300 pidl: Remove trailing whitespace Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit e04f627e4f2c6b2a2501634fd212e2527f4e0891 Author: Joseph Sutton Date: Wed Nov 15 15:07:53 2023 +1300 librpc:ndr: Fix comment Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 204a46b712cb025d2462b7e4319c04d451e2d550 Author: Joseph Sutton Date: Thu Nov 16 10:15:36 2023 +1300 librpc:ndr: Don’t duplicate strings needlessly If the source string doesn’t need to be converted, there’s no reason for it to be talloc‐allocated. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit e01e6202e606476066231b0b84903c604db07a6e Author: Joseph Sutton Date: Thu Nov 16 14:50:58 2023 +1300 librpc:ndr: Move call to convert_string_talloc() on to its own line Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 2e2b80f895dbe436290321074464b54f2943640f Author: Joseph Sutton Date: Thu Nov 16 10:22:26 2023 +1300 librpc:ndr: Introduce common out path in ndr_push_string() This ensures that ‘dest’ gets freed on failure. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 5e580fadeed52ab723c1f6252dd4a49d0824a229 Author: Joseph Sutton Date: Mon Nov 13 17:04:34 2023 +1300 librpc:ndr: Fix error message Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 4b03c6de54bfe7773ea97bf6707c6144433acf11 Author: Joseph Sutton Date: Thu Nov 16 10:43:12 2023 +1300 librpc:ndr: Fix code formatting Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 939ceb233ef94a0d2d45da39076ba3e78665c776 Author: Joseph Sutton Date: Thu Nov 16 11:10:28 2023 +1300 util/charset: Add talloc_utf16_str[n]dup() Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit b6ff89f6fb32a74365cc7116beb1ef949aaae021 Author: Joseph Sutton Date: Wed Nov 15 15:26:56 2023 +1300 util/charset: Include missing headers Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 3f0809f1eef116454584a84b270a1fd7feeebe64 Author: Joseph Sutton Date: Mon Nov 13 12:21:20 2023 +1300 util/charset: Remove unnecessary cast Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- Summary of changes: lib/util/charset/charset.h | 6 ++ lib/util/charset/convert_string.c| 2 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3f908e19a04 s4-scripting: Remove repl_cleartext_pwd.py
via 4ec50d91097 s4-scripting/devel: Fix str() vs bytes() issue in
repl_cleartext_pwd.py
via 79ef40b0262 s4-scripting/devel: Fix repl_cleartext_pwd to use
built-in RC4
via 6613b5bd121 s3/utils: Use sddl_decode_err_msg instead of sddl_decode
via b319769ebd1 s3/utils: Detect (and report) failure to parse sddl
via d0d026bdb51 libcli/security: Debug only when we failed to decode
from 7c1e3f0d82a python:tests: Ensure we clean up callbacks in
pymessaging tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3f908e19a0422f9552d43e30762d93a8fc988ab2
Author: Andrew Bartlett
Date: Thu Nov 16 14:10:45 2023 +1300
s4-scripting: Remove repl_cleartext_pwd.py
This script was the precursor to newer samba-tool commands and no longer
works. The previous commits record some of the work to have it operate in
the
modern era, but keeping this around is more trouble than it is worth.
Use these commands instead:
samba-tool drs clone-dc-database --include-secrets
samba-tool user getpassword administrator --attributes=virtualClearTextUTF8
Signed-off-by: Andrew Bartlett
Reviewed-by: Reviewed-by: Joseph Sutton
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Thu Nov 16 02:46:57 UTC 2023 on atb-devel-224
commit 4ec50d91097dd2467411b1150808ea62652696a3
Author: Andrew Bartlett
Date: Thu Mar 30 01:29:22 2023 +
s4-scripting/devel: Fix str() vs bytes() issue in repl_cleartext_pwd.py
Signed-off-by: Andrew Bartlett
Reviewed-by: Reviewed-by: Joseph Sutton
commit 79ef40b02627668e03651782e45b98ffa0373329
Author: Andrew Bartlett
Date: Thu Mar 30 14:22:24 2023 +1300
s4-scripting/devel: Fix repl_cleartext_pwd to use built-in RC4
This allows the usage test to pass on our CI hosts without
python-crypto and not uxsuccess on hosts with it.
Signed-off-by: Andrew Bartlett
Reviewed-by: Reviewed-by: Joseph Sutton
commit 6613b5bd121e3450060053a5ee8cff0ecd69d55e
Author: Noel Power
Date: Wed Nov 15 13:07:26 2023 +
s3/utils: Use sddl_decode_err_msg instead of sddl_decode
Use sddl_decode_err_msg instead of sddl_decode for possible better
error reporting.
Signed-off-by: Noel Power
Reviewed-by: Andrew Bartlett
commit b319769ebd1caf4a406211f62cf6086ad3057672
Author: Noel Power
Date: Wed Nov 15 12:55:36 2023 +
s3/utils: Detect (and report) failure to parse sddl
Signed-off-by: Noel Power
Reviewed-by: Andrew Bartlett
commit d0d026bdb512b5765f9a8ecc5268fbc238571adc
Author: Noel Power
Date: Wed Nov 15 11:29:46 2023 +
libcli/security: Debug only when we failed to decode
Signed-off-by: Noel Power
Reviewed-by: Andrew Bartlett
---
Summary of changes:
libcli/security/sddl.c| 13 +-
selftest/knownfail.d/usage| 2 -
source3/utils/smbcacls.c | 61 +++-
source4/scripting/devel/repl_cleartext_pwd.py | 412 --
4 files changed, 65 insertions(+), 423 deletions(-)
delete mode 100755 source4/scripting/devel/repl_cleartext_pwd.py
Changeset truncated at 500 lines:
diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 2cad84a937a..a4659c107b5 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -995,11 +995,14 @@ struct security_descriptor *sddl_decode(TALLOC_CTX
*mem_ctx, const char *sddl,
ACE_CONDITION_FLAG_ALLOW_DEVICE,
,
_offset);
- DBG_NOTICE("could not decode '%s'\n", sddl);
- if (msg != NULL) {
- DBG_NOTICE(" %*c\n", (int)msg_offset, '^');
- DBG_NOTICE("error '%s'\n", msg);
- talloc_free(discard_const(msg));
+ if (sd == NULL) {
+ DBG_NOTICE("could not decode '%s'\n", sddl);
+ if (msg != NULL) {
+ DBG_NOTICE(" %*c\n",
+ (int)msg_offset, '^');
+ DBG_NOTICE("error '%s'\n", msg);
+ talloc_free(discard_const(msg));
+ }
}
return sd;
}
diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index b8e0bbc356d..e7d707f0e7d 100644
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -5,7 +5,6 @@
samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_ctdb_etcd_lock.no
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7c1e3f0d82a python:tests: Ensure we clean up callbacks in pymessaging tests via beff3e6d776 python:tests: Fix crashing pymessaging tests via ec3e420840e util/charset: Prefer PULL_LE_U16() to older SVAL() macro via 99e0a0f21ad util/charset/tests: Add tests for UTF‐16 string length functions via 7ebf7f424d0 s4:torture: Remove trailing whitespace via a46746381b2 util/charset: Add utf16_len_n() via 74a5a3b74e1 util/charset: Include final UTF‐16 code unit in length calculation loop via 516f35b5a11 util/charset: Add utf16_len() via 16996d145b1 util/charset: Rename utf16_len() to utf16_null_terminated_len() via 542e5a3039a util/charset: Rename utf16_len_n() to utf16_null_terminated_len_n() via c2a743190fc s4:smb_server: Remove trailing whitespace via a63cf19ee43 s4:libcli: Remove trailing whitespace via 982238e914a util/charset: Remove trailing whitespace via 1e029b2cd75 librpc:ndr: Convert NDR flags types to enumerations via 2562f24d112 librpc:ndr: Fix comment via 5b693597b0d libndr:ndr: Allow only one string encoding flag via ce2f4ecd596 librpc:ndr: Prohibit STR_NULLTERM|STR_NOTERM flags combination via ef0109d2cd7 librpc:ndr: Check return values of talloc functions via b11978a06cf librpc:ndr: Fix error messages via 609965b6ea0 libcli/security:sddl_decode message offset safety latch via 1f4e018ef1b libcli/security/test_sddl_conditional_ace: add message tests via 2b4f97249f3 libcli/security:sddl_parse: add some top level error messages via 15fcf9b769b libcl/security:sddl_decode_acl: expand a comment via 01f8b61035a libcli/security:sddl_decode_ace: fix ';' count message via dd41357fcd0 libcl/security:sddl_decode_acl: add a message via 206db403b49 libcli/security:sddl_decode_ace: add more messages via f712f8d3710 libcli/security: adjust log verbosity in sddl_decode via 74c6cf44b9d libcli/security:sddl_decode_ace: turn DBG_WARNINGs into messages via 23a83d37df6 pytest:samba-tool domain auth policy: expect error message detail via b18fe675c0d libcli/security:sddl_decode_err_msg(): don't pretend msg is optional (CID1548624) from 12e5c15a97b vfs_zfsacl: Call stat CAP_DAC_OVERRIDE functions https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7c1e3f0d82a08cf0e5fea4fabbc7ad05d0ebbb84 Author: Joseph Sutton Date: Tue Nov 14 12:45:35 2023 +1300 python:tests: Ensure we clean up callbacks in pymessaging tests Not calling ‘deregister()’ results in memory getting leaked. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Nov 15 23:11:13 UTC 2023 on atb-devel-224 commit beff3e6d7762b423500a7ebf163878ede68b4a2f Author: Joseph Sutton Date: Tue Nov 14 12:34:01 2023 +1300 python:tests: Fix crashing pymessaging tests Commit 8c75d9fc73614fad29a998d08c4b11034ab2aebb changed Messaging.deregister() to take a two‐element tuple containing private data as well as a callback, but it did not change the call in samba.tests.messaging.MessagingTests.test_register to match. Since imessaging_deregister() completely ignored the ‘private_data’ parameter passed to it (assuming the callback was registered with msg_type == -1), everything still appeared to work — until commit b22c21799527323877b330c16c23057582721abb changed Messaging.deregister() to no longer leak memory. Now the wrong variable had its reference count decremented, causing the test to crash. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit ec3e420840eded527a2a7bb1177b5daa79ee8448 Author: Joseph Sutton Date: Thu Nov 9 12:46:17 2023 +1300 util/charset: Prefer PULL_LE_U16() to older SVAL() macro Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 99e0a0f21adc36e42ecce56c88e584e38e6fb23d Author: Joseph Sutton Date: Tue Nov 14 12:31:07 2023 +1300 util/charset/tests: Add tests for UTF‐16 string length functions Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit 7ebf7f424d0b5d6872ee6a74e369ccd96de4b9f3 Author: Joseph Sutton Date: Tue Nov 14 13:07:19 2023 +1300 s4:torture: Remove trailing whitespace Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit a46746381b2bf7c336e4411430ecfc5fbb3cbb2a Author: Joseph Sutton Date: Thu Nov 9 12:43:07 2023 +1300 util/charset: Add utf16_len_n() This function returns the length in bytes — at most ‘n’ — of a UTF‐16 string excluding the null terminator. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett commit
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 12e5c15a97b vfs_zfsacl: Call stat CAP_DAC_OVERRIDE functions via 9cac9154212 vfs_aixacl2: Call stat DAC_CAP_OVERRIDE functions via bffd8bd8c32 nfs4_acls: Make fstat_with_cap_dac_override static via 0f664f01620 nfs4_acls: Make stat_with_cap_dac_override static via 8831eeca1d7 nfs4_acls: Make fstatat_with_cap_dac_override static via 5fd73e93af9 vfs_gpfs: Move vfs_gpfs_fstatat to nfs4_acls.c and rename function via 2c1195678d3 vfs_gpfs: Move vfs_gpfs_lstat to nfs4_acls.c and rename function via f9301871c61 vfs_gpfs: Move vfs_gpfs_fstat to nfs4_acls.c and rename function via f8a23d960e0 vfs_gpfs: Move vfs_gpfs_stat to nfs4_acls.c and rename function via 6b1e066c4f3 vfs_gpfs: Move stat_with_capability to nfs4_acls.c and rename function via 316c96ea83a vfs_gpfs: Move fstatat_with_cap_dac_override to nfs4_acls.c via 05f1ee1ae2d nfs4_acls: Implement fstat with DAC_CAP_OVERRIDE from 9898ca65e93 docs-xml: Fix a usage for case sensitive parameter https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 12e5c15a97b45aa01fc3f4274f8ba9cf7d1ddbe9 Author: Christof Schmitt Date: Thu Nov 9 12:44:02 2023 -0700 vfs_zfsacl: Call stat CAP_DAC_OVERRIDE functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke Autobuild-User(master): Björn Jacke Autobuild-Date(master): Wed Nov 15 19:55:07 UTC 2023 on atb-devel-224 commit 9cac9154212bde79391ca99291a76752f334 Author: Christof Schmitt Date: Thu Nov 9 12:42:13 2023 -0700 vfs_aixacl2: Call stat DAC_CAP_OVERRIDE functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit bffd8bd8c32fea738824b807eb9e5f97a609493e Author: Christof Schmitt Date: Thu Nov 9 12:39:57 2023 -0700 nfs4_acls: Make fstat_with_cap_dac_override static No other module is calling this function. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit 0f664f016207894e0a156b9e1f4db7677c264205 Author: Christof Schmitt Date: Thu Nov 9 12:38:46 2023 -0700 nfs4_acls: Make stat_with_cap_dac_override static No other module is calling this function. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit 8831eeca1d70c909e15c86c8af6a7b1d7b0d3b5b Author: Christof Schmitt Date: Thu Nov 9 12:37:25 2023 -0700 nfs4_acls: Make fstatat_with_cap_dac_override static No other module is calling this function. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit 5fd73e93af9d015c9e65a6d4d16229476a541cfc Author: Christof Schmitt Date: Thu Nov 9 12:35:21 2023 -0700 vfs_gpfs: Move vfs_gpfs_fstatat to nfs4_acls.c and rename function All stat DAC_CAP_OVERRIDE code is being moved to nfs4_acls.c to allow reuse. Move the vfs_gpfs_fstatat function and rename it to the more generic name nfs4_acl_fstat. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit 2c1195678d34516744ba4f8b1c5582f4046cba35 Author: Christof Schmitt Date: Thu Nov 9 12:30:27 2023 -0700 vfs_gpfs: Move vfs_gpfs_lstat to nfs4_acls.c and rename function All stat CAP_DAC_OVERRIDE code is being moved to nf4_acls.c to allow reuse. Move the vfs_gpfs_lstat function and rename to the more generic name nfs4_acl_lstat. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit f9301871c61b066c1ea464e6e9109bb2cde71598 Author: Christof Schmitt Date: Thu Nov 9 12:27:58 2023 -0700 vfs_gpfs: Move vfs_gpfs_fstat to nfs4_acls.c and rename function All stat DAC_CAP_OVERRIDE code is moving to nfs4_acls.c to allow reuse. Move the vfs_gpfs_fstat function and rename to the more generic name nfs4_acl_fstat. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by: Björn Jacke commit f8a23d960e02f783119c2aef38a6e293ee548df3 Author: Christof Schmitt Date: Thu Nov 9 12:23:49 2023 -0700 vfs_gpfs: Move vfs_gpfs_stat to nfs4_acls.c and rename function All stat DAC_CAP_OVERRIDE code is moving to nfs4_acls.c to allow reuse by other file system modules. Also rename the function to the more generic name nfs4_acl_stat. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15507 Signed-off-by: Christof Schmitt Reviewed-by:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9898ca65e93 docs-xml: Fix a usage for case sensitive parameter
via 2b1a687a6f8 vfs_ceph: Replace libceph with libcephfs in comments
via e091febb0cc vfs_ceph: Fix the comment quoting module usage
via 149734409a8 vfs_ceph: Fix a comment in cephwrap_fchmod()
via 5572400a975 vfs_ceph: Add path based fallback mechanism for
SMB_VFS_CHOWN
from 4e585186f2b smbd: Get the symlink mode for posix through fdos_mode()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9898ca65e936c3f91578b1a24b91ea9243da4b1c
Author: Anoop C S
Date: Mon Nov 13 12:28:19 2023 +0530
docs-xml: Fix a usage for case sensitive parameter
Signed-off-by: Anoop C S
Reviewed-by: Volker Lendecke
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Wed Nov 15 18:52:16 UTC 2023 on atb-devel-224
commit 2b1a687a6f8c500bd66397f2ac7937c70855b268
Author: Anoop C S
Date: Mon Nov 13 12:47:17 2023 +0530
vfs_ceph: Replace libceph with libcephfs in comments
Signed-off-by: Anoop C S
Reviewed-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit e091febb0cccd9146d2e2b8ebf8841b3634809ed
Author: Anoop C S
Date: Mon Nov 13 12:43:59 2023 +0530
vfs_ceph: Fix the comment quoting module usage
Signed-off-by: Anoop C S
Reviewed-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 149734409a882b060a9c344ec2eb843c298343ce
Author: Anoop C S
Date: Sat Nov 11 11:13:15 2023 +0530
vfs_ceph: Fix a comment in cephwrap_fchmod()
Signed-off-by: Anoop C S
Reviewed-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 5572400a975a07905f7cb0f3611590dfaf787311
Author: Anoop C S
Date: Sat Nov 11 11:07:28 2023 +0530
vfs_ceph: Add path based fallback mechanism for SMB_VFS_CHOWN
Fallback mechanism was missing in cephwrap_fchown() for path based call.
Signed-off-by: Anoop C S
Reviewed-by: Jeremy Allison
---
Summary of changes:
docs-xml/manpages/smb.conf.5.xml | 2 +-
source3/modules/vfs_ceph.c | 41
2 files changed, 30 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 4b33c0f59e8..e760ff6b431 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -664,7 +664,7 @@ chmod 1770 /usr/local/samba/lib/usershares
passed names. The default setting of auto allows clients that
support case sensitive filenames (Linux CIFSVFS
and smbclient 3.0.5 and above currently) to tell the Samba
server on a per-packet basis that they wish to
access the file system in a case-sensitive manner (to support
UNIX case sensitive semantics). No Windows or
- DOS system supports case-sensitive filename so setting this
option to auto is that same as setting it to no
+ DOS system supports case-sensitive filename so setting this
option to auto is the same as setting it to no
for them. Default auto.
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 4bcefcf91e8..aa68b5573c8 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -21,13 +21,13 @@
*/
/*
- * This VFS only works with the libceph.so user-space client. It is not needed
+ * This VFS only works with the libcephfs.so user-space client. It is not
needed
* if you are using the kernel client or the FUSE client.
*
* Add the following smb.conf parameter to each share that will be hosted on
* Ceph:
*
- * vfs objects = ceph [any others you need go here]
+ * vfs objects = [any others you need go here] ceph
*/
#include "includes.h"
@@ -54,8 +54,8 @@
#define llu(_var) ((long long unsigned)_var)
/*
- * Note, libceph's return code model is to return -errno! So we have to convert
- * to what Samba expects, with is set errno to -return and return -1
+ * Note, libcephfs's return code model is to return -errno! So we have to
+ * convert to what Samba expects, with is set errno to -return and return -1
*/
#define WRAP_RETURN(_res) \
errno = 0; \
@@ -353,7 +353,7 @@ static int cephwrap_get_quota(struct vfs_handle_struct
*handle,
unid_t id,
SMB_DISK_QUOTA *qt)
{
- /* libceph: Ceph does not implement this */
+ /* libcephfs: Ceph does not implement this */
#if 0
/* was ifdef HAVE_SYS_QUOTAS */
int ret;
@@ -374,7 +374,7 @@ static int cephwrap_get_quota(struct vfs_handle_struct
*handle,
static int cephwrap_set_quota(struct vfs_handle_struct *handle, enum
SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA
