diff --git a/ipapython/certdb.py b/ipapython/certdb.py index b744ddff9..ffd4a6616 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -308,15 +308,6 @@ class NSSDatabase(object): new_args.extend(args) return ipautil.run(new_args, stdin, **kwargs) - def run_modutil(self, args, stdin=None, **kwargs): - self._check_db() - new_args = [ - paths.MODUTIL, - '-dbdir', '{}:{}'.format(self.dbtype, self.secdir) - ] - new_args.extend(args) - return ipautil.run(new_args, stdin, **kwargs) - def exists(self): """Check DB exists (all files are present) """ diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index a9c6666c6..50b971645 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -276,9 +276,6 @@ class CertDB(object): def run_certutil(self, args, stdin=None, **kwargs): return self.nssdb.run_certutil(args, stdin, **kwargs) - def run_modutil(self, args, stdin=None, **kwargs): - return self.nssdb.run_modutil(args, stdin, **kwargs) - def create_noise_file(self): if os.path.isfile(self.noise_fname): os.remove(self.noise_fname) @@ -690,32 +687,6 @@ class CertDB(object): return is_ipa_issued_cert(api, cert) - def disable_system_trust(self): - """Disable system trust module of NSSDB - """ - name = 'Root Certs' - try: - result = self.run_modutil( - ['-force', '-list', name], - env={}, - capture_output=True - ) - except ipautil.CalledProcessError as e: - if e.returncode == 29: # ERROR: Module not found in database. - logger.debug( - 'Module %s not available, treating as disabled', name) - return False - raise - - if 'Status: Enabled' in result.output: - self.run_modutil( - ['-force', '-disable', name], - env={} - ) - return True - - return False - def needs_upgrade_format(self): """Check if NSSDB file format needs upgrade