From a471ebe7517a04d67b788b3cfd59cb9aa451da0a Mon Sep 17 00:00:00 2001 From: Karl MacMillan Date: Mon, 23 Jul 2007 15:14:01 -0400 Subject: Removed duplication. --- ipa-install/src/ipa/krbinstance.py | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'ipa-install/src/ipa/krbinstance.py') diff --git a/ipa-install/src/ipa/krbinstance.py b/ipa-install/src/ipa/krbinstance.py index e10f9c7a..253c506f 100644 --- a/ipa-install/src/ipa/krbinstance.py +++ b/ipa-install/src/ipa/krbinstance.py @@ -28,13 +28,7 @@ from time import gmtime import os import pwd import socket - -SHARE_DIR = "/usr/share/ipa/" - -def realm_to_suffix(realm_name): - s = realm_name.split(".") - terms = ["dc=" + x.lower() for x in s] - return ",".join(terms) +from util import * def host_to_domain(fqdn): s = fqdn.split(".") @@ -49,36 +43,10 @@ def generate_kdc_password(): rndpwd += chr(r.randint(65,90)) #stricter set for testing return rndpwd -def template_str(txt, vars): - return string.Template(txt).substitute(vars) - -def template_file(infilename, vars): - txt = open(infilename).read() - return template_str(txt, vars) - -def write_tmp_file(txt): - fd = tempfile.NamedTemporaryFile() - fd.write(txt) - fd.flush() - - return fd - def ldap_mod(fd, dn, pwd): args = ["/usr/bin/ldapmodify", "-h", "127.0.0.1", "-xv", "-D", dn, "-w", pwd, "-f", fd.name] run(args) -def run(args, stdin=None): - p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if stdin: - stdout,stderr = p.communicate(stdin) - else: - stdout,stderr = p.communicate() - logging.info(stdout) - logging.info(stderr) - - if p.returncode != 0: - raise subprocess.CalledProcessError(p.returncode, args[0]) - class KrbInstance: def __init__(self): self.ds_user = None -- cgit