Merge branch 'js/regexec-buf' into maint

diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 1f14d56e98834e73dce91f3a20c3e3795ba6fb37..1e5f16a3a1272d4a87478525585951d76307750a 100644 (file)
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -257,7 +257,7 @@ static void init_socket_directory(const char *path)
        free(path_copy);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char *socket_path;
        int ignore_sighup = 0;