[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Wed Oct 21 09:41:48 MDT 2009
The branch, master has been updated
via 9f170bc... heimdal - hdb/ext.c - fix a "shadows variable" warning
from 95ce7df... S4: ldb_map modules uses defines that are reserved
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9f170bc7ea5838756b58158842b61815e29a2aaa
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Wed Oct 21 17:35:51 2009 +0200
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.
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal/lib/hdb/ext.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/hdb/ext.c b/source4/heimdal/lib/hdb/ext.c
index faf0b6b..8248098 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) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list