s4:heimdal: import lorikeet-heimdal-201107150856 (commit 48936803fae4a2fb362c79365d31...

[amitay/samba.git] / source4 / heimdal / lib / hdb / ext.c

diff --git a/source4/heimdal/lib/hdb/ext.c b/source4/heimdal/lib/hdb/ext.c
index fb32fdb845e644e0562e6a7bcc43dcaf6c9bc4de..d2a4373b9b3889093967b3e49ae61147d73f2cd8 100644 (file)
--- a/source4/heimdal/lib/hdb/ext.c
+++ b/source4/heimdal/lib/hdb/ext.c
@@ -37,7 +37,7 @@
 krb5_error_code
 hdb_entry_check_mandatory(krb5_context context, const hdb_entry *ent)
 {
-    int i;
+    size_t i;
 
     if (ent->extensions == NULL)
        return 0;
@@ -63,13 +63,13 @@ hdb_entry_check_mandatory(krb5_context context, const hdb_entry *ent)
 HDB_extension *
 hdb_find_extension(const hdb_entry *entry, int type)
 {
-    int i;
+    size_t i;
 
     if (entry->extensions == NULL)
        return NULL;
 
     for (i = 0; i < entry->extensions->len; i++)
-       if (entry->extensions->val[i].data.element == type)
+       if (entry->extensions->val[i].data.element == (unsigned)type)
            return &entry->extensions->val[i];
     return NULL;
 }
@@ -112,7 +112,7 @@ hdb_replace_extension(krb5_context context,
        Der_type replace_type, list_type;
        unsigned int replace_tag, list_tag;
        size_t size;
-       int i;
+       size_t i;
 
        ret = der_get_tag(ext->data.u.asn1_ellipsis.data,
                          ext->data.u.asn1_ellipsis.length,
@@ -180,13 +180,13 @@ hdb_clear_extension(krb5_context context,
                    hdb_entry *entry,
                    int type)
 {
-    int i;
+    size_t i;
 
     if (entry->extensions == NULL)
        return 0;
 
     for (i = 0; i < entry->extensions->len; i++) {
-       if (entry->extensions->val[i].data.element == type) {
+       if (entry->extensions->val[i].data.element == (unsigned)type) {
            free_HDB_extension(&entry->extensions->val[i]);
            memmove(&entry->extensions->val[i],
                    &entry->extensions->val[i + 1],
@@ -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 xstr;
        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') {
+       xstr = pw.data;
+       if (xstr[pw.length - 1] != '\0') {
            krb5_set_error_message(context, EINVAL, "malformed password");
            return EINVAL;
        }
 
-       *p = strdup(str);
+       *p = strdup(xstr);
 
        der_free_octet_string(&pw);
        if (*p == NULL) {