When invoking the mysql script, pass in $*

[bacula/bacula] / bacula / src / lib / cram-md5.c

diff --git a/bacula/src/lib/cram-md5.c b/bacula/src/lib/cram-md5.c
index 514c190755e55ee8ac0b51741dfdd11a9f4386f2..be1ed8db4c529b3446719b58932b7a502ef53b8a 100644 (file)
--- a/bacula/src/lib/cram-md5.c
+++ b/bacula/src/lib/cram-md5.c
@@ -57,19 +57,20 @@ int cram_md5_auth(BSOCK *bs, char *password, int ssl_need)
       return 0;
    }
 
-   Dmsg1(99, "%s", bs->msg);
+   Dmsg1(99, "sent challenge: %s", bs->msg);
    if (bnet_wait_data(bs, 180) <= 0 || bnet_recv(bs) <= 0) {
       bmicrosleep(5, 0);
       return 0;
    }
    hmac_md5((uint8_t *)chal, strlen(chal), (uint8_t *)password, strlen(password), hmac);
    bin_to_base64(host, (char *)hmac, 16);
-   ok = strcmp(bs->msg, host) == 0;
+   ok = strcmp(mp_chr(bs->msg), host) == 0;
    Dmsg3(99, "Authenticate %s: wanted %s, got %s\n", 
               ok ? "OK" : "NOT OK", host, bs->msg);
    if (ok) {
       bnet_fsend(bs, "1000 OK auth\n");
    } else {
+      Dmsg1(100, "PW: %s\n", password);
       bnet_fsend(bs, "1999 Authorization failed.\n");
       bmicrosleep(5, 0);
    }
@@ -92,9 +93,11 @@ int cram_md5_get_auth(BSOCK *bs, char *password, int ssl_need)
       bmicrosleep(5, 0);
       return 0;
    }
-   if (sscanf(bs->msg, "auth cram-md5 %s ssl=%d\n", chal, &ssl_has) != 2) {
+   if (sscanf(mp_chr(bs->msg), "auth cram-md5 %s ssl=%d\n", chal, &ssl_has) != 2) {
       ssl_has = BNET_SSL_NONE;
-      if (sscanf(bs->msg, "auth cram-md5 %s\n", chal) != 1) {
+      if (sscanf(mp_chr(bs->msg), "auth cram-md5 %s\n", chal) != 1) {
+         bnet_fsend(bs, "1999 Authorization failed.\n");
+         Dmsg1(100, "Cannot scan challenge: %s\n", bs->msg);
         bmicrosleep(5, 0);
         return 0;
       }
@@ -104,8 +107,9 @@ int cram_md5_get_auth(BSOCK *bs, char *password, int ssl_need)
    }
 
    hmac_md5((uint8_t *)chal, strlen(chal), (uint8_t *)password, strlen(password), hmac);
-   bs->msglen = bin_to_base64(bs->msg, (char *)hmac, 16) + 1;
+   bs->msglen = bin_to_base64(mp_chr(bs->msg), (char *)hmac, 16) + 1;
    if (!bnet_send(bs)) {
+      Dmsg0(100, "Send response failed.\n");
       return 0;
    }
    Dmsg1(99, "sending resp to challenge: %s\n", bs->msg);
@@ -113,9 +117,10 @@ int cram_md5_get_auth(BSOCK *bs, char *password, int ssl_need)
       bmicrosleep(5, 0);
       return 0;
    }
-   if (strcmp(bs->msg, "1000 OK auth\n") == 0) {
+   if (strcmp(mp_chr(bs->msg), "1000 OK auth\n") == 0) {
       return 1;
    }
+   Dmsg1(100, "PW: %s\n", password);
    bmicrosleep(5, 0);
    return 0;
 }