The branch, master has been updated
via 3fb5ae6 s4:auth/kerberos/kerberos_pac.c - fix another memory leak
regarding the KRB principal
via f92055f s4:dsdb/common/util_samr.c and auth/sam.c - fix error
message
from 929063b lib/torture: add torture_assert_u64_equal_goto()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3fb5ae600efaeeb1cb7ee02d465b49bc52d111bf
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Dec 4 14:24:43 2010 +0100
s4:auth/kerberos/kerberos_pac.c - fix another memory leak regarding the KRB
principal
In addition fix a counter type
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Sat Dec 4 15:14:46 CET 2010 on sn-devel-104
commit f92055f298a94ee53ed409f425198d0942238a8c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Dec 4 12:31:34 2010 +0100
s4:dsdb/common/util_samr.c and auth/sam.c - fix error message
-----------------------------------------------------------------------
Summary of changes:
source4/auth/kerberos/kerberos_pac.c | 5 ++++-
source4/auth/sam.c | 2 +-
source4/dsdb/common/util_samr.c | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/kerberos/kerberos_pac.c
b/source4/auth/kerberos/kerberos_pac.c
index 5e31c45..23b8750 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -93,7 +93,7 @@ krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
DATA_BLOB modified_pac_blob;
NTTIME tgs_authtime_nttime;
krb5_principal client_principal_pac;
- int i;
+ uint32_t i;
krb5_clear_error_message(context);
@@ -316,9 +316,12 @@ krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
if (!krb5_principal_compare_any_realm(context, client_principal,
client_principal_pac)) {
DEBUG(2, ("Name in PAC [%s] does not match principal name in
ticket\n",
logon_name->account_name));
+ krb5_free_principal(context, client_principal_pac);
return NT_STATUS_ACCESS_DENIED;
}
+ krb5_free_principal(context, client_principal_pac);
+
#if 0
if (strcasecmp(logon_info->info3.base.account_name.string,
"Administrator")== 0) {
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 2b3ed91..0da36ea 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -337,7 +337,7 @@ NTSTATUS authsam_expand_nested_groups(struct ldb_context
*sam_ctx,
talloc_free(tmp_ctx);
return NT_STATUS_OK;
} else if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, (__location__ ": when parsing DN %s we failed to parse
our SID component, so we cannot calculate the group token: %s\n",
+ DEBUG(0, (__location__ ": when parsing DN '%s' we failed to
parse it's SID component, so we cannot calculate the group token: %s\n",
ldb_dn_get_extended_linearized(tmp_ctx, dn, 1),
nt_errstr(status)));
talloc_free(tmp_ctx);
diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index e6c7797..621c9be 100644
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -463,8 +463,8 @@ NTSTATUS dsdb_enum_group_mem(struct ldb_context *ldb,
* it could be a non SAM object - e.g. a contact */
continue;
} else if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("When parsing DN %s we failed to parse our
SID component, so we cannot fetch the membership: %s\n",
- ldb_dn_get_extended_linearized(tmp_ctx, dn,
1),
+ DEBUG(1, ("When parsing DN '%s' we failed to parse it's
SID component, so we cannot fetch the membership: %s\n",
+ ldb_dn_get_extended_linearized(tmp_ctx,
member_dn, 1),
nt_errstr(status)));
talloc_free(tmp_ctx);
return status;
--
Samba Shared Repository
