Remove unused prototype for smbldap_get_single_pstring().

Don't use pstr_sprintf() on an fstring - change to talloc.
Jeremy.

diff --git a/source/include/smbldap.h b/source/include/smbldap.h
index 3e2c878dbe501b1dffda45a17865b0cc3bf6aafd..d9d7aca98ea27e9ea9fe4086a0e957f49b725389 100644 (file)
--- a/source/include/smbldap.h
+++ b/source/include/smbldap.h
@@ -141,8 +141,6 @@ void smbldap_make_mod(LDAP *ldap_struct, LDAPMessage *existing,
 bool smbldap_get_single_attribute (LDAP * ldap_struct, LDAPMessage * entry,
                                   const char *attribute, char *value,
                                   int max_len);
-bool smbldap_get_single_pstring (LDAP * ldap_struct, LDAPMessage * entry,
-                                const char *attribute, pstring value);
 char *smbldap_get_dn(LDAP *ld, LDAPMessage *entry);
 int smbldap_modify(struct smbldap_state *ldap_state,
                    const char *dn,

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 707e3f3a3050770aacf876b1908577535e9b1348..7a3d55999ead00060cd459afb4c068195610aaea 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -3403,11 +3403,14 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
 {
        struct ldapsam_privates *ldap_state =
                (struct ldapsam_privates *)my_methods->private_data;
-       fstring filter;
+       char *filter = NULL;
        int rc;
        const char **attr_list;
 
-       pstr_sprintf( filter, "(objectclass=%s)", LDAP_OBJ_GROUPMAP);
+       filter = talloc_asprintf(NULL, "(objectclass=%s)", LDAP_OBJ_GROUPMAP);
+       if (!filter) {
+               return NT_STATUS_NO_MEMORY;
+       }
        attr_list = get_attr_list( NULL, groupmap_attr_list );
        rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
                            LDAP_SCOPE_SUBTREE, filter,
@@ -3421,9 +3424,12 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
                          lp_ldap_group_suffix(), filter));
                ldap_msgfree(ldap_state->result);
                ldap_state->result = NULL;
+               TALLOC_FREE(filter);
                return NT_STATUS_UNSUCCESSFUL;
        }
 
+       TALLOC_FREE(filter);
+
        DEBUG(2, ("ldapsam_setsamgrent: %d entries in the base!\n",
                  ldap_count_entries(ldap_state->smbldap_state->ldap_struct,
                                     ldap_state->result)));