diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/vconn-ssl.c | 8 | ||||
-rw-r--r-- | lib/vconn-tcp.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c index 20bfb979..96890e6b 100644 --- a/lib/vconn-ssl.c +++ b/lib/vconn-ssl.c @@ -279,12 +279,8 @@ ssl_open(const char *name, char *suffix, struct vconn **vconnp) return retval; } - /* Glibc 2.7 has a bug in strtok_r when compiling with optimization that - * can cause segfaults here: - * http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614. - * Using "::" instead of the obvious ":" works around it. */ - host_name = strtok_r(suffix, "::", &save_ptr); - port_string = strtok_r(NULL, "::", &save_ptr); + host_name = strtok_r(suffix, ":", &save_ptr); + port_string = strtok_r(NULL, ":", &save_ptr); if (!host_name) { ovs_error(0, "%s: bad peer name format", name); return EAFNOSUPPORT; diff --git a/lib/vconn-tcp.c b/lib/vconn-tcp.c index 081ac26d..3b29a290 100644 --- a/lib/vconn-tcp.c +++ b/lib/vconn-tcp.c @@ -64,12 +64,8 @@ tcp_open(const char *name, char *suffix, struct vconn **vconnp) int retval; int fd; - /* Glibc 2.7 has a bug in strtok_r when compiling with optimization that - * can cause segfaults here: - * http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614. - * Using "::" instead of the obvious ":" works around it. */ - host_name = strtok_r(suffix, "::", &save_ptr); - port_string = strtok_r(NULL, "::", &save_ptr); + host_name = strtok_r(suffix, ":", &save_ptr); + port_string = strtok_r(NULL, ":", &save_ptr); if (!host_name) { ovs_error(0, "%s: bad peer name format", name); return EAFNOSUPPORT; |