Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 111272 | Differences between
and this patch

Collapse All | Expand All

(-)cups-1.1.23.orig/systemv/cupsaddsmb.c (-9 / +11 lines)
Lines 1-5 Link Here
1
/*
1
/*
2
 * "$Id: cupsaddsmb.c,v 1.20 2005/01/03 19:29:59 mike Exp $"
2
 * "$Id: cupsaddsmb.c 4536 2005-06-18 01:28:52Z mike $"
3
 *
3
 *
4
 *   "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
4
 *   "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
5
 *
5
 *
Lines 625-631 Link Here
625
    * See if we also have the CUPS driver files; if so, use them!
625
    * See if we also have the CUPS driver files; if so, use them!
626
    */
626
    */
627
627
628
    snprintf(file, sizeof(file), "%s/drivers/cupsdrv6.dll", datadir);
628
    snprintf(file, sizeof(file), "%s/drivers/cupsps6.dll", datadir);
629
    if (!access(file, 0))
629
    if (!access(file, 0))
630
    {
630
    {
631
     /*
631
     /*
Lines 633-641 Link Here
633
      */
633
      */
634
634
635
      snprintf(subcmd, sizeof(subcmd),
635
      snprintf(subcmd, sizeof(subcmd),
636
               "put %s/drivers/cupsdrv6.dll W32X86/cupsdrv6.dll;"
636
               "put %s/drivers/cups6.ini W32X86/cups6.ini;"
637
               "put %s/drivers/cupsps6.dll W32X86/cupsps6.dll;"
637
	       "put %s/drivers/cupsui6.dll W32X86/cupsui6.dll",
638
	       "put %s/drivers/cupsui6.dll W32X86/cupsui6.dll",
638
	       datadir, datadir);
639
	       datadir, datadir, datadir);
639
640
640
      if ((status = do_samba_command(command, subcmd)) != 0)
641
      if ((status = do_samba_command(command, subcmd)) != 0)
641
      {
642
      {
Lines 652-659 Link Here
652
      snprintf(subcmd, sizeof(subcmd),
653
      snprintf(subcmd, sizeof(subcmd),
653
               "adddriver \"Windows NT x86\" \"%s:"
654
               "adddriver \"Windows NT x86\" \"%s:"
654
	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
655
	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
655
	       "cupsdrv6.dll,cupsui6.dll,pscript.ntf\"",
656
	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf,"
656
	       dest, dest);
657
	       "cups6.ini,cupsps6.dll,cupsui6.dll\"",
658
	       dest, dest, dest);
657
    }
659
    }
658
    else
660
    else
659
    {
661
    {
Lines 665-672 Link Here
665
      snprintf(subcmd, sizeof(subcmd),
667
      snprintf(subcmd, sizeof(subcmd),
666
               "adddriver \"Windows NT x86\" \"%s:"
668
               "adddriver \"Windows NT x86\" \"%s:"
667
	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
669
	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
668
	       "pscript.ntf\"",
670
	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf\"",
669
	       dest, dest);
671
	       dest, dest, dest);
670
    }
672
    }
671
673
672
    snprintf(command, sizeof(command), "rpcclient %s", SAMBAServer);
674
    snprintf(command, sizeof(command), "rpcclient %s", SAMBAServer);
Lines 947-951 Link Here
947
949
948
950
949
/*
951
/*
950
 * End of "$Id: cupsaddsmb.c,v 1.20 2005/01/03 19:29:59 mike Exp $".
952
 * End of "$Id: cupsaddsmb.c 4536 2005-06-18 01:28:52Z mike $".
951
 */
953
 */

Return to bug 111272