summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-10-20 16:08:06 -0400
committerPatrick Uiterwijk <puiterwijk@redhat.com>2014-11-12 23:46:57 +0100
commit62b4656571be6e8671ada295047eac385d330f66 (patch)
tree3516bb0f3e4c10b250cabdc9f0990b01ac45b286
parent5e0b9747121eab67c5a3ee3bb42a677e35da7fd6 (diff)
downloadipsilon-62b4656571be6e8671ada295047eac385d330f66.tar.gz
ipsilon-62b4656571be6e8671ada295047eac385d330f66.tar.xz
ipsilon-62b4656571be6e8671ada295047eac385d330f66.zip
In configure we do not need to set_config()
All we care about in configure is to store the config in the db, so skip setting the config explicitly in the plugin object and go straight to the database. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rwxr-xr-xipsilon/info/infoldap.py6
-rwxr-xr-xipsilon/info/nss.py3
-rwxr-xr-xipsilon/login/authfas.py3
-rwxr-xr-xipsilon/login/authform.py3
-rwxr-xr-xipsilon/login/authkrb.py3
-rwxr-xr-xipsilon/login/authldap.py6
-rwxr-xr-xipsilon/login/authpam.py6
-rwxr-xr-xipsilon/login/authtest.py3
-rwxr-xr-xipsilon/providers/openidp.py3
-rwxr-xr-xipsilon/providers/saml2idp.py3
10 files changed, 13 insertions, 26 deletions
diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py
index 0b94fac..70d36d5 100755
--- a/ipsilon/info/infoldap.py
+++ b/ipsilon/info/infoldap.py
@@ -198,8 +198,7 @@ class Installer(InfoProviderInstaller):
elif 'ldap_bind_dn_template' in opts:
config['user dn template'] = opts['ldap_bind_dn_template']
config['tls'] = 'Demand'
- po.set_config(config)
- po.save_plugin_config(self.facility)
+ po.save_plugin_config(self.facility, config)
# Replace global config, only one plugin info can be used
po.name = 'global'
@@ -210,5 +209,4 @@ class Installer(InfoProviderInstaller):
order = []
order.append('ldap')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(self.facility)
+ po.save_plugin_config(self.facility, globalconf)
diff --git a/ipsilon/info/nss.py b/ipsilon/info/nss.py
index 4208442..24f3522 100755
--- a/ipsilon/info/nss.py
+++ b/ipsilon/info/nss.py
@@ -101,5 +101,4 @@ class Installer(InfoProviderInstaller):
order = []
order.append('nss')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(self.facility)
+ po.save_plugin_config(self.facility, globalconf)
diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py
index 2759626..c2d8fff 100755
--- a/ipsilon/login/authfas.py
+++ b/ipsilon/login/authfas.py
@@ -211,5 +211,4 @@ class Installer(object):
order = []
order.append('fas')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
index 9c20cf5..418a5e5 100755
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -144,8 +144,7 @@ class Installer(object):
order = []
order.append('form')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
# for selinux enabled platforms, ignore if it fails just report
try:
diff --git a/ipsilon/login/authkrb.py b/ipsilon/login/authkrb.py
index 724c2ce..6c561ac 100755
--- a/ipsilon/login/authkrb.py
+++ b/ipsilon/login/authkrb.py
@@ -164,5 +164,4 @@ class Installer(object):
order = []
order.insert(0, 'krb')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
diff --git a/ipsilon/login/authldap.py b/ipsilon/login/authldap.py
index a41d167..ed75e91 100755
--- a/ipsilon/login/authldap.py
+++ b/ipsilon/login/authldap.py
@@ -212,8 +212,7 @@ class Installer(object):
if 'ldap_bind_dn_template' in opts:
config['bind dn template'] = opts['ldap_bind_dn_template']
config['tls'] = 'Demand'
- po.set_config(config)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, config)
# Update global config to add login plugin
po = PluginObject()
@@ -225,5 +224,4 @@ class Installer(object):
order = []
order.append('ldap')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 35edbaf..10b550e 100755
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -145,8 +145,7 @@ class Installer(object):
po.wipe_config_values(FACILITY)
config = {'service name': opts['pam_service']}
- po.set_config(config)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, config)
# Update global config to add login plugin
po = PluginObject()
@@ -158,8 +157,7 @@ class Installer(object):
order = []
order.append('pam')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
# for selinux enabled platforms, ignore if it fails just report
try:
diff --git a/ipsilon/login/authtest.py b/ipsilon/login/authtest.py
index 44492a4..6288826 100755
--- a/ipsilon/login/authtest.py
+++ b/ipsilon/login/authtest.py
@@ -127,5 +127,4 @@ class Installer(object):
order = []
order.append('testauth')
globalconf['order'] = ','.join(order)
- po.set_config(globalconf)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, globalconf)
diff --git a/ipsilon/providers/openidp.py b/ipsilon/providers/openidp.py
index a3e1b63..5abdcad 100755
--- a/ipsilon/providers/openidp.py
+++ b/ipsilon/providers/openidp.py
@@ -148,5 +148,4 @@ class Installer(object):
config = {'endpoint url': url,
'identity_url_template': '%sid/%%(username)s' % url,
'enabled': '1'}
- po.set_config(config)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, config)
diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py
index 7508760..cb2c4a2 100755
--- a/ipsilon/providers/saml2idp.py
+++ b/ipsilon/providers/saml2idp.py
@@ -307,8 +307,7 @@ class Installer(object):
'idp certificate file': cert.cert,
'idp key file': cert.key,
'enabled': '1'}
- po.set_config(config)
- po.save_plugin_config(FACILITY)
+ po.save_plugin_config(FACILITY, config)
# Fixup permissions so only the ipsilon user can read these files
files.fix_user_dirs(path, opts['system_user'])