Merge branch '2.0' into develop

server/modules/include/maxadmin.h

@@ -13,12 +13,19 @@
  * Public License.
  */
 
-#define MAXADMIN_DEFAULT_SOCKET "/tmp/maxadmin.sock"
+#define MAXADMIN_DEFAULT_SOCKET                "/tmp/maxadmin.sock"
 
 #define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG_LEN 7
-#define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG "default"
-#define MAXADMIN_GETPWUID_BUF_LEN 255
-#define MAXADMIN_AUTH_REPLY_LEN 6
-#define MAXADMIN_FAILED_AUTH_MESSAGE "FAILED"
+#define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG     "default"
+
+#define MAXADMIN_AUTH_REPLY_LEN                6
+#define MAXADMIN_AUTH_FAILED_REPLY             "FAILED"
+#define MAXADMIN_AUTH_SUCCESS_REPLY            "OK----"
+
+#define MAXADMIN_AUTH_USER_PROMPT              "USER"
+#define MAXADMIN_AUTH_USER_PROMPT_LEN          4
+
+#define MAXADMIN_AUTH_PASSWORD_PROMPT          "PASSWORD"
+#define MAXADMIN_AUTH_PASSWORD_PROMPT_LEN      8
 
 #endif

server/modules/include/maxscaled.h

@@ -28,16 +28,17 @@
 #include <spinlock.h>
 #include <housekeeper.h>
 /**
- * The telnetd specific protocol structure to put in the DCB.
+ * The maxscaled specific protocol structure to put in the DCB.
  */
-typedef struct  maxscaled
+typedef struct maxscaled
 {
-    SPINLOCK    lock;       /**< Protocol structure lock */
-    int     state;      /**< The connection state */
-    char        *username;  /**< The login name of the user */
+    SPINLOCK lock;      /**< Protocol structure lock */
+    int      state;     /**< The connection state */
+    char    *username;  /**< The login name of the user */
 } MAXSCALED;
 
-#define MAXSCALED_STATE_LOGIN   1   /**< Waiting for credentials */
-#define MAXSCALED_STATE_DATA    2   /**< User logged in */
+#define MAXSCALED_STATE_LOGIN   1   /**< Waiting for user */
+#define MAXSCALED_STATE_PASSWD  2   /**< Waiting for password */
+#define MAXSCALED_STATE_DATA    3   /**< User logged in */
 
 #endif