diff options
author | Volker Lendecke <vlendec@samba.org> | 2003-03-25 07:54:34 +0000 |
---|---|---|
committer | Volker Lendecke <vlendec@samba.org> | 2003-03-25 07:54:34 +0000 |
commit | 25cdc523ed7b60964bf57c4745bafc74799f099b (patch) | |
tree | d76ea16e7106e6cfc04ce6a83520b8043ec250f9 | |
parent | b7c4fa4cc6c8b9737f8657dace58042e135d8e44 (diff) | |
download | samba-25cdc523ed7b60964bf57c4745bafc74799f099b.tar.gz samba-25cdc523ed7b60964bf57c4745bafc74799f099b.tar.bz2 samba-25cdc523ed7b60964bf57c4745bafc74799f099b.zip |
Apply metze's change correctly this time. Playing 'patch' by
hand can be somewhat error-prone..
Volker
(This used to be commit 12fabd07148c21f5481cb750f1cfdab2e8112e4b)
-rw-r--r-- | source3/passdb/pdb_ldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index a7a168fe64..c54095b250 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2187,6 +2187,12 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state, temp)) { DEBUG(3, ("Attribute displayName not found\n")); temp[0] = '\0'; + if (!get_single_attribute(ldap_state->ldap_struct, entry, "cn", + temp)) { + DEBUG(0, ("Attributes cn not found either " + "for gidNumber(%i)\n",map->gid)); + return False; + } } fstrcpy(map->nt_name, temp); @@ -2194,12 +2200,6 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state, temp)) { DEBUG(3, ("Attribute description not found\n")); temp[0] = '\0'; - if (!get_single_attribute(ldap_state->ldap_struct, entry, "cn", - temp)) { - DEBUG(0, ("Attributes cn not found either " - "for gidNumber(%i)\n",map->gid)); - return False; - } } fstrcpy(map->comment, temp); |