Back out changes accidentally made to branch instead of trunk

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19220 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index 5c01cd13235e9b8e572b45eeb5f973bb72d7eae8..6149e81d89f9fc9c87ff17aadac0fea31a89ac66 100644 (file)
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -971,7 +971,6 @@ static krb5_error_code fixup_database(context, realm)
 }
     
 #else /* KRB5_KRB4_COMPAT */
-#include <stdio.h>
 void
 load_v4db(argc, argv)
        int argc;

diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index b865d4b23a878554bd9eea9bf6e64a035fde08e3..e2464e8535703a7d2aff248329676c588464fb02 100644 (file)
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -213,8 +213,7 @@ void ktutil_list(argc, argv)
     krb5_error_code retval;
     krb5_kt_list lp;
     int show_time = 0, show_keys = 0, show_enctype = 0;
-    int i;
-    unsigned j;
+    int i, j;
     char *pname;
 
     for (i = 1; i < argc; i++) {
@@ -284,3 +283,13 @@ void ktutil_list(argc, argv)
        krb5_xfree(pname);
     }
 }
+
+
+
+
+
+
+
+
+
+

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 1df282989f52bfaf4068c539030b562344d658c7..afae95a120016b690e238c4f197f9754012d357c 100644 (file)
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -990,7 +990,7 @@ void log_badverf(gss_name_t client_name, gss_name_t server_name,
      gss_OID gss_type;
      char *a;
      rpcproc_t proc;
-     size_t i;
+     int i;
      const char *procname;
 
      client.length = 0;

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
index c837f95347cfb2c8329175943659ca362e4b68d6..343705efc2f576a1c8e1120bd850ed2f93633704 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
@@ -210,7 +210,7 @@ krb5_ldap_db_init(krb5_context context, krb5_ldap_context *ldap_context)
        server_info = ldap_context->server_info_list[cnt];
 
        if (server_info->server_status == NOTSET) {
-           krb5_ui_4 conns=0;
+           int conns=0;
 
            /*
             * Check if the server has to perform certificate-based authentication

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index d7b19d67d5df0fc2170bc3099fb9f8e00dc3d188..7926484c71c72df4add7d234ea813684acd30ab8 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -1162,7 +1162,7 @@ krb5_read_tkt_policy (context, ldap_context, entries, policy)
 {
     krb5_error_code             st=0;
     unsigned int                mask=0, omask=0;
-    unsigned int                tkt_mask=(KDB_MAX_LIFE_ATTR | KDB_MAX_RLIFE_ATTR | KDB_TKT_FLAGS_ATTR);
+    int                         tkt_mask=(KDB_MAX_LIFE_ATTR | KDB_MAX_RLIFE_ATTR | KDB_TKT_FLAGS_ATTR);
     krb5_ldap_policy_params     *tktpoldnparam=NULL;
 
     if ((st=krb5_get_attributes_mask(context, entries, &mask)) != 0)

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
index 76a5993fb6885c5b8cf0c315df5d8fc337614c73..4991e98be03c3f3961ba8d6ff8c1f8835639bd08 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
@@ -183,8 +183,7 @@ tohex(in, ret)
     krb5_data         in;
     krb5_data         *ret;
 {
-    unsigned           i=0;
-    int                       err = 0;
+    int                i=0, err = 0;
 
     ret->length = 0;
     ret->data = NULL;

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 6c93a3f7e570c4f37c1ab2ee464bfa12bd3abaf3..77c2703917348f2997a0ee9603c6045a6c20d60d 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -721,8 +721,7 @@ recv_database(context, fd, database_fd, confmsg)
     krb5_data *confmsg;
 {
        krb5_ui_4       database_size; /* This must be 4 bytes */
-       krb5_ui_4       received_size;
-       int             n;
+       int     received_size, n;
        char            buf[1024];
        krb5_data       inbuf, outbuf;
        krb5_error_code retval;