sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r9170: fix crash bug

Browse Source 
metze
(This used to be commit 232b04bf3e)
This commit is contained in:
Stefan Metzmacher
2005-08-07 02:53:27 +00:00
committed by Gerald (Jerry) Carter
parent 3e905b583f
commit 232704793e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source4/kdc/hdb-ldb.c
View File

@ -461,7 +461,7 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
char *princ_str_talloc; char *princ_str_talloc;
char *short_princ; char *short_princ;
struct ldb_message **msg; struct ldb_message **msg = NULL;
/* Structure assignment, so we don't mess with the source parameter */ /* Structure assignment, so we don't mess with the source parameter */
struct Principal princ = *principal; struct Principal princ = *principal;
@ -521,7 +521,6 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
count = ldb_search(ldb_ctx, realm_dn, LDB_SCOPE_SUBTREE, filter, count = ldb_search(ldb_ctx, realm_dn, LDB_SCOPE_SUBTREE, filter,
princ_attrs, &msg); princ_attrs, &msg);
*pmsg = talloc_steal(mem_ctx, msg);
if (count < 1) { if (count < 1) {
krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' failed: %d", krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' failed: %d",
realm_dn, filter, count); realm_dn, filter, count);
@ -529,12 +528,14 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
realm_dn, filter, count); realm_dn, filter, count);
return HDB_ERR_NOENTRY; return HDB_ERR_NOENTRY;
} else if (count > 1) { } else if (count > 1) {
talloc_free(msg);
krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d", krb5_warnx(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d",
realm_dn, filter, count); realm_dn, filter, count);
krb5_set_error_string(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d", krb5_set_error_string(context, "ldb_search: basedn: '%s' filter: '%s' more than 1 entry: %d",
realm_dn, filter, count); realm_dn, filter, count);
return HDB_ERR_NOENTRY; return HDB_ERR_NOENTRY;
} }
*pmsg = talloc_steal(mem_ctx, msg);
return 0; return 0;
} }