Hello community, here is the log from the commit of package xinetd checked in at Thu Aug 9 22:59:59 CEST 2007. -------- --- xinetd/xinetd.changes 2007-04-18 13:42:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/xinetd/xinetd.changes 2007-08-07 08:48:31.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 7 08:45:51 CEST 2007 - anosek@suse.cz + +- fixed: xinetd does not honour disable line + [#254613] (honour_disable.patch) + * As soon as we realize that the service is disabled + we don't continue parsing its config + +------------------------------------------------------------------- New: ---- xinetd-2.3.14-honour_disable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinetd.spec ++++++ --- /var/tmp/diff_new_pack.V19801/_old 2007-08-09 22:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.V19801/_new 2007-08-09 22:56:02.000000000 +0200 @@ -19,7 +19,7 @@ Requires: logrotate Autoreqprov: on Version: 2.3.14 -Release: 44 +Release: 67 URL: http://www.xinetd.org/ Summary: An 'inetd' with Expanded Functionality Source0: %{name}-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch6: %{name}-%{version}-nodeadlock.diff Patch8: %{name}-%{version}-pie.patch Patch9: %{name}-%{version}-ipv6-ipv4-fallback.patch +Patch10: %{name}-%{version}-honour_disable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,6 +67,7 @@ %patch6 %patch8 %patch9 +%patch10 %build %{suse_update_config} @@ -112,6 +114,11 @@ %config(noreplace) /etc/xinetd.conf %changelog +* Tue Aug 07 2007 - anosek@suse.cz +- fixed: xinetd does not honour disable line + [#254613] (honour_disable.patch) + * As soon as we realize that the service is disabled + we don't continue parsing its config * Wed Apr 18 2007 - anosek@suse.cz - improved description for YaST (rc.xinetd) * Tue Dec 19 2006 - prusnak@suse.cz ++++++ xinetd-2.3.14-honour_disable.patch ++++++ --- xinetd/parse.c +++ xinetd/parse.c @@ -702,6 +702,13 @@ terminate_program(); } pset_clear( attr_values ) ; + + /* + * As soon as we realize that the service is disabled + * we don't continue parsing its config + */ + if (EQ(attr_name, "disable") && SC_IS_DISABLED(scp)) + return( FAILED ); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org