diff --git a/tcp_wrappers_7.6.diff b/tcp_wrappers_7.6.diff index b09a006..9e98519 100644 --- a/tcp_wrappers_7.6.diff +++ b/tcp_wrappers_7.6.diff @@ -121,34 +121,26 @@ + --- hosts_access.c.orig +++ hosts_access.c -@@ -33,6 +33,7 @@ static char sccsid[] = "@(#) hosts_acces - #include - #include - #include -+#include - - extern char *fgets(); - extern int errno; @@ -89,6 +90,33 @@ static int masked_match(); /* hosts_access - host access control facility */ -+int ++static int +yp_get_default_domain (char **outdomain) +{ + static char __ypdomainname[1025] = "\0"; -+ int result = YPERR_SUCCESS;; ++ int result = 0; + *outdomain = NULL; + + if (__ypdomainname[0] == '\0') + { + if (getdomainname (__ypdomainname, 1024)) -+ result = YPERR_NODOM; ++ result = 1; + else if (strcmp (__ypdomainname, "(none)") == 0) + { + /* If domainname is not set, some Systems will return "(none)" */ + __ypdomainname[0] = '\0'; -+ result = YPERR_NODOM; ++ result = 1; + } + else + *outdomain = __ypdomainname; diff --git a/tcpd.changes b/tcpd.changes index e5f034b..8602e82 100644 --- a/tcpd.changes +++ b/tcpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 6 10:35:38 CEST 2016 - kukuk@suse.de + +- tcp_wrappers_7.6.diff: don't use public headers for own + functions, make own yp_get_default_domain static. + ------------------------------------------------------------------- Mon Jul 20 14:08:16 UTC 2015 - okir@suse.com diff --git a/tcpd.spec b/tcpd.spec index 8f9d871..0cf0182 100644 --- a/tcpd.spec +++ b/tcpd.spec @@ -1,7 +1,7 @@ # # spec file for package tcpd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed