less warnings

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3750 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/telnet/libtelnet/auth.c

@@ -500,7 +500,7 @@ auth_is(unsigned char *data, int cnt)
 	return;
     }
 
-    if (ap = findauthenticator(data[0], data[1])) {
+    if ((ap = findauthenticator(data[0], data[1]))) {
 	if (ap->is)
 	    (*ap->is)(ap, data+2, cnt-2);
     } else if (auth_debug_mode)
@@ -516,7 +516,7 @@ auth_reply(unsigned char *data, int cnt)
     if (cnt < 2)
 	return;
 
-    if (ap = findauthenticator(data[0], data[1])) {
+    if ((ap = findauthenticator(data[0], data[1]))) {
 	if (ap->reply)
 	    (*ap->reply)(ap, data+2, cnt-2);
     } else if (auth_debug_mode)

appl/telnet/libtelnet/kerberos.c

@@ -179,7 +179,7 @@ kerberos4_send(char *name, Authenticator *ap)
 
     memset(instance, 0, sizeof(instance));
 
-    if (realm = krb_get_phost(RemoteHostName))
+    if ((realm = krb_get_phost(RemoteHostName)))
 	strncpy(instance, realm, sizeof(instance));
 
     instance[sizeof(instance)-1] = '\0';
@@ -190,11 +190,13 @@ kerberos4_send(char *name, Authenticator *ap)
 	printf("Kerberos V4: no realm for %s\r\n", RemoteHostName);
 	return(0);
     }
-    if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L)) {
+    r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L);
+    if (r) {
 	printf("mk_req failed: %s\r\n", krb_get_err_text(r));
 	return(0);
     }
-    if (r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred)) {
+    r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred);
+    if (r) {
 	printf("get_cred failed: %s\r\n", krb_get_err_text(r));
 	return(0);
     }
@@ -288,8 +290,9 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
 	    printf("\r\n");
 	}
 	k_getsockinst(0, instance, sizeof(instance));
-	if (r = krb_rd_req(&auth, KRB_SERVICE_NAME,
-			   instance, 0, &adat, "")) {
+	r = krb_rd_req(&auth, KRB_SERVICE_NAME,
+		       instance, 0, &adat, "");
+	if (r) {
 	    if (auth_debug_mode)
 		printf("Kerberos failed him as %s\r\n", name);
 	    Data(ap, KRB_REJECT, (void *)krb_get_err_text(r), -1);

appl/test/tcp_server.c

@@ -145,7 +145,8 @@ proto (int sock, const char *service)
 	errx (1, "krb5_rd_safe: %s",
 	      krb5_get_err_text(context, status));
 
-    printf ("safe packet: %.*s\n", data.length, data.data);
+    printf ("safe packet: %.*s\n", (int)data.length,
+	    (char *)data.data);
 
     if (krb5_net_read (context, sock, &net_len, 4) != 4)
 	err (1, "krb5_net_read");
@@ -166,7 +167,8 @@ proto (int sock, const char *service)
 	errx (1, "krb5_rd_priv: %s",
 	      krb5_get_err_text(context, status));
 
-    printf ("priv packet: %.*s\n", data.length, data.data);
+    printf ("priv packet: %.*s\n", (int)data.length,
+	    (char *)data.data);
 
     return 0;
 }

appl/test/test_locl.h

@@ -76,6 +76,7 @@
 #include <errno.h>
 #include <roken.h>
 #include <getarg.h>
+#include <err.h>
 #include <krb5.h>
 
 #define SERVICE "test"

kdc/kerberos4.c

@@ -47,10 +47,10 @@ RCSID("$Id$");
 static u_int32_t
 swap32(u_int32_t x)
 {
-    return (x << 24) & 0xff000000 |
-	(x << 8) & 0xff0000 |
-	(x >> 8) & 0xff00 |
-	(x >> 24) & 0xff;
+    return ((x << 24) & 0xff000000) |
+	((x << 8) & 0xff0000) |
+	((x >> 8) & 0xff00) |
+	((x >> 24) & 0xff);
 }
 
 int

kpasswd/kpasswd.c

@@ -132,7 +132,8 @@ main (int argc, char **argv)
 	errx (1, "krb5_change_password: %s",
 	      krb5_get_err_text(context, ret));
 
-    printf ("%.*s\n", result_string.length, result_string.data);
+    printf ("%.*s\n", (int)result_string.length,
+	    (char *)result_string.data);
 
     krb5_data_free (&result_code_string);
     krb5_data_free (&result_string);

kpasswd/kpasswdd.c

@@ -296,7 +296,8 @@ change (krb5_auth_context auth_context,
     krb5_get_salt (principal, &salt);
     memset (&new_keyblock, 0, sizeof(new_keyblock));
     old_keyblock = &ent.keys.val[0].key;
-    krb5_string_to_key_data (pwd_data, &salt, old_keyblock->keytype, /* XXX */
+    krb5_string_to_key_data (pwd_data, &salt,
+			     old_keyblock->keytype, /* XXX */
 			     &new_keyblock);
 
     if (new_keyblock.keytype == old_keyblock->keytype