diff options
author | Rob Crittenden <rcritten@redhat.com> | 2009-08-11 17:08:09 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-08-12 13:18:15 -0400 |
commit | 8780751330871033b13fc8fbb7eb0588baf4417d (patch) | |
tree | 0b21cac0974b193c67c43e22fb7b21983766fbf8 /ipaserver/install | |
parent | c781e8a57d3d05fa07729dbccff07bc1fab9d8e8 (diff) | |
download | freeipa-8780751330871033b13fc8fbb7eb0588baf4417d.tar.gz freeipa-8780751330871033b13fc8fbb7eb0588baf4417d.tar.xz freeipa-8780751330871033b13fc8fbb7eb0588baf4417d.zip |
Clean up some problems discovered with pylint and pychecker
Much of this is formatting to make pylint happy but it also fixes some
real bugs.
Diffstat (limited to 'ipaserver/install')
-rw-r--r-- | ipaserver/install/bindinstance.py | 6 | ||||
-rw-r--r-- | ipaserver/install/cainstance.py | 6 | ||||
-rw-r--r-- | ipaserver/install/dsinstance.py | 7 | ||||
-rw-r--r-- | ipaserver/install/httpinstance.py | 10 | ||||
-rw-r--r-- | ipaserver/install/installutils.py | 17 | ||||
-rw-r--r-- | ipaserver/install/krbinstance.py | 8 | ||||
-rw-r--r-- | ipaserver/install/ntpinstance.py | 1 | ||||
-rw-r--r-- | ipaserver/install/replication.py | 14 |
8 files changed, 26 insertions, 43 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index cadab10e3..f5a704614 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -17,12 +17,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import string import tempfile -import shutil import os import pwd -import socket import logging import installutils @@ -73,7 +70,7 @@ class BindInstance(service.Service): tmp = ip_address.split(".") tmp.reverse() - + self.reverse_host = tmp.pop(0) self.reverse_subnet = ".".join(tmp) @@ -232,7 +229,6 @@ class BindInstance(service.Service): def uninstall(self): running = self.restore_state("running") enabled = self.restore_state("enabled") - domain = self.restore_state("domain") if not running is None: self.stop() diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index a8a1a774c..5ade47160 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -575,7 +575,7 @@ class CAInstance(service.Service): def __restart_instance(self): try: self.restart() - except Exception, e: + except Exception: # TODO: roll back here? logging.critical("Failed to restart the certificate server. See the installation log for details.") @@ -625,8 +625,6 @@ class CAInstance(service.Service): params['submit'] = 'submit' params['requestNotes'] = '' params = urllib.urlencode(params) - headers = {"Content-type": "application/x-www-form-urlencoded", - "Accept": "text/plain"} # Now issue the RA certificate. args = [ @@ -826,8 +824,6 @@ class CAInstance(service.Service): os.chown(self.ra_agent_pwd, pent.pw_uid, pent.pw_gid) def __setup_sign_profile(self): - caconfig = "/var/lib/pki-ca/conf/CS.cfg" - # Tell the profile to automatically issue certs for RAs installutils.set_directive('/var/lib/pki-ca/profiles/ca/caJarSigningCert.cfg', 'auth.instance_id', 'raCertAuth', quotes=False, separator='=') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 76eb8dd95..f66959bc1 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -26,7 +26,6 @@ import sys import os import re import time -import stat from ipapython import ipautil @@ -36,7 +35,7 @@ import certs import ldap from ipaserver import ipaldap from ipaserver.install import ldapupdate -from ipalib import util +from ipalib import util, errors SERVER_ROOT_64 = "/usr/lib64/dirsrv" SERVER_ROOT_32 = "/usr/lib/dirsrv" @@ -319,7 +318,7 @@ class DsInstance(service.Service): dsdb.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1]) server_certs = dsdb.find_server_certs() if len(server_certs) == 0: - raise RuntimeError("Could not find a suitable server cert in import in %s" % pkcs12_info[0]) + raise RuntimeError("Could not find a suitable server cert in import in %s" % self.pkcs12_info[0]) # We only handle one server cert nickname = server_certs[0][0] @@ -453,7 +452,7 @@ class DsInstance(service.Service): status = True try: certdb.load_cacert(cacert_fname) - except ipalib.CalledProcessError, e: + except errors.CalledProcessError, e: logging.critical("Error importing CA cert file named [%s]: %s" % (cacert_fname, str(e))) status = False diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index ba9de6138..b6483fb3d 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -19,13 +19,9 @@ import os import os.path -import subprocess -import string import tempfile import logging import pwd -import fileinput -import sys import shutil import service @@ -105,8 +101,8 @@ class HTTPInstance(service.Service): if selinux: try: # returns e.g. "httpd_can_network_connect --> off" - (stdout, stderr) = ipautils.run(["/usr/sbin/getsebool", - "httpd_can_network_connect"]) + (stdout, stderr) = ipautil.run(["/usr/sbin/getsebool", + "httpd_can_network_connect"]) self.backup_state("httpd_can_network_connect", stdout.split()[2]) except: pass @@ -170,7 +166,7 @@ class HTTPInstance(service.Service): db.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1], passwd="") server_certs = db.find_server_certs() if len(server_certs) == 0: - raise RuntimeError("Could not find a suitable server cert in import in %s" % pkcs12_info[0]) + raise RuntimeError("Could not find a suitable server cert in import in %s" % self.pkcs12_info[0]) db.create_password_conf() # We only handle one server cert diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index c12023719..a41176cc7 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -25,7 +25,6 @@ import os import re import fileinput import sys -import time import struct import fcntl @@ -217,28 +216,28 @@ def set_directive(filename, directive, value, quotes=True, separator=' '): """ valueset = False fd = open(filename) - file = [] + newfile = [] for line in fd: if directive in line: valueset = True if quotes: - file.append('%s%s"%s"\n' % (directive, separator, value)) + newfile.append('%s%s"%s"\n' % (directive, separator, value)) else: - file.append('%s%s%s\n' % (directive, separator, value)) + newfile.append('%s%s%s\n' % (directive, separator, value)) else: - file.append(line) + newfile.append(line) fd.close() if not valueset: if quotes: - file.append('%s%s"%s"\n' % (directive, separator, value)) + newfile.append('%s%s"%s"\n' % (directive, separator, value)) else: - file.append('%s%s%s\n' % (directive, separator, value)) + newfile.append('%s%s%s\n' % (directive, separator, value)) fd = open(filename, "w") - fd.write("".join(file)) + fd.write("".join(newfile)) fd.close() -def get_directive(filename, directive, strip_quotes=True, separator=' '): +def get_directive(filename, directive, separator=' '): """ A rather inefficient way to get a configuration directive. """ diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 1c3489725..a6caa81eb 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -17,8 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import subprocess -import string import shutil import logging import fileinput @@ -27,7 +25,6 @@ import sys import os import pwd import socket -import shutil import service import installutils @@ -46,7 +43,6 @@ from pyasn1.type import univ, namedtype import pyasn1.codec.ber.encoder import pyasn1.codec.ber.decoder import struct -import base64 KRBMKEY_DENY_ACI = """ (targetattr = "krbMKey")(version 3.0; acl "No external access"; deny (all) userdn != "ldap:///uid=kdc,cn=sysaccounts,cn=etc,$SUFFIX";) @@ -225,7 +221,7 @@ class KrbInstance(service.Service): msgid = self.conn.search("cn=mapping,cn=sasl,cn=config", ldap.SCOPE_ONELEVEL, "(objectclass=nsSaslMapping)") res = self.conn.result(msgid) for r in res[1]: - mid = self.conn.delete_s(r[0]) + self.conn.delete_s(r[0]) #except LDAPError, e: # logging.critical("Error during SASL mapping removal: %s" % str(e)) except Exception, e: @@ -301,7 +297,7 @@ class KrbInstance(service.Service): def __write_stash_from_ds(self): try: entry = self.conn.getEntry("cn=%s, cn=kerberos, %s" % (self.realm, self.suffix), ldap.SCOPE_SUBTREE) - except errors.NotFound: + except errors.NotFound, e: logging.critical("Could not find master key in DS") raise e diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py index 3f76551e8..2c53b5611 100644 --- a/ipaserver/install/ntpinstance.py +++ b/ipaserver/install/ntpinstance.py @@ -17,7 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import shutil import logging import service diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 653ec3c4e..242352975 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -27,11 +27,11 @@ from ipalib import util from ipalib import errors DIRMAN_CN = "cn=directory manager" -CACERT="/usr/share/ipa/html/ca.crt" +CACERT = "/usr/share/ipa/html/ca.crt" # the default container used by AD for user entries -WIN_USER_CONTAINER="cn=Users" +WIN_USER_CONTAINER = "cn=Users" # the default container used by IPA for user entries -IPA_USER_CONTAINER="cn=users,cn=accounts" +IPA_USER_CONTAINER = "cn=users,cn=accounts" PORT = 636 TIMEOUT = 120 @@ -351,9 +351,11 @@ class ReplicationManager: def check_repl_init(self, conn, agmtdn): done = False hasError = 0 - attrlist = ['cn', 'nsds5BeginReplicaRefresh', 'nsds5replicaUpdateInProgress', - 'nsds5ReplicaLastInitStatus', 'nsds5ReplicaLastInitStart', - 'nsds5ReplicaLastInitEnd'] + attrlist = ['cn', 'nsds5BeginReplicaRefresh', + 'nsds5replicaUpdateInProgress', + 'nsds5ReplicaLastInitStatus', + 'nsds5ReplicaLastInitStart', + 'nsds5ReplicaLastInitEnd'] entry = conn.getEntry(agmtdn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist) if not entry: print "Error reading status from agreement", agmtdn |