Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	version.m4
	- Reset version.m4 to a more neutral version number

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/syshead.h b/syshead.h
index 1b8bfad..6479b20 100644
--- a/syshead.h
+++ b/syshead.h
@@ -665,6 +665,11 @@ socket_defined (const socket_descriptor_t sd)
 #endif
 
 /*
+ * Do we support challenge/response authentication, as a console-based client?
+ */
+#define ENABLE_CLIENT_CR
+
+/*
  * Do we support pushing peer info?
  */
 #define ENABLE_PUSH_PEER_INFO