summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2003-03-25 08:55:37 +0000
committerVolker Lendecke <vlendec@samba.org>2003-03-25 08:55:37 +0000
commite5c998b5898fcff51066da6f2fee0ebff54a3ff7 (patch)
treea47da6a9bdb6838761af3f24a833e47c27d7b5c8
parent8460dc43406db90c169232ca5562d9bf4c7d34e8 (diff)
downloadsamba-e5c998b5898fcff51066da6f2fee0ebff54a3ff7.tar.gz
samba-e5c998b5898fcff51066da6f2fee0ebff54a3ff7.tar.bz2
samba-e5c998b5898fcff51066da6f2fee0ebff54a3ff7.zip
Must have been somewhere else last sunday...
Apply metzes patch (hopefully) correctly this time Volker (This used to be commit e52a2d5d49e3c784d5db06bade2c866422258fcc)
-rw-r--r--source3/passdb/pdb_ldap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 75969fbbb2..8f03d0cea3 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2190,7 +2190,8 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state,
temp[0] = '\0';
if (!get_single_attribute(ldap_state->ldap_struct, entry, "cn",
temp)) {
- DEBUG(0, ("Attributes displayName and cn not found for gidNumber(%i)\n",map->gid));
+ DEBUG(0, ("Attributes cn not found either "
+ "for gidNumber(%i)\n",map->gid));
return False;
}
}
@@ -2312,8 +2313,8 @@ static NTSTATUS ldapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
/* TODO: Escaping of name? */
snprintf(filter, sizeof(filter)-1,
- "(&(objectClass=sambaGroupMapping)(|(displayName=%s)(cn=%s))",
- name,name);
+ "(&(objectClass=sambaGroupMapping)(|(displayName=%s)(cn=%s)))",
+ name, name);
return ldapsam_getgroup(methods, filter, map);
}