diff sysoptions.h @ 809:0e17269254b6

merge
author Matt Johnston <matt@ucc.asn.au>
date Sun, 26 May 2013 18:42:17 +0800
parents e76614145aea
children 7dcb46da72d9 32862e8283e7
line wrap: on
line diff
--- a/sysoptions.h	Sun May 26 18:39:24 2013 +0800
+++ b/sysoptions.h	Sun May 26 18:42:17 2013 +0800
@@ -4,7 +4,7 @@
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "2013.57"
+#define DROPBEAR_VERSION "2013.58"
 #endif
 
 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
@@ -198,9 +198,6 @@
 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */
 #endif
 
-/* Send an auth request straight away rather than trying "none" type to get a list */
-#define CLI_IMMEDIATE_AUTH
-
 /* Changing this is inadvisable, it appears to have problems
  * with flushing compressed data */
 #define DROPBEAR_ZLIB_MEM_LEVEL 8