diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-08 18:38:44 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-08 18:38:44 +0000 |
| commit | f11a948a02771f78f50b530880a0269d4b4f58eb (patch) | |
| tree | 46f42695fc19300726483f4ad9ca0ecddeb50a16 /scheduler/classes.c | |
| parent | e07d4801f9846b9155d4c63872f51b18d8537d01 (diff) | |
| download | cups-f11a948a02771f78f50b530880a0269d4b4f58eb.tar.gz | |
Merge changes from CUPS 1.4svn-r8606.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1480 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/classes.c')
| -rw-r--r-- | scheduler/classes.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scheduler/classes.c b/scheduler/classes.c index d34697600..b836962cf 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -55,9 +55,9 @@ cupsdAddClass(const char *name) /* I - Name of class */ c->type = CUPS_PRINTER_CLASS; - cupsdSetStringf(&c->uri, "ipp://%s:%d/classes/%s", ServerName, LocalPort, + cupsdSetStringf(&c->uri, "ipp://%s:%d/classes/%s", ServerName, RemotePort, name); - cupsdSetString(&c->error_policy, "retry-job"); + cupsdSetString(&c->error_policy, "retry-current-job"); } return (c); @@ -629,7 +629,12 @@ cupsdLoadAllClasses(void) else if (!strcasecmp(line, "ErrorPolicy")) { if (value) - cupsdSetString(&p->error_policy, value); + { + if (strcmp(value, "retry-current-job") && strcmp(value, "retry-job")) + cupsdLogMessage(CUPSD_LOG_WARN, + "ErrorPolicy %s ignored on line %d of classes.conf", + value, linenum); + } else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); |