From 1d99557541008b5a3484e9c025dd1a7241cecef2 Mon Sep 17 00:00:00 2001
From: William Brown <william@blackhats.net.au>
Date: Jun 02 2020 23:10:34 +0000
Subject: Ticket 51115 - enable samba3.ldif by default


Bug Description: Samba has an ldapsam module that allows
samba to authenticate via LDAP for ad-domain-less systems.
By enabling it by default this opens some easier out-of-the-box
integrations.

Fix Description: Enable it by default, and fix a type in 60samba.ldif
Already tested with replication and 60samba.ldif to ensure no conflict.

https://pagure.io/389-ds-base/issue/51115

Author: William Brown <william@blackhats.net.au>

Review by: mreynolds (Thanks!)

---

diff --git a/Makefile.am b/Makefile.am
index 0e5f04f..b36513a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -718,7 +718,6 @@ sampledata_DATA = ldap/admin/src/scripts/DSSharedLib \
 	$(srcdir)/ldap/schema/60radius.ldif \
 	$(srcdir)/ldap/schema/60rfc4876.ldif \
 	$(srcdir)/ldap/schema/60samba.ldif \
-	$(srcdir)/ldap/schema/60samba3.ldif \
 	$(srcdir)/ldap/schema/60sendmail.ldif \
 	$(LIBPRESENCE_SCHEMA)
 
@@ -752,6 +751,7 @@ systemschema_DATA = $(srcdir)/ldap/schema/00core.ldif \
 	$(srcdir)/ldap/schema/60rfc2739.ldif \
 	$(srcdir)/ldap/schema/60rfc3712.ldif \
 	$(srcdir)/ldap/schema/60sabayon.ldif \
+	$(srcdir)/ldap/schema/60samba3.ldif \
 	$(srcdir)/ldap/schema/60sudo.ldif \
 	$(srcdir)/ldap/schema/60trust.ldif \
 	$(srcdir)/ldap/schema/60nss-ldap.ldif \
diff --git a/ldap/schema/60samba.ldif b/ldap/schema/60samba.ldif
index 481e018..4e9bc4f 100644
--- a/ldap/schema/60samba.ldif
+++ b/ldap/schema/60samba.ldif
@@ -197,9 +197,9 @@ objectClasses: (
   SUP top
   AUXILIARY
   MUST ( uid $ rid )
+  )
 #  MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $ logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $ displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $ description $ userWorkstations $ primaryGroupID $ domain )
   MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $ logoffTime $ kickoffTime $ pwdCanChange $ acctFlags $ displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $ description $ userWorkstations $ primaryGroupID $ domain )
-  )
 #
 ################################################################################
 #