From 190fccbcdc8112c787a60542b5844e49263ff148 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 17 Dec 2018 16:21:03 -0800 Subject: [PATCH] Missed a schema conflict --- servers/slapd/schema/msuser.ldif | 8 ++++---- servers/slapd/schema/msuser.schema | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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'