diff options
| author | Günther Deschner <gd@samba.org> | 2010-07-16 04:06:48 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-08-25 13:27:50 +0200 |
| commit | e2f15d2a25302ee529006b2d1d6b99993c7102e8 (patch) | |
| tree | 0189ae9cc476c77cb1f0dde4aa7274cd4a7cc043 /source4/kdc | |
| parent | 2eff142cce536a8966e63bdf9e514bc22d03acc4 (diff) | |
| download | samba-e2f15d2a25302ee529006b2d1d6b99993c7102e8.tar.gz samba-e2f15d2a25302ee529006b2d1d6b99993c7102e8.tar.bz2 samba-e2f15d2a25302ee529006b2d1d6b99993c7102e8.zip | |
s4-trusts: fix trustDomainPasswords drsblobs IDL and server side support.
Also remove bogus trustCurrentPasswords struct which we just had because our IDL
was incorrect.
Guenther
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/db-glue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index c8bbea7531..8e311b439b 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -834,15 +834,15 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context, entry_ex->entry.kvno = -1; for (i=0; i < password_blob.count; i++) { - if (password_blob.current->array[i].AuthType == TRUST_AUTH_TYPE_VERSION) { - entry_ex->entry.kvno = password_blob.current->array[i].AuthInfo.version.version; + if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_VERSION) { + entry_ex->entry.kvno = password_blob.current.array[i].AuthInfo.version.version; } } for (i=0; i < password_blob.count; i++) { - if (password_blob.current->array[i].AuthType == TRUST_AUTH_TYPE_CLEAR) { - password_utf16 = data_blob_const(password_blob.current->array[i].AuthInfo.clear.password, - password_blob.current->array[i].AuthInfo.clear.size); + if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_CLEAR) { + password_utf16 = data_blob_const(password_blob.current.array[i].AuthInfo.clear.password, + password_blob.current.array[i].AuthInfo.clear.size); /* In the future, generate all sorts of * hashes, but for now we can't safely convert * the random strings windows uses into @@ -851,8 +851,8 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context, /* but as it is utf16 already, we can get the NT password/arcfour-hmac-md5 key */ mdfour(password_hash.hash, password_utf16.data, password_utf16.length); break; - } else if (password_blob.current->array[i].AuthType == TRUST_AUTH_TYPE_NT4OWF) { - password_hash = password_blob.current->array[i].AuthInfo.nt4owf.password; + } else if (password_blob.current.array[i].AuthType == TRUST_AUTH_TYPE_NT4OWF) { + password_hash = password_blob.current.array[i].AuthInfo.nt4owf.password; break; } } |