sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r16056: Fix errors found by trying to use our kpasswd server and the Apple client.

Browse Source 
Andrew Bartlett
(This used to be commit ae2913898c983dcba69b5d0b89c428e450e9bf5f)
This commit is contained in:
Andrew Bartlett 2006-06-06 04:50:14 +00:00 committed by Gerald (Jerry) Carter
parent 66f77c4ebf
commit e0bb0e9f95
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/auth/gensec/gensec_krb5.c
View File

@ -151,7 +151,7 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
}
}
peer_addr = gensec_get_my_addr(gensec_security);
peer_addr = gensec_get_peer_addr(gensec_security);
if (peer_addr && peer_addr->sockaddr) {
ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context,
peer_addr->sockaddr, &peer_krb5_addr);

2
source4/heimdal/lib/hdb/keytab.c
View File

@ -218,7 +218,7 @@ hdb_get_entry(krb5_context context,
(*db->hdb_destroy)(context, db);
return ret;
}
ret = (*db->hdb_fetch)(context, db, principal, HDB_F_DECRYPT, &ent);
ret = (*db->hdb_fetch)(context, db, principal, HDB_F_DECRYPT|HDB_F_GET_CLIENT|HDB_F_GET_SERVER, &ent);
/* Shutdown the hdb on error */

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

@ -611,13 +611,10 @@ static krb5_error_code LDB_fetch_client(krb5_context context, HDB *db,
&msg, &realm_ref_msg);
free(principal_string);
if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) {
talloc_free(mem_ctx);
return HDB_ERR_NOENTRY;
} else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_MEMORY)) {
talloc_free(mem_ctx);
return ENOMEM;
} else if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(mem_ctx);
return EINVAL;
}
@ -788,7 +785,7 @@ static krb5_error_code LDB_fetch(krb5_context context, HDB *db,
unsigned flags,
hdb_entry_ex *entry_ex)
{
krb5_error_code ret;
krb5_error_code ret = HDB_ERR_NOENTRY;
TALLOC_CTX *mem_ctx = talloc_named(db, 0, "LDB_fetch context");