commit 47d41463eb3539ecd885c285b0086edea44b0f39 Author: Leonid Krivoshein Date: Thu Feb 28 18:36:34 2019 +0300 Switch OFF sanitizer by default. diff --git a/cups/backend/lpd.c b/cups/backend/lpd.c index 4325b7c..878ae9a 100644 --- a/cups/backend/lpd.c +++ b/cups/backend/lpd.c @@ -223,20 +223,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ manual_copies = 1; timeout = 300; contimeout = 7 * 24 * 60 * 60; - -#ifdef __APPLE__ - /* - * We want to pass UTF-8 characters by default, not re-map them (3071945) - */ - sanitize_title = 0; -#else - /* - * Otherwise we want to re-map UTF-8 to "safe" characters by default... - */ - - sanitize_title = 1; -#endif /* __APPLE__ */ if ((options = strchr(resource, '?')) != NULL) { @@ -1011,16 +998,16 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ snprintf(control, sizeof(control), "H%.31s\n" /* RFC 1179, Section 7.2 - host name <= 31 chars */ - "P%.31s\n" /* RFC 1179, Section 7.2 - user name <= 31 chars */ - "J%.99s\n", /* RFC 1179, Section 7.2 - job name <= 99 chars */ + "P%.31s\n" /* RFC 1179, Section 7.8 - user name <= 31 chars */ + "J%.99s\n", /* RFC 1179, Section 7.4 - job name <= 99 chars */ localhost, user, title); cptr = control + strlen(control); if (banner) { snprintf(cptr, sizeof(control) - (size_t)(cptr - control), - "C%.31s\n" /* RFC 1179, Section 7.2 - class name <= 31 chars */ - "L%s\n", + "C%.31s\n" /* RFC 1179, Section 7.1 - class name <= 31 chars */ + "L%s\n", /* RFC 1179, Section 7.5 - user name in baner page */ localhost, user); cptr += strlen(cptr); } @@ -1035,7 +1022,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ snprintf(cptr, sizeof(control) - (size_t)(cptr - control), "UdfA%03d%.15s\n" - "N%.131s\n", /* RFC 1179, Section 7.2 - sourcefile name <= 131 chars */ + "N%.131s\n", /* RFC 1179, Section 7.7 - sourcefile name <= 131 chars */ (int)getpid() % 1000, localhost, title); fprintf(stderr, "DEBUG: Control file is:\n%s", control);