Changeset 745 for trunk/server/source3/libads/ldap_utils.c

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/libads/ldap_utils.c (modified) (9 diffs)

trunk/server/source3/libads/ldap_utils.c

@@ -6 +6 @@
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Guenther Deschner 2006,2007
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
 
 #include "includes.h"
+#include "ads.h"
 
 #ifdef HAVE_LDAP
+
+static ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads,
+                                             TALLOC_CTX *mem_ctx,
+                                             int scope,
+                                             const char *base,
+                                             const char *filter,
+                                             const char **attrs,
+                                             void *args,
+                                             const char *range_attr,
+                                             char ***strings,
+                                             size_t *num_strings,
+                                             uint32 *first_usn,
+                                             int *num_retries,
+                                             bool *more_values);
+
 /*
   a wrapper around ldap_search_s that retries depending on the error code
@@ -40 +56 @@
 
         if (!ads->ldap.ld &&
-            time(NULL) - ads->ldap.last_attempt < ADS_RECONNECT_TIME) {
+            time_mono(NULL) - ads->ldap.last_attempt < ADS_RECONNECT_TIME) {
                 return ADS_ERROR(LDAP_SERVER_DOWN);
         }
@@ -72 +88 @@
                         ads_msgfree(ads, *res);
                 *res = NULL;
-                
+
                 DEBUG(3,("Reopening ads connection to realm '%s' after error %s\n", 
                          ads->config.realm, ads_errstr(status)));
-                         
+
                 ads_disconnect(ads);
                 status = ads_connect(ads);
-                
+
                 if (!ADS_ERR_OK(status)) {
                         DEBUG(1,("ads_search_retry: failed to reconnect (%s)\n",
@@ -121 +137 @@
 }
 
- ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_path,
-                                     int scope, const char *expr,
-                                     const char **attrs, void *args,
-                                     LDAPMessage **res)
+static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_path,
+                                           int scope, const char *expr,
+                                           const char **attrs, void *args,
+                                           LDAPMessage **res)
 {
         return ads_do_search_retry_internal(ads, bind_path, scope, expr, attrs, args, res);
@@ -143 +159 @@
         return ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE,
                                    "(objectclass=*)", attrs, res);
-}
-
- ADS_STATUS ads_search_retry_extended_dn(ADS_STRUCT *ads, LDAPMessage **res, 
-                                         const char *dn, 
-                                         const char **attrs,
-                                         enum ads_extended_dn_flags flags)
-{
-        ads_control args;
-
-        args.control = ADS_EXTENDED_DN_OID;
-        args.val = flags;
-        args.critical = True;
-
-        return ads_do_search_retry_args(ads, dn, LDAP_SCOPE_BASE,
-                                        "(objectclass=*)", attrs, &args, res);
 }
 
@@ -200 +201 @@
 
  ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res, 
-                                 const DOM_SID *sid,
+                                 const struct dom_sid *sid,
                                  const char **attrs)
 {
         char *dn, *sid_string;
         ADS_STATUS status;
-        
+
         sid_string = sid_binstring_hex(sid);
         if (sid_string == NULL) {
@@ -278 +279 @@
 }
 
-ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads, 
+static ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads,
                                       TALLOC_CTX *mem_ctx,
                                       int scope,
@@ -308 +309 @@
                 return status;
         }
-        
+
         if (!res) {
                 return ADS_ERROR(LDAP_NO_MEMORY);