diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-01-13 22:42:34 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-13 22:42:34 +1100 |
commit | e2b36741725c2214f72a3ef07bc0788191ac7ea9 (patch) | |
tree | b05d64a5a3970c714377b31cbde829ecf211c41d | |
parent | d59487a33bfaadc3ced41a1c604ec603d716df42 (diff) |
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2010/01/13 00:19:04
[sshconnect.c auth.c]
Fix a couple of typos/mispellings in comments
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth.c | 4 | ||||
-rw-r--r-- | sshconnect.c | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -6,6 +6,10 @@ | |||
6 | - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.22. | 6 | - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.22. |
7 | Fixes bz #1590, where sometimes you could not interrupt a connection while | 7 | Fixes bz #1590, where sometimes you could not interrupt a connection while |
8 | ssh was prompting for a passphrase or password. | 8 | ssh was prompting for a passphrase or password. |
9 | - (dtucker) OpenBSD CVS Sync | ||
10 | - dtucker@cvs.openbsd.org 2010/01/13 00:19:04 | ||
11 | [sshconnect.c auth.c] | ||
12 | Fix a couple of typos/mispellings in comments | ||
9 | 13 | ||
10 | 20100112 | 14 | 20100112 |
11 | - (dtucker) OpenBSD CVS Sync | 15 | - (dtucker) OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.81 2010/01/10 07:15:56 dtucker Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.82 2010/01/13 00:19:04 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -455,7 +455,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw, | |||
455 | return -1; | 455 | return -1; |
456 | } | 456 | } |
457 | 457 | ||
458 | /* If are passed the homedir then we can stop */ | 458 | /* If are past the homedir then we can stop */ |
459 | if (comparehome && strcmp(homedir, buf) == 0) { | 459 | if (comparehome && strcmp(homedir, buf) == 0) { |
460 | debug3("secure_filename: terminating check at '%s'", | 460 | debug3("secure_filename: terminating check at '%s'", |
461 | buf); | 461 | buf); |
diff --git a/sshconnect.c b/sshconnect.c index 5cfc3c16a..63c4650f7 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.217 2010/01/09 23:04:13 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.218 2010/01/13 00:19:04 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -929,7 +929,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
929 | * XXX Should permit the user to change to use the new id. | 929 | * XXX Should permit the user to change to use the new id. |
930 | * This could be done by converting the host key to an | 930 | * This could be done by converting the host key to an |
931 | * identifying sentence, tell that the host identifies itself | 931 | * identifying sentence, tell that the host identifies itself |
932 | * by that sentence, and ask the user if he/she whishes to | 932 | * by that sentence, and ask the user if he/she wishes to |
933 | * accept the authentication. | 933 | * accept the authentication. |
934 | */ | 934 | */ |
935 | break; | 935 | break; |