diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
| commit | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (patch) | |
| tree | 4f6b5042db1bbe7c1d262ec4eecbb8936a6a0f1f /scheduler/dirsvc.c | |
| parent | ee6ddad2570bbfe4ac3c3378b8765532b6d7cde5 (diff) | |
| download | cups-7a0cbd5e5715d715c3fddfaace2f800ef820d328.tar.gz | |
Import changes from CUPS 1.4.1 (r8801)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1649 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/dirsvc.c')
| -rw-r--r-- | scheduler/dirsvc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 89bcaefbf..49b267273 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1558,8 +1558,11 @@ cupsdStartBrowsing(void) * Add the master connection to the select list... */ - cupsdAddSelect(DNSServiceRefSockFD(DNSSDRef), - (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); + int fd = DNSServiceRefSockFD(DNSSDRef); + + fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); + + cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); /* * Then get the port we use for registrations. If we are not listening @@ -2369,7 +2372,7 @@ dnssdBuildTxtRecord( (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", p->name); keyvalue[i ][0] = "ty"; - keyvalue[i++][1] = p->make_model; + keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; if (p->location && *p->location != '\0') { |