diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sshconnect1.c | 7 |
2 files changed, 9 insertions, 6 deletions
@@ -16,6 +16,12 @@ | |||
16 | - markus@cvs.openbsd.org 2001/07/04 23:49:27 | 16 | - markus@cvs.openbsd.org 2001/07/04 23:49:27 |
17 | [ssh-agent.c] | 17 | [ssh-agent.c] |
18 | handle mutiple adds of the same smartcard key | 18 | handle mutiple adds of the same smartcard key |
19 | - espie@cvs.openbsd.org 2001/07/05 11:43:33 | ||
20 | [sftp-glob.c] | ||
21 | Directly cast to the right type. Ok markus@ | ||
22 | - stevesk@cvs.openbsd.org 2001/07/05 20:32:47 | ||
23 | [sshconnect1.c] | ||
24 | statement after label; ok dugsong@ | ||
19 | 25 | ||
20 | 20010711 | 26 | 20010711 |
21 | - (djm) dirname(3) may modify its argument on glibc and other systems. | 27 | - (djm) dirname(3) may modify its argument on glibc and other systems. |
@@ -5991,4 +5997,4 @@ | |||
5991 | - Wrote replacements for strlcpy and mkdtemp | 5997 | - Wrote replacements for strlcpy and mkdtemp |
5992 | - Released 1.0pre1 | 5998 | - Released 1.0pre1 |
5993 | 5999 | ||
5994 | $Id: ChangeLog,v 1.1390 2001/07/14 02:14:27 djm Exp $ | 6000 | $Id: ChangeLog,v 1.1391 2001/07/14 02:16:59 djm Exp $ |
diff --git a/sshconnect1.c b/sshconnect1.c index 526d149f4..8575081ed 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.38 2001/06/26 20:14:11 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.39 2001/07/05 20:32:47 stevesk Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/evp.h> | 19 | #include <openssl/evp.h> |
@@ -1272,8 +1272,5 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host, | |||
1272 | } | 1272 | } |
1273 | #endif /* AFS */ | 1273 | #endif /* AFS */ |
1274 | 1274 | ||
1275 | /* give the compiler something to do for success: */ | 1275 | return; /* need statement after label */ |
1276 | #if !defined(KRB5) && !defined(AFS) | ||
1277 | ; | ||
1278 | #endif | ||
1279 | } | 1276 | } |