From 5f0adc3fbe5b193a57b05eed70b9f59463d9d9da Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Thu, 14 Jul 2011 09:07:41 +0200
Subject: Fix exit status of ipa-nis-manage enable.

ticket 1247
---
 install/tools/ipa-nis-manage | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'install/tools')

diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index 2c0936b49..f61610af8 100755
--- a/install/tools/ipa-nis-manage
+++ b/install/tools/ipa-nis-manage
@@ -154,19 +154,16 @@ def main():
 
             # The cn=config entry for the plugin may already exist but it
             # could be turned off, handle both cases.
-            if (entry is None or
-              entry.get('nsslapd-pluginenabled', [''])[0].lower() == 'off'):
-                # Already configured, just enable the plugin
+            if entry is None:
                 print "Enabling plugin"
                 ld = LDAPUpdate(dm_password=dirman_password, sub_dict={}, ldapi=True)
                 if ld.update(files) != True:
                     retval = 1
+            elif entry.get('nsslapd-pluginenabled', [''])[0].lower() == 'off':
+                print "Enabling plugin"
+                # Already configured, just enable the plugin
                 mod = {'nsslapd-pluginenabled': 'on'}
-                try:
-                    conn.update_entry(nis_config_dn, mod, normalize=False)
-                except errors.EmptyModlist:
-                    # plugin is already enabled, silently continue
-                    pass
+                conn.update_entry(nis_config_dn, mod, normalize=False)
             else:
                 print "Plugin already Enabled"
                 retval = 2
-- 
cgit