Don't munge ``set dial|login|logout|hangup'' arguments before

ExpandString() has a chance to do its own substitutions.

1 files changed, 9 insertions, 6 deletions

diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index b7ee588f11e1..67472c4754f9 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -264,13 +264,16 @@ IntToSpeed(int nspeed)
 }
 
 char *
-findblank(char *p, int instring)
+findblank(char *p, int instring, int reduce)
 {
   while (*p) {
     if (*p == '\\') {
-      memmove(p, p + 1, strlen(p));
-      if (!*p)
-        break;
+      if (reduce) {
+        memmove(p, p + 1, strlen(p));
+        if (!*p)
+          break;
+      } else
+        p++;
     } else if ((instring && *p == '"') ||
                (!instring && (issep(*p) || *p == '#')))
       return p;
@@ -281,7 +284,7 @@ findblank(char *p, int instring)
 }
 
 int
-MakeArgs(char *script, char **pvect, int maxargs)
+MakeArgs(char *script, char **pvect, int maxargs, int reduce)
 {
   int nargs, nb;
   int instring;
@@ -303,7 +306,7 @@ MakeArgs(char *script, char **pvect, int maxargs)
 	break;
       *pvect++ = script;
       nargs++;
-      script = findblank(script, instring);
+      script = findblank(script, instring, reduce);
       if (script == NULL)
         return -1;
       else if (*script == '#')