Changeset 134 for branches/samba-3.0/source/libads/ldap.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/libads/ldap.c (modified) (2 diffs)

branches/samba-3.0/source/libads/ldap.c

@@ -789 +789 @@
                 /* this relies on the way that ldap_add_result_entry() works internally. I hope
                    that this works on all ldap libs, but I have only tested with openldap */
-                for (msg = ads_first_entry(ads, res2); msg; msg = next) {
-                        next = ads_next_entry(ads, msg);
+                for (msg = ads_first_message(ads, res2); msg; msg = next) {
+                        next = ads_next_message(ads, msg);
                         ldap_add_result_entry((LDAPMessage **)res, msg);
                 }
@@ -1924 +1924 @@
 
 /**
+ * pull the first message from a ADS result
+ * @param ads connection to ads server
+ * @param res Results of search
+ * @return first message from result
+ **/
+ LDAPMessage *ads_first_message(ADS_STRUCT *ads, LDAPMessage *res)
+{
+        return ldap_first_message(ads->ld, res);
+}
+
+/**
+ * pull the next message from a ADS result
+ * @param ads connection to ads server
+ * @param res Results of search
+ * @return next message from result
+ **/
+ LDAPMessage *ads_next_message(ADS_STRUCT *ads, LDAPMessage *res)
+{
+        return ldap_next_message(ads->ld, res);
+}
+
+/**
  * pull a single string from a ADS result
  * @param ads connection to ads server