Changeset 745 for trunk/server/source3/include/smbldap.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/include/smbldap.h (modified) (10 diffs)

trunk/server/source3/include/smbldap.h

@@ -23 +23 @@
 
 struct smbldap_state;
+
+#include "smb_ldap.h"
 
 #ifdef HAVE_LDAP
@@ -42 +44 @@
 #define LDAP_OBJ_TRUST_PASSWORD         "sambaTrustPassword"
 #define LDAP_OBJ_TRUSTDOM_PASSWORD      "sambaTrustedDomainPassword"
+#define LDAP_OBJ_TRUSTED_DOMAIN         "sambaTrustedDomain"
 
 #define LDAP_OBJ_ACCOUNT                "account"
@@ -136 +139 @@
 const char** get_attr_list( TALLOC_CTX *mem_ctx, ATTRIB_MAP_ENTRY table[] );
 void smbldap_set_mod (LDAPMod *** modlist, int modop, const char *attribute, const char *value);
+void smbldap_set_mod_blob(LDAPMod *** modlist, int modop, const char *attribute, const DATA_BLOB *newblob);
 void smbldap_make_mod(LDAP *ldap_struct, LDAPMessage *existing,
                       LDAPMod ***mods,
                       const char *attribute, const char *newval);
+void smbldap_make_mod_blob(LDAP *ldap_struct, LDAPMessage *existing,
+                           LDAPMod ***mods,
+                           const char *attribute, const DATA_BLOB *newblob);
 bool smbldap_get_single_attribute (LDAP * ldap_struct, LDAPMessage * entry,
                                    const char *attribute, char *value,
@@ -154 +161 @@
         LDAP *ldap_struct;
         pid_t pid;
-        time_t last_ping;
+        time_t last_ping; /* monotonic */
         /* retrive-once info */
         const char *uri;
@@ -167 +174 @@
         unsigned int num_failures;
 
-        time_t last_use;
+        time_t last_use; /* monotonic */
         struct event_context *event_context;
         struct timed_event *idle_event;
 
-        struct timeval last_rebind;
+        struct timeval last_rebind; /* monotonic */
 };
 
 /* struct used by both pdb_ldap.c and pdb_nds.c */
+
+struct ipasam_privates;
 
 struct ldapsam_privates {
@@ -185 +194 @@
 
         const char *domain_name;
-        DOM_SID domain_sid;
+        struct dom_sid domain_sid;
 
         /* configuration items */
@@ -194 +203 @@
         /* Is this NDS ldap? */
         int is_nds_ldap;
+
+        /* Is this IPA ldap? */
+        int is_ipa_ldap;
+        struct ipasam_privates *ipasam_privates;
 
         /* ldap server location parameter */
@@ -205 +218 @@
 
 /* Functions shared between pdb_ldap.c and pdb_nds.c. */
+struct pdb_methods;
 NTSTATUS pdb_init_ldapsam_compat( struct pdb_methods **pdb_method, const char *location);
 void private_data_free_fn(void **result);
@@ -232 +246 @@
 char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld,
                               LDAPMessage *entry);
-
-
-#else
-#define LDAP void
-#define LDAPMod void
-#define LDAP_CONST const
-#define LDAPControl void
-struct berval;
-struct ldapsam_privates;
+LDAP *priv2ld(struct ldapsam_privates *priv);
+
+/* The following definitions come from lib/smbldap.c  */
+
+int smb_ldap_start_tls(LDAP *ldap_struct, int version);
+int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri);
+int smbldap_search(struct smbldap_state *ldap_state,
+                   const char *base, int scope, const char *filter,
+                   const char *attrs[], int attrsonly,
+                   LDAPMessage **res);
+int smbldap_search_paged(struct smbldap_state *ldap_state,
+                         const char *base, int scope, const char *filter,
+                         const char **attrs, int attrsonly, int pagesize,
+                         LDAPMessage **res, void **cookie);
+int smbldap_modify(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]);
+int smbldap_add(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]);
+int smbldap_delete(struct smbldap_state *ldap_state, const char *dn);
+int smbldap_extended_operation(struct smbldap_state *ldap_state,
+                               LDAP_CONST char *reqoid, struct berval *reqdata,
+                               LDAPControl **serverctrls, LDAPControl **clientctrls,
+                               char **retoidp, struct berval **retdatap);
+int smbldap_search_suffix (struct smbldap_state *ldap_state,
+                           const char *filter, const char **search_attr,
+                           LDAPMessage ** result);
+void smbldap_free_struct(struct smbldap_state **ldap_state) ;
+NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx, struct event_context *event_ctx,
+                      const char *location,
+                      struct smbldap_state **smbldap_state);
+bool smbldap_has_control(LDAP *ld, const char *control);
+bool smbldap_has_extension(LDAP *ld, const char *extension);
+bool smbldap_has_naming_context(LDAP *ld, const char *naming_context);
+bool smbldap_set_creds(struct smbldap_state *ldap_state, bool anon, const char *dn, const char *secret);
+
+/* The following definitions come from lib/smbldap_util.c  */
+
+NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state,
+                                    LDAPMessage ** result, const char *domain_name,
+                                    bool try_add);
+
 #endif  /* HAVE_LDAP */
 
@@ -247 +291 @@
 #define LDAP_PAGE_SIZE 1024
 
+#define ADS_PAGE_CTL_OID        "1.2.840.113556.1.4.319"
+
+/*
+ * Work around versions of the LDAP client libs that don't have the OIDs
+ * defined, or have them defined under the old name.
+ * This functionality is really a factor of the server, not the client
+ *
+ */
+
+#if defined(LDAP_EXOP_X_MODIFY_PASSWD) && !defined(LDAP_EXOP_MODIFY_PASSWD)
+#define LDAP_EXOP_MODIFY_PASSWD LDAP_EXOP_X_MODIFY_PASSWD
+#elif !defined(LDAP_EXOP_MODIFY_PASSWD)
+#define LDAP_EXOP_MODIFY_PASSWD "1.3.6.1.4.1.4203.1.11.1"
+#endif
+
+#if defined(LDAP_EXOP_X_MODIFY_PASSWD_ID) && !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID LDAP_EXOP_X_MODIFY_PASSWD_ID
+#elif !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID        ((ber_tag_t) 0x80U)
+#endif
+
+#if defined(LDAP_EXOP_X_MODIFY_PASSWD_NEW) && !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW LDAP_EXOP_X_MODIFY_PASSWD_NEW
+#elif !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW       ((ber_tag_t) 0x82U)
+#endif
+
 #endif  /* _SMBLDAP_H */