more %d vs. %s in fmt-strings

5 files changed, 11 insertions, 11 deletions

diff --git a/usr.bin/ssh/auth-rhosts.c b/usr.bin/ssh/auth-rhosts.c
index d58bd135ceb..7d32076310b 100644
--- a/usr.bin/ssh/auth-rhosts.c
+++ b/usr.bin/ssh/auth-rhosts.c
@@ -16,7 +16,7 @@ the login based on rhosts authentication.  This file also processes
 */
 
 #include "includes.h"
-RCSID("$Id: auth-rhosts.c,v 1.7 1999/11/14 23:20:09 markus Exp $");
+RCSID("$Id: auth-rhosts.c,v 1.8 1999/11/18 14:00:47 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -213,7 +213,7 @@ int auth_rhosts(struct passwd *pw, const char *client_user)
      group or world writable. */
   if (stat(pw->pw_dir, &st) < 0)
     {
-      log("Rhosts authentication refused for %.100: no home directory %.200s",
+      log("Rhosts authentication refused for %.100s: no home directory %.200s",
 	  pw->pw_name, pw->pw_dir);
       packet_send_debug("Rhosts authentication refused for %.100: no home directory %.200s",
 			pw->pw_name, pw->pw_dir);
diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c
index a108d6a2a50..382ac71a717 100644
--- a/usr.bin/ssh/auth-rsa.c
+++ b/usr.bin/ssh/auth-rsa.c
@@ -16,7 +16,7 @@ validity of the host key.
 */
 
 #include "includes.h"
-RCSID("$Id: auth-rsa.c,v 1.9 1999/11/15 20:53:24 markus Exp $");
+RCSID("$Id: auth-rsa.c,v 1.10 1999/11/18 14:00:48 markus Exp $");
 
 #include "rsa.h"
 #include "packet.h"
@@ -259,7 +259,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
 
       /* check the real bits  */
       if (bits != BN_num_bits(n))
-        error("Warning: error in %s, line %d: keysize mismatch: "
+        error("Warning: error in %s, line %ld: keysize mismatch: "
               "actual size %d vs. announced %d.",
               file, linenum, BN_num_bits(n), bits);
 
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index e105fb1acbd..6d8f12b2f3b 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $	*/
+/*	$OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $	*/
 
 /*
 
@@ -16,7 +16,7 @@ The authentication agent program.
 */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -186,7 +186,7 @@ process_remove_identity(SocketEntry *e)
   buffer_get_bignum(&e->input, n);
 
   if (bits != BN_num_bits(n))
-    error("Warning: keysize mismatch: actual %d, announced %s",
+    error("Warning: keysize mismatch: actual %d, announced %d",
 	  BN_num_bits(n), bits);
   
   /* Check if we have the key. */
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index a1faa7e61a4..23418cfe240 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -15,7 +15,7 @@ login (authentication) dialog.
 */
 
 #include "includes.h"
-RCSID("$Id: sshconnect.c,v 1.34 1999/11/17 09:51:57 markus Exp $");
+RCSID("$Id: sshconnect.c,v 1.35 1999/11/18 14:00:49 markus Exp $");
 
 #include <ssl/bn.h>
 #include "xmalloc.h"
@@ -1348,7 +1348,7 @@ void ssh_login(int host_key_valid,
     if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default))
       options.cipher = ssh_cipher_default;
     else {
-      debug("Cipher %d not supported, using %.100s instead.",
+      debug("Cipher %s not supported, using %.100s instead.",
 	    cipher_name(ssh_cipher_default),
 	    cipher_name(SSH_FALLBACK_CIPHER));
       options.cipher = SSH_FALLBACK_CIPHER;
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 8da874e97eb..8ab869b0bd9 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -18,7 +18,7 @@ agent connections.
 */
 
 #include "includes.h"
-RCSID("$Id: sshd.c,v 1.57 1999/11/17 09:51:21 markus Exp $");
+RCSID("$Id: sshd.c,v 1.58 1999/11/18 14:00:49 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -1209,7 +1209,7 @@ do_authloop(struct passwd *pw)
 
         if (bits != BN_num_bits(client_host_key_n))
           error("Warning: keysize mismatch for client_host_key: "
-	        "actual %d, announced %s", BN_num_bits(client_host_key_n), bits);
+	        "actual %d, announced %d", BN_num_bits(client_host_key_n), bits);
 	packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type);
   
 	authenticated = auth_rhosts_rsa(pw, client_user,