From: Howard Chu <hyc@openldap.org>
Date: Tue, 18 Dec 2018 00:21:03 +0000 (-0800)
Subject: Missed a schema conflict
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190fccbcdc8112c787a60542b5844e49263ff148;p=thirdparty%2Fopenldap.git

Missed a schema conflict
---

diff --git a/servers/slapd/schema/msuser.ldif b/servers/slapd/schema/msuser.ldif
index 534e3d0eeb..8eeba592c8 100644
--- a/servers/slapd/schema/msuser.ldif
+++ b/servers/slapd/schema/msuser.ldif
@@ -1788,10 +1788,10 @@ olcAttributeTpes: ( MSADat4:845
   SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
   SINGLE-VALUE )
 #
-olcAttributeTpes: ( MSADat4:44
-  NAME 'homeDirectory'
-  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
-  SINGLE-VALUE )
+#olcAttributeTpes: ( MSADat4:44
+#  NAME 'homeDirectory'
+#  SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
+#  SINGLE-VALUE )
 #
 olcAttributeTpes: ( MSADat4:698
   NAME 'dhcpUniqueKey'
diff --git a/servers/slapd/schema/msuser.schema b/servers/slapd/schema/msuser.schema
index 5539fe26d7..b45357a240 100644
--- a/servers/slapd/schema/msuser.schema
+++ b/servers/slapd/schema/msuser.schema
@@ -1784,10 +1784,10 @@ attributetype ( MSADat4:845
 	SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
 	SINGLE-VALUE )
 
-attributetype ( MSADat4:44
-	NAME 'homeDirectory'
-	SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
-	SINGLE-VALUE )
+#attributetype ( MSADat4:44
+#	NAME 'homeDirectory'
+#	SYNTAX '1.3.6.1.4.1.1466.115.121.1.15'
+#	SINGLE-VALUE )
 
 attributetype ( MSADat4:698
 	NAME 'dhcpUniqueKey'