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
cc116736
Commit
cc116736
authored
Feb 05, 2019
by
antirez
Browse files
ACL: ability to configure an external ACL file.
parent
416c6401
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
cc116736
...
@@ -283,6 +283,9 @@ void loadServerConfigFromString(char *config) {
...
@@ -283,6 +283,9 @@ void loadServerConfigFromString(char *config) {
}
}
fclose
(
logfp
);
fclose
(
logfp
);
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"aclfile"
)
&&
argc
==
2
)
{
zfree
(
server
.
acl_filename
);
server
.
acl_filename
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"always-show-logo"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"always-show-logo"
)
&&
argc
==
2
)
{
if
((
server
.
always_show_logo
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
if
((
server
.
always_show_logo
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
...
@@ -1355,6 +1358,7 @@ void configGetCommand(client *c) {
...
@@ -1355,6 +1358,7 @@ void configGetCommand(client *c) {
config_get_string_field
(
"cluster-announce-ip"
,
server
.
cluster_announce_ip
);
config_get_string_field
(
"cluster-announce-ip"
,
server
.
cluster_announce_ip
);
config_get_string_field
(
"unixsocket"
,
server
.
unixsocket
);
config_get_string_field
(
"unixsocket"
,
server
.
unixsocket
);
config_get_string_field
(
"logfile"
,
server
.
logfile
);
config_get_string_field
(
"logfile"
,
server
.
logfile
);
config_get_string_field
(
"aclfile"
,
server
.
acl_filename
);
config_get_string_field
(
"pidfile"
,
server
.
pidfile
);
config_get_string_field
(
"pidfile"
,
server
.
pidfile
);
config_get_string_field
(
"slave-announce-ip"
,
server
.
slave_announce_ip
);
config_get_string_field
(
"slave-announce-ip"
,
server
.
slave_announce_ip
);
config_get_string_field
(
"replica-announce-ip"
,
server
.
slave_announce_ip
);
config_get_string_field
(
"replica-announce-ip"
,
server
.
slave_announce_ip
);
...
@@ -2214,6 +2218,7 @@ int rewriteConfig(char *path) {
...
@@ -2214,6 +2218,7 @@ int rewriteConfig(char *path) {
rewriteConfigNumericalOption
(
state
,
"replica-announce-port"
,
server
.
slave_announce_port
,
CONFIG_DEFAULT_SLAVE_ANNOUNCE_PORT
);
rewriteConfigNumericalOption
(
state
,
"replica-announce-port"
,
server
.
slave_announce_port
,
CONFIG_DEFAULT_SLAVE_ANNOUNCE_PORT
);
rewriteConfigEnumOption
(
state
,
"loglevel"
,
server
.
verbosity
,
loglevel_enum
,
CONFIG_DEFAULT_VERBOSITY
);
rewriteConfigEnumOption
(
state
,
"loglevel"
,
server
.
verbosity
,
loglevel_enum
,
CONFIG_DEFAULT_VERBOSITY
);
rewriteConfigStringOption
(
state
,
"logfile"
,
server
.
logfile
,
CONFIG_DEFAULT_LOGFILE
);
rewriteConfigStringOption
(
state
,
"logfile"
,
server
.
logfile
,
CONFIG_DEFAULT_LOGFILE
);
rewriteConfigStringOption
(
state
,
"aclfile"
,
server
.
acl_filename
,
CONFIG_DEFAULT_ACL_FILENAME
);
rewriteConfigYesNoOption
(
state
,
"syslog-enabled"
,
server
.
syslog_enabled
,
CONFIG_DEFAULT_SYSLOG_ENABLED
);
rewriteConfigYesNoOption
(
state
,
"syslog-enabled"
,
server
.
syslog_enabled
,
CONFIG_DEFAULT_SYSLOG_ENABLED
);
rewriteConfigStringOption
(
state
,
"syslog-ident"
,
server
.
syslog_ident
,
CONFIG_DEFAULT_SYSLOG_IDENT
);
rewriteConfigStringOption
(
state
,
"syslog-ident"
,
server
.
syslog_ident
,
CONFIG_DEFAULT_SYSLOG_IDENT
);
rewriteConfigSyslogfacilityOption
(
state
);
rewriteConfigSyslogfacilityOption
(
state
);
...
...
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