Merge changes from CUPS 1.5svn-r9641

[thirdparty/cups.git] / scheduler / dirsvc.h

diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 7de4e2d56eecad7876302709e0be0cae6bdec2e8..933a057ba5cc615006a27cf11f339ddd8ee6d882 100644 (file)
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,10 +1,9 @@
 /*
- * "$Id: dirsvc.h 7676 2008-06-18 23:42:37Z mike $"
+ * "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $"
  *
- *   Directory services definitions for the Common UNIX Printing System
- *   (CUPS) scheduler.
+ *   Directory services definitions for the CUPS scheduler.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -62,7 +61,7 @@ typedef struct
 
 typedef struct
 {
-  cupsd_authmask_t     from;           /* Source address/name mask */
+  cups_array_t         *from;          /* Source address/name mask(s) */
   http_addr_t          to;             /* Destination address */
 } cupsd_dirsvc_relay_t;
 
@@ -85,6 +84,8 @@ typedef struct
 
 VAR int                        Browsing        VALUE(TRUE),
                                        /* Whether or not browsing is enabled */
+                       BrowseWebIF     VALUE(FALSE),
+                                       /* Whether the web interface is advertised */
                        BrowseLocalProtocols
                                        VALUE(BROWSE_ALL),
                                        /* Protocols to support for local printers */
@@ -131,8 +132,14 @@ VAR cupsd_statbuf_t        *PollStatusBuffer VALUE(NULL);
                                        /* Status buffer for pollers */
 
 #ifdef HAVE_DNSSD
-VAR char               *DNSSDName      VALUE(NULL);
+VAR char               *DNSSDComputerName VALUE(NULL),
                                        /* Computer/server name */
+                       *DNSSDHostName  VALUE(NULL),
+                                       /* Hostname */
+                       *DNSSDRegType VALUE(NULL);
+                                       /* Bonjour registration type */
+VAR cups_array_t       *DNSSDAlias     VALUE(NULL);
+                                       /* List of dynamic ServerAlias's */
 VAR int                        DNSSDPort       VALUE(0);
                                        /* Port number to register */
 VAR cups_array_t       *DNSSDPrinters  VALUE(NULL);
@@ -159,8 +166,6 @@ VAR time_t          BrowseLDAPRefresh VALUE(0);
                                        /* Next LDAP refresh time */
 VAR char               *BrowseLDAPBindDN VALUE(NULL),
                                        /* LDAP login DN */
-                       *BrowseLDAPCACertFile VALUE(NULL),
-                                       /* LDAP CA cert file */
                        *BrowseLDAPDN   VALUE(NULL),
                                        /* LDAP search DN */
                        *BrowseLDAPPassword VALUE(NULL),
@@ -204,5 +209,5 @@ extern void cupsdUpdateSLPBrowse(void);
 
 
 /*
- * End of "$Id: dirsvc.h 7676 2008-06-18 23:42:37Z mike $".
+ * End of "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $".
  */