From 0d4d48ad6388d3103260cbd7fae710bb717218dc Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 26 Jul 2013 03:12:37 +0000 Subject: [PATCH] Fax queues did not work when shared via Bonjour () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11193 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 4 +++- cups/http-support.c | 3 ++- scheduler/dirsvc.c | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2a07b40e7..48f32de70 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,10 @@ -CHANGES.txt - 1.7.0 - 2013-07-24 +CHANGES.txt - 1.7.0 - 2013-07-25 -------------------------------- CHANGES IN CUPS V1.7.0 + - Fax queues did not work when shared via Bonjour + () - Added an Italian localization () - Fixed a couple memory leaks in ippfind that were reported by Clang. - Fixed a compile issue on 64-bit Linux with Clang - need to use the diff --git a/cups/http-support.c b/cups/http-support.c index 4fac9fe79..1aa4a1634 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -2056,7 +2056,8 @@ http_resolve_cb( */ if ((uribuf->options & _HTTP_RESOLVE_FAXOUT) && - (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps"))) + (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !TXTRecordGetValuePtr(txtLen, txtRecord, "printer-type", &valueLen)) { reskey = "rfo"; resdefault = "/ipp/faxout"; diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 3eabf2f30..f372c00c8 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -3,7 +3,7 @@ * * Directory services routines for the CUPS scheduler. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -639,7 +639,9 @@ dnssdBuildTxtRecord( if (p->type & CUPS_PRINTER_FAX) { keyvalue[count ][0] = "Fax"; - keyvalue[count++][1] = (p->type & CUPS_PRINTER_FAX) ? "T" : "F"; + keyvalue[count++][1] = "T"; + keyvalue[count ][0] = "rfo"; + keyvalue[count++][1] = rp_str; } if (p->type & CUPS_PRINTER_COLOR) -- 2.39.2