Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source4 / heimdal / lib / krb5 / keytab_file.c

diff --git a/source4/heimdal/lib/krb5/keytab_file.c b/source4/heimdal/lib/krb5/keytab_file.c
index 2b9ea7f11de8b03f4147272bf3f850a7026c12a3..ccaf62fcb4c2ab62733c701d48db8ff5c69964a5 100644 (file)
--- a/source4/heimdal/lib/krb5/keytab_file.c
+++ b/source4/heimdal/lib/krb5/keytab_file.c
@@ -101,7 +101,7 @@ krb5_kt_store_data(krb5_context context,
     if(ret < 0)
        return ret;
     ret = krb5_storage_write(sp, data.data, data.length);
-    if(ret != data.length){
+    if(ret != (int)data.length){
        if(ret < 0)
            return errno;
        return KRB5_KT_END;
@@ -119,7 +119,7 @@ krb5_kt_store_string(krb5_storage *sp,
     if(ret < 0)
        return ret;
     ret = krb5_storage_write(sp, data, len);
-    if(ret != len){
+    if(ret != (int)len){
        if(ret < 0)
            return errno;
        return KRB5_KT_END;
@@ -182,7 +182,7 @@ krb5_kt_ret_principal(krb5_context context,
                      krb5_storage *sp,
                      krb5_principal *princ)
 {
-    int i;
+    size_t i;
     int ret;
     krb5_principal p;
     int16_t len;
@@ -262,7 +262,7 @@ krb5_kt_store_principal(krb5_context context,
                        krb5_storage *sp,
                        krb5_principal p)
 {
-    int i;
+    size_t i;
     int ret;
 
     if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS))
@@ -536,7 +536,7 @@ fkt_setup_keytab(krb5_context context,
        id->version = KRB5_KT_VNO;
     return krb5_store_int8 (sp, id->version);
 }
-               
+
 static krb5_error_code KRB5_CALLCONV
 fkt_add_entry(krb5_context context,
              krb5_keytab id,
@@ -699,7 +699,7 @@ fkt_add_entry(krb5_context context,
        }
        if(len < 0) {
            len = -len;
-           if(len >= keytab.length) {
+           if(len >= (int)keytab.length) {
                krb5_storage_seek(sp, -4, SEEK_CUR);
                break;
            }
@@ -749,8 +749,9 @@ fkt_remove_entry(krb5_context context,
            krb5_store_int32(cursor.sp, -len);
            memset(buf, 0, sizeof(buf));
            while(len > 0) {
-               krb5_storage_write(cursor.sp, buf, min(len, sizeof(buf)));
-               len -= min(len, sizeof(buf));
+               krb5_storage_write(cursor.sp, buf,
+                   min((size_t)len, sizeof(buf)));
+               len -= min((size_t)len, sizeof(buf));
            }
        }
        krb5_kt_free_entry(context, &e);