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:30:06 -0500 |
| commit | 9efd83bfd32b38c675b263f532ebe9a6ec53149e (patch) | |
| tree | e301743d36dda19da57e7572f11b29ee1a6250b3 | |
| parent | 2d7e35b3a931fcef48a1faf0a0fb04f3db57cbde (diff) | |
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 6030aa5e874..8fb518dbc24 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -2018,7 +2018,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 b4b608c220b..18b5a6b3b97 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -1464,9 +1464,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 */ |