s3-libads: move ads_protos.h to ads_ldap_protos.h.

Guenther

2 files changed, 20 insertions, 20 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c97042537..6a64db3556 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -739,7 +739,7 @@ enum flush_reason_enum {
 #endif
 
 #ifdef HAVE_LDAP
-#include "ads_protos.h"
+#include "libads/ads_ldap_protos.h"
 #endif
 
 /* We need this after proto.h to reference GetTimeOfDay(). */
diff --git a/source3/include/ads_protos.h b/source3/libads/ads_ldap_protos.h
index 09eaf99cfb..a4821d8308 100644
--- a/source3/include/ads_protos.h
+++ b/source3/libads/ads_ldap_protos.h
@@ -11,7 +11,7 @@ char *ads_pull_string(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg,
 char **ads_pull_strings(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 			LDAPMessage *msg, const char *field,
 			size_t *num_values);
-char **ads_pull_strings_range(ADS_STRUCT *ads, 
+char **ads_pull_strings_range(ADS_STRUCT *ads,
 			      TALLOC_CTX *mem_ctx,
 			      LDAPMessage *msg, const char *field,
 			      char **current_strings,
@@ -29,9 +29,9 @@ bool ads_pull_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 		 LDAPMessage *msg, const char *field, struct security_descriptor **sd);
 char *ads_pull_username(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 			LDAPMessage *msg);
-int ads_pull_sids_from_extendeddn(ADS_STRUCT *ads, 
-				  TALLOC_CTX *mem_ctx, 
-				  LDAPMessage *msg, 
+int ads_pull_sids_from_extendeddn(ADS_STRUCT *ads,
+				  TALLOC_CTX *mem_ctx,
+				  LDAPMessage *msg,
 				  const char *field,
 				  enum ads_extended_dn_flags flags,
 				  struct dom_sid **sids);
@@ -45,12 +45,12 @@ ADS_STATUS ads_find_printers(ADS_STRUCT *ads, LDAPMessage **res);
 ADS_STATUS ads_find_user_acct(ADS_STRUCT *ads, LDAPMessage **res,
 			      const char *user);
 
-ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope, 
+ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope,
 			 const char *expr,
 			 const char **attrs, LDAPMessage **res);
-ADS_STATUS ads_search(ADS_STRUCT *ads, LDAPMessage **res, 
+ADS_STATUS ads_search(ADS_STRUCT *ads, LDAPMessage **res,
 		      const char *expr, const char **attrs);
-ADS_STATUS ads_search_dn(ADS_STRUCT *ads, LDAPMessage **res, 
+ADS_STATUS ads_search_dn(ADS_STRUCT *ads, LDAPMessage **res,
 			 const char *dn, const char **attrs);
 ADS_STATUS ads_do_search_all_args(ADS_STRUCT *ads, const char *bind_path,
 				  int scope, const char *expr,
@@ -60,29 +60,29 @@ ADS_STATUS ads_do_search_all(ADS_STRUCT *ads, const char *bind_path,
 			     int scope, const char *expr,
 			     const char **attrs, LDAPMessage **res);
 ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path,
-			       int scope, 
+			       int scope,
 			       const char *expr,
 			       const char **attrs, LDAPMessage **res);
 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);
-ADS_STATUS ads_search_retry(ADS_STRUCT *ads, LDAPMessage **res, 
+ADS_STATUS ads_search_retry(ADS_STRUCT *ads, LDAPMessage **res,
 			    const char *expr, const char **attrs);
-ADS_STATUS ads_search_retry_dn(ADS_STRUCT *ads, LDAPMessage **res, 
-			       const char *dn, 
+ADS_STATUS ads_search_retry_dn(ADS_STRUCT *ads, LDAPMessage **res,
+			       const char *dn,
 			       const char **attrs);
-ADS_STATUS ads_search_retry_extended_dn(ADS_STRUCT *ads, LDAPMessage **res, 
-					const char *dn, 
+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_STATUS ads_search_retry_extended_dn_ranged(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, 
-						const char *dn, 
+ADS_STATUS ads_search_retry_extended_dn_ranged(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
+						const char *dn,
 						const char **attrs,
 						enum ads_extended_dn_flags flags,
 						char ***strings,
 						size_t *num_strings);
-ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res, 
+ADS_STATUS ads_search_retry_sid(ADS_STRUCT *ads, LDAPMessage **res,
 				const struct dom_sid *sid,
 				const char **attrs);
 
@@ -102,13 +102,13 @@ ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
 			 LDAPMessage *res,
 			 const char *gpo_dn,
 			 struct GROUP_POLICY_OBJECT *gpo);
-ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, 
+ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res,
 					 uint32 sd_flags,
-					 const char *dn, 
+					 const char *dn,
 					 const char **attrs);
 ADS_STATUS ads_do_search_all_sd_flags(ADS_STRUCT *ads, const char *bind_path,
 				       int scope, const char *expr,
-				       const char **attrs, uint32 sd_flags, 
+				       const char **attrs, uint32 sd_flags,
 				       LDAPMessage **res);
 ADS_STATUS ads_get_tokensids(ADS_STRUCT *ads,
 			      TALLOC_CTX *mem_ctx,