client.conf - client configuration file for cups
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <i>client.conf</i> file configures the CUPS client and is
-normally located in the <i>/private/etc/cups</i> or <i>~/.cups</i>
+normally located in the <i>/etc/cups</i> or <i>~/.cups</i>
directory. Each line in the file can be a configuration
directive, a blank line, or a comment. Comment lines start with
the # character.
</b><i>request-id limit user-id options
</i><h2 class="title"><a name="DESCRIPTION">Description</a></h2>
<i>cups-deviced</i> polls the backends in
-<i>/usr/libexec/cups/backend</i> for a list of available devices.
+<i>/usr/lib/cups/backend</i> for a list of available devices.
It is run by <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a> in response to a
<i>CUPS-Get-Devices</i> request. The output format is an IPP
response message. The <i>request-id</i> argument is the request ID
<h2 class="title"><a name="DRIVERS">Drivers</a></h2>
Drivers can be static PPD files under the
<i>/usr/share/cups/model</i> directory or programs under the
-<i>/usr/libexec/cups/driver</i> directory. Static PPD files must
+<i>/usr/lib/cups/driver</i> directory. Static PPD files must
conform to the Adobe PPD File Format Specification version 4.3
and may be compressed using the <i>gzip(1)</i> program. Driver
programs must implement the command-line interface shown in the
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <i>cups-files.conf</i> file configures the files and directories used by the
CUPS scheduler, <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a>. It is normally located in the
-<i>/private/etc/cups</i> directory.
+<i>/etc/cups</i> directory.
<p>Each line in the file can be a configuration directive, a blank line,
or a comment. Comment lines start with the # character.
<h2 class="title"><a name="DIRECTIVES">Directives</a></h2>
<br>
<pre>
- printer stream tcp nowait lp /usr/libexec/cups/daemon/cups-lpd cups-lpd \
+ printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \
-o document-format=application/octet-stream
</pre>
<p><p><b>Note:</b> If you are using Solaris 10 or higher, you must run
user = lp
group = sys
passenv =
- server = /usr/libexec/cups/daemon/cups-lpd
+ server = /usr/lib/cups/daemon/cups-lpd
server_args = -o document-format=application/octet-stream
}
</pre>
<h2 class="title"><a name="NAME">Name</a></h2>
snmp - cups snmp backend
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
-<b>/usr/libexec/cups/backend/snmp
+<b>/usr/lib/cups/backend/snmp
</b><i>ip-address-or-hostname
</i><br>
<b>lpinfo -v --include-schemes snmp
Monitor MIBs along with some vendor private MIBs and intelligent port probes to
determine the correct device URI and make and model for each printer.
<h2 class="title"><a name="CONFIGURATION">Configuration</a></h2>
-The SNMP backend reads the /private/etc/cups/snmp.conf configuration file, if
+The SNMP backend reads the /etc/cups/snmp.conf configuration file, if
present, to set the default broadcast address, community name, and logging
level. The configuration file is documented in <a href='man-cups-snmp.conf.html?TOPIC=Man+Pages'>cups-snmp.conf(5)</a>. The
DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL environment
cupsd.conf - server configuration file for cups
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <i>cupsd.conf</i> file configures the CUPS scheduler, <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a>. It
-is normally located in the <i>/private/etc/cups</i> directory. <b>Note:</b>
+is normally located in the <i>/etc/cups</i> directory. <b>Note:</b>
File, directory, and user configuration directives that used to be allowed in
the <i>cupsd.conf</i> file are now stored in the <a href='man-cups-files.conf.html?TOPIC=Man+Pages'>cups-files.conf(5)</a> instead
in order to prevent certain types of privilege escalation attacks.
<i>cupsd</i> is the scheduler for CUPS. It implements a printing system based
upon the Internet Printing Protocol, version 2.1. If no options are specified
on the command-line then the default configuration file
-<i>/private/etc/cups/cupsd.conf</i> will be used.
+<i>/etc/cups/cupsd.conf</i> will be used.
<h2 class="title"><a name="OPTIONS">Options</a></h2>
<dl>
<dt>-c config-file
<h2 class="title"><a name="ROOT_ACCOUNT_OPTIONS">Root Account Options</a></h2>
When run by the root user, <i>lpoptions</i> gets and sets default
options and instances for <i>all users</i> in the
-/private/etc/cups/lpoptions file.
+/etc/cups/lpoptions file.
<h2 class="title"><a name="COMPATIBILITY">Compatibility</a></h2>
The <i>lpoptions</i> command is unique to CUPS.
<h2 class="title"><a name="FILES">Files</a></h2>
~/.cups/lpoptions - user defaults and instances created by non-root
users.
<br>
-/private/etc/cups/lpoptions - system-wide defaults and instances
+/etc/cups/lpoptions - system-wide defaults and instances
created by the root user.
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<a href='man-cancel.html?TOPIC=Man+Pages'>cancel(1)</a>, <a href='man-lp.html?TOPIC=Man+Pages'>lp(1)</a>, <a href='man-lpadmin.html?TOPIC=Man+Pages'>lpadmin(8)</a>, <a href='man-lpr.html?TOPIC=Man+Pages'>lpr(1)</a>,
static void resolve_callback(AvahiServiceResolver *res,
AvahiIfIndex interface,
AvahiProtocol protocol,
- AvahiBrowserEvent event,
+ AvahiResolverEvent event,
const char *serviceName,
const char *regtype,
const char *replyDomain,
const char *host_name,
+ const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
AvahiLookupResultFlags flags,
avahi_client = avahi_client_new(avahi_simple_poll_get(avahi_poll),
0, client_callback, avahi_poll, &err);
- if (!client)
+ if (!avahi_client)
{
_cupsLangPrintf(stderr, _("ippfind: Unable to use Bonjour: %s"),
dnssd_error_string(err));
if (service->ref)
err = 0;
else
- err = avahi_client_get_error(avahi_client);
+ err = avahi_client_errno(avahi_client);
#endif /* HAVE_DNSSD */
}
else
browse_callback, services))
err = 0;
else
- err = avahi_client_get_errno(avahi_client);
+ err = avahi_client_errno(avahi_client);
#endif /* HAVE_DNSSD */
}
if (service->ref)
err = 0;
else
- err = avahi_client_get_errno(avahi_client);
+ err = avahi_client_errno(avahi_client);
#endif /* HAVE_DNSSD */
if (err)
#ifdef HAVE_DNSSD
DNSServiceRefDeallocate(service->ref);
#else
- avahi_record_browser_free(service->ref);
+ avahi_service_resolver_free(service->ref);
#endif /* HAVE_DNSSD */
service->ref = NULL;
AvahiServiceResolver *resolver, /* I - Resolver */
AvahiIfIndex interface, /* I - Interface */
AvahiProtocol protocol, /* I - Address protocol */
- AvahiBrowserEvent event, /* I - Event */
+ AvahiResolverEvent event, /* I - Event */
const char *serviceName,/* I - Service name */
const char *regtype, /* I - Registration type */
const char *replyDomain,/* I - Domain name */
const char *hostTarget, /* I - FQDN */
+ const AvahiAddress *address, /* I - Address */
uint16_t port, /* I - Port number */
AvahiStringList *txt, /* I - TXT records */
AvahiLookupResultFlags flags, /* I - Lookup flags */
void *context) /* I - Service */
{
- char uri[1024]; /* URI */
- key[256], /* TXT key */
+ char key[256], /* TXT key */
*value; /* TXT value */
ippfind_srv_t *service = (ippfind_srv_t *)context;
/* Service */
AvahiStringList *current; /* Current TXT key/value pair */
+ (void)address;
+
if (event != AVAHI_RESOLVER_FOUND)
{
bonjour_error = 1;
avahi_service_resolver_free(resolver);
- avahi_simple_poll_quit(uribuf->poll);
+ avahi_simple_poll_quit(avahi_poll);
return;
}
projects / thirdparty / cups.git / commitdiff
