summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2008-10-03 14:11:14 -0600
committerRob Crittenden <rcritten@redhat.com>2008-10-13 14:15:19 -0400
commit08e80a67b7327927db825b9872af8abcc7f85711 (patch)
tree55ae0856689bc20ff88b8315ae38d285a068ff45
parenteac09d38b78867465ba44872db0ddbb4b631a4b0 (diff)
downloadfreeipa-08e80a67b7327927db825b9872af8abcc7f85711.zip
freeipa-08e80a67b7327927db825b9872af8abcc7f85711.tar.gz
freeipa-08e80a67b7327927db825b9872af8abcc7f85711.tar.xz
Don't try to conditionally stop the server - it doesn't seem to work
Just call stop() - if it's not already running, no big deal
-rw-r--r--ipa-server/ipaserver/dsinstance.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 2d3f78a..1dae1b6 100644
--- a/ipa-server/ipaserver/dsinstance.py
+++ b/ipa-server/ipaserver/dsinstance.py
@@ -458,10 +458,7 @@ class DsInstance(service.Service):
return False
# ok - ca cert file can be read
# shutdown the server
- running = self.restore_state("running")
-
- if not running is None:
- self.stop()
+ self.stop()
dirname = config_dirname(realm_to_serverid(self.realm_name))
certdb = certs.CertDB(dirname)