Merge master with resolved conflict in src/redis-cli.c

[redis.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 1bd678c783050927f662f99e1a78df9ede38d771..4257fc36a30463b4e2160232078238f28e19ffe8 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -71,6 +71,8 @@ void loadServerConfig(char *filename) {
             }
         } else if (!strcasecmp(argv[0],"bind") && argc == 2) {
             server.bindaddr = zstrdup(argv[1]);
+        } else if (!strcasecmp(argv[0],"unixsocket") && argc == 2) {
+            server.unixsocket = zstrdup(argv[1]);
         } else if (!strcasecmp(argv[0],"save") && argc == 3) {
             int seconds = atoi(argv[1]);
             int changes = atoi(argv[2]);