Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/conf.c.serverbin-compat cups-1.4.6/scheduler/conf.c
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/conf.c.serverbin-compat	2010-08-31 05:18:38.000000000 +0100
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/conf.c	2011-01-12 16:28:47.233270999 +0000
Tim Waugh 529334
@@ -488,6 +488,9 @@ cupsdReadConfiguration(void)
Tim Waugh a1088d
   cupsdClearString(&ServerName);
Tim Waugh a1088d
   cupsdClearString(&ServerAdmin);
Tim Waugh 69289f
   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
Tim Waugh 69289f
+#ifdef __x86_64__
Tim Waugh 69289f
+  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
Tim Waugh 69289f
+#endif /* __x86_64__ */
Tim Waugh 69289f
   cupsdSetString(&RequestRoot, CUPS_REQUESTS);
Tim Waugh 69289f
   cupsdSetString(&CacheDir, CUPS_CACHEDIR);
Tim Waugh 69289f
   cupsdSetString(&DataDir, CUPS_DATADIR);
Tim Waugh 0b0e73
@@ -1331,7 +1334,12 @@ cupsdReadConfiguration(void)
Tim Waugh 69289f
     * Read the MIME type and conversion database...
Tim Waugh 69289f
     */
Tim Waugh 69289f
 
Tim Waugh 69289f
+#ifdef __x86_64__
Tim Waugh 69289f
+    snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
Tim Waugh 69289f
+	     ServerBin_compat);
Tim Waugh cb06f2
+#else
Tim Waugh 69289f
     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
Tim Waugh 69289f
+#endif
Tim Waugh cb06f2
     snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir);
Tim Waugh 69289f
 
Tim Waugh cb06f2
     MimeDatabase = mimeLoadTypes(NULL, mimedir);
Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/conf.h.serverbin-compat cups-1.4.6/scheduler/conf.h
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/conf.h.serverbin-compat	2010-04-23 19:56:34.000000000 +0100
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/conf.h	2011-01-12 16:28:47.233270999 +0000
Tim Waugh 529334
@@ -105,6 +105,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
Tim Waugh 69289f
 					/* Root directory for scheduler */
Tim Waugh 69289f
 			*ServerBin		VALUE(NULL),
Tim Waugh 69289f
 					/* Root directory for binaries */
Tim Waugh 69289f
+#ifdef __x86_64__
Tim Waugh 69289f
+			*ServerBin_compat	VALUE(NULL),
Tim Waugh 69289f
+					/* Compat directory for binaries */
Tim Waugh 69289f
+#endif /* __x86_64__ */
Tim Waugh 69289f
 			*StateDir		VALUE(NULL),
Tim Waugh 69289f
 					/* Root directory for state data */
Tim Waugh 69289f
 			*RequestRoot		VALUE(NULL),
Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/env.c.serverbin-compat cups-1.4.6/scheduler/env.c
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/env.c.serverbin-compat	2009-06-15 18:13:52.000000000 +0100
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/env.c	2011-01-12 16:28:47.234270949 +0000
Tim Waugh 529334
@@ -87,8 +87,13 @@ cupsdInitEnv(void)
Tim Waugh 69289f
   cupsdSetEnv("LD_LIBRARY_PATH", NULL);
Tim Waugh 69289f
   cupsdSetEnv("LD_PRELOAD", NULL);
Tim Waugh 69289f
   cupsdSetEnv("NLSPATH", NULL);
Tim Waugh 69289f
+#ifdef __x86_64__
Tim Waugh 69289f
+  cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
Tim Waugh 69289f
+                       ":/bin:/usr/bin", ServerBin, ServerBin_compat);
Tim Waugh 69289f
+#else /* ! defined(__x86_64__) */
Tim Waugh 69289f
   cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
Tim Waugh 69289f
                        ":/bin:/usr/bin", ServerBin);
Tim Waugh 69289f
+#endif
Tim Waugh 69289f
   cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
Tim Waugh 69289f
   cupsdSetEnv("SHLIB_PATH", NULL);
