The branch, master has been updated via b9f0c7f Fix invocation of gnutls_aead_cipher_encrypt() via e133490 selftest: Ensure tmpkpasswdscript is always under $PREFIX via 8fd73b3 selftest: Align cleanup of tmpkpasswdscript with scripts that use it from 35ca616 s3:lib: Fix probably a copy&paste error in namemap_cache_set_sid2name()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b9f0c7f93c058685e24d104432978bd40b94b49f Author: Timur I. Bakeyev <ti...@ixsystems.com> Date: Thu Mar 22 05:47:58 2018 +0100 Fix invocation of gnutls_aead_cipher_encrypt() Which was failing with GNUTLS_E_SHORT_MEMORY_BUFFER - The given memory buffer is too short to hold parameters. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13352 Signed-off-by: Timur I. Bakeyev <ti...@ixsystems.com> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> Reviewed-by: Gary Lockyer <g...@catalyst.net.nz> Autobuild-User(master): Garming Sam <garm...@samba.org> Autobuild-Date(master): Fri Mar 23 07:25:30 CET 2018 on sn-devel-144 commit e13349093923e754884a30db8c6b4f8928b32dad Author: Andrew Bartlett <abart...@samba.org> Date: Thu Mar 22 13:18:39 2018 +1300 selftest: Ensure tmpkpasswdscript is always under $PREFIX Otherwise it might not be removed at the end of the test Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> commit 8fd73b389177f0622c3a6935a986e2581f7f661e Author: Andrew Bartlett <abart...@samba.org> Date: Thu Mar 22 13:15:34 2018 +1300 selftest: Align cleanup of tmpkpasswdscript with scripts that use it Some scripts removed it without creating it and the others created it and did not remove it. Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: source4/dsdb/samdb/ldb_modules/encrypted_secrets.c | 6 +++--- testprogs/blackbox/test_chgdcpass.sh | 2 +- testprogs/blackbox/test_kinit_mit.sh | 2 +- testprogs/blackbox/test_kinit_trusts_heimdal.sh | 2 +- testprogs/blackbox/test_kpasswd_heimdal.sh | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c index 34c44c7..87ec9e4 100644 --- a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c +++ b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c @@ -750,16 +750,16 @@ static struct ldb_val gnutls_encrypt_aead(int *err, * Encrypt the value. */ { - size_t el; - const unsigned block_size = gnutls_cipher_get_tag_size( + const unsigned block_size = gnutls_cipher_get_block_size( data->encryption_algorithm); - const unsigned tag_size = gnutls_cipher_get_block_size( + const unsigned tag_size = gnutls_cipher_get_tag_size( data->encryption_algorithm); const size_t ed_size = round_to_block_size( block_size, sizeof(struct PlaintextSecret) + val.length); const size_t en_size = ed_size + tag_size; uint8_t *ct = talloc_zero_size(frame, en_size); + size_t el = en_size; if (ct == NULL) { ldb_set_errstring(ldb, diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh index 3830cb4..6ac4c88 100755 --- a/testprogs/blackbox/test_chgdcpass.sh +++ b/testprogs/blackbox/test_chgdcpass.sh @@ -110,5 +110,5 @@ test_smbclient "Test login with kerberos ccache with fresh kinit" 'ls' "$unc" -k rm -f $KRB5CCNAME -rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript +rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache exit $failed diff --git a/testprogs/blackbox/test_kinit_mit.sh b/testprogs/blackbox/test_kinit_mit.sh index 3e07281..d178ba4 100755 --- a/testprogs/blackbox/test_kinit_mit.sh +++ b/testprogs/blackbox/test_kinit_mit.sh @@ -306,5 +306,5 @@ $samba_kdestroy rm -f $KRB5CCNAME_PATH rm -f $PREFIX/tmpkinituserpassscript rm -f $PREFIX/tmpkinitscript - +rm -f $PREFIX/tmpkpasswdscript exit $failed diff --git a/testprogs/blackbox/test_kinit_trusts_heimdal.sh b/testprogs/blackbox/test_kinit_trusts_heimdal.sh index e67f773..4a1c0f7 100755 --- a/testprogs/blackbox/test_kinit_trusts_heimdal.sh +++ b/testprogs/blackbox/test_kinit_trusts_heimdal.sh @@ -94,5 +94,5 @@ testit "wbinfo check outgoing trust pw" $VALGRIND $wbinfo --check-secret --domai test_smbclient "Test user login with the changed outgoing secret" 'ls' "$unc" -k yes -U$USERNAME@$REALM%$PASSWORD || failed=`expr $failed + 1` -rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript +rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache exit $failed diff --git a/testprogs/blackbox/test_kpasswd_heimdal.sh b/testprogs/blackbox/test_kpasswd_heimdal.sh index 7e3daed..5cb6dab 100755 --- a/testprogs/blackbox/test_kpasswd_heimdal.sh +++ b/testprogs/blackbox/test_kpasswd_heimdal.sh @@ -109,7 +109,7 @@ testit "kpasswd check short user password" \ ########################################################### echo "check that a short password is rejected" -cat > ./tmpkpasswdscript <<EOF +cat > $PREFIX/tmpkpasswdscript <<EOF expect Password password ${TEST_PASSWORD}\n expect New password @@ -126,7 +126,7 @@ testit "kpasswd check weak user password" \ ### check that a strong password is accepted ########################################################### -cat > ./tmpkpasswdscript <<EOF +cat > $PREFIX/tmpkpasswdscript <<EOF expect Password password ${TEST_PASSWORD}\n expect New password -- Samba Shared Repository