aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2012-12-04 06:41:21 -0500
committerPeter Eisentraut <peter_e@gmx.net>2012-12-04 06:42:25 -0500
commitec8d1e32dd0a9801e62b8217b9305b6bc2119119 (patch)
tree0192bc25e7742a4164d52eb84f31355afc2d4d76
parent5ce108bf320d23070c53d3437fd3dc799a97310c (diff)
downloadpostgresql-ec8d1e32dd0a9801e62b8217b9305b6bc2119119.tar.gz
postgresql-ec8d1e32dd0a9801e62b8217b9305b6bc2119119.zip
Fix build of LDAP URL feature
Some code was not ifdef'ed out for non-LDAP builds. patch from Bruce Momjian
-rw-r--r--src/backend/libpq/hba.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2bb661cf122..40727a9c8ee 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1385,7 +1385,9 @@ parse_hba_line(List *line, int line_num)
static bool
parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
{
+#ifdef USE_LDAP
hbaline->ldapscope = LDAP_SCOPE_SUBTREE;
+#endif
if (strcmp(name, "map") == 0)
{
@@ -1448,11 +1450,12 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int line_num)
}
else if (strcmp(name, "ldapurl") == 0)
{
+#ifdef LDAP_API_FEATURE_X_OPENLDAP
LDAPURLDesc *urldata;
int rc;
+#endif
REQUIRE_AUTH_OPTION(uaLDAP, "ldapurl", "ldap");
-
#ifdef LDAP_API_FEATURE_X_OPENLDAP
rc = ldap_url_parse(val, &urldata);
if (rc != LDAP_SUCCESS)