Tim Waugh 69289f
   cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/ipp.c.serverbin-compat cups-1.4.6/scheduler/ipp.c
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/ipp.c.serverbin-compat	2010-10-06 21:07:44.000000000 +0100
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/ipp.c	2011-01-12 16:28:47.246270349 +0000
Tim Waugh 0b0e73
@@ -2602,9 +2602,18 @@ add_printer(cupsd_client_t  *con,	/* I -
Tim Waugh c07f02
         * Could not find device in list!
Tim Waugh c07f02
 	*/
Tim Waugh c07f02
 
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh cb06f2
+	snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat,
Tim Waugh 4f25cb
+		 scheme);
Tim Waugh c07f02
+	if (access(srcfile, X_OK))
Tim Waugh cb06f2
+	{
Tim Waugh c07f02
+#endif /* __x86_64__ */
Tim Waugh cb06f2
 	send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri scheme \"%s\"!"),
Tim Waugh cb06f2
         	        scheme);
Tim Waugh c07f02
 	return;
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh cb06f2
+	}
Tim Waugh c07f02
+#endif /* __x86_64__ */
Tim Waugh c07f02
       }
Tim Waugh c07f02
     }
Tim Waugh c07f02
 
Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/job.c.serverbin-compat cups-1.4.6/scheduler/job.c
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/job.c.serverbin-compat	2010-11-30 22:35:02.000000000 +0000
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/job.c	2011-01-12 16:31:43.515443755 +0000
Tim Waugh 0b0e73
@@ -975,8 +975,32 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
Tim Waugh c07f02
        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
Tim Waugh c07f02
   {
Tim Waugh c07f02
     if (filter->filter[0] != '/')
Tim Waugh c07f02
-      snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
Tim Waugh c07f02
-               filter->filter);
Tim Waugh c07f02
+      {
Tim Waugh c07f02
+	snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
Tim Waugh c07f02
+		 filter->filter);
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh c07f02
+	if (access(command, F_OK))
Tim Waugh c07f02
+	  {
Tim Waugh c07f02
+	    snprintf(command, sizeof(command), "%s/filter/%s",
Tim Waugh c07f02
+		     ServerBin_compat, filter->filter);
Tim Waugh c07f02
+	    if (!access(command, F_OK))
Tim Waugh c07f02
+	      {
Tim Waugh c07f02
+		/* Not in the correct directory, but found it in the compat
Tim Waugh c07f02
+		 * directory.  Issue a warning. */
Tim Waugh c07f02
+		cupsdLogMessage(CUPSD_LOG_INFO,
Tim Waugh c07f02
+				"Filter '%s' not in %s/filter!",
Tim Waugh c07f02
+				filter->filter, ServerBin);
Tim Waugh c07f02
+	      }
Tim Waugh c07f02
+	    else
Tim Waugh c07f02
+	      {
Tim Waugh c07f02
+		/* Not in the compat directory either; make any error
Tim Waugh c07f02
+		 * messages use the correct directory name then. */
Tim Waugh c07f02
+		snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
Tim Waugh c07f02
+			 filter->filter);
Tim Waugh c07f02
+	      }
Tim Waugh c07f02
+	  }
Tim Waugh c07f02
+#endif /* __x86_64__ */
Tim Waugh 02266b
+      }
Tim Waugh c07f02
     else
Tim Waugh c07f02
       strlcpy(command, filter->filter, sizeof(command));
Tim Waugh c07f02
 
Tim Waugh 0b0e73
@@ -1122,6 +1146,28 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
Tim Waugh a1088d
       cupsdClosePipe(job->print_pipes);
Tim Waugh a1088d
       cupsdClosePipe(job->back_pipes);
