diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-08-15 21:35:35 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-08-15 21:35:35 -0400 |
| commit | 82f24bb4902df4da9ba36e3bfe5b4e301c0f4227 (patch) | |
| tree | f81ea210ad51670f547fa570dc9ce5a417dddcad /ipa-server | |
| parent | 1e59adbe451680f9ab56323802538804dcfb5180 (diff) | |
| download | freeipa-82f24bb4902df4da9ba36e3bfe5b4e301c0f4227.tar.gz freeipa-82f24bb4902df4da9ba36e3bfe5b4e301c0f4227.tar.xz freeipa-82f24bb4902df4da9ba36e3bfe5b4e301c0f4227.zip | |
General fixes.
Do not start ipa_kpasswd by default yet
Diffstat (limited to 'ipa-server')
| -rwxr-xr-x | ipa-server/freeipa-server.spec | 2 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 2 | ||||
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-pwd-extop/pwd-extop-conf.ldif | 1 | ||||
| -rw-r--r-- | ipa-server/ipaserver/krbinstance.py | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index 05e915da8..608756988 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -14,7 +14,7 @@ BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap- Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntp cyrus-sasl-gssapi nss TurboGears %define httpd_conf /etc/httpd/conf.d -%define plugin_dir /usr/lib/fedora-ds/plugins +%define plugin_dir /usr/lib/dirsrv/plugins %description FreeIPA is a server for identity, policy, and audit. diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index 88b9973b5..76927dc39 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -132,7 +132,7 @@ def main(): run(["/sbin/chkconfig", "ipa-kpasswd", "on"]) # Start Kpasswd - run(["/sbin/service", "ipa-kpasswd", "start"]) + # run(["/sbin/service", "ipa-kpasswd", "start"]) # Create the config file fd = open("/etc/ipa/ipa.conf", "w") 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 index 6240c10f6..f99c4d93a 100644 --- 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 @@ -1,4 +1,5 @@ dn: cn=ipa_pwd_extop,cn=plugins,cn=config +changetype: add objectclass: top objectclass: nsSlapdPlugin objectclass: extensibleObject diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py index c44cff91a..8adeb012f 100644 --- a/ipa-server/ipaserver/krbinstance.py +++ b/ipa-server/ipaserver/krbinstance.py @@ -150,9 +150,8 @@ class KrbInstance: args = ["/usr/kerberos/sbin/kdb5_ldap_util", "-D", "uid=kdc,cn=kerberos,"+self.suffix, "-w", self.kdc_password, "create", "-s", "-P", self.master_password, "-r", self.realm, "-subtrees", self.suffix, "-sscope", "sub"] run(args) - # TODO: NOT called yet, need to find out how to make sure the plugin is available first + #add the password extop module def __add_pwd_extop_module(self): - #add the password extop module 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) |