From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 5 Sep 2017 22:42:26 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1e3ee6540dc2918ed13245231a2ad566e0986015;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/init.d/dhcpd b/init.d/dhcpd
index f38e5ed3..73de3d5c 100755
--- a/init.d/dhcpd
+++ b/init.d/dhcpd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="configtest"
 
diff --git a/init.d/dhcrelay b/init.d/dhcrelay
index eaf3af61..c557501f 100755
--- a/init.d/dhcrelay
+++ b/init.d/dhcrelay
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/init.d/dhcrelay6 b/init.d/dhcrelay6
index eaf3af61..c557501f 100755
--- a/init.d/dhcrelay6
+++ b/init.d/dhcrelay6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/openldap/schema/dhcp.schema b/openldap/schema/dhcp.schema
index 0c24a7a2..378243ec 100644
--- a/openldap/schema/dhcp.schema
+++ b/openldap/schema/dhcp.schema
@@ -484,5 +484,5 @@ objectclass ( 2.16.840.1.113719.1.203.6.18
     SUP top
     MUST ( cn $ dhcpRange6 )
     MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption )
-    X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
+    X-NDS_CONTAINMENT ('dhcpSubnet6' 'dhcpSharedNetwork') )