Fix build of LDAP URL feature

petere · petere · commit ec8d1e32dd0a · 2012-12-04T06:42:25.000-05:00
Some code was not ifdef'ed out for non-LDAP builds.

patch from Bruce Momjian
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1385,7 +1385,9 @@ parse_hba_line(List *line, int line_num)`
`1385`	`1385`	`static bool`
`1386`	`1386`	`parse_hba_auth_opt(char name, char val, HbaLine *hbaline, int line_num)`
`1387`	`1387`	`{`
	`1388`	`+#ifdef USE_LDAP`
`1388`	`1389`	`hbaline->ldapscope = LDAP_SCOPE_SUBTREE;`
	`1390`	`+#endif`
`1389`	`1391`
`1390`	`1392`	`if (strcmp(name, "map") == 0)`
`1391`	`1393`	`{`
`@@ -1448,11 +1450,12 @@ parse_hba_auth_opt(char name, char val, HbaLine *hbaline, int line_num)`
`1448`	`1450`	`}`
`1449`	`1451`	`else if (strcmp(name, "ldapurl") == 0)`
`1450`	`1452`	`{`
	`1453`	`+#ifdef LDAP_API_FEATURE_X_OPENLDAP`
`1451`	`1454`	`LDAPURLDesc *urldata;`
`1452`	`1455`	`int rc;`
	`1456`	`+#endif`
`1453`	`1457`
`1454`	`1458`	`REQUIRE_AUTH_OPTION(uaLDAP, "ldapurl", "ldap");`
`1455`		`-`
`1456`	`1459`	`#ifdef LDAP_API_FEATURE_X_OPENLDAP`
`1457`	`1460`	`rc = ldap_url_parse(val, &urldata);`
`1458`	`1461`	`if (rc != LDAP_SUCCESS)`