- Merged OpenBSD CVS changes

   - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c]
     more %d vs. %s in fmt-strings
   - [authfd.c]
     Integers should not be printed with %s

diff --git a/ChangeLog b/ChangeLog
index f9889b4d83ac9821241d011eb69a4f7b6b2206aa..71fdc4a66ca5fb114395e8d056d1b15283f4ff25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 19991119
  - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com>
+ - Merged OpenBSD CVS changes
+   - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c]
+     more %d vs. %s in fmt-strings
+   - [authfd.c]
+     Integers should not be printed with %s
 
 19991118
  - Merged OpenBSD CVS changes

diff --git a/auth-rhosts.c b/auth-rhosts.c
index c1f1034ef0a7f9cd4c8cc7278b303d2bcb84732f..8149be6bb1a46b9cd0b8fd9bf1ad9d7ab88b2687 100644 (file)
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -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/auth-rsa.c b/auth-rsa.c
index c4e52fbb918fc6b1a8cfb7c11bc3736eea8dd280..8a8eca985158db33525bcbe53b102b7b1e3a5bdb 100644 (file)
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -265,7 +265,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/authfd.c b/authfd.c
index 0f0d1db620a8cc55b90f0609b324079278d88ae0..f5851d28dea3b21cdf39c39f9402a2c095f3e7d1 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -212,7 +212,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
   *comment = buffer_get_string(&auth->identities, NULL);
 
   if (bits != BN_num_bits(n))
-    error("Warning: keysize mismatch: actual %d, announced %s",
+    error("Warning: keysize mismatch: actual %d, announced %u",
          BN_num_bits(n), bits);
 
   /* Decrement the number of remaining entries. */

diff --git a/ssh-agent.c b/ssh-agent.c
index 743cdb20d7a1713e75eeed51a70939d2f6093006..296bb4c762739147e8f9ae3e9e8054e8a5e3039d 100644 (file)
--- a/ssh-agent.c
+++ b/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"
@@ -197,7 +197,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/sshconnect.c b/sshconnect.c
index 99c88adf0de6ae215d2b774dd29bcb21af6cadd7..3f6277f0d4e7a3a885378fb7d5b86728bd4005ff 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1354,7 +1354,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/sshd.c b/sshd.c
index bb2b0acd7d5513e8b325f6395cecd0fa11c3870c..cbd555f093166876dafdcbc93e06f21d373b990a 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1394,8 +1394,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,