Merge changes from CUPS 1.4svn-r7961.

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

diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 60c22c3bd0ccbb66bf76770c7bb273b8922196ff..8dfc2d585bb20c225b6893d0a78a772c0f205418 100644 (file)
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,10 +1,10 @@
 /*
- * "$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.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -22,12 +22,15 @@
 #  include <slp.h>
 #endif /* HAVE_LIBSLP */
 
-#ifdef HAVE_OPENLDAP
+#ifdef HAVE_LDAP
 #  ifdef __sun
 #    include <lber.h>
 #  endif /* __sun */
 #  include <ldap.h>
-#endif /* HAVE_OPENLDAP */
+#  ifdef HAVE_LDAP_SSL_H
+#    include <ldap_ssl.h>
+#  endif /* HAVE_LDAP_SSL_H */
+#endif /* HAVE_LDAP */
 
 /*
  * Browse protocols...
@@ -82,6 +85,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 */
@@ -150,10 +155,8 @@ VAR time_t         BrowseSLPRefresh VALUE(0);
 #endif /* HAVE_LIBSLP */
 
 #ifdef HAVE_LDAP
-#  ifdef HAVE_OPENLDAP
 VAR LDAP               *BrowseLDAPHandle VALUE(NULL);
                                        /* Handle to LDAP server */
-#  endif /* HAVE_OPENLDAP */
 VAR time_t             BrowseLDAPRefresh VALUE(0);
                                        /* Next LDAP refresh time */
 VAR char               *BrowseLDAPBindDN VALUE(NULL),
@@ -162,10 +165,14 @@ 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);
+VAR int                        BrowseLDAPUpdate VALUE(TRUE);
+                                       /* enables LDAP updates */
+#  ifdef HAVE_LDAP_SSL
+VAR char               *BrowseLDAPCACertFile VALUE(NULL);
                                        /* LDAP CA CERT file to use */
+#  endif /* HAVE_LDAP_SSL */
 #endif /* HAVE_LDAP */
 VAR char               *LPDConfigFile  VALUE(NULL),
                                        /* LPD configuration file */
@@ -197,5 +204,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 $".
  */