packaging/Debian/debian/patches/loadparm.patch

   1 --- samba-2.2.2.cvs20020201/source/param/loadparm.c.orig        Fri Feb  1 17:03:50 2002
   2 +++ samba-2.2.2.cvs20020201/source/param/loadparm.c     Fri Feb  1 18:45:41 2002
   3 @@ -1085,26 +1085,26 @@
   4                 case PRINT_AIX:
   5                 case PRINT_LPRNT:
   6                 case PRINT_LPROS2:
   7 -                       string_set(&sDefault.szLpqcommand, "lpq -P%p");
   8 -                       string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
   9 +                       string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
  10 +                       string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
  11                         string_set(&sDefault.szPrintcommand,
  12 -                                  "lpr -r -P%p %s");
  13 +                                  "lpr -r -P'%p' %s");
  14                         break;
  15
  16                 case PRINT_LPRNG:
  17                 case PRINT_PLP:
  18 -                       string_set(&sDefault.szLpqcommand, "lpq -P%p");
  19 -                       string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
  20 +                       string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
  21 +                       string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
  22                         string_set(&sDefault.szPrintcommand,
  23 -                                  "lpr -r -P%p %s");
  24 +                                  "lpr -r -P'%p' %s");
  25                         string_set(&sDefault.szQueuepausecommand,
  26 -                                  "lpc stop %p");
  27 +                                  "lpc stop '%p'");
  28                         string_set(&sDefault.szQueueresumecommand,
  29 -                                  "lpc start %p");
  30 +                                  "lpc start '%p'");
  31                         string_set(&sDefault.szLppausecommand,
  32 -                                  "lpc hold %p %j");
  33 +                                  "lpc hold '%p' %j");
  34                         string_set(&sDefault.szLpresumecommand,
  35 -                                  "lpc release %p %j");
  36 +                                  "lpc release '%p' %j");
  37                         break;
  38
  39                 case PRINT_CUPS:
  40 @@ -1120,19 +1120,19 @@
  41                         string_set(&Globals.szPrintcapname, "cups");
  42  #else
  43                         string_set(&sDefault.szLpqcommand,
  44 -                                  "/usr/bin/lpstat -o %p");
  45 +                                  "/usr/bin/lpstat -o '%p'");
  46                         string_set(&sDefault.szLprmcommand,
  47 -                                  "/usr/bin/cancel %p-%j");
  48 +                                  "/usr/bin/cancel '%p-%j'");
  49                         string_set(&sDefault.szPrintcommand,
  50 -                                  "/usr/bin/lp -d %p %s; rm %s");
  51 +                                  "/usr/bin/lp -d '%p' %s; rm %s");
  52                         string_set(&sDefault.szLppausecommand,
  53 -                                  "lp -i %p-%j -H hold");
  54 +                                  "lp -i '%p-%j' -H hold");
  55                         string_set(&sDefault.szLpresumecommand,
  56 -                                  "lp -i %p-%j -H resume");
  57 +                                  "lp -i '%p-%j' -H resume");
  58                         string_set(&sDefault.szQueuepausecommand,
  59 -                                  "/usr/bin/disable %p");
  60 +                                  "/usr/bin/disable '%p'");
  61                         string_set(&sDefault.szQueueresumecommand,
  62 -                                  "/usr/bin/enable %p");
  63 +                                  "/usr/bin/enable '%p'");
  64                         string_set(&Globals.szPrintcapname, "lpstat");
  65  #endif /* HAVE_CUPS */
  66                         break;
  67 @@ -1437,7 +1437,10 @@
  68         else
  69                 StrnCpy(ret, s, len);
  70
  71 -       trim_string(ret, "\"", "\"");
  72 +       if (trim_string(ret, "\"", "\"")) {
  73 +               if (strchr(ret,'"') != NULL)
  74 +                       StrnCpy(ret, s, len);
  75 +       }
  76
  77         standard_sub_basic(ret);
  78         return (ret);