s3-smbldap: use smbldap_ prefix for all functions

diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 5051fcf333734aa587d474ea4aa639f43287ea4d..ea944cf78ff94c2d8ea7857fb47fa7bd385c35d7 100644 (file)
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -118,8 +118,8 @@ bool smbldap_get_single_attribute (LDAP * ldap_struct, LDAPMessage * entry,
 int smbldap_modify(struct smbldap_state *ldap_state,
                    const char *dn,
                    LDAPMod *attrs[]);
-int smb_ldap_start_tls(LDAP *ldap_struct, int version);
-int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri);
+int smbldap_start_tls(LDAP *ldap_struct, int version);
+int smbldap_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,
@@ -157,8 +157,8 @@ bool smbldap_talloc_single_blob(TALLOC_CTX *mem_ctx, LDAP *ld,
                                DATA_BLOB *blob);
 bool smbldap_pull_sid(LDAP *ld, LDAPMessage *msg, const char *attrib,
                      struct dom_sid *sid);
-void talloc_autofree_ldapmsg(TALLOC_CTX *mem_ctx, LDAPMessage *result);
-void talloc_autofree_ldapmod(TALLOC_CTX *mem_ctx, LDAPMod **mod);
+void smbldap_talloc_autofree_ldapmsg(TALLOC_CTX *mem_ctx, LDAPMessage *result);
+void smbldap_talloc_autofree_ldapmod(TALLOC_CTX *mem_ctx, LDAPMod **mod);
 char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld,
                              LDAPMessage *entry);
 

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index bdd90f0c950b7df8fd3e33865cfc5ab4c52c2a2e..5dd6d8d65b39516a384a4242c56ce5c6e1bf760a 100644 (file)
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -247,7 +247,7 @@
        return 0;
 }
 
- void talloc_autofree_ldapmsg(TALLOC_CTX *mem_ctx, LDAPMessage *result)
+ void smbldap_talloc_autofree_ldapmsg(TALLOC_CTX *mem_ctx, LDAPMessage *result)
 {
        LDAPMessage **handle;
 
@@ -267,7 +267,7 @@
        return 0;
 }
 
- void talloc_autofree_ldapmod(TALLOC_CTX *mem_ctx, LDAPMod **mod)
+ void smbldap_talloc_autofree_ldapmod(TALLOC_CTX *mem_ctx, LDAPMod **mod)
 {
        LDAPMod ***handle;
 
@@ -554,7 +554,7 @@ static void smbldap_store_state(LDAP *ld, struct smbldap_state *smbldap_state)
  start TLS on an existing LDAP connection
 *******************************************************************/
 
-int smb_ldap_start_tls(LDAP *ldap_struct, int version)
+int smbldap_start_tls(LDAP *ldap_struct, int version)
 { 
 #ifdef LDAP_OPT_X_TLS
        int rc;
@@ -725,7 +725,7 @@ static int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version)
  open a connection to the ldap server (just until the bind)
  ******************************************************************/
 
-int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri)
+int smbldap_setup_full_conn(LDAP **ldap_struct, const char *uri)
 {
        int rc, version;
 
@@ -739,7 +739,7 @@ int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri)
                return rc;
        }
 
-       rc = smb_ldap_start_tls(*ldap_struct, version);
+       rc = smbldap_start_tls(*ldap_struct, version);
        if (rc) {
                return rc;
        }
@@ -776,7 +776,7 @@ static int smbldap_open_connection (struct smbldap_state *ldap_state)
 
        /* Start TLS if required */
 
-       rc = smb_ldap_start_tls(*ldap_struct, version);
+       rc = smbldap_start_tls(*ldap_struct, version);
        if (rc) {
                return rc;
        }
@@ -870,7 +870,7 @@ static int rebindproc_connect_with_state (LDAP *ldap_struct,
         * our credentials. At least *try* to secure the connection - Guenther */
 
        smb_ldap_upgrade_conn(ldap_struct, &version);
-       smb_ldap_start_tls(ldap_struct, version);
+       smbldap_start_tls(ldap_struct, version);
 
        /** @TODO Should we be doing something to check what servers we rebind to?
            Could we get a referral to a machine that we don't want to give our