diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-21 17:35:51 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-21 17:35:51 +0200 |
| commit | 9f170bc7ea5838756b58158842b61815e29a2aaa (patch) | |
| tree | f3d30dac365104cef560ae9ce3e332179ce253f8 | |
| parent | 95ce7dff20d5629eff16cc6f7527c542987d8eb0 (diff) | |
| download | samba-9f170bc7ea5838756b58158842b61815e29a2aaa.tar.gz samba-9f170bc7ea5838756b58158842b61815e29a2aaa.tar.bz2 samba-9f170bc7ea5838756b58158842b61815e29a2aaa.zip | |
heimdal - hdb/ext.c - fix a "shadows variable" warning
Renamed the variable "str" in the nested block to "str2" to prevent the collision
with "str" in the main function block.
| -rw-r--r-- | source4/heimdal/lib/hdb/ext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/heimdal/lib/hdb/ext.c b/source4/heimdal/lib/hdb/ext.c index faf0b6bdf2..8248098dc5 100644 --- a/source4/heimdal/lib/hdb/ext.c +++ b/source4/heimdal/lib/hdb/ext.c @@ -286,7 +286,7 @@ hdb_entry_get_password(krb5_context context, HDB *db, ext = hdb_find_extension(entry, choice_HDB_extension_data_password); if (ext) { - heim_utf8_string str; + heim_utf8_string str2; heim_octet_string pw; if (db->hdb_master_key_set && ext->data.u.password.mkvno) { @@ -314,13 +314,13 @@ hdb_entry_get_password(krb5_context context, HDB *db, return ret; } - str = pw.data; - if (str[pw.length - 1] != '\0') { + str2 = pw.data; + if (str2[pw.length - 1] != '\0') { krb5_set_error_message(context, EINVAL, "password malformated"); return EINVAL; } - *p = strdup(str); + *p = strdup(str2); der_free_octet_string(&pw); if (*p == NULL) { |