Commit 845fb2d1 authored by Benjamin Sergeant's avatar Benjamin Sergeant Committed by Oran Agra
Browse files

Update redis-cli.c

(cherry picked from commit 93021da2)
parent 930fac80
...@@ -3423,6 +3423,7 @@ static redisReply *clusterManagerMigrateKeysInReply(clusterManagerNode *source, ...@@ -3423,6 +3423,7 @@ static redisReply *clusterManagerMigrateKeysInReply(clusterManagerNode *source,
size_t *argv_len = NULL; size_t *argv_len = NULL;
int c = (replace ? 8 : 7); int c = (replace ? 8 : 7);
if (config.auth) c += 2; if (config.auth) c += 2;
if (config.user) c += 1;
size_t argc = c + reply->elements; size_t argc = c + reply->elements;
size_t i, offset = 6; // Keys Offset size_t i, offset = 6; // Keys Offset
argv = zcalloc(argc * sizeof(char *)); argv = zcalloc(argc * sizeof(char *));
...@@ -3449,12 +3450,24 @@ static redisReply *clusterManagerMigrateKeysInReply(clusterManagerNode *source, ...@@ -3449,12 +3450,24 @@ static redisReply *clusterManagerMigrateKeysInReply(clusterManagerNode *source,
offset++; offset++;
} }
if (config.auth) { if (config.auth) {
argv[offset] = "AUTH"; if (config.user) {
argv_len[offset] = 4; argv[offset] = "AUTH2";
offset++; argv_len[offset] = 5;
argv[offset] = config.auth; offset++;
argv_len[offset] = strlen(config.auth); argv[offset] = config.user;
offset++; argv_len[offset] = strlen(config.user);
offset++;
argv[offset] = config.auth;
argv_len[offset] = strlen(config.auth);
offset++;
} else {
argv[offset] = "AUTH";
argv_len[offset] = 4;
offset++;
argv[offset] = config.auth;
argv_len[offset] = strlen(config.auth);
offset++;
}
} }
argv[offset] = "KEYS"; argv[offset] = "KEYS";
argv_len[offset] = 4; argv_len[offset] = 4;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment