[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 83edfcff5cc vfs_ceph: call 'ceph_fgetxattr' only if valid fd from af53df6cd6e python/samba/tests: Fix incorrect super-class in cred_opt.py setUp() https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 83edfcff5ccd8c4c710576b6d5612e0578d168c8 Author: Shachar Sharon Date: Thu Nov 16 11:57:02 2023 +0200 vfs_ceph: call 'ceph_fgetxattr' only if valid fd Align getxattr logic with the rest of xattr hooks: call ceph_fgetxattr with appropriate io-fd when 'is_pathref' is false; otherwise, call ceph_getxattr. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15440 Signed-off-by: Shachar Sharon Reviewed-by: Anoop C S Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Nov 30 12:32:29 UTC 2023 on atb-devel-224 --- Summary of changes: source3/modules/vfs_ceph.c | 27 --- 1 file changed, 24 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 6d252d20425..b1039ee36ef 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -1431,11 +1431,32 @@ static const char *cephwrap_connectpath( Extended attribute operations. */ -static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size) +static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, + struct files_struct *fsp, + const char *name, + void *value, + size_t size) { int ret; - DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp, name, value, llu(size)); - ret = ceph_fgetxattr(handle->data, fsp_get_io_fd(fsp), name, value, size); + DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", + handle, + fsp, + name, + value, + llu(size)); + if (!fsp->fsp_flags.is_pathref) { + ret = ceph_fgetxattr(handle->data, +fsp_get_io_fd(fsp), +name, +value, +size); + } else { + ret = ceph_getxattr(handle->data, + fsp->fsp_name->base_name, + name, + value, + size); + } DBG_DEBUG("[CEPH] fgetxattr(...) = %d\n", ret); if (ret < 0) { WRAP_RETURN(ret); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b12a33e2251 third_party/heimdal: import lorikeet-heimdal-202311290849 (commit 84fb4579594a5fd8f8462450777eb24d5832be07) via f65a17e7abb lib:crypto: Use bytearray macros from 83edfcff5cc vfs_ceph: call 'ceph_fgetxattr' only if valid fd https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b12a33e225197ec71285586ec44140b421f2e5c6 Author: Andrew Bartlett Date: Wed Nov 29 22:46:28 2023 +1300 third_party/heimdal: import lorikeet-heimdal-202311290849 (commit 84fb4579594a5fd8f8462450777eb24d5832be07) Some of our pending PRs for Heimdal were recently accepted, so this brings in a new update (mostly improved spelling). Signed-off-by: Andrew Bartlett Reviewed-by: Joseph Sutton Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Nov 30 21:25:56 UTC 2023 on atb-devel-224 commit f65a17e7abb83b2d352fd7f75d3a32b7a729b76c Author: Andreas Schneider Date: Thu Nov 30 08:32:45 2023 +0100 lib:crypto: Use bytearray macros Do not use old macros which are not descriptive by the name. Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton --- Summary of changes: lib/crypto/gnutls_sp800_108.c | 4 +- third_party/heimdal/kdc/kerberos5.c| 17 +++--- third_party/heimdal/kdc/krb5tgs.c | 2 +- third_party/heimdal/kdc/pkinit.c | 10 ++-- third_party/heimdal/kuser/kinit.c | 2 +- third_party/heimdal/lib/base/json.c| 2 +- third_party/heimdal/lib/hdb/ext.c | 8 +-- third_party/heimdal/lib/hx509/cert.c | 26 - third_party/heimdal/lib/hx509/cms.c| 64 +++--- third_party/heimdal/lib/hx509/crypto-ec.c | 2 +- third_party/heimdal/lib/hx509/crypto.c | 4 +- third_party/heimdal/lib/hx509/hx509_err.et | 2 +- third_party/heimdal/lib/hx509/req.c| 2 +- third_party/heimdal/lib/hx509/revoke.c | 32 +-- third_party/heimdal/lib/hx509/test_cms.in | 2 +- third_party/heimdal/lib/kadm5/bump_pw_expire.c | 7 ++- third_party/heimdal/lib/krb5/cache.c | 4 +- third_party/heimdal/lib/krb5/crypto.c | 10 ++-- third_party/heimdal/lib/krb5/digest.c | 2 +- third_party/heimdal/lib/krb5/init_creds_pw.c | 34 ++-- third_party/heimdal/lib/krb5/krb5.conf.5 | 3 +- third_party/heimdal/lib/krb5/krb5_err.et | 2 +- third_party/heimdal/lib/krb5/pac.c | 4 +- third_party/heimdal/lib/krb5/pkinit.c | 16 +++--- third_party/heimdal/lib/krb5/store.c | 34 ++-- third_party/heimdal/lib/roken/parse_time-test.c| 1 + third_party/heimdal/lib/wind/utf8.c| 8 +-- third_party/heimdal/po/heimdal_krb5/de.po | 2 +- .../heimdal/po/heimdal_krb5/heimdal_krb5.pot | 2 +- third_party/heimdal/po/heimdal_krb5/sv_SE.po | 2 +- 30 files changed, 159 insertions(+), 151 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/crypto/gnutls_sp800_108.c b/lib/crypto/gnutls_sp800_108.c index dc04354d3d2..65710657bae 100644 --- a/lib/crypto/gnutls_sp800_108.c +++ b/lib/crypto/gnutls_sp800_108.c @@ -41,7 +41,7 @@ static NTSTATUS samba_gnutls_sp800_108_derive_key_part( static const uint8_t zero = 0; int rc; - RSIVAL(buf, 0, i); + PUSH_BE_U32(buf, 0, i); rc = gnutls_hmac(hmac_hnd, buf, sizeof(buf)); if (rc < 0) { return gnutls_error_to_ntstatus(rc, @@ -69,7 +69,7 @@ static NTSTATUS samba_gnutls_sp800_108_derive_key_part( return gnutls_error_to_ntstatus( rc, NT_STATUS_HMAC_NOT_SUPPORTED); } - RSIVAL(buf, 0, L); + PUSH_BE_U32(buf, 0, L); rc = gnutls_hmac(hmac_hnd, buf, sizeof(buf)); if (rc < 0) { return gnutls_error_to_ntstatus( diff --git a/third_party/heimdal/kdc/kerberos5.c b/third_party/heimdal/kdc/kerberos5.c index 76cecd3e12f..5991711a289 100644 --- a/third_party/heimdal/kdc/kerberos5.c +++ b/third_party/heimdal/kdc/kerberos5.c @@ -1125,7 +1125,7 @@ pa_enc_ts_validate(astgs_request_t r, const PA_DATA *pa) ret = pa_enc_ts_decrypt_kvno(r, kvno, &enc_data, &ts_data, &pa_key); if (ret == KRB5KDC_ERR_ETYPE_NOSUPP) { char *estr; - _kdc_set_e_text(r, "No key matching entype"); + _kdc_set_e_text(r, "No key matching enctype"); if(krb5_enctype_to_string(r->context, enc_data.etype, &estr)) estr = NULL; if(estr == NULL) @@ -1143,6 +1143,7 @@ pa_enc_ts_validate(astgs_request_t r, co