Changeset 740 for vendor/current/source4/scripting/bin

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/scripting/bin

Files:

• autoidl (modified) (1 diff)
• enablerecyclebin (added)
• fullschema (modified) (3 diffs)
• get-descriptors (modified) (4 diffs)
• ktpass.sh (added)
• machineaccountccache (added)
• minschema (modified) (1 diff)
• rebuildextendeddn (modified) (3 diffs)
• reorgldb.py (deleted)
• rpcclient (modified) (1 diff)
• samba3dump (modified) (1 diff)
• samba_backup (added)
• samba_dnsupdate (added)
• samba_spnupdate (added)
• setup_dns.sh (modified) (2 diffs)
• smbstatus (modified) (1 diff)
• subunitrun (modified) (2 diffs)
• testparm (added)
• upgradeprovision (added)
• w32err_code.py (added)

vendor/current/source4/scripting/bin/autoidl

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 

vendor/current/source4/scripting/bin/fullschema

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # 
 # Works out the full schema
@@ -6 +6 @@
 import base64
 import optparse
-import os
 import sys
 
@@ -14 +13 @@
 import samba
 from samba import getopt as options, Ldb
-from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError
+from ldb import SCOPE_SUBTREE, SCOPE_BASE
 import sys
 

vendor/current/source4/scripting/bin/get-descriptors

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
@@ -28 +28 @@
 #
 
-import getopt
 import optparse
 import sys
-import os
 import base64
-import re
 
 sys.path.insert(0, "bin/python")
@@ -40 +37 @@
 from samba.auth import system_session
 import samba.getopt as options
-from samba import param
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security
 from samba import Ldb
 from samba.samdb import SamDB
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
+from ldb import SCOPE_SUBTREE, SCOPE_BASE
 
 parser = optparse.OptionParser("get-descriptor [options]")
@@ -66 +62 @@
 
 class DescrGetter:
+
     def __init__(self, localdomain, remotedomain):
         self.samdb = SamDB(session_info=system_session(), lp=lp, options=["modules:paged_searches"])

vendor/current/source4/scripting/bin/minschema

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # 
 # Works out the minimal schema for a set of objectclasses

vendor/current/source4/scripting/bin/rebuildextendeddn

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
@@ -24 +24 @@
 #
 
-import getopt
 import optparse
 import os
@@ -34 +33 @@
 from samba.credentials import DONT_USE_KERBEROS
 from samba.auth import system_session
-from samba import Ldb, substitute_var, valid_netbios_name, check_all_substituted
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
-                        timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
+from samba import Ldb
+from ldb import SCOPE_SUBTREE, SCOPE_BASE
 import ldb
 import samba.getopt as options
-from samba.samdb import SamDB
 from samba import param
-from samba.provision import ProvisionPaths, ProvisionNames,provision_paths_from_lp,get_dnsyntax_attributes,get_linked_attributes
+from samba.provision import ProvisionNames, provision_paths_from_lp
+from samba.schema import get_dnsyntax_attributes, get_linked_attributes
 
 parser = optparse.OptionParser("provision [options]")

vendor/current/source4/scripting/bin/rpcclient

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys, os, string

vendor/current/source4/scripting/bin/samba3dump

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 #    Dump Samba3 data

vendor/current/source4/scripting/bin/setup_dns.sh

@@ -17 +17 @@
 }
 
-OBJECTGUID=$(bin/ldbsearch -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2)
+OBJECTGUID=$(bin/ldbsearch -s base -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2)
 
 echo "Found objectGUID $OBJECTGUID"
@@ -34 +34 @@
 }
 echo "Checking"
+rndc flush
 host $HOSTNAME.$DOMAIN
 host $OBJECTGUID._msdcs.$DOMAIN

vendor/current/source4/scripting/bin/smbstatus

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #

vendor/current/source4/scripting/bin/subunitrun

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Simple subunit testrunner for python
@@ -22 +22 @@
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
-sys.path.insert(1, "../lib/subunit/python")
 
-from subunit import SubunitTestRunner
-from unittest import TestProgram
 import optparse
-import os
-from samba import param
+import samba
+samba.ensure_external_module("testtools", "testtools")
+samba.ensure_external_module("subunit", "subunit/python")
+from subunit.run import SubunitTestRunner
 import samba.getopt as options
 import samba.tests
+
 
 parser = optparse.OptionParser("subunitrun [options] <tests>")
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
-sambaopts = options.SambaOptions(parser)
-parser.add_option_group(sambaopts)
-parser.add_option_group(options.VersionOptions(parser))
+try:
+    from subunit.run import TestProgram
+except ImportError:
+    from unittest import TestProgram
+else:
+    parser.add_option('-l', '--list', dest='listtests', default=False,
+                      help='List tests rather than running them.',
+                      action="store_true")
 
-args = parser.parse_args()[1]
+opts, args = parser.parse_args()
 
-samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
-samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
+samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.env_loadparm())
+if getattr(opts, "listtests", False):
+    args.insert(0, "--list")
 
 runner = SubunitTestRunner()