diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-02-06 05:41:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:42 -0500 |
| commit | e47305005221b33e54c318d2e507f56efd4b6b8f (patch) | |
| tree | ba987f2e652b150d6e205ecfda8e4f3d7a16d475 /source4/auth | |
| parent | 8538af1107a6e894d4941708b77e79fac587e35d (diff) | |
| download | samba-e47305005221b33e54c318d2e507f56efd4b6b8f.tar.gz samba-e47305005221b33e54c318d2e507f56efd4b6b8f.tar.bz2 samba-e47305005221b33e54c318d2e507f56efd4b6b8f.zip | |
r21175: Fix the kerberos keytab update code to handle deletes.
Fix the join code to know that the ldb layer handles the keytab update.
Andrew Bartlett
(This used to be commit d3fbc089f4161ae71b21077d50130fdabd8b2d77)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index a68268e697..78fc95b649 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -417,10 +417,9 @@ static int create_keytab(TALLOC_CTX *parent_ctx, const struct samr_Password *mach_pwd; mach_pwd = cli_credentials_get_nt_hash(machine_account, mem_ctx); if (!mach_pwd) { - DEBUG(1, ("create_keytab: Domain trust informaton for account %s not available\n", - cli_credentials_get_principal(machine_account, mem_ctx))); + /* OK, nothing to do here */ talloc_free(mem_ctx); - return EINVAL; + return 0; } ret = krb5_keyblock_init(smb_krb5_context->krb5_context, ETYPE_ARCFOUR_HMAC_MD5, |