11 files changed, 30 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 85a2545cc..9adfbb7b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,10 @@
    - jmc@cvs.openbsd.org 2005/10/30 08:43:47
      [ssh_config.5]
      remove trailing whitespace;
+   - djm@cvs.openbsd.org 2005/10/30 08:52:18
+     [clientloop.c packet.c serverloop.c session.c ssh-agent.c ssh-keygen.c]
+     [ssh.c sshconnect.c sshconnect1.c sshd.c]
+     no need to escape single quotes in comments, no binary change
 
 20051102
  - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3204,4 +3208,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3944 2005/11/05 04:13:49 djm Exp $
+$Id: ChangeLog,v 1.3945 2005/11/05 04:14:59 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index b267fa142..001c8f119 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.144 2005/10/14 02:29:37 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.145 2005/10/30 08:52:17 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -113,7 +113,7 @@ extern char *host;
 static volatile sig_atomic_t received_window_change_signal = 0;
 static volatile sig_atomic_t received_signal = 0;
 
-/* Flag indicating whether the user\'s terminal is in non-blocking mode. */
+/* Flag indicating whether the user's terminal is in non-blocking mode. */
 static int in_non_blocking_mode = 0;
 
 /* Common data for the client loop code. */
diff --git a/packet.c b/packet.c
index 70e0110cb..db2aa2411 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.119 2005/07/28 17:36:22 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.120 2005/10/30 08:52:17 djm Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -572,7 +572,7 @@ packet_send1(void)
         buffer_clear(&outgoing_packet);
 
         /*
-         * Note that the packet is now only buffered in output.  It won\'t be
+         * Note that the packet is now only buffered in output.  It won't be
          * actually sent until packet_write_wait or packet_write_poll is
          * called.
          */
diff --git a/serverloop.c b/serverloop.c
index 17608c238..208f7e1e9 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.119 2005/10/10 10:23:08 djm Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.120 2005/10/30 08:52:17 djm Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -548,7 +548,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
          * If we have no separate fderr (which is the case when we have a pty
          * - there we cannot make difference between data sent to stdout and
          * stderr), indicate that we have seen an EOF from stderr.  This way
-         * we don\'t need to check the descriptor everywhere.
+         * we don't need to check the descriptor everywhere.
          */
         if (fderr == -1)
                 fderr_eof = 1;
diff --git a/session.c b/session.c
index 5e6627cb0..7863aa15f 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.187 2005/10/10 10:23:08 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.188 2005/10/30 08:52:17 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1419,7 +1419,7 @@ child_close_fds(void)
         endpwent();
 
         /*
-         * Close any extra open file descriptors so that we don\'t have them
+         * Close any extra open file descriptors so that we don't have them
          * hanging around in clients.  Note that we want to do this after
          * initgroups, because at least on Solaris 2.3 it leaves file
          * descriptors open.
@@ -1554,7 +1554,7 @@ do_child(Session *s, const char *command)
         }
 #endif
 
-        /* Change current directory to the user\'s home directory. */
+        /* Change current directory to the user's home directory. */
         if (chdir(pw->pw_dir) < 0) {
                 fprintf(stderr, "Could not chdir to home directory %s: %s\n",
                     pw->pw_dir, strerror(errno));
diff --git a/ssh-agent.c b/ssh-agent.c
index 6f0ba130d..a69c25eec 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.123 2005/09/13 23:40:07 djm Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.124 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -355,7 +355,7 @@ process_remove_identity(SocketEntry *e, int version)
                 if (id != NULL) {
                         /*
                          * We have this key.  Free the old key.  Since we
-                         * don\'t want to leave empty slots in the middle of
+                         * don't want to leave empty slots in the middle of
                          * the array, we actually free the key there and move
                          * all the entries between the empty slot and the end
                          * of the array.
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 040813c5a..915d5580b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.131 2005/10/14 02:17:59 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.132 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -1274,7 +1274,7 @@ main(int ac, char **av)
         if (!have_identity)
                 ask_filename(pw, "Enter file in which to save the key");
 
-        /* Create ~/.ssh directory if it doesn\'t already exist. */
+        /* Create ~/.ssh directory if it doesn't already exist. */
         snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR);
         if (strstr(identity_file, dotsshdir) != NULL &&
             stat(dotsshdir, &st) < 0) {
diff --git a/ssh.c b/ssh.c
index 7e8bc1f24..2227755cd 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.253 2005/10/30 04:03:24 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.254 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -698,7 +698,7 @@ again:
 
         /*
          * Now that we are back to our own permissions, create ~/.ssh
-         * directory if it doesn\'t already exist.
+         * directory if it doesn't already exist.
          */
         snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
         if (stat(buf, &st) < 0)
@@ -810,7 +810,7 @@ static void
 check_agent_present(void)
 {
         if (options.forward_agent) {
-                /* Clear agent forwarding if we don\'t have an agent. */
+                /* Clear agent forwarding if we don't have an agent. */
                 if (!ssh_agent_present())
                         options.forward_agent = 0;
         }
diff --git a/sshconnect.c b/sshconnect.c
index d8cfd35b3..2245a8af6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.169 2005/10/15 15:28:12 stevesk Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.170 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/bn.h>
 
@@ -603,7 +603,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
         file_key = key_new(host_key->type);
 
         /*
-         * Check if the host key is present in the user\'s list of known
+         * Check if the host key is present in the user's list of known
          * hosts or in the systemwide list.
          */
         host_file = user_hostfile;
diff --git a/sshconnect1.c b/sshconnect1.c
index bd05723c7..440d7c5bd 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.61 2005/06/17 02:44:33 djm Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.62 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -84,7 +84,7 @@ try_agent_authentication(void)
                 /* Wait for server's response. */
                 type = packet_read();
 
-                /* The server sends failure if it doesn\'t like our key or
+                /* The server sends failure if it doesn't like our key or
                    does not support RSA authentication. */
                 if (type == SSH_SMSG_FAILURE) {
                         debug("Server refused our key.");
@@ -215,8 +215,8 @@ try_rsa_authentication(int idx)
         type = packet_read();
 
         /*
-         * The server responds with failure if it doesn\'t like our key or
-         * doesn\'t support RSA authentication.
+         * The server responds with failure if it doesn't like our key or
+         * doesn't support RSA authentication.
          */
         if (type == SSH_SMSG_FAILURE) {
                 debug("Server refused our key.");
diff --git a/sshd.c b/sshd.c
index 4b5f89e2a..f0fdf5a83 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.316 2005/10/30 08:29:29 dtucker Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.317 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1682,10 +1682,10 @@ main(int ac, char **av)
         verbose("Connection from %.500s port %d", remote_ip, remote_port);
 
         /*
-         * We don\'t want to listen forever unless the other side
+         * We don't want to listen forever unless the other side
          * successfully authenticates itself.  So we set up an alarm which is
          * cleared after successful authentication.  A limit of zero
-         * indicates no limit. Note that we don\'t set the alarm in debugging
+         * indicates no limit. Note that we don't set the alarm in debugging
          * mode; it is just annoying to have the server exit just when you
          * are about to discover the bug.
          */