mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-06 19:36:53 +02:00
Fix some null pointer dereferences in LDAP auth code
An LDAP URL without a host name such as "ldap://" or without a base DN such as "ldap://localhost" would cause a crash when reading pg_hba.conf. If no binddn is configured, an error message might end up trying to print a null pointer, which could crash on some platforms. Author: Thomas Munro <thomas.munro@enterprisedb.com> Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
parent
859662c26c
commit
d380d080fa
@ -2205,7 +2205,8 @@ CheckLDAPAuth(Port *port)
|
||||
{
|
||||
ereport(LOG,
|
||||
(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
|
||||
port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
|
||||
port->hba->ldapbinddn ? port->hba->ldapbinddn : "",
|
||||
port->hba->ldapserver, ldap_err2string(r))));
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
|
||||
|
@ -1488,9 +1488,11 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
|
||||
return false;
|
||||
}
|
||||
|
||||
hbaline->ldapserver = pstrdup(urldata->lud_host);
|
||||
if (urldata->lud_host)
|
||||
hbaline->ldapserver = pstrdup(urldata->lud_host);
|
||||
hbaline->ldapport = urldata->lud_port;
|
||||
hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
|
||||
if (urldata->lud_dn)
|
||||
hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
|
||||
|
||||
if (urldata->lud_attrs)
|
||||
hbaline->ldapsearchattribute = pstrdup(urldata->lud_attrs[0]); /* only use first one */
|
||||
|
Loading…
Reference in New Issue
Block a user