Attachment 648713 Details for Bug 877279 – updated debian patch for issue

[patch] updated debian patch for issue

file_877279.txt (text/plain), 1.97 KB, created by James Clawson on 2012-11-20 18:32:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Clawson

Created: 2012-11-20 18:32:00 UTC

Size: 1.97 KB

patch

obsolete

>diff --git a/util.c b/util.c
>index a3e9829..027ed91 100644
>--- a/util.c
>+++ b/util.c
>@@ -206,21 +206,42 @@ static int rsync_e_okay( char **vec )
>        int     server = FALSE;
>        int     e_found = FALSE;
>
>-       static const char pattern[] = "^-([^-][^ ]*)?e[^.0-9]";
>+       /*
>+        * rsync will send -e, followed by either just "." (meaning no special
>+        * protocol) or "N.N" (meaning a pre-release protocol version),
>+        * followed by some number of alphabetic flags indicating various
>+        * supported options.  There may be other options between - and the e,
>+        * but -e will always be the last option in the string.  A typical
>+        * option passed by the client is "-ltpre.iL".
>+        *
>+        * Note that if --server is given, this should never be parsed as a
>+        * shell, but we'll tightly verify it anyway, just in case.
>+        *
>+        * This regex matches the acceptable flags containing -e, so if it
>+        * does not match, the command line should be rejected.
>+        */
>+       static const char pattern[]
>+           = "^-[a-df-zA-Z]*e[0-9]*\.[0-9]*[a-zA-Z]*$";
>
>        /*
>-        * This is more complicated than it looks because we don't want to
>-        * trigger on the e in --server, but we do want to allow the common
>-        * case of -ltpre.iL (which contains -e.).
>+        * Only recognize --server if it's the first option.  rsync itself
>+        * always passes it that way, and if it's not the first argument, it
>+        * could be hidden from the server as an argument to some other
>+        * option.
>         */
>+       if ( vec && vec[0] && vec[1] && strcmp(vec[1], "--server") == 0 ){
>+               server = TRUE;
>+       }
>+
>+       /* Check the remaining options for -e. */
>        if ( regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0 ){
>                return FALSE;
>        }
>        while (vec && *vec){
>-               if ( strcmp(*vec, "--server") == 0 ) server = TRUE;

Actions: View | Diff

Attachments on bug 877279: 648691 | 648713 | 660999