summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2017-10-27 08:42:33 +1100
committerDamien Miller <djm@mindrot.org>2017-10-27 08:42:33 +1100
commit2de5c6b53bf063ac698596ef4e23d8e3099656ea (patch)
tree4c254dd2c5368fef53a0273ba8d945c779357201
parent6bd5b569fd6dfd5e8c8af20bbc41e45c2d6462ab (diff)
fix rdomain compilation errors
-rw-r--r--openbsd-compat/port-net.c2
-rw-r--r--openbsd-compat/port-net.h2
-rw-r--r--servconf.c2
3 files changed, 3 insertions, 3 deletions
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)
74} 74}
75 75
76int 76int
77valid_rdomain(const char *name) 77sys_valid_rdomain(const char *name)
78{ 78{
79 int fd; 79 int fd;
80 80
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 *);
37# define HAVE_SYS_VALID_RDOMAIN 37# define HAVE_SYS_VALID_RDOMAIN
38char *sys_get_rdomain(int fd); 38char *sys_get_rdomain(int fd);
39int sys_set_rdomain(int fd, const char *name); 39int sys_set_rdomain(int fd, const char *name);
40int valid_rdomain(const char *name); 40int sys_valid_rdomain(const char *name);
41#endif 41#endif
42 42
43#if defined(SYS_RDOMAIN_XXX) 43#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
736valid_rdomain(const char *name) 736valid_rdomain(const char *name)
737{ 737{
738#if defined(HAVE_SYS_VALID_RDOMAIN) 738#if defined(HAVE_SYS_VALID_RDOMAIN)
739 return valid_rdomain(name) 739 return sys_valid_rdomain(name);
740#elif defined(__OpenBSD__) 740#elif defined(__OpenBSD__)
741 const char *errstr; 741 const char *errstr;
742 long long num; 742 long long num;