summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2007-08-15 18:55:20 -0400
committerSimo Sorce <ssorce@redhat.com>2007-08-15 18:55:20 -0400
commit9faa5ce77e9323c9060868ab0f55c0b3cb98ff70 (patch)
tree8cde358b3cab5d6e415be252b7f0f9da02a4a181
parentbe34ddfc2814c11b4050215b4bddce619181a4bb (diff)
downloadfreeipa-9faa5ce77e9323c9060868ab0f55c0b3cb98ff70.tar.gz
freeipa-9faa5ce77e9323c9060868ab0f55c0b3cb98ff70.tar.xz
freeipa-9faa5ce77e9323c9060868ab0f55c0b3cb98ff70.zip
Use relative .so names for plugin so that lib/lib64 does not get in the way
change the pwd-extop conf ldif to a more sensible name
-rw-r--r--ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif2
-rw-r--r--ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif (renamed from ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif)0
-rw-r--r--ipa-server/ipaserver/krbinstance.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif b/ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
index d07796173..48888dfac 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
+++ b/ipa-server/ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif
@@ -3,7 +3,7 @@ objectclass: top
objectclass: nsSlapdPlugin
objectclass: extensibleObject
cn: ipa-memberof
-nsslapd-pluginpath: /usr/lib/fedora-ds/plugins/libipa-memberof-plugin.so
+nsslapd-pluginpath: libipa-memberof-plugin.so
nsslapd-plugininitfunc: ipamo_postop_init
nsslapd-plugintype: postoperation
nsslapd-pluginenabled: on
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
index 6240c10f6..6240c10f6 100644
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index 996873703..b1317f82f 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -153,7 +153,7 @@ class KrbInstance:
# TODO: NOT called yet, need to find out how to make sure the plugin is available first
def __add_pwd_extop_module(self):
#add the password extop module
- extop_txt = template_file(SHARE_DIR + "ipapwd_extop_plugin.ldif", self.sub_dict)
+ extop_txt = template_file(SHARE_DIR + "pwd-extop-conf.ldif", self.sub_dict)
extop_fd = write_tmp_file(extop_txt)
ldap_mod(extop_fd, "cn=Directory Manager", self.admin_password)
extop_fd.close()