From 08e80a67b7327927db825b9872af8abcc7f85711 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Fri, 3 Oct 2008 14:11:14 -0600
Subject: 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
---
 ipa-server/ipaserver/dsinstance.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 2d3f78ace..1dae1b6ca 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)
-- 
cgit