Merge pull request #5796 from soloestoy/fix-acl-compile-warning

ACL: fix compile warnings
This commit is contained in:
Salvatore Sanfilippo 2019-01-21 17:14:04 +01:00 committed by GitHub
commit 7c53e5bdc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -399,7 +399,7 @@ void aclCommand(client *c) {
if (ACLSetUser(u,c->argv[j]->ptr,sdslen(c->argv[j]->ptr)) != C_OK) {
addReplyErrorFormat(c,
"Syntax error in ACL SETUSER modifier '%s'",
c->argv[j]->ptr);
(char*)c->argv[j]->ptr);
return;
}
}

View File

@ -927,7 +927,7 @@ void configSetCommand(client *c) {
/* The old "requirepass" directive just translates to setting
* a password to the default user. */
ACLSetUser(DefaultUser,"resetpass",-1);
sds aclop = sdscatprintf(sdsempty(),">%s",o->ptr);
sds aclop = sdscatprintf(sdsempty(),">%s",(char*)o->ptr);
ACLSetUser(DefaultUser,aclop,sdslen(aclop));
sdsfree(aclop);
} config_set_special_field("masterauth") {