[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-386-g6cae4b5

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  6cae4b5fa1bcb848cb2a28daaafeefd6bcd08274 (commit)
      from  f1e401ef5c89ecf12921b7adb228da438521a693 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 6cae4b5fa1bcb848cb2a28daaafeefd6bcd08274
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Tue Nov 27 22:22:35 2007 -0800

    Remove unused prototype for smbldap_get_single_pstring().
    Don't use pstr_sprintf() on an fstring - change to talloc.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/include/smbldap.h |    2 --
 source/passdb/pdb_ldap.c |   10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/smbldap.h b/source/include/smbldap.h
index 3e2c878..d9d7aca 100644
--- 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 707e3f3..7a3d559 100644
--- 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)));


-- 
Samba Shared Repository