From: Damien Miller <djm@mindrot.org>
Date: Thu, 26 Oct 2017 21:42:33 +0000 (+1100)
Subject: fix rdomain compilation errors
X-Git-Tag: V_7_7_P1~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2de5c6b53bf063ac698596ef4e23d8e3099656ea;p=thirdparty%2Fopenssh-portable.git

fix rdomain compilation errors
---

diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c
index efc9f46fb..7050629c3 100644
--- a/openbsd-compat/port-net.c
+++ b/openbsd-compat/port-net.c
@@ -74,7 +74,7 @@ sys_set_rdomain(int fd, const char *name)
 }
 
 int
-valid_rdomain(const char *name)
+sys_valid_rdomain(const char *name)
 {
 	int fd;
 
diff --git a/openbsd-compat/port-net.h b/openbsd-compat/port-net.h
index 8aa4085f4..3a0d1104b 100644
--- a/openbsd-compat/port-net.h
+++ b/openbsd-compat/port-net.h
@@ -37,7 +37,7 @@ u_char	*sys_tun_outfilter(struct ssh *, struct Channel *, u_char **, size_t *);
 # define HAVE_SYS_VALID_RDOMAIN
 char *sys_get_rdomain(int fd);
 int sys_set_rdomain(int fd, const char *name);
-int valid_rdomain(const char *name);
+int sys_valid_rdomain(const char *name);
 #endif
 
 #if defined(SYS_RDOMAIN_XXX)
diff --git a/servconf.c b/servconf.c
index 7fc3551d7..53d81fb3c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -736,7 +736,7 @@ static int
 valid_rdomain(const char *name)
 {
 #if defined(HAVE_SYS_VALID_RDOMAIN)
-	return valid_rdomain(name)
+	return sys_valid_rdomain(name);
 #elif defined(__OpenBSD__)
 	const char *errstr;
 	long long num;