The unified diff between revisions [7d2393b4..] and [ced3f1d1..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'options.h'

#
#
# patch "options.h"
#  from [f935c4df56b027bd3f16e3c883f14a0d0013c71a]
#    to [23835cbd607e400bf2b5f997c0ea166ae2026f82]
#
============================================================
--- options.h	f935c4df56b027bd3f16e3c883f14a0d0013c71a
+++ options.h	23835cbd607e400bf2b5f997c0ea166ae2026f82
@@ -111,16 +111,14 @@ etc) slower (perhaps by 50%). Recommende
 /* Authentication Types - at least one required.
    RFC Draft requires pubkey auth, and recommends password */

-/* PAM auth is quite simple, and only works for PAM modules which just do a
- * simple "Login: " "Password: " (or something like that - if your module is
- * similar but not quite like that, edit the strings in svr-authpam.c).
- * Basically, it's useful for systems like OS X where standard password crypts
- * don't work, but there's an interface via a PAM module. You'll need to
- * configure with --enable-pam as well, since it's off by default. And you
- * should only enable either PASSWORD _or_ PAM auth, not both. */
+/* Note: PAM auth is quite simple, and only works for PAM modules which just do
+ * a simple "Login: " "Password: " (you can edit the strings in svr-authpam.c).
+ * It's useful for systems like OS X where standard password crypts don't work,
+ * but there's an interface via a PAM module - don't bother using it otherwise.
+ * You can't enable both PASSWORD and PAM. */

 #define ENABLE_SVR_PASSWORD_AUTH
-/*#define ENABLE_SVR_PAM_AUTH*/
+//#define ENABLE_SVR_PAM_AUTH
 #define ENABLE_SVR_PUBKEY_AUTH

 #define ENABLE_CLI_PASSWORD_AUTH
@@ -143,7 +141,8 @@ etc) slower (perhaps by 50%). Recommende
 /* If you are lacking entropy on the system then using /dev/urandom
  * will prevent Dropbear from blocking on the device. This could
  * however significantly reduce the security of your ssh connections
- * if the PRNG state becomes simpler. */
+ * if the PRNG state becomes guessable - make sure you know what you are
+ * doing if you change this. */
 #define DROPBEAR_RANDOM_DEV "/dev/random"

 /* prngd must be manually set up to produce output */
@@ -190,7 +189,7 @@ etc) slower (perhaps by 50%). Recommende
  *******************************************************************/

 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.44"
+#define DROPBEAR_VERSION "0.45"
 #endif

 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION