bd1cd7b
diff -up cups-2.2rc1/scheduler/conf.c.serverbin-compat cups-2.2rc1/scheduler/conf.c
bd1cd7b
--- cups-2.2rc1/scheduler/conf.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/conf.c	2016-08-09 09:58:21.324033645 +0200
bd1cd7b
@@ -609,6 +609,9 @@ cupsdReadConfiguration(void)
a1088d0
   cupsdClearString(&ServerName);
a1088d0
   cupsdClearString(&ServerAdmin);
69289fd
   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
69289fd
+#ifdef __x86_64__
69289fd
+  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
69289fd
+#endif /* __x86_64__ */
69289fd
   cupsdSetString(&RequestRoot, CUPS_REQUESTS);
69289fd
   cupsdSetString(&CacheDir, CUPS_CACHEDIR);
69289fd
   cupsdSetString(&DataDir, CUPS_DATADIR);
bd1cd7b
@@ -1604,7 +1607,12 @@ cupsdReadConfiguration(void)
69289fd
     * Read the MIME type and conversion database...
69289fd
     */
69289fd
 
69289fd
+#ifdef __x86_64__
69289fd
+    snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
69289fd
+	     ServerBin_compat);
cb06f24
+#else
69289fd
     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
69289fd
+#endif
cb06f24
     snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir);
69289fd
 
4743e10
     MimeDatabase = mimeNew();
bd1cd7b
diff -up cups-2.2rc1/scheduler/conf.h.serverbin-compat cups-2.2rc1/scheduler/conf.h
bd1cd7b
--- cups-2.2rc1/scheduler/conf.h.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/conf.h	2016-08-09 09:58:21.325033636 +0200
bd1cd7b
@@ -106,6 +106,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
69289fd
 					/* Root directory for scheduler */
69289fd
 			*ServerBin		VALUE(NULL),
69289fd
 					/* Root directory for binaries */
69289fd
+#ifdef __x86_64__
69289fd
+			*ServerBin_compat	VALUE(NULL),
69289fd
+					/* Compat directory for binaries */
69289fd
+#endif /* __x86_64__ */
69289fd
 			*StateDir		VALUE(NULL),
69289fd
 					/* Root directory for state data */
69289fd
 			*RequestRoot		VALUE(NULL),
bd1cd7b
diff -up cups-2.2rc1/scheduler/env.c.serverbin-compat cups-2.2rc1/scheduler/env.c
bd1cd7b
--- cups-2.2rc1/scheduler/env.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/env.c	2016-08-09 09:58:21.325033636 +0200
bd1cd7b
@@ -212,8 +212,13 @@ cupsdUpdateEnv(void)
4743e10
   set_if_undefined("LD_PRELOAD", NULL);
4743e10
   set_if_undefined("NLSPATH", NULL);
4743e10
   if (find_env("PATH") < 0)
69289fd
+#ifdef __x86_64__
4743e10
+    cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
4743e10
+                         ":/bin:/usr/bin", ServerBin, ServerBin_compat);
69289fd
+#else /* ! defined(__x86_64__) */
4743e10
     cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
4743e10
 			 ":/bin:/usr/bin", ServerBin);
69289fd
+#endif
4743e10
   set_if_undefined("SERVER_ADMIN", ServerAdmin);
4743e10
   set_if_undefined("SHLIB_PATH", NULL);
4743e10
   set_if_undefined("SOFTWARE", CUPS_MINIMAL);
bd1cd7b
diff -up cups-2.2rc1/scheduler/ipp.c.serverbin-compat cups-2.2rc1/scheduler/ipp.c
bd1cd7b
--- cups-2.2rc1/scheduler/ipp.c.serverbin-compat	2016-08-09 09:58:21.326033626 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/ipp.c	2016-08-09 10:10:16.266127629 +0200
bd1cd7b
@@ -2419,12 +2419,21 @@ add_printer(cupsd_client_t  *con,	/* I -
c07f027
         * Could not find device in list!
c07f027
 	*/
c07f027
 
c07f027
+#ifdef __x86_64__
cb06f24
+	snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat,
4f25cbd
+		 scheme);
c07f027
+	if (access(srcfile, X_OK))
cb06f24
+	{
c07f027
+#endif /* __x86_64__ */
4743e10
 	send_ipp_status(con, IPP_NOT_POSSIBLE,
4743e10
                         _("Bad device-uri scheme \"%s\"."), scheme);
bd1cd7b
 	if (!modify)
bd1cd7b
 	  cupsdDeletePrinter(printer, 0);
bd1cd7b
 
c07f027
 	return;
c07f027
+#ifdef __x86_64__
cb06f24
+	}
c07f027
+#endif /* __x86_64__ */
c07f027
       }
c07f027
     }
c07f027
 
