Use bucket name in SASL if username omitted

Change-Id: Idd4837b33dfb63b7834436e6a9d6f5302ce3d31c
Reviewed-on: http://review.couchbase.org/28532
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>

src/bconf_provider.c

@@ -93,7 +93,8 @@ static lcb_error_t setup_sasl_params(lcb_t instance)
     sasl_callbacks[3].proc = NULL;
     sasl_callbacks[3].context = NULL;
 
-    instance->sasl.name = instance->username;
+    instance->sasl.name = instance->username ?
+                          instance->username : instance->bucket;
     memset(instance->sasl.password.buffer, 0,
            sizeof(instance->sasl.password.buffer));
     passwd = instance->password;

src/instance.c

@@ -352,6 +352,7 @@ lcb_error_t lcb_create(lcb_t *instance,
         offset = snprintf(buffer, sizeof(buffer),
                           "GET /pools/default/bucketsStreaming/%s HTTP/1.1\r\n",
                           bucket);
+        obj->bucket = strdup(bucket);
         break;
     case LCB_TYPE_CLUSTER:
         offset = snprintf(buffer, sizeof(buffer), "GET /pools/ HTTP/1.1\r\n");
@@ -458,6 +459,7 @@ void lcb_destroy(lcb_t instance)
     free(instance->vbucket_stream.header);
     free(instance->vb_server_map);
     free(instance->histogram);
+    free(instance->bucket);
     free(instance->username);
     free(instance->password);
     memset(instance, 0xff, sizeof(*instance));

src/internal.h

@@ -239,6 +239,7 @@ extern "C" {
         /* credentials needed to operate cluster via REST API */
         char *username;
         char *password;
+        char *bucket;
 
         struct {
             const char *name;