|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/conf.c.serverbin-compat cups-1.3.10/scheduler/conf.c
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/conf.c.serverbin-compat 2009-04-16 20:32:04.000000000 +0100
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/conf.c 2009-04-20 17:05:08.000000000 +0100
|
|
Tim Waugh |
d88b53 |
@@ -430,6 +430,9 @@ cupsdReadConfiguration(void)
|
|
Tim Waugh |
d88b53 |
cupsdClearString(&ServerName);
|
|
Tim Waugh |
d88b53 |
cupsdClearString(&ServerAdmin);
|
|
Tim Waugh |
6a249a |
cupsdSetString(&ServerBin, CUPS_SERVERBIN);
|
|
Tim Waugh |
6a249a |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
|
|
Tim Waugh |
6a249a |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
cupsdSetString(&RequestRoot, CUPS_REQUESTS);
|
|
Tim Waugh |
6a249a |
cupsdSetString(&CacheDir, CUPS_CACHEDIR);
|
|
Tim Waugh |
6a249a |
cupsdSetString(&DataDir, CUPS_DATADIR);
|
|
Tim Waugh |
d88b53 |
@@ -1178,7 +1181,12 @@ cupsdReadConfiguration(void)
|
|
Tim Waugh |
6a249a |
* Read the MIME type and conversion database...
|
|
Tim Waugh |
6a249a |
*/
|
|
Tim Waugh |
6a249a |
|
|
Tim Waugh |
6a249a |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
|
|
Tim Waugh |
6a249a |
+ ServerBin_compat);
|
|
Tim Waugh |
6a249a |
+#else /* ! defined(__x86_64__) */
|
|
Tim Waugh |
6a249a |
snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
|
|
Tim Waugh |
6a249a |
+#endif
|
|
Tim Waugh |
6a249a |
|
|
Tim Waugh |
6a249a |
MimeDatabase = mimeLoad(ServerRoot, temp);
|
|
Tim Waugh |
6a249a |
|
|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/conf.h.serverbin-compat cups-1.3.10/scheduler/conf.h
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/conf.h.serverbin-compat 2009-04-16 20:32:04.000000000 +0100
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/conf.h 2009-04-20 17:03:48.000000000 +0100
|
|
Tim Waugh |
d88b53 |
@@ -70,6 +70,10 @@ VAR char *ConfigurationFile VALUE(NULL)
|
|
Tim Waugh |
6a249a |
/* Root directory for scheduler */
|
|
Tim Waugh |
6a249a |
*ServerBin VALUE(NULL),
|
|
Tim Waugh |
6a249a |
/* Root directory for binaries */
|
|
Tim Waugh |
6a249a |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ *ServerBin_compat VALUE(NULL),
|
|
Tim Waugh |
6a249a |
+ /* Compat directory for binaries */
|
|
Tim Waugh |
6a249a |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
*StateDir VALUE(NULL),
|
|
Tim Waugh |
6a249a |
/* Root directory for state data */
|
|
Tim Waugh |
6a249a |
*RequestRoot VALUE(NULL),
|
|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/env.c.serverbin-compat cups-1.3.10/scheduler/env.c
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/env.c.serverbin-compat 2007-07-11 22:46:42.000000000 +0100
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/env.c 2009-04-20 17:03:48.000000000 +0100
|
|
Tim Waugh |
6a249a |
@@ -86,8 +86,13 @@ cupsdInitEnv(void)
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("LD_LIBRARY_PATH", NULL);
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("LD_PRELOAD", NULL);
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("NLSPATH", NULL);
|
|
Tim Waugh |
6a249a |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
|
|
Tim Waugh |
6a249a |
+ ":/bin:/usr/bin", ServerBin, ServerBin_compat);
|
|
Tim Waugh |
6a249a |
+#else /* ! defined(__x86_64__) */
|
|
Tim Waugh |
6a249a |
cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
|
|
Tim Waugh |
6a249a |
":/bin:/usr/bin", ServerBin);
|
|
Tim Waugh |
6a249a |
+#endif
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("SHLIB_PATH", NULL);
|
|
Tim Waugh |
6a249a |
cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
|
|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/ipp.c.serverbin-compat cups-1.3.10/scheduler/ipp.c
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/ipp.c.serverbin-compat 2009-03-18 16:30:29.000000000 +0000
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/ipp.c 2009-04-20 17:03:48.000000000 +0100
|
|
Tim Waugh |
d88b53 |
@@ -2475,9 +2475,18 @@ add_printer(cupsd_client_t *con, /* I -
|
|
Tim Waugh |
427ab2 |
* Could not find device in list!
|
|
Tim Waugh |
427ab2 |
*/
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
427ab2 |
+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat,
|
|
Tim Waugh |
50551d |
+ scheme);
|
|
Tim Waugh |
427ab2 |
+ if (access(srcfile, X_OK))
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
427ab2 |
send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"),
|
|
Tim Waugh |
427ab2 |
attr->values[0].string.text);
|
|
Tim Waugh |
427ab2 |
return;
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
427ab2 |
}
|
|
Tim Waugh |
427ab2 |
}
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/job.c.serverbin-compat cups-1.3.10/scheduler/job.c
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/job.c.serverbin-compat 2009-04-16 20:32:04.000000000 +0100
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/job.c 2009-04-20 17:03:48.000000000 +0100
|
|
Tim Waugh |
d88b53 |
@@ -3242,8 +3242,32 @@ start_job(cupsd_job_t *job, /* I -
|
|
Tim Waugh |
427ab2 |
i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
|
|
Tim Waugh |
427ab2 |
{
|
|
Tim Waugh |
427ab2 |
if (filter->filter[0] != '/')
|
|
Tim Waugh |
427ab2 |
- snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
|
|
Tim Waugh |
427ab2 |
- filter->filter);
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
|
|
Tim Waugh |
427ab2 |
+ filter->filter);
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
427ab2 |
+ if (access(command, F_OK))
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ snprintf(command, sizeof(command), "%s/filter/%s",
|
|
Tim Waugh |
427ab2 |
+ ServerBin_compat, filter->filter);
|
|
Tim Waugh |
427ab2 |
+ if (!access(command, F_OK))
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ /* Not in the correct directory, but found it in the compat
|
|
Tim Waugh |
427ab2 |
+ * directory. Issue a warning. */
|
|
Tim Waugh |
427ab2 |
+ cupsdLogMessage(CUPSD_LOG_INFO,
|
|
Tim Waugh |
427ab2 |
+ "Filter '%s' not in %s/filter!",
|
|
Tim Waugh |
427ab2 |
+ filter->filter, ServerBin);
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+ else
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ /* Not in the compat directory either; make any error
|
|
Tim Waugh |
427ab2 |
+ * messages use the correct directory name then. */
|
|
Tim Waugh |
427ab2 |
+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin,
|
|
Tim Waugh |
427ab2 |
+ filter->filter);
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
a7da93 |
+ }
|
|
Tim Waugh |
427ab2 |
else
|
|
Tim Waugh |
427ab2 |
strlcpy(command, filter->filter, sizeof(command));
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
d88b53 |
@@ -3394,6 +3418,28 @@ start_job(cupsd_job_t *job, /* I -
|
|
Tim Waugh |
427ab2 |
{
|
|
Tim Waugh |
427ab2 |
sscanf(printer->device_uri, "%254[^:]", method);
|
|
Tim Waugh |
427ab2 |
snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
427ab2 |
+ if (access(command, F_OK))
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat,
|
|
Tim Waugh |
427ab2 |
+ method);
|
|
Tim Waugh |
427ab2 |
+ if (!access(command, F_OK))
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ /* Not in the correct directory, but we found it in the compat
|
|
Tim Waugh |
427ab2 |
+ * directory. Issue a warning. */
|
|
Tim Waugh |
427ab2 |
+ cupsdLogMessage(CUPSD_LOG_INFO,
|
|
Tim Waugh |
427ab2 |
+ "Backend '%s' not in %s/backend!", method,
|
|
Tim Waugh |
427ab2 |
+ ServerBin);
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+ else
|
|
Tim Waugh |
427ab2 |
+ {
|
|
Tim Waugh |
427ab2 |
+ /* Not in the compat directory either; make any error
|
|
Tim Waugh |
427ab2 |
+ messages use the correct directory name then. */
|
|
Tim Waugh |
427ab2 |
+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin,
|
|
Tim Waugh |
427ab2 |
+ method);
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+ }
|
|
Tim Waugh |
427ab2 |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
427ab2 |
/*
|
|
Tim Waugh |
427ab2 |
* See if the backend needs to run as root...
|
|
Tim Waugh |
d88b53 |
diff -up cups-1.3.10/scheduler/printers.c.serverbin-compat cups-1.3.10/scheduler/printers.c
|
|
Tim Waugh |
d88b53 |
--- cups-1.3.10/scheduler/printers.c.serverbin-compat 2008-11-12 00:18:36.000000000 +0000
|
|
Tim Waugh |
d88b53 |
+++ cups-1.3.10/scheduler/printers.c 2009-04-20 17:03:48.000000000 +0100
|
|
Tim Waugh |
d88b53 |
@@ -943,9 +943,19 @@ cupsdLoadAllPrinters(void)
|
|
Tim Waugh |
6a249a |
* Backend does not exist, stop printer...
|
|
Tim Waugh |
6a249a |
*/
|
|
Tim Waugh |
6a249a |
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
|
|
Tim Waugh |
6a249a |
+ p->device_uri);
|
|
Tim Waugh |
6a249a |
+ if (access(line, F_OK))
|
|
Tim Waugh |
6a249a |
+ {
|
|
Tim Waugh |
6a249a |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
+
|
|
Tim Waugh |
6a249a |
p->state = IPP_PRINTER_STOPPED;
|
|
Tim Waugh |
6a249a |
snprintf(p->state_message, sizeof(p->state_message),
|
|
Tim Waugh |
6a249a |
"Backend %s does not exist!", line);
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ }
|
|
Tim Waugh |
427ab2 |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
}
|
|
Tim Waugh |
6a249a |
}
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
d88b53 |
@@ -3433,6 +3443,12 @@ add_printer_filter(
|
|
Tim Waugh |
6a249a |
|
|
Tim Waugh |
6a249a |
if (access(filename, X_OK))
|
|
Tim Waugh |
6a249a |
{
|
|
Tim Waugh |
427ab2 |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
|
|
Tim Waugh |
6a249a |
+ program);
|
|
Tim Waugh |
6a249a |
+ if (access(filename, X_OK))
|
|
Tim Waugh |
6a249a |
+ {
|
|
Tim Waugh |
6a249a |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
snprintf(p->state_message, sizeof(p->state_message),
|
|
Tim Waugh |
6a249a |
"Filter \"%s\" for printer \"%s\" not available: %s",
|
|
Tim Waugh |
6a249a |
program, p->name, strerror(errno));
|
|
Tim Waugh |
d88b53 |
@@ -3440,6 +3456,9 @@ add_printer_filter(
|
|
Tim Waugh |
6a249a |
cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0);
|
|
Tim Waugh |
427ab2 |
|
|
Tim Waugh |
6a249a |
cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);
|
|
Tim Waugh |
6a249a |
+#ifdef __x86_64__
|
|
Tim Waugh |
6a249a |
+ }
|
|
Tim Waugh |
6a249a |
+#endif /* __x86_64__ */
|
|
Tim Waugh |
6a249a |
}
|
|
Tim Waugh |
6a249a |
}
|
|
Tim Waugh |
427ab2 |
|