.gitignore | 6
API.txt | 2875 +++---
BUILD.txt | 3
Contributors.txt | 2
Makefile | 12
VERSION | 18
daemons/configure.ac | 42
daemons/ipa-kdb/Makefile.am | 33
daemons/ipa-kdb/ipa_kdb.c | 34
daemons/ipa-kdb/ipa_kdb.h | 8
daemons/ipa-kdb/ipa_kdb_common.c | 51
daemons/ipa-kdb/ipa_kdb_mspac.c | 412
daemons/ipa-kdb/ipa_kdb_passwords.c | 5
daemons/ipa-kdb/ipa_kdb_principals.c | 45
daemons/ipa-kdb/tests/ipa_kdb_tests.c | 217
daemons/ipa-sam/Makefile.am | 2
daemons/ipa-sam/ipa_sam.c | 210
daemons/ipa-slapi-plugins/Makefile.am | 1
daemons/ipa-slapi-plugins/ipa-cldap/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-dns/Makefile.am | 46
daemons/ipa-slapi-plugins/ipa-dns/ipa-dns-conf.ldif | 15
daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c | 211
daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c | 33
daemons/ipa-slapi-plugins/ipa-lockout/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c | 251
daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 36
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c | 20
daemons/ipa-slapi-plugins/ipa-range-check/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-range-check/ipa_range_check.c | 41
daemons/ipa-slapi-plugins/ipa-sidgen/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-version/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am | 2
daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-conf.ldif | 4
debian/changelog | 2
debian/patches/check-dbus-before-starting.diff | 10
debian/patches/convert-base-platform.diff | 2307 -----
debian/patches/correct-python-path.diff | 2
debian/patches/fix-install-layout.diff | 2
debian/patches/fix-ldap-conf-path.diff | 16
debian/patches/fix-string-format.diff | 8
debian/patches/no-test-lang.diff | 2
debian/patches/no-testcert.patch | 2
debian/patches/prefix.patch | 2
debian/patches/series | 1
doc/examples/examples.py | 2
freeipa.spec.in | 233
init/systemd/ipa.service | 4
install/Makefile.am | 1
install/certmonger/dogtag-ipa-retrieve-agent-submit | 1
install/conf/ipa-pki-proxy.conf | 4
install/conf/ipa-rewrite.conf | 5
install/conf/ipa.conf | 26
install/configure.ac | 7
install/html/browserconfig.html | 4
install/html/ssbrowser.html | 2
install/html/unauthorized.html | 2
install/migration/migration.py | 75
install/po/LINGUAS | 3
install/po/bn_IN.po | 18
install/po/ca.po | 620 +
install/po/cs.po | 31
install/po/de.po | 20
install/po/es.po | 2324 +++--
install/po/eu.po | 568 +
install/po/fr.po | 3059 ++++--
install/po/id.po | 77
install/po/ipa.pot | 4049 +++++---
install/po/ja.po | 64
install/po/kn.po | 93
install/po/nl.po | 6
install/po/pl.po | 250
install/po/ru.po | 119
install/po/tg.po | 15
install/po/uk.po | 4534 ++++++----
install/po/zh_CN.po | 49
install/restart_scripts/Makefile.am | 1
install/restart_scripts/renew_ca_cert | 43
install/restart_scripts/renew_ra_cert | 59
install/restart_scripts/restart_pkicad | 25
install/restart_scripts/stop_pkicad | 43
install/share/05rfc2247.ldif | 2
install/share/60basev2.ldif | 2
install/share/60basev3.ldif | 22
install/share/60ipadns.ldif | 6
install/share/65ipasudo.ldif | 2
install/share/bind.named.conf.template | 4
install/share/bind.zone.db.template | 2
install/share/default-aci.ldif | 2
install/share/default-smb-group.ldif | 2
install/share/delegation.ldif | 9
install/share/dna.ldif | 2
install/share/krb5.conf.template | 2
install/share/replica-acis.ldif | 5
install/share/schema_compat.uldif | 2
install/tools/Makefile.am | 4
install/tools/ipa-adtrust-install | 59
install/tools/ipa-backup | 23
install/tools/ipa-ca-install | 4
install/tools/ipa-compat-manage | 6
install/tools/ipa-compliance | 10
install/tools/ipa-csreplica-manage | 280
install/tools/ipa-dns-install | 14
install/tools/ipa-managed-entries | 68
install/tools/ipa-nis-manage | 6
install/tools/ipa-replica-conncheck | 45
install/tools/ipa-replica-install | 48
install/tools/ipa-replica-manage | 602 +
install/tools/ipa-replica-prepare | 492 -
install/tools/ipa-restore | 23
install/tools/ipa-server-install | 261
install/tools/ipa-upgradeconfig | 374
install/tools/ipactl | 94
install/tools/man/Makefile.am | 5
install/tools/man/ipa-backup.1 | 84
install/tools/man/ipa-replica-conncheck.1 | 2
install/tools/man/ipa-replica-install.1 | 3
install/tools/man/ipa-replica-manage.1 | 48
install/tools/man/ipa-restore.1 | 105
install/tools/man/ipa-server-install.1 | 12
install/ui/Makefile.am | 46
install/ui/README-LICENSE.txt | 41
install/ui/aci.js | 897 -
install/ui/add.js | 195
install/ui/association.js | 1395 ---
install/ui/automember.js | 679 -
install/ui/automount.js | 354
install/ui/browser.js | 61
install/ui/build/Makefile.am | 16
install/ui/build/dojo/Makefile.am | 14
install/ui/build/dojo/dojo.js | 1
install/ui/build/freeipa/Makefile.am | 22
install/ui/certificate.js | 979 --
install/ui/config.js | 39
install/ui/details.js | 1239 --
install/ui/dialog.js | 759 -
install/ui/dns.js | 2558 -----
install/ui/entitle.js | 745 -
install/ui/entity.js | 731 -
install/ui/ext/Makefile.am | 14
install/ui/facet.js | 2040 ----
install/ui/field.js | 951 --
install/ui/group.js | 259
install/ui/hbac.js | 553 -
install/ui/hbactest.js | 842 -
install/ui/host.js | 943 --
install/ui/hostgroup.js | 90
install/ui/idrange.js | 162
install/ui/index.html | 98
install/ui/ipa.css | 194
install/ui/ipa.js | 2131 ----
install/ui/jquery-ui.js | 125
install/ui/jquery.ba-bbq.js | 18
install/ui/jquery.js | 4
install/ui/jquery.ordered-map.js | 155
install/ui/js/dojo | 1
install/ui/js/freeipa | 1
install/ui/js/libs | 1
install/ui/js/plugins | 1
install/ui/jsl.conf | 48
install/ui/json2.js | 482 -
install/ui/login.html | 3
install/ui/navigation.js | 455 -
install/ui/net.js | 394
install/ui/netgroup.js | 306
install/ui/policy.js | 122
install/ui/reset_password.html | 3
install/ui/rule.js | 254
install/ui/search.js | 493 -
install/ui/selinux.js | 315
install/ui/serverconfig.js | 118
install/ui/service.js | 467 -
install/ui/src/Makefile.am | 15
install/ui/src/build.profile.js | 108
install/ui/src/dojo.profile.js | 100
install/ui/src/freeipa/Application_controller.js | 366
install/ui/src/freeipa/_base/Builder.js | 372
install/ui/src/freeipa/_base/Construct_registry.js | 198
install/ui/src/freeipa/_base/Phase_controller.js | 208
install/ui/src/freeipa/_base/Provider.js | 222
install/ui/src/freeipa/_base/Search_provider.js | 111
install/ui/src/freeipa/_base/Singleton_registry.js | 132
install/ui/src/freeipa/_base/Spec_mod.js | 177
install/ui/src/freeipa/_base/construct.js | 113
install/ui/src/freeipa/_base/i18n.js | 39
install/ui/src/freeipa/_base/metadata_provider.js | 62
install/ui/src/freeipa/aci.js | 923 ++
install/ui/src/freeipa/add.js | 209
install/ui/src/freeipa/app.js | 118
install/ui/src/freeipa/association.js | 1456 +++
install/ui/src/freeipa/automember.js | 721 +
install/ui/src/freeipa/automount.js | 370
install/ui/src/freeipa/builder.js | 76
install/ui/src/freeipa/certificate.js | 1345 ++
install/ui/src/freeipa/config.js | 75
install/ui/src/freeipa/details.js | 1238 ++
install/ui/src/freeipa/develop.js | 51
install/ui/src/freeipa/dialog.js | 857 +
install/ui/src/freeipa/dns.js | 2547 +++++
install/ui/src/freeipa/entitle.js | 770 +
install/ui/src/freeipa/entity.js | 665 +
install/ui/src/freeipa/facet.js | 2452 +++++
install/ui/src/freeipa/field.js | 962 ++
install/ui/src/freeipa/freeipa.profile.js | 19
install/ui/src/freeipa/group.js | 284
install/ui/src/freeipa/hbac.js | 505 +
install/ui/src/freeipa/hbactest.js | 836 +
install/ui/src/freeipa/host.js | 993 ++
install/ui/src/freeipa/hostgroup.js | 108
install/ui/src/freeipa/idrange.js | 175
install/ui/src/freeipa/ipa.js | 1960 ++++
install/ui/src/freeipa/jquery.js | 26
install/ui/src/freeipa/json2.js | 27
install/ui/src/freeipa/menu.js | 100
install/ui/src/freeipa/navigation.js | 150
install/ui/src/freeipa/navigation/Menu.js | 249
install/ui/src/freeipa/navigation/Router.js | 373
install/ui/src/freeipa/navigation/menu_spec.js | 146
install/ui/src/freeipa/net.js | 399
install/ui/src/freeipa/netgroup.js | 330
install/ui/src/freeipa/ordered-map.js | 29
install/ui/src/freeipa/package.json | 39
install/ui/src/freeipa/phases.js | 95
install/ui/src/freeipa/plugin_loader.js | 82
install/ui/src/freeipa/plugins.js | 1
install/ui/src/freeipa/policy.js | 132
install/ui/src/freeipa/realmdomains.js | 113
install/ui/src/freeipa/reg.js | 83
install/ui/src/freeipa/rule.js | 271
install/ui/src/freeipa/search.js | 528 +
install/ui/src/freeipa/selinux.js | 337
install/ui/src/freeipa/serverconfig.js | 130
install/ui/src/freeipa/service.js | 528 +
install/ui/src/freeipa/spec_util.js | 80
install/ui/src/freeipa/sudo.js | 952 ++
install/ui/src/freeipa/text.js | 40
install/ui/src/freeipa/trust.js | 313
install/ui/src/freeipa/user.js | 684 +
install/ui/src/freeipa/widget.js | 4033 ++++++++
install/ui/src/freeipa/widgets/App.js | 194
install/ui/src/freeipa/widgets/Menu.js | 269
install/ui/src/libs/Makefile.am | 18
install/ui/src/libs/browser.js | 63
install/ui/src/libs/jquery-ui.js | 125
install/ui/src/libs/jquery.js | 4
install/ui/src/libs/jquery.ordered-map.js | 165
install/ui/src/libs/json2.js | 482 +
install/ui/src/webui.profile.js | 122
install/ui/sudo.js | 932 --
install/ui/test/aci_tests.html | 27
install/ui/test/aci_tests.js | 50
install/ui/test/all_tests.html | 65
install/ui/test/association_tests.html | 21
install/ui/test/association_tests.js | 6
install/ui/test/build_tests.html | 24
install/ui/test/build_tests.js | 264
install/ui/test/certificate_tests.html | 21
install/ui/test/certificate_tests.js | 5
install/ui/test/config.js | 43
install/ui/test/data/cert_find.json | 71
install/ui/test/data/host_mod.json | 1
install/ui/test/data/host_show.json | 2
install/ui/test/data/host_show_dev.example.com.json | 2
install/ui/test/data/host_show_test.example.com.json | 2
install/ui/test/data/ipa_init.json | 65
install/ui/test/data/ipa_init_commands.json | 147
install/ui/test/data/ipa_init_objects.json | 230
install/ui/test/data/realmdomains_show.json | 24
install/ui/test/data/trust_show.json | 67
install/ui/test/data/trustconfigad_show.json | 41
install/ui/test/details_tests.html | 22
install/ui/test/details_tests.js | 86
install/ui/test/entity_tests.html | 24
install/ui/test/entity_tests.js | 49
install/ui/test/index.html | 1
install/ui/test/ip_tests.html | 10
install/ui/test/ip_tests.js | 7
install/ui/test/ipa_tests.html | 20
install/ui/test/ipa_tests.js | 6
install/ui/test/jsl.conf | 6
install/ui/test/navigation_tests.html | 21
install/ui/test/navigation_tests.js | 377
install/ui/test/ordered_map_tests.html | 13
install/ui/test/ordered_map_tests.js | 42
install/ui/test/utils_tests.html | 18
install/ui/test/utils_tests.js | 9
install/ui/test/widget_tests.html | 18
install/ui/test/widget_tests.js | 12
install/ui/trust.js | 183
install/ui/user.js | 667 -
install/ui/util/build.sh | 35
install/ui/util/build/LICENSE | 195
install/ui/util/build/README | 12
install/ui/util/build/_base/configRhino.js | 121
install/ui/util/build/build.js | 1
install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch | 169
install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch | 98
install/ui/util/change-profile.sh | 142
install/ui/util/clean.sh | 26
install/ui/util/compile.sh | 120
install/ui/util/make-builder.sh | 50
install/ui/util/make-dojo.sh | 38
install/ui/util/make-ui.sh | 35
install/ui/util/prepare-dojo.sh | 204
install/ui/util/sync.sh | 348
install/ui/util/uglifyjs/lib/consolidator.js | 1219 ++
install/ui/util/uglifyjs/lib/parse-js.js | 1369 +++
install/ui/util/uglifyjs/lib/process.js | 2117 ++++
install/ui/util/uglifyjs/lib/squeeze-more.js | 78
install/ui/util/uglifyjs/ug.js | 1
install/ui/util/uglifyjs/uglify | 32
install/ui/util/uglifyjs/uglify-js.js | 86
install/ui/webui.js | 204
install/ui/widget.js | 3561 -------
install/updates/10-60basev3.update | 6
install/updates/10-bind-schema.update | 3
install/updates/10-schema_compat.update | 2
install/updates/10-selinuxusermap.update | 2
install/updates/20-dna.update | 10
install/updates/20-replication.update | 6
install/updates/40-delegation.update | 19
install/updates/40-dns.update | 16
install/updates/40-realm_domains.update | 8
install/updates/40-replication.update | 12
install/updates/50-hbacservice.update | 7
install/updates/60-trusts.update | 42
install/updates/Makefile.am | 1
install/updates/README | 23
install/wsgi/Makefile.am | 14
install/wsgi/plugins.py | 54
ipa-client/Makefile.am | 2
ipa-client/ipa-install/ipa-client-automount | 33
ipa-client/ipa-install/ipa-client-install | 435
ipa-client/ipa-join.c | 14
ipa-client/ipaclient/ipachangeconf.py | 14
ipa-client/ipaclient/ipadiscovery.py | 185
ipa-client/man/default.conf.5 | 2
ipa-client/man/ipa-client-install.1 | 40
ipa-client/man/ipa-join.1 | 3
ipalib/__init__.py | 53
ipalib/aci.py | 1
ipalib/capabilities.py | 56
ipalib/cli.py | 131
ipalib/constants.py | 3
ipalib/errors.py | 147
ipalib/frontend.py | 98
ipalib/krb_utils.py | 6
ipalib/messages.py | 157
ipalib/parameters.py | 105
ipalib/plugable.py | 45
ipalib/plugins/aci.py | 43
ipalib/plugins/automember.py | 42
ipalib/plugins/automount.py | 20
ipalib/plugins/baseldap.py | 108
ipalib/plugins/batch.py | 1
ipalib/plugins/cert.py | 162
ipalib/plugins/config.py | 4
ipalib/plugins/delegation.py | 7
ipalib/plugins/dns.py | 150
ipalib/plugins/entitle.py | 18
ipalib/plugins/group.py | 80
ipalib/plugins/hbacrule.py | 71
ipalib/plugins/hbacsvcgroup.py | 6
ipalib/plugins/hbactest.py | 225
ipalib/plugins/host.py | 213
ipalib/plugins/hostgroup.py | 6
ipalib/plugins/idrange.py | 157
ipalib/plugins/internal.py | 47
ipalib/plugins/kerberos.py | 9
ipalib/plugins/krbtpolicy.py | 4
ipalib/plugins/migration.py | 148
ipalib/plugins/netgroup.py | 2
ipalib/plugins/passwd.py | 2
ipalib/plugins/permission.py | 16
ipalib/plugins/ping.py | 2
ipalib/plugins/pwpolicy.py | 11
ipalib/plugins/realmdomains.py | 192
ipalib/plugins/selfservice.py | 15
ipalib/plugins/selinuxusermap.py | 6
ipalib/plugins/service.py | 97
ipalib/plugins/sudocmd.py | 29
ipalib/plugins/sudocmdgroup.py | 2
ipalib/plugins/sudorule.py | 30
ipalib/plugins/trust.py | 306
ipalib/plugins/user.py | 45
ipalib/util.py | 26
ipalib/x509.py | 4
ipapython/admintool.py | 125
ipapython/certdb.py | 127
ipapython/certmonger.py | 38
ipapython/compat.py | 81
ipapython/cookie.py | 18
ipapython/dogtag.py | 2
ipapython/entity.py | 181
ipapython/ipaldap.py | 1827 ++++
ipapython/ipautil.py | 76
ipapython/nsslib.py | 17
ipapython/platform/base.py | 226
ipapython/platform/base/__init__.py | 226
ipapython/platform/base/systemd.py | 233
ipapython/platform/fedora16.py | 214
ipapython/platform/fedora16/__init__.py | 52
ipapython/platform/fedora16/selinux.py | 26
ipapython/platform/fedora16/service.py | 182
ipapython/platform/fedora18.py | 113
ipapython/platform/fedora18/__init__.py | 113
ipapython/platform/redhat.py | 261
ipapython/platform/redhat/__init__.py | 133
ipapython/platform/redhat/auth.py | 49
ipapython/platform/redhat/service.py | 123
ipapython/platform/systemd.py | 230
ipapython/setup.py.in | 7
ipapython/ssh.py | 18
ipaserver/dcerpc.py | 301
ipaserver/install/adtrustinstance.py | 189
ipaserver/install/bindinstance.py | 389
ipaserver/install/cainstance.py | 239
ipaserver/install/certs.py | 939 --
ipaserver/install/dsinstance.py | 176
ipaserver/install/httpinstance.py | 67
ipaserver/install/installutils.py | 61
ipaserver/install/ipa_backup.py | 568 +
ipaserver/install/ipa_ldap_updater.py | 50
ipaserver/install/ipa_replica_prepare.py | 506 +
ipaserver/install/ipa_restore.py | 639 +
ipaserver/install/krbinstance.py | 157
ipaserver/install/ldapupdate.py | 135
ipaserver/install/ntpinstance.py | 1
ipaserver/install/plugins/Makefile.am | 1
ipaserver/install/plugins/baseupdate.py | 1
ipaserver/install/plugins/dns.py | 1
ipaserver/install/plugins/fix_replica_agreements.py | 33
ipaserver/install/plugins/rename_managed.py | 14
ipaserver/install/plugins/update_pacs.py | 57
ipaserver/install/plugins/updateclient.py | 8
ipaserver/install/plugins/upload_cacrt.py | 3
ipaserver/install/replication.py | 715 +
ipaserver/install/service.py | 77
ipaserver/install/upgradeinstance.py | 2
ipaserver/ipaldap.py | 789 -
ipaserver/plugins/dogtag.py | 174
ipaserver/plugins/join.py | 26
ipaserver/plugins/ldap2.py | 1371 ---
ipaserver/plugins/rabase.py | 10
ipaserver/plugins/selfsign.py | 230
ipaserver/rpcserver.py | 12
make-lint | 71
make-test | 2
makeapi | 29
tests/test_cmdline/cmdline.py | 4
tests/test_cmdline/test_cli.py | 43
tests/test_cmdline/test_help.py | 141
tests/test_install/1_add.update | 4
tests/test_install/test_updates.py | 103
tests/test_ipalib/test_backend.py | 16
tests/test_ipalib/test_capabilities.py | 33
tests/test_ipalib/test_crud.py | 4
tests/test_ipalib/test_errors.py | 72
tests/test_ipalib/test_frontend.py | 101
tests/test_ipalib/test_messages.py | 89
tests/test_ipalib/test_parameters.py | 62
tests/test_ipaserver/test_ldap.py | 122
tests/test_ipaserver/test_rpcserver.py | 3
tests/test_xmlrpc/objectclasses.py | 7
tests/test_xmlrpc/test_cert.py | 180
tests/test_xmlrpc/test_cert_plugin.py | 454 +
tests/test_xmlrpc/test_dns_plugin.py | 146
tests/test_xmlrpc/test_dns_realmdomains_integration.py | 168
tests/test_xmlrpc/test_external_members.py | 160
tests/test_xmlrpc/test_group_plugin.py | 131
tests/test_xmlrpc/test_hbac_plugin.py | 131
tests/test_xmlrpc/test_hbactest_plugin.py | 80
tests/test_xmlrpc/test_host_plugin.py | 27
tests/test_xmlrpc/test_nesting.py | 1
tests/test_xmlrpc/test_netgroup_plugin.py | 12
tests/test_xmlrpc/test_ping_plugin.py | 5
tests/test_xmlrpc/test_range_plugin.py | 46
tests/test_xmlrpc/test_realmdomains_plugin.py | 164
tests/test_xmlrpc/test_selinuxusermap_plugin.py | 220
tests/test_xmlrpc/test_service_plugin.py | 84
tests/test_xmlrpc/test_sudocmd_plugin.py | 152
tests/test_xmlrpc/test_sudocmdgroup_plugin.py | 85
tests/test_xmlrpc/test_sudorule_plugin.py | 2
tests/test_xmlrpc/test_trust_plugin.py | 159
tests/test_xmlrpc/test_user_plugin.py | 89
tests/test_xmlrpc/xmlrpc_test.py | 33
tests/util.py | 9
util/ipa_mspac.h | 32
util/ipa_pwd.h | 3
493 files changed, 70266 insertions(+), 46520 deletions(-)
New commits:
commit 4828cb83c5c17026e1a5b398a9efb4516f9cc1be
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed May 22 16:41:27 2013 +0300
refresh patches
diff --git a/debian/patches/check-dbus-before-starting.diff b/debian/patches/check-dbus-before-starting.diff
index 6c62247..1ef2811 100644
--- a/debian/patches/check-dbus-before-starting.diff
+++ b/debian/patches/check-dbus-before-starting.diff
@@ -1,8 +1,6 @@
-Index: freeipa/ipa-client/ipa-install/ipa-client-install
-===================================================================
---- freeipa.orig/ipa-client/ipa-install/ipa-client-install 2013-02-21 01:19:38.000000000 +0000
-+++ freeipa/ipa-client/ipa-install/ipa-client-install 2013-02-21 02:03:54.000000000 +0000
-@@ -353,10 +353,11 @@
+--- a/ipa-client/ipa-install/ipa-client-install
++++ b/ipa-client/ipa-install/ipa-client-install
+@@ -372,10 +372,11 @@ def uninstall(options, env):
# Always start certmonger. We can't untrack something if it isn't
# running
messagebus = ipaservices.knownservices.messagebus
@@ -18,7 +16,7 @@ Index: freeipa/ipa-client/ipa-install/ipa-client-install
cmonger = ipaservices.knownservices.certmonger
try:
-@@ -868,10 +869,11 @@
+@@ -970,10 +971,11 @@ def configure_certmonger(fstore, subject
principal = 'host/%s@%s' % (hostname, cli_realm)
messagebus = ipaservices.knownservices.messagebus
diff --git a/debian/patches/correct-python-path.diff b/debian/patches/correct-python-path.diff
index 6a74d35..c6478cd 100644
--- a/debian/patches/correct-python-path.diff
+++ b/debian/patches/correct-python-path.diff
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -44,7 +44,7 @@ ifneq ($(DEVELOPER_MODE),0)
+@@ -50,7 +50,7 @@ ifneq ($(DEVELOPER_MODE),0)
LINT_OPTIONS=--no-fail
endif
diff --git a/debian/patches/fix-install-layout.diff b/debian/patches/fix-install-layout.diff
index 53e4892..293fe7d 100644
--- a/debian/patches/fix-install-layout.diff
+++ b/debian/patches/fix-install-layout.diff
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -76,9 +76,9 @@ client-install: client client-dirs
+@@ -82,9 +82,9 @@ client-install: client client-dirs
done
cd install/po && $(MAKE) install || exit 1;
if [ "$(DESTDIR)" = "" ]; then \
diff --git a/debian/patches/fix-ldap-conf-path.diff b/debian/patches/fix-ldap-conf-path.diff
index d3f52a2..90c08c4 100644
--- a/debian/patches/fix-ldap-conf-path.diff
+++ b/debian/patches/fix-ldap-conf-path.diff
@@ -1,13 +1,11 @@
-Index: freeipa/ipa-client/ipa-install/ipa-client-install
-===================================================================
---- freeipa.orig/ipa-client/ipa-install/ipa-client-install 2013-02-12 23:09:34.000000000 +0000
-+++ freeipa/ipa-client/ipa-install/ipa-client-install 2013-02-21 01:19:38.000000000 +0000
-@@ -770,7 +770,7 @@
- {'name':'TLS_CACERT', 'type':'option', 'value':CACERT},
- {'name':'empty', 'type':'empty'}]
+--- a/ipa-client/ipa-install/ipa-client-install
++++ b/ipa-client/ipa-install/ipa-client-install
+@@ -854,7 +854,7 @@ def configure_openldap_conf(fstore, cli_
+ {'action':'addifnotset', 'name':'TLS_CACERT', 'type':'option',
+ 'value':CACERT},]
- target_fname = '/etc/openldap/ldap.conf'
+ target_fname = '/etc/ldap/ldap.conf'
fstore.backup_file(target_fname)
- ldapconf.newConf(target_fname, opts)
- os.chmod(target_fname, 0644)
+
+ error_msg = "Configuring {path} failed with: {err}"
diff --git a/debian/patches/fix-string-format.diff b/debian/patches/fix-string-format.diff
index e38b32e..4d1ccd4 100644
--- a/debian/patches/fix-string-format.diff
+++ b/debian/patches/fix-string-format.diff
@@ -39,7 +39,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
-@@ -545,7 +545,7 @@ free_and_return:
+@@ -549,7 +549,7 @@ free_and_return:
if (targetEntry) slapi_entry_free(targetEntry);
if (ber) ber_free(ber, 1);
@@ -48,7 +48,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1115,7 +1115,7 @@ free_and_return:
+@@ -1119,7 +1119,7 @@ free_and_return:
if (rc == LDAP_SUCCESS)
errMesg = NULL;
@@ -57,7 +57,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1142,7 +1142,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
+@@ -1146,7 +1146,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid) != 0) {
errMesg = "Could not get OID value from request.\n";
rc = LDAP_OPERATIONS_ERROR;
@@ -66,7 +66,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
goto free_and_return;
} else {
LOG("Received extended operation request with OID %s\n", oid);
-@@ -1165,7 +1165,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
+@@ -1169,7 +1169,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
free_and_return:
if (krbcfg) free_ipapwd_krbcfg(&krbcfg);
diff --git a/debian/patches/no-test-lang.diff b/debian/patches/no-test-lang.diff
index ac87a72..d5f5619 100644
--- a/debian/patches/no-test-lang.diff
+++ b/debian/patches/no-test-lang.diff
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -92,7 +92,7 @@ client-dirs:
+@@ -98,7 +98,7 @@ client-dirs:
lint: bootstrap-autogen
./make-lint $(LINT_OPTIONS)
diff --git a/debian/patches/no-testcert.patch b/debian/patches/no-testcert.patch
index 907d92c..70a6704 100644
--- a/debian/patches/no-testcert.patch
+++ b/debian/patches/no-testcert.patch
@@ -7,7 +7,7 @@ they need a working certificate server running
--- a/Makefile
+++ b/Makefile
-@@ -96,7 +96,7 @@ lint: bootstrap-autogen
+@@ -102,7 +102,7 @@ lint: bootstrap-autogen
test:
diff --git a/debian/patches/prefix.patch b/debian/patches/prefix.patch
index 8669958..0d0b2e6 100644
--- a/debian/patches/prefix.patch
+++ b/debian/patches/prefix.patch
@@ -5,7 +5,7 @@ use the debian layout when installing python modules
--- a/Makefile
+++ b/Makefile
-@@ -140,7 +140,7 @@ server-install: server
+@@ -146,7 +146,7 @@ server-install: server
if [ "$(DESTDIR)" = "" ]; then \
$(PYTHON) setup.py install; \
else \
commit 6d907fcb1b0bae579544d327c9b903332041b7c3
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed May 22 16:37:55 2013 +0300
drop convert-base-platform.diff, upstream
diff --git a/debian/patches/convert-base-platform.diff b/debian/patches/convert-base-platform.diff
deleted file mode 100644
index 7df4d5e..0000000
--- a/debian/patches/convert-base-platform.diff
+++ /dev/null
@@ -1,2307 +0,0 @@
-commit 874d03b7c8edbb81d4f73de52fb1fb11505abecb
-Author: Timo Aaltonen <tjaalton at ubuntu.com>
-Date: Wed Dec 5 14:58:06 2012 +0200
-
- convert the base platform modules into packages
-
-diff --git a/freeipa.spec.in b/freeipa.spec.in
-index f1c45b6..0ce06cc 100644
---- a/freeipa.spec.in
-+++ b/freeipa.spec.in
-@@ -740,8 +740,16 @@ fi
- %doc COPYING README Contributors.txt
- %dir %{python_sitelib}/ipapython
- %dir %{python_sitelib}/ipapython/platform
-+%dir %{python_sitelib}/ipapython/platform/base
-+%dir %{python_sitelib}/ipapython/platform/fedora16
-+%dir %{python_sitelib}/ipapython/platform/fedora18
-+%dir %{python_sitelib}/ipapython/platform/redhat
- %{python_sitelib}/ipapython/*.py*
- %{python_sitelib}/ipapython/platform/*.py*
-+%{python_sitelib}/ipapython/platform/base/*.py*
-+%{python_sitelib}/ipapython/platform/fedora16/*.py*
-+%{python_sitelib}/ipapython/platform/fedora18/*.py*
-+%{python_sitelib}/ipapython/platform/redhat/*.py*
- %dir %{python_sitelib}/ipalib
- %{python_sitelib}/ipalib/*
- %{python_sitearch}/default_encoding_utf8.so
-diff --git a/ipapython/platform/base.py b/ipapython/platform/base.py
-deleted file mode 100644
-index e2aa33f..0000000
---- a/ipapython/platform/base.py
-+++ /dev/null
-@@ -1,226 +0,0 @@
--# Authors: Alexander Bokovoy <abokovoy at redhat.com>
--#
--# Copyright (C) 2011 Red Hat
--# see file 'COPYING' for use and warranty information
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 3 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--from ipalib.plugable import MagicDict
--import json
--import os
--
--# Canonical names of services as IPA wants to see them. As we need to have
--# *some* naming, set them as in Red Hat distributions. Actual implementation
--# should make them available through knownservices.<name> and take care of
--# re-mapping internally, if needed
--wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc',
-- 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap',
-- 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd',
-- 'rpcidmapd', 'pki_tomcatd', 'pki-cad', 'chronyd']
--
--# System may support more time&date services. FreeIPA supports ntpd only, other
--# services will be disabled during IPA installation
--timedate_services = ['ntpd', 'chronyd']
--
--
--# The common ports for these services. This is used to wait for the
--# service to become available.
--wellknownports = {
-- 'dirsrv at PKI-IPA.service': [7389],
-- 'PKI-IPA': [7389],
-- 'dirsrv': [389], # this is only used if the incoming instance name is blank
-- 'pki-cad': [9180, 9443, 9444],
-- 'pki-tomcatd at pki-tomcat.service': [8080, 8443],
-- 'pki-tomcat': [8080, 8443],
-- 'pki-tomcatd': [8080, 8443], # used if the incoming instance name is blank
--}
--
--SVC_LIST_FILE = "/var/run/ipa/services.list"
--
--class AuthConfig(object):
-- """
-- AuthConfig class implements system-independent interface to configure
-- system authentication resources. In Red Hat systems this is done with
-- authconfig(8) utility.
--
-- AuthConfig class is nothing more than a tool to gather configuration
-- options and execute their processing. These options then converted by
-- an actual implementation to series of a system calls to appropriate
-- utilities performing real configuration.
--
-- IPA *expects* names of AuthConfig's options to follow authconfig(8)
-- naming scheme!
--
-- Actual implementation should be done in ipapython/platform/<platform>.py
-- by inheriting from platform.AuthConfig and redefining __build_args()
-- and execute() methods.
--
-- from ipapython.platform import platform
-- class PlatformAuthConfig(platform.AuthConfig):
-- def __build_args():
-- ...
--
-- def execute():
-- ...
--
-- authconfig = PlatformAuthConfig
-- ....
--
-- See ipapython/platform/redhat.py for a sample implementation that uses
-- authconfig(8) as its backend.
--
-- From IPA code perspective, the authentication configuration should be
-- done with use of ipapython.services.authconfig:
--
-- from ipapython import services as ipaservices
-- auth_config = ipaservices.authconfig()
-- auth_config.disable("ldap").\
-- disable("krb5").\
-- disable("sssd").\
-- disable("sssdauth").\
-- disable("mkhomedir").\
-- add_option("update").\
-- enable("nis").\
-- add_parameter("nisdomain","foobar")
-- auth_config.execute()
--
-- If you need to re-use existing AuthConfig instance for multiple runs,
-- make sure to call 'AuthConfig.reset()' between the runs.
-- """
--
-- def __init__(self):
-- self.parameters = {}
--
-- def enable(self, option):
-- self.parameters[option] = True
-- return self
--
-- def disable(self, option):
-- self.parameters[option] = False
-- return self
--
-- def add_option(self, option):
-- self.parameters[option] = None
-- return self
--
-- def add_parameter(self, option, value):
-- self.parameters[option] = [value]
-- return self
--
-- def __build_args(self):
-- # do nothing
-- return None
--
-- def execute(self):
-- # do nothing
-- return None
--
-- def reset(self):
-- self.parameters = {}
-- return self
--
--class PlatformService(object):
-- """
-- PlatformService abstracts out external process running on the system
-- which is possible to administer (start, stop, check status, etc).
--
-- """
--
-- def __init__(self, service_name):
-- self.service_name = service_name
--
-- def start(self, instance_name="", capture_output=True, wait=True,
-- update_service_list=True):
-- """
-- When a service is started record the fact in a special file.
-- This allows ipactl stop to always stop all services that have
-- been started via ipa tools
-- """
-- if not update_service_list:
-- return
-- svc_list = []
-- try:
-- f = open(SVC_LIST_FILE, 'r')
-- svc_list = json.load(f)
-- except Exception:
-- # not fatal, may be the first service
-- pass
--
-- if self.service_name not in svc_list:
-- svc_list.append(self.service_name)
--
-- f = open(SVC_LIST_FILE, 'w')
-- json.dump(svc_list, f)
-- f.flush()
-- f.close()
-- return
--
-- def stop(self, instance_name="", capture_output=True, update_service_list=True):
-- """
-- When a service is stopped remove it from the service list file.
-- """
-- if not update_service_list:
-- return
-- svc_list = []
-- try:
-- f = open(SVC_LIST_FILE, 'r')
-- svc_list = json.load(f)
-- except Exception:
-- # not fatal, may be the first service
-- pass
--
-- while self.service_name in svc_list:
-- svc_list.remove(self.service_name)
--
-- f = open(SVC_LIST_FILE, 'w')
-- json.dump(svc_list, f)
-- f.flush()
-- f.close()
-- return
--
-- def restart(self, instance_name="", capture_output=True, wait=True):
-- return
--
-- def is_running(self, instance_name=""):
-- return False
--
-- def is_installed(self):
-- return False
--
-- def is_enabled(self, instance_name=""):
-- return False
--
-- def enable(self, instance_name=""):
-- return
--
-- def disable(self, instance_name=""):
-- return
--
-- def install(self, instance_name=""):
-- return
--
-- def remove(self, instance_name=""):
-- return
--
-- def get_config_dir(self, instance_name=""):
-- return
--
--class KnownServices(MagicDict):
-- """
-- KnownServices is an abstract class factory that should give out instances
-- of well-known platform services. Actual implementation must create these
-- instances as its own attributes on first access (or instance creation)
-- and cache them.
-- """
--
-diff --git a/ipapython/platform/base/__init__.py b/ipapython/platform/base/__init__.py
-new file mode 100644
-index 0000000..e2aa33f
---- /dev/null
-+++ b/ipapython/platform/base/__init__.py
-@@ -0,0 +1,226 @@
-+# Authors: Alexander Bokovoy <abokovoy at redhat.com>
-+#
-+# Copyright (C) 2011 Red Hat
-+# see file 'COPYING' for use and warranty information
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-+from ipalib.plugable import MagicDict
-+import json
-+import os
-+
-+# Canonical names of services as IPA wants to see them. As we need to have
-+# *some* naming, set them as in Red Hat distributions. Actual implementation
-+# should make them available through knownservices.<name> and take care of
-+# re-mapping internally, if needed
-+wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc',
-+ 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap',
-+ 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd',
-+ 'rpcidmapd', 'pki_tomcatd', 'pki-cad', 'chronyd']
-+
-+# System may support more time&date services. FreeIPA supports ntpd only, other
-+# services will be disabled during IPA installation
-+timedate_services = ['ntpd', 'chronyd']
-+
-+
-+# The common ports for these services. This is used to wait for the
-+# service to become available.
-+wellknownports = {
-+ 'dirsrv at PKI-IPA.service': [7389],
-+ 'PKI-IPA': [7389],
-+ 'dirsrv': [389], # this is only used if the incoming instance name is blank
-+ 'pki-cad': [9180, 9443, 9444],
-+ 'pki-tomcatd at pki-tomcat.service': [8080, 8443],
-+ 'pki-tomcat': [8080, 8443],
-+ 'pki-tomcatd': [8080, 8443], # used if the incoming instance name is blank
-+}
-+
-+SVC_LIST_FILE = "/var/run/ipa/services.list"
-+
-+class AuthConfig(object):
-+ """
-+ AuthConfig class implements system-independent interface to configure
-+ system authentication resources. In Red Hat systems this is done with
-+ authconfig(8) utility.
-+
-+ AuthConfig class is nothing more than a tool to gather configuration
-+ options and execute their processing. These options then converted by
-+ an actual implementation to series of a system calls to appropriate
-+ utilities performing real configuration.
-+
-+ IPA *expects* names of AuthConfig's options to follow authconfig(8)
-+ naming scheme!
-+
-+ Actual implementation should be done in ipapython/platform/<platform>.py
-+ by inheriting from platform.AuthConfig and redefining __build_args()
-+ and execute() methods.
-+