Fix build of LDAP URL feature
authorPeter Eisentraut
Tue, 4 Dec 2012 11:41:21 +0000 (06:41 -0500)
committerPeter Eisentraut
Tue, 4 Dec 2012 11:42:25 +0000 (06:42 -0500)
Some code was not ifdef'ed out for non-LDAP builds.

patch from Bruce Momjian

src/backend/libpq/hba.c

index 2bb661cf122bd15725f3cc766134499158842a86..40727a9c8eeecdd1b1e94103bfebaf19f7ba5124 100644 (file)
@@ -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)