From 99d9cf500b30c77107bf8477dd55831626f9beaf Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Fri, 29 Mar 2013 23:29:48 +0800
Subject: Add kexguess2 behaviour

--HG--
branch : kexguess
---
 options.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'options.h')

diff --git a/options.h b/options.h
index c52d6c2..71d39cc 100644
--- a/options.h
+++ b/options.h
@@ -174,9 +174,9 @@ much traffic. */
  * PAM challenge/response.
  * You can't enable both PASSWORD and PAM. */
 
-#define ENABLE_SVR_PASSWORD_AUTH
+//#define ENABLE_SVR_PASSWORD_AUTH
 /* PAM requires ./configure --enable-pam */
-/*#define ENABLE_SVR_PAM_AUTH*/
+#define ENABLE_SVR_PAM_AUTH
 #define ENABLE_SVR_PUBKEY_AUTH
 
 /* Whether to take public key options in 
-- 
cgit v1.2.3


From 557d86aa79ec533c816bc062d1263a17b291eb84 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 3 Apr 2013 07:33:47 +0800
Subject: Fix a few options and headers

---
 bignum.h  | 1 +
 options.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'options.h')

diff --git a/bignum.h b/bignum.h
index cabb4a2..ba98db1 100644
--- a/bignum.h
+++ b/bignum.h
@@ -26,6 +26,7 @@
 #define _BIGNUM_H_
 
 #include "includes.h"
+#include "dbutil.h"
 
 void m_mp_init(mp_int *mp);
 void m_mp_init_multi(mp_int *mp, ...) ATTRIB_SENTINEL;
diff --git a/options.h b/options.h
index 71d39cc..88b17ca 100644
--- a/options.h
+++ b/options.h
@@ -153,7 +153,7 @@ much traffic. */
 #endif
 
 /* Whether to do reverse DNS lookups. */
-#define DO_HOST_LOOKUP
+//#define DO_HOST_LOOKUP
 
 /* Whether to print the message of the day (MOTD). This doesn't add much code
  * size */
@@ -174,9 +174,9 @@ much traffic. */
  * PAM challenge/response.
  * You can't enable both PASSWORD and PAM. */
 
-//#define ENABLE_SVR_PASSWORD_AUTH
+#define ENABLE_SVR_PASSWORD_AUTH
 /* PAM requires ./configure --enable-pam */
-#define ENABLE_SVR_PAM_AUTH
+//#define ENABLE_SVR_PAM_AUTH
 #define ENABLE_SVR_PUBKEY_AUTH
 
 /* Whether to take public key options in 
-- 
cgit v1.2.3


From 43769b5bb370cb932012eccb3bca7487955760f0 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Thu, 18 Apr 2013 21:47:38 +0800
Subject: Don't enable CLI_IMMEDIATE_AUTH by default, it breaks blank password
 logins

---
 options.h    | 7 +++++++
 sysoptions.h | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'options.h')

diff --git a/options.h b/options.h
index 88b17ca..7d06322 100644
--- a/options.h
+++ b/options.h
@@ -204,6 +204,13 @@ much traffic. */
  * return the password on standard output */
 /*#define ENABLE_CLI_ASKPASS_HELPER*/
 
+/* Send a real auth request first rather than requesting a list of available methods.
+ * It saves a network round trip at login but prevents immediate login to
+ * accounts with no password, and might be rejected by some strict servers (none
+ * encountered yet) - hence it isn't enabled by default. */
+/* #define CLI_IMMEDIATE_AUTH */
+
+
 /* Source for randomness. This must be able to provide hundreds of bytes per SSH
  * connection without blocking. In addition /dev/random is used for seeding
  * rsa/dss key generation */
diff --git a/sysoptions.h b/sysoptions.h
index 3072d3d..be736ef 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -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
-- 
cgit v1.2.3