Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7c53e5bd
"doc/Sets.html" did not exist on "73287b2b576fa6a1ff1b61467286cbd5458881d2"
Unverified
Commit
7c53e5bd
authored
Jan 21, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 21, 2019
Browse files
Merge pull request #5796 from soloestoy/fix-acl-compile-warning
ACL: fix compile warnings
parents
4dc69497
ab1992c9
Changes
2
Show whitespace changes
Inline
Side-by-side
src/acl.c
View file @
7c53e5bd
...
@@ -399,7 +399,7 @@ void aclCommand(client *c) {
...
@@ -399,7 +399,7 @@ void aclCommand(client *c) {
if
(
ACLSetUser
(
u
,
c
->
argv
[
j
]
->
ptr
,
sdslen
(
c
->
argv
[
j
]
->
ptr
))
!=
C_OK
)
{
if
(
ACLSetUser
(
u
,
c
->
argv
[
j
]
->
ptr
,
sdslen
(
c
->
argv
[
j
]
->
ptr
))
!=
C_OK
)
{
addReplyErrorFormat
(
c
,
addReplyErrorFormat
(
c
,
"Syntax error in ACL SETUSER modifier '%s'"
,
"Syntax error in ACL SETUSER modifier '%s'"
,
c
->
argv
[
j
]
->
ptr
);
(
char
*
)
c
->
argv
[
j
]
->
ptr
);
return
;
return
;
}
}
}
}
...
...
src/config.c
View file @
7c53e5bd
...
@@ -927,7 +927,7 @@ void configSetCommand(client *c) {
...
@@ -927,7 +927,7 @@ void configSetCommand(client *c) {
/* The old "requirepass" directive just translates to setting
/* The old "requirepass" directive just translates to setting
* a password to the default user. */
* a password to the default user. */
ACLSetUser
(
DefaultUser
,
"resetpass"
,
-
1
);
ACLSetUser
(
DefaultUser
,
"resetpass"
,
-
1
);
sds
aclop
=
sdscatprintf
(
sdsempty
(),
">%s"
,
o
->
ptr
);
sds
aclop
=
sdscatprintf
(
sdsempty
(),
">%s"
,
(
char
*
)
o
->
ptr
);
ACLSetUser
(
DefaultUser
,
aclop
,
sdslen
(
aclop
));
ACLSetUser
(
DefaultUser
,
aclop
,
sdslen
(
aclop
));
sdsfree
(
aclop
);
sdsfree
(
aclop
);
}
config_set_special_field
(
"masterauth"
)
{
}
config_set_special_field
(
"masterauth"
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment