Mercurial > dropbear
diff sysoptions.h @ 989:73ea0dce9a57 pam
Merge up to date
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 23 Jan 2015 21:38:47 +0800 |
parents | bae0b34bc059 735511a4c761 |
children | 2fa71c3b2827 |
line wrap: on
line diff
--- a/sysoptions.h Wed Mar 12 23:40:02 2014 +0800 +++ b/sysoptions.h Fri Jan 23 21:38:47 2015 +0800 @@ -4,7 +4,7 @@ *******************************************************************/ #ifndef DROPBEAR_VERSION -#define DROPBEAR_VERSION "2014.63" +#define DROPBEAR_VERSION "2014.66" #endif #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION @@ -153,8 +153,7 @@ #define MAX_CHANNELS 100 /* simple mem restriction, includes each tcp/x11 connection, so can't be _too_ small */ -#define MAX_STRING_LEN 1400 /* ~= MAX_PROPOSED_ALGO * MAX_NAME_LEN, also - is the max length for a password etc */ +#define MAX_STRING_LEN 2400 /* Sun SSH needs this long for algos */ /* For a 4096 bit DSS key, empirically determined */ #define MAX_PUBKEY_SIZE 1700 @@ -249,4 +248,13 @@ #define USE_VFORK #endif /* don't HAVE_FORK */ +#if MAX_UNAUTH_CLIENTS > MAX_CHANNELS +#define DROPBEAR_LISTEN_BACKLOG MAX_UNAUTH_CLIENTS +#else +#define DROPBEAR_LISTEN_BACKLOG MAX_CHANNELS +#endif + +/* Use this string since some implementations might special-case it */ +#define DROPBEAR_KEEPALIVE_STRING "[email protected]" + /* no include guard for this file */