oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(LDAP__connect): bind sasl "EXTERNAL" to ldap connection

Browse Source 
(LDAP_store): remove superfluous argument to asprintf

From Alberto Patino <jalbertop@aranea.com.mx>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12334 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-05-27 10:03:54 +00:00
parent 68ba8507a5
commit cb73a5dde8
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/hdb/hdb-ldap.c
View File

@@ -953,6 +953,13 @@ LDAP_rename(krb5_context context, HDB * db, const char *new_name)
static krb5_error_code LDAP__connect(krb5_context context, HDB * db) static krb5_error_code LDAP__connect(krb5_context context, HDB * db)
{ {
int rc, version = LDAP_VERSION3; int rc, version = LDAP_VERSION3;
/*
* Empty credentials to do a SASL bind with LDAP. Note that empty
* different from NULL credentials. If you provide NULL
* credentials instead of empty credentials you will get a SASL
* bind in progress message.
*/
struct berval bv = { 0, "" };
if (db->db != NULL) { if (db->db != NULL) {
/* connection has been opened. ping server. */ /* connection has been opened. ping server. */
@@ -986,6 +993,14 @@ static krb5_error_code LDAP__connect(krb5_context context, HDB * db)
return HDB_ERR_BADVERSION; return HDB_ERR_BADVERSION;
} }
rc = ldap_sasl_bind_s((LDAP *) db->db, NULL, "EXTERNAL", &bv, NULL, NULL, NULL);
if (rc != LDAP_SUCCESS) {
krb5_set_error_string(context, "ldap_sasl_bind_s: %s", ldap_err2string(rc));
ldap_unbind_ext((LDAP *) db->db, NULL, NULL);
db->db = NULL;
return HDB_ERR_BADVERSION;
}
return 0; return 0;
} }
@@ -1104,7 +1119,7 @@ LDAP_store(krb5_context context, HDB * db, unsigned flags,
ret = asprintf(&dn, "cn=%s,%s", name, db->name); ret = asprintf(&dn, "cn=%s,%s", name, db->name);
} else { } else {
/* A bit bogus, but we don't have a search base */ /* A bit bogus, but we don't have a search base */
ret = asprintf(&dn, "cn=%s", name, db->name); ret = asprintf(&dn, "cn=%s", name);
} }
if (ret < 0) { if (ret < 0) {
krb5_set_error_string(context, "asprintf: out of memory"); krb5_set_error_string(context, "asprintf: out of memory");