[Pkg-cups-devel] r372 - in cupsys/branches/cups-1.2/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Fri Sep 15 14:49:36 2006
New Revision: 372

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch

Log:
back 57_cupsaddsmb. cupsaddsmb has many problems about an error handling...

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Fri Sep 15 14:49:36 2006
@@ -23,6 +23,8 @@
   * Merge old separated style configuration to the single format
     only if user upgraded from an affected version. (closes: #386551)
   * Provide /usr/share/cups/drivers to contain Windows drivers.
+  * 57_cupsaddsmb: original cupsaddsmb easily goes infinite and DoS-like
+    loop. Debian cupsaddsmb ends soon when it catches an error.
 
  -- Kenshi Muto <kmuto at debian.org>  Fri,  8 Sep 2006 11:28:12 +0200
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Fri Sep 15 14:49:36 2006
@@ -21,9 +21,10 @@
 54_cups-config_modeldir.dpatch
 55_ppd_okidata_name.dpatch
 56_dirsvc.dpatch
-#57_cupsaddsmb.dpatch
+57_cupsaddsmb.dpatch
 #58_fixdestc.dpatch
 #59_de_docroot.dpatch
 60_device_uri.dpatch
 #61_job_c_strangeloop.dpatch
 62_classes_crash.dpatch
+#64_driverfolder.dpatch

Modified: cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch	Fri Sep 15 14:49:36 2006
@@ -1,46 +1,19 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 56_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
+## 57_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.2.1~/systemv/cupsaddsmb.c cupsys-1.2.1/systemv/cupsaddsmb.c
---- cupsys-1.2.1~/systemv/cupsaddsmb.c	2006-07-01 10:54:43.000000000 +0000
-+++ cupsys-1.2.1/systemv/cupsaddsmb.c	2006-07-01 12:14:15.000000000 +0000
-@@ -240,26 +240,30 @@
-   * Try to export it...
-   */
- 
--  for (status = 0; !status;)
--  {
-+/*  for (status = 0; !status;)
-+  { */
-    /*
-     * Get the password, as needed...
-     */
- 
-     if (!SAMBAPassword)
-     {
--      snprintf(prompt, sizeof(prompt),
-+      /* snprintf(prompt, sizeof(prompt),
-                _("Password for %s required to access %s via SAMBA: "),
- 	       SAMBAUser, SAMBAServer);
- 
-       if ((SAMBAPassword = cupsGetPassword(prompt)) == NULL)
--	break;
-+	break; */
-+      _cupsLangPrintf(stderr,
-+               _("Password for %s required to access %s via SAMBA: "),
-+	       SAMBAUser, SAMBAServer); /* localize */
-+      SAMBAPassword = cupsGetPassword("");
-     }
- 
+diff -urNad cupsys-1.2.3~/systemv/cupsaddsmb.c cupsys-1.2.3/systemv/cupsaddsmb.c
+--- cupsys-1.2.3~/systemv/cupsaddsmb.c	2006-09-15 14:45:03.000000000 +0000
++++ cupsys-1.2.3/systemv/cupsaddsmb.c	2006-09-15 14:46:16.000000000 +0000
+@@ -263,6 +263,8 @@
      status = cupsAdminExportSamba(dest, ppdfile, SAMBAServer,
                                    SAMBAUser, SAMBAPassword,
  				  Verbosity ? stderr : NULL);
--  }
-+  /* } */
++
++    break; /* Debian patch: anyway force to break */
+   }
  
    unlink(ppdfile);
-