Fix warnings

diff --git a/kadmin/server.c b/kadmin/server.c
index d0893089ad5fb43db3682aba794f899f704f0f23..ccb6a7a991dbad1de8fefcc4feda3d68bc6c02e3 100644 (file)
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -759,7 +759,7 @@ handle_v5(krb5_context contextp,
     krb5_boolean initial;
     krb5_auth_context ac = NULL;
 
-    unsigned kadm_version;
+    unsigned kadm_version = 1;
     kadm5_config_params realm_params;
 
     ret = krb5_recvauth_match_version(contextp, &ac, &fd,

diff --git a/lib/krb5/recvauth.c b/lib/krb5/recvauth.c
index 3af283d7c3256a1f337c37706084cef072910816..785c4c9c5f1b800d8d3011c179e9d2c7c87b14a8 100644 (file)
--- a/lib/krb5/recvauth.c
+++ b/lib/krb5/recvauth.c
@@ -126,7 +126,7 @@ krb5_recvauth_match_version(krb5_context context,
     if(!(flags & KRB5_RECVAUTH_IGNORE_VERSION)) {
        n = krb5_net_read (context, p_fd, &len, 4);
        if (n < 0) {
-           ret = errno;
+           ret = errno ? errno : EINVAL;
            krb5_set_error_message(context, ret, "read: %s", strerror(ret));
            return ret;
        }
@@ -151,7 +151,7 @@ krb5_recvauth_match_version(krb5_context context,
      */
     n = krb5_net_read (context, p_fd, &len, 4);
     if (n < 0) {
-       ret = errno;
+       ret = errno ? errno : EINVAL;
        krb5_set_error_message(context, ret, "read: %s", strerror(ret));
        return ret;
     }
@@ -183,7 +183,7 @@ krb5_recvauth_match_version(krb5_context context,
      */
     repl = 0;
     if (krb5_net_write (context, p_fd, &repl, 1) != 1) {
-       ret = errno;
+       ret = errno ? errno : EINVAL;
        krb5_set_error_message(context, ret, "write: %s", strerror(ret));
        return ret;
     }
@@ -234,7 +234,7 @@ krb5_recvauth_match_version(krb5_context context,
      */
     len = 0;
     if (krb5_net_write (context, p_fd, &len, 4) != 4) {
-       ret = errno;
+       ret = errno ? errno : EINVAL;
        krb5_set_error_message(context, ret, "write: %s", strerror(ret));
        krb5_free_ticket(context, *ticket);
        *ticket = NULL;