- OpenBSD CVS Sync

   - stevesk@cvs.openbsd.org 2001/07/05 20:32:47
     [sshconnect1.c]
     statement after label; ok dugsong@

2 files changed, 9 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 40bcff435..f3ef541c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,12 @@
    - markus@cvs.openbsd.org 2001/07/04 23:49:27
      [ssh-agent.c]
      handle mutiple adds of the same smartcard key
+   - espie@cvs.openbsd.org 2001/07/05 11:43:33
+     [sftp-glob.c]
+     Directly cast to the right type. Ok markus@
+   - stevesk@cvs.openbsd.org 2001/07/05 20:32:47
+     [sshconnect1.c]
+     statement after label; ok dugsong@
 
 20010711
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
@@ -5991,4 +5997,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1390 2001/07/14 02:14:27 djm Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.38 2001/06/26 20:14:11 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.39 2001/07/05 20:32:47 stevesk Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -1272,8 +1272,5 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
         }
 #endif /* AFS */
 
-/* give the compiler something to do for success: */
-#if !defined(KRB5) && !defined(AFS)
-        ;
-#endif
+        return; /* need statement after label */
 }