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

[Martin Pitt]

Author: mpitt
Date: Mon Jul 16 13:59:19 2007
New Revision: 497

Log:
* debian/patches/10_external_pam_helper.dpatch: Close pipes in the case of
  errors, too. This can not really be responsible for the mess in #112803,
  but should be fixed anyway.

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Mon Jul 16 13:59:19 2007
@@ -1,8 +1,11 @@
 cupsys (1.2.12-1ubuntu1) UNRELEASED; urgency=low
 
   * Merge to Debian's svn head to get upstream fixes.
+  * debian/patches/10_external_pam_helper.dpatch: Close pipes in the case of
+    errors, too. This can not really be responsible for the mess in #112803,
+    but should be fixed anyway.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 16 Jul 2007 14:52:55 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 16 Jul 2007 15:58:08 +0200
 
 cupsys (1.2.12-2) UNRELEASED; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch	Mon Jul 16 13:59:19 2007
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.2.12~/scheduler/Makefile cupsys-1.2.12/scheduler/Makefile
---- cupsys-1.2.12~/scheduler/Makefile	2006-09-12 03:30:09.000000000 +0900
-+++ cupsys-1.2.12/scheduler/Makefile	2007-07-14 18:21:16.403132897 +0900
+diff -urNad cups-1.2-ubuntu~/scheduler/Makefile cups-1.2-ubuntu/scheduler/Makefile
+--- cups-1.2-ubuntu~/scheduler/Makefile	2006-09-11 20:30:09.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/Makefile	2007-07-16 15:54:59.000000000 +0200
 @@ -58,6 +58,7 @@
  		cups-driverd.o \
  		cups-lpd.o \
@@ -54,10 +54,10 @@
  
  #
  # libmime.a
-diff -urNad cupsys-1.2.12~/scheduler/auth.c cupsys-1.2.12/scheduler/auth.c
---- cupsys-1.2.12~/scheduler/auth.c	2006-09-12 22:58:39.000000000 +0900
-+++ cupsys-1.2.12/scheduler/auth.c	2007-07-14 18:23:44.131238819 +0900
-@@ -300,6 +300,59 @@
+diff -urNad cups-1.2-ubuntu~/scheduler/auth.c cups-1.2-ubuntu/scheduler/auth.c
+--- cups-1.2-ubuntu~/scheduler/auth.c	2006-09-12 15:58:39.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/auth.c	2007-07-16 15:57:35.000000000 +0200
+@@ -300,6 +300,61 @@
    memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
  }
  
@@ -84,6 +84,8 @@
 +  if (pid < 0) {
 +    cupsdLogMessage(CUPSD_LOG_ERROR, 
 +	    "cupsdCallPamAuthHelper: fork() failed: %s\n", strerror(errno));
++    close(inp[0]);
++    close(inp[1]);
 +    return 2;
 +  }
 +
@@ -96,7 +98,7 @@
 +    execle (authhelper, authhelper, NULL, envp);
 +    cupsdLogMessage(CUPSD_LOG_ERROR, 
 +	    "cupsdCallPamAuthHelper: execle() failed: %s\n", strerror(errno));
-+    return 2;
++    exit(2);
 +  }
 +
 +  close (inp[0]);
@@ -117,7 +119,7 @@
  
  /*
   * 'cupsdAuthorize()' - Validate any authorization credentials.
-@@ -467,6 +520,28 @@
+@@ -467,6 +522,28 @@
      {
        case AUTH_BASIC :
            {
@@ -146,9 +148,9 @@
  #if HAVE_LIBPAM
  	   /*
  	    * Only use PAM to do authentication.  This supports MD5
-diff -urNad cupsys-1.2.12~/scheduler/cups-check-pam-auth.c cupsys-1.2.12/scheduler/cups-check-pam-auth.c
---- cupsys-1.2.12~/scheduler/cups-check-pam-auth.c	1970-01-01 09:00:00.000000000 +0900
-+++ cupsys-1.2.12/scheduler/cups-check-pam-auth.c	2007-07-14 18:21:16.403132897 +0900
+diff -urNad cups-1.2-ubuntu~/scheduler/cups-check-pam-auth.c cups-1.2-ubuntu/scheduler/cups-check-pam-auth.c
+--- cups-1.2-ubuntu~/scheduler/cups-check-pam-auth.c	1970-01-01 01:00:00.000000000 +0100
++++ cups-1.2-ubuntu/scheduler/cups-check-pam-auth.c	2007-07-16 15:54:59.000000000 +0200
 @@ -0,0 +1,148 @@
 +/* setgid shadow PAM authentication helper for cupsd
 + *