diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-07-05 10:39:41 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-07-05 10:39:41 +0000 |
| commit | 85921dbd6fa417aa451ab9b6e88ecb7900333549 (patch) | |
| tree | 8bdb5a575f2f9dc06d29480bbf5165e5bb8760c6 /source3/sam | |
| parent | a3ddfa5069c9df07626135aa5fd2ec411c41943f (diff) | |
| download | samba-85921dbd6fa417aa451ab9b6e88ecb7900333549.tar.gz samba-85921dbd6fa417aa451ab9b6e88ecb7900333549.tar.bz2 samba-85921dbd6fa417aa451ab9b6e88ecb7900333549.zip | |
Add some debug statments to our vampire code - try to make it easier to track
down failures.
Add a 'auto-add on modify' feature to guestsam
Fix some segfault bugs on no-op idmap modifications, and on new idmappings that
do not have a DN to tack onto.
Make the 'private data' a bit more robust.
Andrew Bartlett
(This used to be commit 6c48309cda9538da5a32f3d88a7bb9c413ae9e8e)
Diffstat (limited to 'source3/sam')
| -rw-r--r-- | source3/sam/idmap_ldap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/sam/idmap_ldap.c b/source3/sam/idmap_ldap.c index 56a289d8aa..ade88d9220 100644 --- a/source3/sam/idmap_ldap.c +++ b/source3/sam/idmap_ldap.c @@ -397,7 +397,7 @@ static NTSTATUS ldap_set_mapping_internals(const DOM_SID *sid, unid_t id, int rc = -1; int ldap_op; fstring sid_string; - char **values; + char **values = NULL; int i; sid_to_string( sid_string, sid ); @@ -424,7 +424,9 @@ static NTSTATUS ldap_set_mapping_internals(const DOM_SID *sid, unid_t id, snprintf(id_str, sizeof(id_str), "%u", ((id_type & ID_USERID) ? id.uid : id.gid)); - values = ldap_get_values(ldap_state.smbldap_state->ldap_struct, entry, "objectClass"); + if (entry) + values = ldap_get_values(ldap_state.smbldap_state->ldap_struct, entry, "objectClass"); + if (values) { BOOL found_idmap = False; for (i=0; values[i]; i++) { |