[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Tue Aug 14 20:03:02 UTC 2018
The branch, master has been updated
via 9eccf6a s3:libads: Free addr before we free the context
via e4f38b0 ldb tests: fix assertion on wrong pointer
from a45de51 cracknames: Fix DoS (NULL pointer de-ref) when not servicePrincipalName is set on a user
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9eccf6a16f5b198181a4fa80b835b1a65b40ed76
Author: Andreas Schneider <asn at samba.org>
Date: Tue Aug 14 18:55:33 2018 +0200
s3:libads: Free addr before we free the context
Introduced by dbdbd4875ecac3e7334750f46f1f494b7afe6628
CID 1438395
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13567
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Aug 14 22:02:06 CEST 2018 on sn-devel-144
commit e4f38b067020213671b5d712efc1a99726420b7f
Author: Timur I. Bakeyev <timur at freebsd.org>
Date: Tue Aug 14 10:40:33 2018 +1200
ldb tests: fix assertion on wrong pointer
We are allocating msg02, but check in assertion msg01, which makes no
sense here.
Signed-off-by: Timur I. Bakeyev <timur at freebsd.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/tests/ldb_mod_op_test.c | 2 +-
source3/libads/krb5_setpw.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index 01667af..924c80a 100644
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -3973,7 +3973,7 @@ static void test_ldb_unique_index_duplicate_with_guid(void **state)
assert_int_equal(ret, LDB_SUCCESS);
msg02 = ldb_msg_new(tmp_ctx);
- assert_non_null(msg01);
+ assert_non_null(msg02);
msg02->dn = ldb_dn_new_fmt(msg02, test_ctx->ldb, "dc=test02");
assert_non_null(msg02->dn);
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 0418fec..8f90988 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -222,9 +222,9 @@ static ADS_STATUS ads_krb5_chg_password(const char *kdc_host,
/* We have to obtain an INITIAL changepw ticket for changing password */
if (asprintf(&chpw_princ, "kadmin/changepw@%s", realm) == -1) {
krb5_get_init_creds_opt_free(context, opts);
+ smb_krb5_free_addresses(context, addr);
krb5_free_context(context);
free(realm);
- smb_krb5_free_addresses(context, addr);
DEBUG(1,("ads_krb5_chg_password: asprintf fail\n"));
return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list