s4: Remove autogenerated attributes from minschema and fullschema output

These attributes will be generated by Samba on import, and do not need
to be in the schema file.

Andrew Bartlett

diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index 02e90f6973c7232d1726e0b6732d505bf4defea4..d3bf398e6579278ff6e96d08b009c746156c87d2 100644 (file)
--- a/source4/scripting/bin/fullschema
+++ b/source4/scripting/bin/fullschema
@@ -22,7 +22,6 @@ parser.add_option_group(sambaopts)
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
 parser.add_option_group(options.VersionOptions(parser))
-parser.add_option("--verbose", help="Be verbose", action="store_true")
 parser.add_option("--dump-classes", action="store_true")
 parser.add_option("--dump-attributes", action="store_true")
 
@@ -48,9 +47,6 @@ lp_ctx = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp_ctx)
 ldb = Ldb(url, credentials=creds, lp=lp_ctx, options=["modules:paged_searches"])
 
-objectclasses = {}
-attributes = {}
-
 # the attributes we need for objectclasses
 class_attrs = ["objectClass", 
                "cn",
@@ -62,7 +58,6 @@ class_attrs = ["objectClass",
                "mustContain",
                "auxiliaryClass",
                "rDNAttID",
-               "showInAdvancedViewOnly",
                "adminDisplayName",
                "adminDescription",
                "objectClassCategory",
@@ -94,7 +89,6 @@ attrib_attrs = ["objectClass",
                 "rangeUpper",
                 "mAPIID",
                 "linkID",
-                "showInAdvancedViewOnly",
                 "adminDisplayName",
                 "oMObjectClass",
                 "adminDescription",
@@ -116,14 +110,6 @@ attrib_attrs = ["objectClass",
                 "isEphemeral",
                 "isDefunct"]
 
-#
-#  notes:
-#
-#  objectClassCategory 
-#      1: structural
-#      2: abstract
-#      3: auxiliary
-
 class Objectclass(dict):
 
     def __init__(self, ldb, name):

diff --git a/source4/scripting/bin/minschema b/source4/scripting/bin/minschema
index 4983502ba758a7fc9ca8680ad8db0ef15a4512b3..c860495e96595ff1640cc4776d39b0f7564d37da 100755 (executable)
--- a/source4/scripting/bin/minschema
+++ b/source4/scripting/bin/minschema
@@ -72,7 +72,6 @@ class_attrs = ["objectClass",
                "mustContain",
                "auxiliaryClass",
                "rDNAttID",
-               "showInAdvancedViewOnly",
                "adminDisplayName",
                "adminDescription",
                "objectClassCategory",
@@ -104,7 +103,6 @@ attrib_attrs = ["objectClass",
                 "rangeUpper",
                 "mAPIID",
                 "linkID",
-                "showInAdvancedViewOnly",
                 "adminDisplayName",
                 "oMObjectClass",
                 "adminDescription",