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

Kenshi Muto kmuto at costa.debian.org
Sat Jul 1 12:27:43 UTC 2006


Author: kmuto
Date: Sat Jul  1 12:27:42 2006
New Revision: 281

Added:
   cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
cupsaddsmb fix (infinite loop, missing localized message) for #376232

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Jul  1 12:27:42 2006
@@ -3,6 +3,9 @@
   [Kenshi Muto]
   * Bug, bug, bug, ... our BTS is tainted by duplicate bugs like flood.
   * Include changelogs during 1.1.23-13 - 1.1.23-15. (closes: #374494)
+  * 56_cupsaddsmb: avoid infinite loop when connect with Samba fails
+    by something reasons. (closes: #376232)
+    This patch fixes missing localized message.
 
  -- Kenshi Muto <kmuto at debian.org>  Wed, 21 Jun 2006 15:06:02 +0000
 

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	Sat Jul  1 12:27:42 2006
@@ -20,3 +20,4 @@
 53_usr_share_ppd_support.dpatch
 55_ppd_okidata_name.dpatch
 #56_dirsvc.dpatch
+57_cupsaddsmb.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/57_cupsaddsmb.dpatch	Sat Jul  1 12:27:42 2006
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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("");
+     }
+ 
+     status = cupsAdminExportSamba(dest, ppdfile, SAMBAServer,
+                                   SAMBAUser, SAMBAPassword,
+ 				  Verbosity ? stderr : NULL);
+-  }
++  /* } */
+ 
+   unlink(ppdfile);
+ 



More information about the Pkg-cups-devel mailing list