If we don't recognize an extra arg supplied hidden behind the
command, we should skip it and look at the next extra arg, in
case we recognize the next one.
For example, we currently don't recognize the "user=" extra arg,
but we should still be able to start this connection anyway:
perl -e '
$s="git-upload-pack /.git\0user=me\0host=localhost\0";
printf "%4.4x%s",4+length $s,$s
' | ./git-daemon --inetd --base-path=`pwd` --export-all
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
This should go in maint.
daemon.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/daemon.c b/daemon.c
index daa4c8e..a9a4f02 100644
--- a/daemon.c
+++ b/daemon.c
@@ -411,14 +411,13 @@ static char *xstrdup_tolower(const char *str)
static void parse_extra_args(char *extra_args, int buflen)
{
char *val;
- int vallen;
char *end = extra_args + buflen;
while (extra_args < end && *extra_args) {
+ int arglen = strlen(extra_args);
saw_extended_args = 1;
if (strncasecmp("host=", extra_args, 5) == 0) {
val = extra_args + 5;
- vallen = strlen(val) + 1;
if (*val) {
/* Split <host>:<port> at colon. */
char *host = val;
@@ -432,10 +431,10 @@ static void parse_extra_args(char *extra_args, int buflen)
free(hostname);
hostname = xstrdup_tolower(host);
}
-
- /* On to the next one */
- extra_args = val + vallen;
}
+
+ /* On to the next one */
+ extra_args += arglen + 1;
}
/*
--
1.6.3.1.333.g3ebba7
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html