summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-03-29 16:08:11 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-03-29 18:05:29 +0200
commit4bbc3ff037026c72f3249f59c1b5af69a6ad6d69 (patch)
tree125857a1edbf3246579e51b10f6e62ec875062bc /source4/scripting/bin
parent89aa3b766b926d19dac4805a7e72433e497ce872 (diff)
downloadsamba-4bbc3ff037026c72f3249f59c1b5af69a6ad6d69.tar.gz
samba-4bbc3ff037026c72f3249f59c1b5af69a6ad6d69.tar.bz2
samba-4bbc3ff037026c72f3249f59c1b5af69a6ad6d69.zip
s4-python: Move dnspython to lib/, like the other Python modules
This also avoids it from being installed if it's already present on the system.
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/samba_dnsupdate8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 4d54ab4f4c..fab112e2bd 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import getopt
import os
import fcntl
import sys
@@ -33,15 +32,14 @@ sys.path.insert(0, "bin/python")
import samba
import optparse
-from samba import getopt as options, Ldb
-from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError
-import ldb
+from samba import getopt as options
+from ldb import SCOPE_BASE
from samba import glue
from samba.auth import system_session
from samba.samdb import SamDB
import samba.external
-resolver = samba.external.samba_external_dns_resolver()
+resolver = samba.external.dns_resolver()
default_ttl = 900