From 45f1769ff12bef4f39a517a244ebd15e056afcd5 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 24 Jun 2013 21:24:04 +0200
Subject: [PATCH] Revert "Try to handle xinetd flags sanely"

This reverts commit aae8b555c902a217d68dc96ccd50ae6144e8e686.
---
 modules/rsync/manifests/site.pp      | 2 --
 modules/xinetd/manifests/service.pp  | 2 +-
 modules/xinetd/templates/service.erb | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 6a4284a3c..bb2ee1446 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -1,6 +1,5 @@
 define rsync::site (
 	$bind='',
-	$bind6='',
 	$source='',
 	$content='',
 	$fname='',
@@ -40,7 +39,6 @@ define rsync::site (
 
 	xinetd::service { "rsync-${name}":
 		bind        => $bind,
-		bind6       => $bind6,
 		id          => "${name}-rsync",
 		server      => '/usr/bin/rsync',
 		port        => 'rsync',
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 5c8f954ad..522af17c4 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -6,7 +6,7 @@ define xinetd::service (
 	$type='',
 	$socket_type=stream,
 	$protocol=tcp,
-	$flags='',
+	$flags=IPv6,
 	$wait=no,
 	$user=root,
 	$group='',
diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index 9478c1d13..33a9de7a4 100644
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -10,11 +10,7 @@ service <%= scope.lookupvar('port') %>
 
 	socket_type	= <%= scope.lookupvar('socket_type') %>
 	protocol	= <%= scope.lookupvar('protocol') %>
-<%- if scope.lookupvar('flags') != '' -%>
 	flags		= <%= scope.lookupvar('flags') %>
-<%- elsif scope.lookupvar('bind') =~  ':' -%>
-	flags		= IPv6
-<%- end -%>
 	wait		= <%= scope.lookupvar('wait') %>
 	user		= <%= scope.lookupvar('user') %>
 <%- if scope.lookupvar('group') != '' -%>
-- 
2.20.1