Import CUPS 1.4svn r7023 into easysw/current.

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

diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index f8d8c5adf9ccf0ad3cd78775654691b0859739e7..5ff06c3eea2e36351df95ca44d7fbd39ee314cd6 100644 (file)
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,26 +1,17 @@
 /*
- * "$Id$"
+ * "$Id: dirsvc.h 6930 2007-09-08 00:28:06Z mike $"
  *
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -45,8 +36,10 @@
 #define BROWSE_CUPS    1               /* CUPS */
 #define        BROWSE_SLP      2               /* SLPv2 */
 #define BROWSE_LDAP    4               /* LDAP */
-#define BROWSE_DNSSD   8               /* DNS Service Discovery aka Bonjour */
-#define BROWSE_ALL     15              /* All protocols */
+#define BROWSE_DNSSD   8               /* DNS Service Discovery (aka Bonjour) */
+#define BROWSE_SMB     16              /* SMB/Samba */
+#define BROWSE_LPD     32              /* LPD via xinetd or launchd */
+#define BROWSE_ALL     63              /* All protocols */
 
 
 /*
@@ -154,31 +147,40 @@ VAR char          *BrowseLDAPBindDN VALUE(NULL),
                                        /* LDAP search DN */
                        *BrowseLDAPPassword VALUE(NULL),
                                        /* LDAP login password */
-                       *BrowseLDAPServer VALUE(NULL);
+                       *BrowseLDAPServer VALUE(NULL),
                                        /* LDAP server to use */
+                       *BrowseLDAPCACertFile VALUE(NULL);
+                                       /* LDAP CA CERT file to use */
 #endif /* HAVE_LDAP */
+VAR char               *LPDConfigFile  VALUE(NULL),
+                                       /* LPD configuration file */
+                       *SMBConfigFile  VALUE(NULL);
+                                       /* SMB configuration file */
 
 
 /*
  * Prototypes...
  */
 
+extern void    cupsdDeregisterPrinter(cupsd_printer_t *p, int removeit);
 extern void    cupsdLoadRemoteCache(void);
+extern void    cupsdRegisterPrinter(cupsd_printer_t *p);
+extern void    cupsdRestartPolling(void);
 extern void    cupsdSaveRemoteCache(void);
-extern void    cupsdSendBrowseDelete(cupsd_printer_t *p);
 extern void    cupsdSendBrowseList(void);
 extern void    cupsdStartBrowsing(void);
 extern void    cupsdStartPolling(void);
 extern void    cupsdStopBrowsing(void);
 extern void    cupsdStopPolling(void);
-extern void    cupsdUpdateCUPSBrowse(void);
+#ifdef HAVE_DNSSD
+extern void    cupsdUpdateDNSSDBrowse(cupsd_printer_t *p);
+#endif /* HAVE_DNSSD */
 #ifdef HAVE_LDAP
 extern void    cupsdUpdateLDAPBrowse(void);
 #endif /* HAVE_LDAP */
-extern void    cupsdUpdatePolling(void);
 extern void    cupsdUpdateSLPBrowse(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dirsvc.h 6930 2007-09-08 00:28:06Z mike $".
  */