summaryrefslogtreecommitdiff
path: root/python/samba/kcc
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2015-06-10 15:39:40 +1200
committerAndrew Bartlett <abartlet@samba.org>2015-06-12 06:57:13 +0200
commitdb56d4ae3b0a0b8e76beee1fe5ccbb2c3c258e68 (patch)
tree11aab87a9c1fe0d351a5c678d7fdea9047f38fd7 /python/samba/kcc
parent427d05d1ac451bdeeabdc3567e9c2243ee31e1dd (diff)
downloadsamba-db56d4ae3b0a0b8e76beee1fe5ccbb2c3c258e68.tar.gz
samba-db56d4ae3b0a0b8e76beee1fe5ccbb2c3c258e68.tar.bz2
samba-db56d4ae3b0a0b8e76beee1fe5ccbb2c3c258e68.zip
KCC: remove remnants of script from samba/kcc/__init__
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/kcc')
-rw-r--r--python/samba/kcc/__init__.py34
1 files changed, 6 insertions, 28 deletions
diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index d2c99c98a13..1f13627bfd9 100644
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -19,45 +19,23 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-import sys
import random
import uuid
-# ensure we get messages out immediately, so they get in the samba logs,
-# and don't get swallowed by a timeout
-os.environ['PYTHONUNBUFFERED'] = '1'
-
-# forcing GMT avoids a problem in some timezones with kerberos. Both MIT
-# heimdal can get mutual authentication errors due to the 24 second difference
-# between UTC and GMT when using some zone files (eg. the PDT zone from
-# the US)
-os.environ["TZ"] = "GMT"
-
-# Find right directory when running from source tree
-sys.path.insert(0, "bin/python")
-
-import optparse
-import logging
import itertools
-import heapq
-import time
-from functools import partial
-
-from samba import (
- getopt as options,
- ldb,
- dsdb,
- drs_utils,
- nttime2unix)
+from samba import unix2nttime, nttime2unix
+from samba import ldb, dsdb, drs_utils
from samba.auth import system_session
from samba.samdb import SamDB
-from samba.dcerpc import drsuapi
+from samba.dcerpc import drsuapi, misc
from samba.kcc.kcc_utils import Site, Partition, Transport, SiteLink
from samba.kcc.kcc_utils import NCReplica, NCType, nctype_lut, GraphNode
from samba.kcc.kcc_utils import RepsFromTo, KCCError, KCCFailedObject
from samba.kcc.kcc_utils import convert_schedule_to_repltimes
+
+from samba.ndr import ndr_pack
+
from samba.kcc.graph_utils import verify_and_dot
from samba import ldif_utils