summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-20 16:18:40 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-20 16:28:42 +1100
commitf696bb81f8499443eee9815e7adf8dbb6810506a (patch)
tree14fcefa50e72228df9692d29275c22a7efa29701 /source4/scripting
parent653dd024a630af095277f5884add9246da399eb9 (diff)
downloadsamba-f696bb81f8499443eee9815e7adf8dbb6810506a.tar.gz
samba-f696bb81f8499443eee9815e7adf8dbb6810506a.tar.bz2
samba-f696bb81f8499443eee9815e7adf8dbb6810506a.zip
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
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/bin/fullschema14
-rwxr-xr-xsource4/scripting/bin/minschema2
2 files changed, 0 insertions, 16 deletions
diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index 02e90f6973..d3bf398e65 100644
--- 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 4983502ba7..c860495e96 100755
--- 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",