diff options
author | Damien Miller <djm@mindrot.org> | 2005-11-05 15:14:59 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-11-05 15:14:59 +1100 |
commit | 788f212aed68781efe7aa80e625c5f8cd4d98100 (patch) | |
tree | 2325dfd810906d1b4eb02bda7a8ead19b4e9186e | |
parent | 713de76f66d4a27134938ebf6836ef97471c128a (diff) |
- 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | packet.c | 4 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | session.c | 6 | ||||
-rw-r--r-- | ssh-agent.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 | ||||
-rw-r--r-- | ssh.c | 6 | ||||
-rw-r--r-- | sshconnect.c | 4 | ||||
-rw-r--r-- | sshconnect1.c | 8 | ||||
-rw-r--r-- | sshd.c | 6 |
11 files changed, 30 insertions, 26 deletions
@@ -71,6 +71,10 @@ | |||
71 | - jmc@cvs.openbsd.org 2005/10/30 08:43:47 | 71 | - jmc@cvs.openbsd.org 2005/10/30 08:43:47 |
72 | [ssh_config.5] | 72 | [ssh_config.5] |
73 | remove trailing whitespace; | 73 | remove trailing whitespace; |
74 | - djm@cvs.openbsd.org 2005/10/30 08:52:18 | ||
75 | [clientloop.c packet.c serverloop.c session.c ssh-agent.c ssh-keygen.c] | ||
76 | [ssh.c sshconnect.c sshconnect1.c sshd.c] | ||
77 | no need to escape single quotes in comments, no binary change | ||
74 | 78 | ||
75 | 20051102 | 79 | 20051102 |
76 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). | 80 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). |
@@ -3204,4 +3208,4 @@ | |||
3204 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3208 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3205 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3209 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3206 | 3210 | ||
3207 | $Id: ChangeLog,v 1.3944 2005/11/05 04:13:49 djm Exp $ | 3211 | $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 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.144 2005/10/14 02:29:37 stevesk Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.145 2005/10/30 08:52:17 djm Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -113,7 +113,7 @@ extern char *host; | |||
113 | static volatile sig_atomic_t received_window_change_signal = 0; | 113 | static volatile sig_atomic_t received_window_change_signal = 0; |
114 | static volatile sig_atomic_t received_signal = 0; | 114 | static volatile sig_atomic_t received_signal = 0; |
115 | 115 | ||
116 | /* Flag indicating whether the user\'s terminal is in non-blocking mode. */ | 116 | /* Flag indicating whether the user's terminal is in non-blocking mode. */ |
117 | static int in_non_blocking_mode = 0; | 117 | static int in_non_blocking_mode = 0; |
118 | 118 | ||
119 | /* Common data for the client loop code. */ | 119 | /* Common data for the client loop code. */ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.119 2005/07/28 17:36:22 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.120 2005/10/30 08:52:17 djm Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -572,7 +572,7 @@ packet_send1(void) | |||
572 | buffer_clear(&outgoing_packet); | 572 | buffer_clear(&outgoing_packet); |
573 | 573 | ||
574 | /* | 574 | /* |
575 | * Note that the packet is now only buffered in output. It won\'t be | 575 | * Note that the packet is now only buffered in output. It won't be |
576 | * actually sent until packet_write_wait or packet_write_poll is | 576 | * actually sent until packet_write_wait or packet_write_poll is |
577 | * called. | 577 | * called. |
578 | */ | 578 | */ |
diff --git a/serverloop.c b/serverloop.c index 17608c238..208f7e1e9 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.119 2005/10/10 10:23:08 djm Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.120 2005/10/30 08:52:17 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -548,7 +548,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) | |||
548 | * If we have no separate fderr (which is the case when we have a pty | 548 | * If we have no separate fderr (which is the case when we have a pty |
549 | * - there we cannot make difference between data sent to stdout and | 549 | * - there we cannot make difference between data sent to stdout and |
550 | * stderr), indicate that we have seen an EOF from stderr. This way | 550 | * stderr), indicate that we have seen an EOF from stderr. This way |
551 | * we don\'t need to check the descriptor everywhere. | 551 | * we don't need to check the descriptor everywhere. |
552 | */ | 552 | */ |
553 | if (fderr == -1) | 553 | if (fderr == -1) |
554 | fderr_eof = 1; | 554 | fderr_eof = 1; |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.187 2005/10/10 10:23:08 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.188 2005/10/30 08:52:17 djm Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1419,7 +1419,7 @@ child_close_fds(void) | |||
1419 | endpwent(); | 1419 | endpwent(); |
1420 | 1420 | ||
1421 | /* | 1421 | /* |
1422 | * Close any extra open file descriptors so that we don\'t have them | 1422 | * Close any extra open file descriptors so that we don't have them |
1423 | * hanging around in clients. Note that we want to do this after | 1423 | * hanging around in clients. Note that we want to do this after |
1424 | * initgroups, because at least on Solaris 2.3 it leaves file | 1424 | * initgroups, because at least on Solaris 2.3 it leaves file |
1425 | * descriptors open. | 1425 | * descriptors open. |
@@ -1554,7 +1554,7 @@ do_child(Session *s, const char *command) | |||
1554 | } | 1554 | } |
1555 | #endif | 1555 | #endif |
1556 | 1556 | ||
1557 | /* Change current directory to the user\'s home directory. */ | 1557 | /* Change current directory to the user's home directory. */ |
1558 | if (chdir(pw->pw_dir) < 0) { | 1558 | if (chdir(pw->pw_dir) < 0) { |
1559 | fprintf(stderr, "Could not chdir to home directory %s: %s\n", | 1559 | fprintf(stderr, "Could not chdir to home directory %s: %s\n", |
1560 | pw->pw_dir, strerror(errno)); | 1560 | 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 @@ | |||
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.123 2005/09/13 23:40:07 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.124 2005/10/30 08:52:18 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -355,7 +355,7 @@ process_remove_identity(SocketEntry *e, int version) | |||
355 | if (id != NULL) { | 355 | if (id != NULL) { |
356 | /* | 356 | /* |
357 | * We have this key. Free the old key. Since we | 357 | * We have this key. Free the old key. Since we |
358 | * don\'t want to leave empty slots in the middle of | 358 | * don't want to leave empty slots in the middle of |
359 | * the array, we actually free the key there and move | 359 | * the array, we actually free the key there and move |
360 | * all the entries between the empty slot and the end | 360 | * all the entries between the empty slot and the end |
361 | * of the array. | 361 | * 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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.131 2005/10/14 02:17:59 stevesk Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.132 2005/10/30 08:52:18 djm Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -1274,7 +1274,7 @@ main(int ac, char **av) | |||
1274 | if (!have_identity) | 1274 | if (!have_identity) |
1275 | ask_filename(pw, "Enter file in which to save the key"); | 1275 | ask_filename(pw, "Enter file in which to save the key"); |
1276 | 1276 | ||
1277 | /* Create ~/.ssh directory if it doesn\'t already exist. */ | 1277 | /* Create ~/.ssh directory if it doesn't already exist. */ |
1278 | snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR); | 1278 | snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR); |
1279 | if (strstr(identity_file, dotsshdir) != NULL && | 1279 | if (strstr(identity_file, dotsshdir) != NULL && |
1280 | stat(dotsshdir, &st) < 0) { | 1280 | stat(dotsshdir, &st) < 0) { |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.253 2005/10/30 04:03:24 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.254 2005/10/30 08:52:18 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -698,7 +698,7 @@ again: | |||
698 | 698 | ||
699 | /* | 699 | /* |
700 | * Now that we are back to our own permissions, create ~/.ssh | 700 | * Now that we are back to our own permissions, create ~/.ssh |
701 | * directory if it doesn\'t already exist. | 701 | * directory if it doesn't already exist. |
702 | */ | 702 | */ |
703 | snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); | 703 | snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); |
704 | if (stat(buf, &st) < 0) | 704 | if (stat(buf, &st) < 0) |
@@ -810,7 +810,7 @@ static void | |||
810 | check_agent_present(void) | 810 | check_agent_present(void) |
811 | { | 811 | { |
812 | if (options.forward_agent) { | 812 | if (options.forward_agent) { |
813 | /* Clear agent forwarding if we don\'t have an agent. */ | 813 | /* Clear agent forwarding if we don't have an agent. */ |
814 | if (!ssh_agent_present()) | 814 | if (!ssh_agent_present()) |
815 | options.forward_agent = 0; | 815 | options.forward_agent = 0; |
816 | } | 816 | } |
diff --git a/sshconnect.c b/sshconnect.c index d8cfd35b3..2245a8af6 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.169 2005/10/15 15:28:12 stevesk Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.170 2005/10/30 08:52:18 djm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -603,7 +603,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
603 | file_key = key_new(host_key->type); | 603 | file_key = key_new(host_key->type); |
604 | 604 | ||
605 | /* | 605 | /* |
606 | * Check if the host key is present in the user\'s list of known | 606 | * Check if the host key is present in the user's list of known |
607 | * hosts or in the systemwide list. | 607 | * hosts or in the systemwide list. |
608 | */ | 608 | */ |
609 | host_file = user_hostfile; | 609 | 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 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.61 2005/06/17 02:44:33 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.62 2005/10/30 08:52:18 djm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/md5.h> | 19 | #include <openssl/md5.h> |
@@ -84,7 +84,7 @@ try_agent_authentication(void) | |||
84 | /* Wait for server's response. */ | 84 | /* Wait for server's response. */ |
85 | type = packet_read(); | 85 | type = packet_read(); |
86 | 86 | ||
87 | /* The server sends failure if it doesn\'t like our key or | 87 | /* The server sends failure if it doesn't like our key or |
88 | does not support RSA authentication. */ | 88 | does not support RSA authentication. */ |
89 | if (type == SSH_SMSG_FAILURE) { | 89 | if (type == SSH_SMSG_FAILURE) { |
90 | debug("Server refused our key."); | 90 | debug("Server refused our key."); |
@@ -215,8 +215,8 @@ try_rsa_authentication(int idx) | |||
215 | type = packet_read(); | 215 | type = packet_read(); |
216 | 216 | ||
217 | /* | 217 | /* |
218 | * The server responds with failure if it doesn\'t like our key or | 218 | * The server responds with failure if it doesn't like our key or |
219 | * doesn\'t support RSA authentication. | 219 | * doesn't support RSA authentication. |
220 | */ | 220 | */ |
221 | if (type == SSH_SMSG_FAILURE) { | 221 | if (type == SSH_SMSG_FAILURE) { |
222 | debug("Server refused our key."); | 222 | debug("Server refused our key."); |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.316 2005/10/30 08:29:29 dtucker Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.317 2005/10/30 08:52:18 djm Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -1682,10 +1682,10 @@ main(int ac, char **av) | |||
1682 | verbose("Connection from %.500s port %d", remote_ip, remote_port); | 1682 | verbose("Connection from %.500s port %d", remote_ip, remote_port); |
1683 | 1683 | ||
1684 | /* | 1684 | /* |
1685 | * We don\'t want to listen forever unless the other side | 1685 | * We don't want to listen forever unless the other side |
1686 | * successfully authenticates itself. So we set up an alarm which is | 1686 | * successfully authenticates itself. So we set up an alarm which is |
1687 | * cleared after successful authentication. A limit of zero | 1687 | * cleared after successful authentication. A limit of zero |
1688 | * indicates no limit. Note that we don\'t set the alarm in debugging | 1688 | * indicates no limit. Note that we don't set the alarm in debugging |
1689 | * mode; it is just annoying to have the server exit just when you | 1689 | * mode; it is just annoying to have the server exit just when you |
1690 | * are about to discover the bug. | 1690 | * are about to discover the bug. |
1691 | */ | 1691 | */ |