]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
fix rdomain compilation errors
authorDamien Miller <djm@mindrot.org>
Thu, 26 Oct 2017 21:42:33 +0000 (08:42 +1100)
committerDamien Miller <djm@mindrot.org>
Thu, 26 Oct 2017 21:42:33 +0000 (08:42 +1100)
openbsd-compat/port-net.c
openbsd-compat/port-net.h
servconf.c

index efc9f46fb723cdd0bbb2d5272bca4f7f0f4947a9..7050629c31f79d0ae6ffc939ce2c5d686231cebf 100644 (file)
@@ -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;
 
index 8aa4085f48b6b1dc488ec65c123290d17c59e8a4..3a0d1104bf6d091aee9d5f7ab45f9126e4e5ece3 100644 (file)
@@ -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)
index 7fc3551d78b0eefc8aaa0511abbd76dd2fcda66f..53d81fb3cff5647ff754a1c8b42320ef1b8d2ff7 100644 (file)
@@ -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;