From 9faa5ce77e9323c9060868ab0f55c0b3cb98ff70 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Wed, 15 Aug 2007 18:55:20 -0400
Subject: 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

---
 .../ipa-slapi-plugins/ipa-memberof/memberof-conf.ldif      |  2 +-
 .../ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif       | 14 --------------
 .../ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif    | 14 ++++++++++++++
 ipa-server/ipaserver/krbinstance.py                        |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
 create mode 100644 ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif

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 d0779617..48888dfa 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/plugin-conf.ldif
deleted file mode 100644
index 6240c10f..00000000
--- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/plugin-conf.ldif
+++ /dev/null
@@ -1,14 +0,0 @@
-dn: cn=ipa_pwd_extop,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: ipa_pwd_extop
-nsslapd-pluginpath: libipa_pwd_extop.so
-nsslapd-plugininitfunc: ipapwd_init
-nsslapd-plugintype: extendedop
-nsslapd-pluginenabled: on
-nsslapd-pluginid: Multi-hash Change Password Extended Operation
-nsslapd-pluginversion: 1.0
-nsslapd-pluginvendor: RedHat
-nsslapd-plugindescription: Support saving passwords in multiple formats for different consumers (krb5, samba, freeradius, etc.)
-nsslapd-pluginarg0: /var/kerberos/krb5kdc/.k5.$REALM
diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
new file mode 100644
index 00000000..6240c10f
--- /dev/null
+++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif
@@ -0,0 +1,14 @@
+dn: cn=ipa_pwd_extop,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+cn: ipa_pwd_extop
+nsslapd-pluginpath: libipa_pwd_extop.so
+nsslapd-plugininitfunc: ipapwd_init
+nsslapd-plugintype: extendedop
+nsslapd-pluginenabled: on
+nsslapd-pluginid: Multi-hash Change Password Extended Operation
+nsslapd-pluginversion: 1.0
+nsslapd-pluginvendor: RedHat
+nsslapd-plugindescription: Support saving passwords in multiple formats for different consumers (krb5, samba, freeradius, etc.)
+nsslapd-pluginarg0: /var/kerberos/krb5kdc/.k5.$REALM
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index 99687370..b1317f82 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()
-- 
cgit