diff options
| author | Kai Blin <kai@samba.org> | 2007-12-26 10:43:35 +0100 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2008-01-11 11:12:52 +0100 |
| commit | ed4fde2acc82a55bcd7f0b05ae37a7a84560d250 (patch) | |
| tree | 986326799d60291cf4c911716e77aa875899486b | |
| parent | 7b7749042134e31490e21b3e001451eb0f8c410e (diff) | |
| download | samba-ed4fde2acc82a55bcd7f0b05ae37a7a84560d250.tar.gz samba-ed4fde2acc82a55bcd7f0b05ae37a7a84560d250.tar.bz2 samba-ed4fde2acc82a55bcd7f0b05ae37a7a84560d250.zip | |
libnet: Rename a variable so it does not shadow a global.
(This used to be commit a5b9d2f33279e0f96a36acbf3da7c018aadf08c9)
| -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); |