diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-22 16:39:56 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-22 16:39:56 +0100 |
| commit | 4075a2ba982ea56ff925e0a33839f0760fd71911 (patch) | |
| tree | 87d87734257f814b7960a843e54455c447f34a9e /source4/libnet/libnet_join.c | |
| parent | 24da29746998de1001d18871dcbe8d37643667d5 (diff) | |
| parent | 35c68316442808a135aafa864d19592108a4d879 (diff) | |
| download | samba-4075a2ba982ea56ff925e0a33839f0760fd71911.tar.gz samba-4075a2ba982ea56ff925e0a33839f0760fd71911.tar.bz2 samba-4075a2ba982ea56ff925e0a33839f0760fd71911.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
(This used to be commit 2f57e25f8f692889d9e057e13256f8a24c5ec10c)
Diffstat (limited to 'source4/libnet/libnet_join.c')
| -rw-r--r-- | source4/libnet/libnet_join.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 8297172a58..22134518d6 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -1064,7 +1064,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, return NT_STATUS_INTERNAL_DB_CORRUPTION; } else { const struct ldb_val *private_keytab; - const struct ldb_val *krb5_keytab; + const struct ldb_val *krb5_main_keytab; const struct ldb_val *prior_secret; const struct ldb_val *prior_modified_time; int i; @@ -1125,9 +1125,10 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, return NT_STATUS_NO_MEMORY; } } - krb5_keytab = ldb_msg_find_ldb_val(msgs[0], "krb5Keytab"); - if (krb5_keytab) { - rtn = samdb_msg_set_value(ldb, tmp_mem, msg, "krb5Keytab", krb5_keytab); + krb5_main_keytab = ldb_msg_find_ldb_val(msgs[0], "krb5Keytab"); + if (krb5_main_keytab) { + rtn = samdb_msg_set_value(ldb, tmp_mem, msg, + "krb5Keytab", krb5_main_keytab); if (rtn == -1) { r->out.error_string = NULL; talloc_free(tmp_mem); |