Merge branch 'fc/vimdiff-layout-vimdiff3-fix'

[thirdparty/git.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index 58f1077885c574da5e51898f859ad5ae4cee0049..0ae7d12b5c132883907192d16c3e2f04d56a80fb 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -279,7 +279,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
                /* The validation is done on the paths after enter_repo
                 * appends optional {.git,.git/.git} and friends, but
                 * it does not use getcwd().  So if your /pub is
-                * a symlink to /mnt/pub, you can whitelist /pub and
+                * a symlink to /mnt/pub, you can include /pub and
                 * do not have to say /mnt/pub.
                 * Do not say /pub/.
                 */
@@ -298,7 +298,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
                        return path;
        }
 
-       logerror("'%s': not in whitelist", path);
+       logerror("'%s': not in directory list", path);
        return NULL;            /* Fallthrough. Deny by default */
 }
 
@@ -403,7 +403,7 @@ static int run_service(const char *dir, struct daemon_service *service,
         * a "git-daemon-export-ok" flag that says that the other side
         * is ok with us doing this.
         *
-        * path_ok() uses enter_repo() and does whitelist checking.
+        * path_ok() uses enter_repo() and checks for included directories.
         * We only need to make sure the repository is exported.
         */
 
@@ -1444,7 +1444,7 @@ int cmd_main(int argc, const char **argv)
                cred = prepare_credentials(user_name, group_name);
 
        if (strict_paths && (!ok_paths || !*ok_paths))
-               die("option --strict-paths requires a whitelist");
+               die("option --strict-paths requires '<directory>' arguments");
 
        if (base_path && !is_directory(base_path))
                die("base-path '%s' does not exist or is not a directory",