Tim Waugh a1088d
       cupsdClosePipe(job->side_pipes);
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh c07f02
+      if (access(command, F_OK))
Tim Waugh c07f02
+	{
Tim Waugh c07f02
+	  snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
Tim Waugh 0b0e73
+		   scheme);
Tim Waugh c07f02
+	  if (!access(command, F_OK))
Tim Waugh c07f02
+	    {
Tim Waugh c07f02
+	      /* Not in the correct directory, but we found it in the compat
Tim Waugh c07f02
+	       * directory.  Issue a warning. */
Tim Waugh c07f02
+	      cupsdLogMessage(CUPSD_LOG_INFO,
Tim Waugh 0b0e73
+			      "Backend '%s' not in %s/backend!", scheme,
Tim Waugh c07f02
+			      ServerBin);
Tim Waugh c07f02
+	    }
Tim Waugh c07f02
+	  else
Tim Waugh c07f02
+	    {
Tim Waugh c07f02
+	      /* Not in the compat directory either; make any error
Tim Waugh c07f02
+		 messages use the correct directory name then. */
Tim Waugh c07f02
+	      snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
Tim Waugh 0b0e73
+		       scheme);
Tim Waugh c07f02
+	    }
Tim Waugh c07f02
+	}
Tim Waugh c07f02
+#endif /* __x86_64__ */
Tim Waugh c07f02
 
Tim Waugh a1088d
       close(job->status_pipes[1]);
Tim Waugh a1088d
       job->status_pipes[1] = -1;
Tim Waugh 0b0e73
diff -up cups-1.4.6/scheduler/printers.c.serverbin-compat cups-1.4.6/scheduler/printers.c
Tim Waugh 0b0e73
--- cups-1.4.6/scheduler/printers.c.serverbin-compat	2010-09-22 19:35:07.000000000 +0100
Tim Waugh 0b0e73
+++ cups-1.4.6/scheduler/printers.c	2011-01-12 16:28:47.261269599 +0000
Tim Waugh 0b0e73
@@ -1114,9 +1114,19 @@ cupsdLoadAllPrinters(void)
Tim Waugh 69289f
 	    * Backend does not exist, stop printer...
Tim Waugh 69289f
 	    */
Tim Waugh 69289f
 
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh 69289f
+	    snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
Tim Waugh 69289f
+		     p->device_uri);
Tim Waugh ca53cd
+	    if (access(line, 0))
Tim Waugh 69289f
+	      {
Tim Waugh 69289f
+#endif /* __x86_64__ */
Tim Waugh 69289f
+
Tim Waugh 69289f
 	    p->state = IPP_PRINTER_STOPPED;
Tim Waugh 69289f
 	    snprintf(p->state_message, sizeof(p->state_message),
Tim Waugh 69289f
 	             "Backend %s does not exist!", line);
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh 69289f
+	      }
Tim Waugh c07f02
+#endif /* __x86_64__ */
Tim Waugh 69289f
 	  }
Tim Waugh 69289f
         }
Tim Waugh c07f02
 
Tim Waugh 0b0e73
@@ -3658,6 +3668,14 @@ add_printer_filter(
Tim Waugh 69289f
 
Tim Waugh a1088d
     if (stat(filename, &fileinfo))
Tim Waugh 69289f
     {
Tim Waugh c07f02
+#ifdef __x86_64__
Tim Waugh 69289f
+      snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
Tim Waugh 69289f
+	       program);
Tim Waugh ca53cd
+      if (stat(filename, &fileinfo))
Tim Waugh ca53cd
+      {
Tim Waugh 529334
+        snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin,
Tim Waugh 529334
+                 program);
Tim Waugh 69289f
+#endif /* __x86_64__ */
Tim Waugh ca53cd
       memset(&fileinfo, 0, sizeof(fileinfo));
Tim Waugh ca53cd
 
Tim Waugh 69289f
       snprintf(p->state_message, sizeof(p->state_message),
Tim Waugh 0b0e73
@@ -3666,6 +3684,9 @@ add_printer_filter(
Tim Waugh ca53cd
       cupsdSetPrinterReasons(p, "+cups-missing-filter-warning");
Tim Waugh c07f02
 
Tim Waugh 69289f
       cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);
Tim Waugh 69289f
+#ifdef __x86_64__
Tim Waugh ca53cd
+      }
Tim Waugh 69289f
+#endif /* __x86_64__ */
Tim Waugh 69289f
     }
Tim Waugh c07f02
 
Tim Waugh a1088d
    /*