diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-11-10 14:21:32 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-11-10 14:29:13 -0500 |
| commit | d380d080fa0ad230d86bc5e4bc3512a199f68e43 (patch) | |
| tree | 378c97c3296c5a8d29646002a8aab061d571460b | |
| parent | 859662c26cf9eac8bfa50a83913523606bdf3e28 (diff) | |
| download | postgresql-d380d080fa0ad230d86bc5e4bc3512a199f68e43.tar.gz postgresql-d380d080fa0ad230d86bc5e4bc3512a199f68e43.zip | |
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>
| -rw-r--r-- | src/backend/libpq/auth.c | 3 | ||||
| -rw-r--r-- | src/backend/libpq/hba.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index ba64bcf9132..be8c4776859 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -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; } diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index d3b316b9e34..b3c44f2ec53 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -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 */ |