Merge branch '2.0' into develop

2016-12-05 21:19:59 +02:00
parent f5eb4e21dc 1a9232b152
commit 4ae85dc754
18 changed files with 215 additions and 55 deletions
--- a/server/modules/protocol/CDC/cdc.c
+++ b/server/modules/protocol/CDC/cdc.c
@ -447,7 +447,7 @@ cdc_protocol_done(DCB* dcb)
 static void
 write_auth_ack(DCB *dcb)
 {
-    dcb_printf(dcb, "OK");
+    dcb_printf(dcb, "OK\n");
 }

 /**
@ -459,6 +459,6 @@ write_auth_ack(DCB *dcb)
 static void
 write_auth_err(DCB *dcb)
 {
-    dcb_printf(dcb, "ERR, code 11, msg: abcd");
+    dcb_printf(dcb, "ERROR: Authentication failed\n");
 }