bd1cd7b
diff -up cups-2.2rc1/scheduler/job.c.serverbin-compat cups-2.2rc1/scheduler/job.c
bd1cd7b
--- cups-2.2rc1/scheduler/job.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/job.c	2016-08-09 09:58:21.327033616 +0200
bd1cd7b
@@ -1126,8 +1126,32 @@ cupsdContinueJob(cupsd_job_t *job)	/* I
c07f027
        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
c07f027
   {
c07f027
     if (filter->filter[0] != '/')
c07f027
-      snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
c07f027
-               filter->filter);
c07f027
+      {
c07f027
+	snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
c07f027
+		 filter->filter);
c07f027
+#ifdef __x86_64__
c07f027
+	if (access(command, F_OK))
c07f027
+	  {
c07f027
+	    snprintf(command, sizeof(command), "%s/filter/%s",
c07f027
+		     ServerBin_compat, filter->filter);
c07f027
+	    if (!access(command, F_OK))
c07f027
+	      {
c07f027
+		/* Not in the correct directory, but found it in the compat
c07f027
+		 * directory.  Issue a warning. */
c07f027
+		cupsdLogMessage(CUPSD_LOG_INFO,
c07f027
+				"Filter '%s' not in %s/filter!",
c07f027
+				filter->filter, ServerBin);
c07f027
+	      }
c07f027
+	    else
c07f027
+	      {
c07f027
+		/* Not in the compat directory either; make any error
c07f027
+		 * messages use the correct directory name then. */
c07f027
+		snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
c07f027
+			 filter->filter);
c07f027
+	      }
c07f027
+	  }
c07f027
+#endif /* __x86_64__ */
02266be
+      }
c07f027
     else
c07f027
       strlcpy(command, filter->filter, sizeof(command));
c07f027
 
bd1cd7b
@@ -1283,6 +1307,28 @@ cupsdContinueJob(cupsd_job_t *job)	/* I
4743e10
     {
a1088d0
       cupsdClosePipe(job->back_pipes);
a1088d0
       cupsdClosePipe(job->side_pipes);
c07f027
+#ifdef __x86_64__
c07f027
+      if (access(command, F_OK))
c07f027
+	{
c07f027
+	  snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
0b0e738
+		   scheme);
c07f027
+	  if (!access(command, F_OK))
c07f027
+	    {
c07f027
+	      /* Not in the correct directory, but we found it in the compat
c07f027
+	       * directory.  Issue a warning. */
c07f027
+	      cupsdLogMessage(CUPSD_LOG_INFO,
0b0e738
+			      "Backend '%s' not in %s/backend!", scheme,
c07f027
+			      ServerBin);
c07f027
+	    }
c07f027
+	  else
c07f027
+	    {
c07f027
+	      /* Not in the compat directory either; make any error
c07f027
+		 messages use the correct directory name then. */
c07f027
+	      snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
0b0e738
+		       scheme);
c07f027
+	    }
c07f027
+	}
c07f027
+#endif /* __x86_64__ */
c07f027
 
a1088d0
       close(job->status_pipes[1]);
a1088d0
       job->status_pipes[1] = -1;
bd1cd7b
diff -up cups-2.2rc1/scheduler/printers.c.serverbin-compat cups-2.2rc1/scheduler/printers.c
bd1cd7b
--- cups-2.2rc1/scheduler/printers.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
bd1cd7b
+++ cups-2.2rc1/scheduler/printers.c	2016-08-09 09:58:21.327033616 +0200
bd1cd7b
@@ -967,9 +967,19 @@ cupsdLoadAllPrinters(void)
69289fd
 	    * Backend does not exist, stop printer...
69289fd
 	    */
69289fd
 
c07f027
+#ifdef __x86_64__
69289fd
+	    snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
69289fd
+		     p->device_uri);
ca53cd4
+	    if (access(line, 0))
69289fd
+	      {
69289fd
+#endif /* __x86_64__ */
69289fd
+
69289fd
 	    p->state = IPP_PRINTER_STOPPED;
69289fd
 	    snprintf(p->state_message, sizeof(p->state_message),
69289fd
 	             "Backend %s does not exist!", line);
c07f027
+#ifdef __x86_64__
69289fd
+	      }
c07f027
+#endif /* __x86_64__ */
69289fd
 	  }
69289fd
         }
c07f027
 
bd1cd7b
@@ -3481,8 +3491,20 @@ add_printer_filter(
4743e10
     else
4743e10
       snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program);
69289fd
 
c07f027
+#ifdef __x86_64__
4743e10
+    if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser,
4743e10
+                       cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) {
69289fd
+      snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
4743e10
+               program);
4743e10
+      if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser,
4743e10
+                         cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING)
529334a
+        snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin,
529334a
+                 program);
4743e10
+    }
4743e10
+#else /* ! defined(__x86_64__) */
4743e10
     _cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser,
4743e10
                    cupsdLogFCMessage, p);
4743e10
+#endif 
4743e10
   }
c07f027
 
4743e10
  /*