summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-12-09 08:16:58 -0500
committerThomas Markwalder <tmark@isc.org>2019-12-09 08:16:58 -0500
commit83175640024277fefae5f3eb5a253bec50717976 (patch)
tree05e8d8e2b558b86198249825891851ec443b46ea
parent2fefb3ff08295c688fd32d43e3e8fdfa7558f867 (diff)
downloadisc-dhcp-51-ldap-c-won-t-compile-under-ubuntu-18.tar.gz
[#51] Fixed a syntax error in ldap.c51-ldap-c-won-t-compile-under-ubuntu-18
server/ldap.c - fixed invalid compare to "\0" added a release note
-rw-r--r--RELNOTES4
-rw-r--r--server/ldap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index ba9324bd..a53c55b6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -199,6 +199,10 @@ by Eric Young (eay@cryptsoft.com).
source.
[Gitlab #35]
+- Fixed a syntax error in ldap.c which cropped up under Ubuntu
+ 18.04.1/gcc 7.4.0. Thanks to Charles Hedrick for pointing it out.
+ [Gitlab #51]
+
Changes since 4.4.0 (New Features)
- none
Changes since 4.4.0 (Bug Fixes)
diff --git a/server/ldap.c b/server/ldap.c
index 5126d24a..46b13d00 100644
--- a/server/ldap.c
+++ b/server/ldap.c
@@ -925,7 +925,7 @@ ldap_parse_failover (struct ldap_config_stack *item, struct parse *cfile)
ldap_value_free_len (tempbv);
- if (primary == -1 || srvaddr[0] == '\0' || srvaddr[1] == '\0')
+ if (primary == -1 || *srvaddr[0] == '\0' || *srvaddr[1] == '\0')
{
log_error("Could not decide if the server type is primary"
" or secondary for failover peering '%s'.", peername[0]->bv_val);