[Pkg-freeipa-devel] freeipa: Changes to 'upstream-unstable'

Timo Aaltonen tjaalton-guest at alioth.debian.org
Fri Jun 29 23:48:20 UTC 2012


 .gitignore                                                         |    5 
 .tx/config                                                         |    2 
 API.txt                                                            | 5098 +--
 Contributors.txt                                                   |    2 
 Makefile                                                           |   32 
 TODO                                                               |    5 
 VERSION                                                            |    6 
 contrib/RHEL4/ipa-client-setup                                     |   67 
 daemons/Makefile.am                                                |    2 
 daemons/configure.ac                                               |    5 
 daemons/ipa-kdb/Makefile.am                                        |   58 
 daemons/ipa-kdb/README                                             |    1 
 daemons/ipa-kdb/README.s4u2proxy.txt                               |  124 
 daemons/ipa-kdb/ipa_kdb.c                                          |  464 
 daemons/ipa-kdb/ipa_kdb.exports                                    |   10 
 daemons/ipa-kdb/ipa_kdb.h                                          |  258 
 daemons/ipa-kdb/ipa_kdb_audit_as.c                                 |  120 
 daemons/ipa-kdb/ipa_kdb_common.c                                   |  533 
 daemons/ipa-kdb/ipa_kdb_delegation.c                               |  214 
 daemons/ipa-kdb/ipa_kdb_mkey.c                                     |  225 
 daemons/ipa-kdb/ipa_kdb_mspac.c                                    |  989 
 daemons/ipa-kdb/ipa_kdb_passwords.c                                |  254 
 daemons/ipa-kdb/ipa_kdb_principals.c                               | 2014 +
 daemons/ipa-kdb/ipa_kdb_pwdpolicy.c                                |  333 
 daemons/ipa-kpasswd/Makefile.am                                    |   59 
 daemons/ipa-kpasswd/README                                         |    2 
 daemons/ipa-kpasswd/ipa_kpasswd.c                                  | 1422 -
 daemons/ipa-kpasswd/ipa_kpasswd.init                               |   83 
 daemons/ipa-slapi-plugins/common/util.h                            |    1 
 daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c          |    4 
 daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c                |   22 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am                |    4 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c            |  178 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h                   |   38 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c            |  665 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c          |  402 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c           |  148 
 daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c         |   96 
 daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h                |    6 
 dev/null                                                           |binary
 doc/examples/examples.py                                           |    9 
 doc/guide/Makefile                                                 |   36 
 doc/guide/README                                                   |   36 
 doc/guide/guide.org                                                | 1060 
 doc/guide/netgroup.js                                              |   62 
 doc/guide/role.py.txt                                              |  140 
 doc/guide/wsgi.py.txt                                              |   26 
 freeipa.spec.in                                                    |  228 
 init/SystemV/ipa_memcached.init                                    |  120 
 init/ipa_memcached.conf                                            |    5 
 init/systemd/freeipa-systemd-upgrade                               |   96 
 init/systemd/ipa.conf.tmpfiles                                     |    1 
 init/systemd/ipa_kpasswd.service                                   |   10 
 init/systemd/ipa_memcached.service                                 |   12 
 install/Makefile.am                                                |    1 
 install/conf/ipa.conf                                              |   18 
 install/configure.ac                                               |    3 
 install/html/Makefile.am                                           |    1 
 install/html/browserconfig.html                                    |    5 
 install/html/hbac-deny-remove.html                                 |   82 
 install/html/ipa_error.css                                         |  849 
 install/html/ssbrowser.html                                        |   13 
 install/html/unauthorized.html                                     |    5 
 install/migration/Makefile.am                                      |    1 
 install/migration/error.html                                       |    8 
 install/migration/index.html                                       |   10 
 install/migration/invalid.html                                     |   14 
 install/migration/ipa_migration.css                                |  863 
 install/migration/migration.py                                     |   10 
 install/po/Makefile.in                                             |   71 
 install/po/as.po                                                   | 9562 +++---
 install/po/bn_IN.po                                                | 9094 +++---
 install/po/de.po                                                   | 9897 +++----
 install/po/el.po                                                   | 9560 +++---
 install/po/es.po                                                   |13288 ++++-----
 install/po/fa.po                                                   | 9575 +++---
 install/po/fr.po                                                   |11476 ++++----
 install/po/gu.po                                                   | 9560 +++---
 install/po/he.po                                                   | 9560 +++---
 install/po/id.po                                                   | 8371 +++--
 install/po/ipa.pot                                                 | 9922 +++----
 install/po/it.po                                                   | 9560 +++---
 install/po/ja.po                                                   | 9588 +++---
 install/po/kn.po                                                   | 8333 +++--
 install/po/ko.po                                                   | 9575 +++---
 install/po/nl.po                                                   | 9564 +++---
 install/po/pl.po                                                   | 9207 +++---
 install/po/pt.po                                                   | 9560 +++---
 install/po/pt_BR.po                                                | 9562 +++---
 install/po/ru.po                                                   | 8883 +++---
 install/po/sv.po                                                   | 9562 +++---
 install/po/test_i18n.py                                            |  109 
 install/po/uk.po                                                   |14007 ++++------
 install/po/zh_CN.po                                                | 8873 +++---
 install/po/zh_TW.po                                                | 9573 +++---
 install/restart_scripts/Makefile.am                                |   15 
 install/restart_scripts/README                                     |    2 
 install/restart_scripts/restart_dirsrv                             |   13 
 install/restart_scripts/restart_httpd                              |    7 
 install/share/60basev2.ldif                                        |   42 
 install/share/60basev3.ldif                                        |   19 
 install/share/60ipaconfig.ldif                                     |    4 
 install/share/60ipadns.ldif                                        |   54 
 install/share/60ipasudo.ldif                                       |   39 
 install/share/65ipasudo.ldif                                       |   39 
 install/share/Makefile.am                                          |    7 
 install/share/bootstrap-template.ldif                              |   45 
 install/share/default-aci.ldif                                     |    7 
 install/share/default-keytypes.ldif                                |   33 
 install/share/default-pwpolicy.ldif                                |   14 
 install/share/delegation.ldif                                      |   24 
 install/share/dns.ldif                                             |   25 
 install/share/kdc.conf.template                                    |    1 
 install/share/kerberos.ldif                                        |   50 
 install/share/krb5.conf.template                                   |    9 
 install/share/master-entry.ldif                                    |    4 
 install/share/nis.uldif                                            |    2 
 install/share/preferences.html.template                            |    1 
 install/share/replica-s4u2proxy.ldif                               |    9 
 install/share/wsgi.py                                              |    3 
 install/tools/ipa-ca-install                                       |   11 
 install/tools/ipa-compat-manage                                    |    8 
 install/tools/ipa-csreplica-manage                                 |   49 
 install/tools/ipa-dns-install                                      |   51 
 install/tools/ipa-ldap-updater                                     |   51 
 install/tools/ipa-managed-entries                                  |   26 
 install/tools/ipa-nis-manage                                       |    9 
 install/tools/ipa-replica-conncheck                                |  137 
 install/tools/ipa-replica-install                                  |  128 
 install/tools/ipa-replica-manage                                   |  193 
 install/tools/ipa-replica-prepare                                  |   19 
 install/tools/ipa-server-install                                   |  209 
 install/tools/ipa-upgradeconfig                                    |  128 
 install/tools/ipactl                                               |    1 
 install/tools/man/Makefile.am                                      |    2 
 install/tools/man/ipa-dns-install.1                                |    4 
 install/tools/man/ipa-ldap-updater.1                               |    5 
 install/tools/man/ipa-managed-entries.1                            |    7 
 install/tools/man/ipa-replica-install.1                            |   14 
 install/tools/man/ipa-replica-manage.1                             |    8 
 install/tools/man/ipa-server-install.1                             |   15 
 install/tools/man/ipa-upgradeconfig.8                              |    4 
 install/tools/man/ipa_kpasswd.8                                    |   36 
 install/ui/Makefile.am                                             |   64 
 install/ui/aci.js                                                  |  999 
 install/ui/add.js                                                  |  206 
 install/ui/association.js                                          |  593 
 install/ui/automember.js                                           |  675 
 install/ui/automount.js                                            |  228 
 install/ui/browser.js                                              |   61 
 install/ui/certificate.js                                          |   76 
 install/ui/details.js                                              |  918 
 install/ui/develop.js                                              |   13 
 install/ui/dialog.js                                               |  239 
 install/ui/dns.js                                                  | 2684 +
 install/ui/entitle.js                                              |   90 
 install/ui/entity.js                                               |  821 
 install/ui/ext/Makefile.am                                         |   14 
 install/ui/facet.js                                                | 1056 
 install/ui/field.js                                                |  893 
 install/ui/group.js                                                |   90 
 install/ui/hbac.js                                                 |  891 
 install/ui/hbactest.js                                             |  833 
 install/ui/host.js                                                 |  475 
 install/ui/hostgroup.js                                            |   56 
 install/ui/images/Makefile.am                                      |   65 
 install/ui/images/add-icon.png                                     |binary
 install/ui/images/arrow-collapsed.png                              |binary
 install/ui/images/arrow-expanded.png                               |binary
 install/ui/images/background-center.png                            |binary
 install/ui/images/background-left.png                              |binary
 install/ui/images/background-right.png                             |binary
 install/ui/images/caution-icon.png                                 |binary
 install/ui/images/centered-background.png                          |binary
 install/ui/images/check-icon.png                                   |binary
 install/ui/images/combobox-open.png                                |binary
 install/ui/images/entitle-consume.png                              |binary
 install/ui/images/entitle-import.png                               |binary
 install/ui/images/entitle-register.png                             |binary
 install/ui/images/facet-tab-off.png                                |binary
 install/ui/images/facet-tab-on.png                                 |binary
 install/ui/images/firefox-icon.png                                 |binary
 install/ui/images/hover-tab.png                                    |binary
 install/ui/images/ie-icon.png                                      |binary
 install/ui/images/ipa-banner.png                                   |binary
 install/ui/images/ipa-logo.png                                     |binary
 install/ui/images/mainnav-background.png                           |binary
 install/ui/images/mainnav-tab-off.png                              |binary
 install/ui/images/mainnav-tab-on.png                               |binary
 install/ui/images/modal-background.png                             |binary
 install/ui/images/nav-arrow.png                                    |binary
 install/ui/images/outer-background.png                             |binary
 install/ui/images/panel-background.png                             |binary
 install/ui/images/remove-icon.png                                  |binary
 install/ui/images/reset-icon.png                                   |binary
 install/ui/images/search-background.png                            |binary
 install/ui/images/search-icon.png                                  |binary
 install/ui/images/spinner-header.gif                               |binary
 install/ui/images/spinner-small.gif                                |binary
 install/ui/images/static-background.png                            |binary
 install/ui/images/subnav-background.png                            |binary
 install/ui/images/top-background.png                               |binary
 install/ui/images/ui-bg_flat_65_ffffff_40x100.png                  |binary
 install/ui/images/ui-bg_glass_40_111111_1x400.png                  |binary
 install/ui/images/ui-bg_glass_55_1c1c1c_1x400.png                  |binary
 install/ui/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png        |binary
 install/ui/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png         |binary
 install/ui/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png         |binary
 install/ui/images/ui-bg_inset-hard_45_cd0a0a_1x100.png             |binary
 install/ui/images/ui-bg_inset-hard_55_ffeb80_1x100.png             |binary
 install/ui/images/ui-bg_loop_8_333333_21x21.png                    |binary
 install/ui/images/ui-icons_222222_256x240.png                      |binary
 install/ui/images/ui-icons_4ca300_256x240.png                      |binary
 install/ui/images/ui-icons_bbbbbb_256x240.png                      |binary
 install/ui/images/ui-icons_ededed_256x240.png                      |binary
 install/ui/images/ui-icons_ffcf29_256x240.png                      |binary
 install/ui/images/ui-icons_ffffff_256x240.png                      |binary
 install/ui/images/update-icon.png                                  |binary
 install/ui/index.html                                              |   27 
 install/ui/ipa.css                                                 |  633 
 install/ui/ipa.js                                                  |  969 
 install/ui/jquery-ui.css                                           |   34 
 install/ui/jquery.ordered-map.js                                   |   37 
 install/ui/jsl.conf                                                |   10 
 install/ui/login.html                                              |   58 
 install/ui/login.js                                                |   97 
 install/ui/logout.html                                             |   30 
 install/ui/navigation.js                                           |   58 
 install/ui/net.js                                                  |  394 
 install/ui/netgroup.js                                             |  293 
 install/ui/policy.js                                               |   81 
 install/ui/rule.js                                                 |  245 
 install/ui/search.js                                               |  254 
 install/ui/selinux.js                                              |  295 
 install/ui/serverconfig.js                                         |   56 
 install/ui/service.js                                              |  297 
 install/ui/sudo.js                                                 | 1401 -
 install/ui/test/aci_tests.html                                     |    6 
 install/ui/test/aci_tests.js                                       |  230 
 install/ui/test/all_tests.html                                     |    6 
 install/ui/test/association_tests.html                             |    1 
 install/ui/test/association_tests.js                               |   40 
 install/ui/test/bin/update_ipa_init.sh                             |   28 
 install/ui/test/certificate_tests.js                               |   27 
 install/ui/test/data/aci_find.json                                 |   63 
 install/ui/test/data/automembergroup_add.json                      |   21 
 install/ui/test/data/automembergroup_default_group_remove.json     |   14 
 install/ui/test/data/automembergroup_default_group_set.json        |   16 
 install/ui/test/data/automembergroup_default_group_show.json       |   17 
 install/ui/test/data/automembergroup_find_pkeys.json               |   24 
 install/ui/test/data/automembergroup_get_records.json              |   27 
 install/ui/test/data/automembergroup_show.json                     |   31 
 install/ui/test/data/automemberhostgroup_add.json                  |   21 
 install/ui/test/data/automemberhostgroup_default_group_remove.json |   14 
 install/ui/test/data/automemberhostgroup_default_group_set.json    |   16 
 install/ui/test/data/automemberhostgroup_default_group_show.json   |   15 
 install/ui/test/data/automemberhostgroup_find_pkeys.json           |   24 
 install/ui/test/data/automemberhostgroup_get_records.json          |   27 
 install/ui/test/data/automemberhostgroup_show.json                 |   30 
 install/ui/test/data/automountkey_add.json                         |    2 
 install/ui/test/data/automountkey_find.json                        |    4 
 install/ui/test/data/automountkey_show.json                        |    2 
 install/ui/test/data/automountlocation_add.json                    |    2 
 install/ui/test/data/automountlocation_find.json                   |    8 
 install/ui/test/data/automountlocation_find_pkeys.json             |   35 
 install/ui/test/data/automountlocation_get_records.json            |   53 
 install/ui/test/data/automountlocation_show.json                   |    2 
 install/ui/test/data/automountmap_add.json                         |    2 
 install/ui/test/data/automountmap_add_indirect.json                |    2 
 install/ui/test/data/automountmap_find.json                        |    8 
 install/ui/test/data/automountmap_find_pkeys.json                  |   35 
 install/ui/test/data/automountmap_get_records.json                 |   69 
 install/ui/test/data/automountmap_show.json                        |    2 
 install/ui/test/data/cert_request.json                             |    4 
 install/ui/test/data/cert_show.json                                |    4 
 install/ui/test/data/config_show.json                              |   14 
 install/ui/test/data/delegation_find.json                          |    8 
 install/ui/test/data/delegation_find_pkeys.json                    |   14 
 install/ui/test/data/delegation_get_records.json                   |   30 
 install/ui/test/data/delegation_list.json                          |    8 
 install/ui/test/data/delegation_mod.json                           |    4 
 install/ui/test/data/dns_find.json                                 |  101 
 install/ui/test/data/dns_find_rr.json                              |  110 
 install/ui/test/data/dns_show.json                                 |   38 
 install/ui/test/data/dnsconfig_mod.json                            |   41 
 install/ui/test/data/dnsconfig_show.json                           |   42 
 install/ui/test/data/dnsrecord_add.json                            |   63 
 install/ui/test/data/dnsrecord_del.json                            |   66 
 install/ui/test/data/dnsrecord_find.json                           |   50 
 install/ui/test/data/dnsrecord_find_pkeys.json                     |   83 
 install/ui/test/data/dnsrecord_get_records.json                    |  194 
 install/ui/test/data/dnsrecord_show.json                           |   80 
 install/ui/test/data/dnszone_add.json                              |   10 
 install/ui/test/data/dnszone_find.json                             |   64 
 install/ui/test/data/dnszone_find_pkeys.json                       |   29 
 install/ui/test/data/dnszone_get_records.json                      |  156 
 install/ui/test/data/dnszone_show.json                             |   30 
 install/ui/test/data/entitle_find_offline.json                     |    2 
 install/ui/test/data/entitle_find_online.json                      |    2 
 install/ui/test/data/entitle_register.json                         |    2 
 install/ui/test/data/group_add.json                                |    2 
 install/ui/test/data/group_add_member.json                         |    2 
 install/ui/test/data/group_find.json                               |   10 
 install/ui/test/data/group_find_pkeys.json                         |   41 
 install/ui/test/data/group_get_records.json                        |  105 
 install/ui/test/data/group_member_user.json                        | 1424 -
 install/ui/test/data/group_remove_member.json                      |    2 
 install/ui/test/data/group_show.json                               |  270 
 install/ui/test/data/hbacrule_add.json                             |    2 
 install/ui/test/data/hbacrule_add_host.json                        |    2 
 install/ui/test/data/hbacrule_add_service.json                     |    2 
 install/ui/test/data/hbacrule_add_sourcehost.json                  |    2 
 install/ui/test/data/hbacrule_add_user.json                        |    2 
 install/ui/test/data/hbacrule_find.json                            |   42 
 install/ui/test/data/hbacrule_find_pkeys.json                      |  137 
 install/ui/test/data/hbacrule_get_records.json                     |  639 
 install/ui/test/data/hbacrule_remove_host.json                     |    2 
 install/ui/test/data/hbacrule_remove_service.json                  |    2 
 install/ui/test/data/hbacrule_remove_sourcehost.json               |    2 
 install/ui/test/data/hbacrule_remove_user.json                     |    2 
 install/ui/test/data/hbacrule_show.json                            |    8 
 install/ui/test/data/hbacsvc_add.json                              |    2 
 install/ui/test/data/hbacsvc_find.json                             |   20 
 install/ui/test/data/hbacsvc_find_pkeys.json                       |   71 
 install/ui/test/data/hbacsvc_get_records.json                      |  149 
 install/ui/test/data/hbacsvc_show.json                             |    4 
 install/ui/test/data/hbacsvcgroup_add.json                         |    2 
 install/ui/test/data/hbacsvcgroup_add_member.json                  |    2 
 install/ui/test/data/hbacsvcgroup_find.json                        |    2 
 install/ui/test/data/hbacsvcgroup_find_pkeys.json                  |   17 
 install/ui/test/data/hbacsvcgroup_get_records.json                 |   27 
 install/ui/test/data/hbacsvcgroup_member_hbacsvc.json              |    8 
 install/ui/test/data/hbacsvcgroup_remove_member.json               |    2 
 install/ui/test/data/hbacsvcgroup_show.json                        |    2 
 install/ui/test/data/hbactest.json                                 |   34 
 install/ui/test/data/hbactest_matched.json                         |  408 
 install/ui/test/data/hbactest_unmatched.json                       |  249 
 install/ui/test/data/host_add.json                                 |    6 
 install/ui/test/data/host_find.json                                |   59 
 install/ui/test/data/host_find_pkeys.json                          |   23 
 install/ui/test/data/host_get_records.json                         |  112 
 install/ui/test/data/host_mod.json                                 |    9 
 install/ui/test/data/host_show.json                                |   11 
 install/ui/test/data/host_show_dev.example.com.json                |    8 
 install/ui/test/data/host_show_test.example.com.json               |   11 
 install/ui/test/data/hostgroup_add.json                            |    2 
 install/ui/test/data/hostgroup_add_member.json                     |    2 
 install/ui/test/data/hostgroup_find.json                           |    4 
 install/ui/test/data/hostgroup_find_pkeys.json                     |   23 
 install/ui/test/data/hostgroup_get_records.json                    |   41 
 install/ui/test/data/hostgroup_member_host.json                    |    4 
 install/ui/test/data/hostgroup_show.json                           |    2 
 install/ui/test/data/ipa_init.json                                 |  201 
 install/ui/test/data/ipa_init_commands.json                        |12946 +++++++++
 install/ui/test/data/ipa_init_methods.json                         | 2975 +-
 install/ui/test/data/ipa_init_objects.json                         | 6527 ++++
 install/ui/test/data/json_metadata.json                            |    1 
 install/ui/test/data/krbtpolicy_show.json                          |   11 
 install/ui/test/data/netgroup_add.json                             |    4 
 install/ui/test/data/netgroup_add_member.json                      |    4 
 install/ui/test/data/netgroup_find.json                            |   14 
 install/ui/test/data/netgroup_find_pkeys.json                      |   23 
 install/ui/test/data/netgroup_get_records.json                     |   64 
 install/ui/test/data/netgroup_show.json                            |    4 
 install/ui/test/data/permission_add.json                           |    2 
 install/ui/test/data/permission_find.json                          |   10 
 install/ui/test/data/permission_find_pkeys.json                    |   35 
 install/ui/test/data/permission_get_records.json                   |  101 
 install/ui/test/data/permission_show.json                          |    4 
 install/ui/test/data/permission_show_filter.json                   |    8 
 install/ui/test/data/permission_show_subtree.json                  |   10 
 install/ui/test/data/permission_show_targetgroup.json              |    2 
 install/ui/test/data/permission_show_type.json                     |    8 
 install/ui/test/data/privilege_find.json                           |   32 
 install/ui/test/data/privilege_find_pkeys.json                     |   95 
 install/ui/test/data/privilege_get_records.json                    |  283 
 install/ui/test/data/privilege_show.json                           |    4 
 install/ui/test/data/pwpolicy_find.json                            |   12 
 install/ui/test/data/pwpolicy_find_pkeys.json                      |   27 
 install/ui/test/data/pwpolicy_get_records.json                     |   85 
 install/ui/test/data/pwpolicy_show.json                            |    2 
 install/ui/test/data/role_find.json                                |    2 
 install/ui/test/data/role_find_pkeys.json                          |   17 
 install/ui/test/data/role_get_records.json                         |   23 
 install/ui/test/data/role_show.json                                |    2 
 install/ui/test/data/rolegroup_add.json                            |   22 
 install/ui/test/data/rolegroup_add_member.json                     |   27 
 install/ui/test/data/rolegroup_del.json                            |    9 
 install/ui/test/data/rolegroup_find.json                           |  185 
 install/ui/test/data/rolegroup_remove_member.json                  |   24 
 install/ui/test/data/rolegroup_show.json                           |   20 
 install/ui/test/data/selfservice_find_pkeys.json                   |   17 
 install/ui/test/data/selfservice_get_records.json                  |   69 
 install/ui/test/data/selinuxusermap_add_host.json                  |   35 
 install/ui/test/data/selinuxusermap_add_user.json                  |   38 
 install/ui/test/data/selinuxusermap_details_update.json            |   47 
 install/ui/test/data/selinuxusermap_find_pkeys.json                |   23 
 install/ui/test/data/selinuxusermap_get_records.json               |   69 
 install/ui/test/data/selinuxusermap_mod.json                       |   47 
 install/ui/test/data/selinuxusermap_remove_host.json               |   35 
 install/ui/test/data/selinuxusermap_remove_user.json               |   32 
 install/ui/test/data/selinuxusermap_show.json                      |   48 
 install/ui/test/data/service_add.json                              |    8 
 install/ui/test/data/service_add_host.json                         |    4 
 install/ui/test/data/service_del.json                              |    4 
 install/ui/test/data/service_disable.json                          |    4 
 install/ui/test/data/service_find.json                             |   12 
 install/ui/test/data/service_find_pkeys.json                       |   29 
 install/ui/test/data/service_get_records.json                      |   61 
 install/ui/test/data/service_managedby_host.json                   |    4 
 install/ui/test/data/service_mod.json                              |    6 
 install/ui/test/data/service_remove_host.sh                        |    4 
 install/ui/test/data/service_show.json                             |   11 
 install/ui/test/data/session_logout.json                           |    7 
 install/ui/test/data/sudocmd_add.json                              |    2 
 install/ui/test/data/sudocmd_find.json                             |    4 
 install/ui/test/data/sudocmd_find_pkeys.json                       |   23 
 install/ui/test/data/sudocmd_get_records.json                      |   31 
 install/ui/test/data/sudocmd_memberof_add.json                     |    4 
 install/ui/test/data/sudocmd_memberof_remove.json                  |    4 
 install/ui/test/data/sudocmd_memberof_show.json                    |    4 
 install/ui/test/data/sudocmd_show.json                             |    6 
 install/ui/test/data/sudocmdgroup_add.json                         |    2 
 install/ui/test/data/sudocmdgroup_add_member.json                  |    2 
 install/ui/test/data/sudocmdgroup_find.json                        |    4 
 install/ui/test/data/sudocmdgroup_find_pkeys.json                  |   23 
 install/ui/test/data/sudocmdgroup_get_records.json                 |   41 
 install/ui/test/data/sudocmdgroup_member_sudocmd.json              |    8 
 install/ui/test/data/sudocmdgroup_remove_member.json               |    2 
 install/ui/test/data/sudocmdgroup_show.json                        |    2 
 install/ui/test/data/sudorule_add.json                             |    2 
 install/ui/test/data/sudorule_find.json                            |    2 
 install/ui/test/data/sudorule_find_pkeys.json                      |   23 
 install/ui/test/data/sudorule_get_records.json                     |  191 
 install/ui/test/data/sudorule_show.json                            |    2 
 install/ui/test/data/taskgroup_find.json                           |  554 
 install/ui/test/data/user_add.json                                 |    4 
 install/ui/test/data/user_details_refresh.json                     |  316 
 install/ui/test/data/user_find.json                                |  200 
 install/ui/test/data/user_find_pkeys.json                          | 1499 +
 install/ui/test/data/user_get_records.json                         | 1422 +
 install/ui/test/data/user_memberof_group.json                      |    4 
 install/ui/test/data/user_mod.json                                 |   19 
 install/ui/test/data/user_show.json                                |   27 
 install/ui/test/data/whoami.json                                   |    2 
 install/ui/test/details_tests.html                                 |    3 
 install/ui/test/details_tests.js                                   |  242 
 install/ui/test/entity_tests.html                                  |    1 
 install/ui/test/entity_tests.js                                    |   51 
 install/ui/test/index.html                                         |    2 
 install/ui/test/ip_tests.html                                      |   18 
 install/ui/test/ip_tests.js                                        |  303 
 install/ui/test/ipa_tests.html                                     |    4 
 install/ui/test/ipa_tests.js                                       |  140 
 install/ui/test/jsl.conf                                           |  149 
 install/ui/test/navigation_tests.html                              |    1 
 install/ui/test/navigation_tests.js                                |   55 
 install/ui/test/ordered_map_tests.html                             |    1 
 install/ui/test/widget_tests.html                                  |    5 
 install/ui/test/widget_tests.js                                    |  131 
 install/ui/user.js                                                 |  513 
 install/ui/webui.js                                                |   45 
 install/ui/widget.js                                               | 2510 +
 install/updates/10-60basev3.update                                 |    6 
 install/updates/10-bind-schema.update                              |   71 
 install/updates/10-config.update                                   |   12 
 install/updates/10-schema_compat.update                            |    4 
 install/updates/10-selinuxusermap.update                           |   50 
 install/updates/10-ssh.update                                      |   21 
 install/updates/10-sudo.update                                     |    2 
 install/updates/20-aci.update                                      |   10 
 install/updates/20-user_private_groups.update                      |    4 
 install/updates/30-s4u2proxy.update                                |   24 
 install/updates/40-delegation.update                               |  109 
 install/updates/40-dns.update                                      |    7 
 install/updates/45-roles.update                                    |    3 
 install/updates/50-ipaconfig.update                                |    5 
 install/updates/50-nis.update                                      |   11 
 install/updates/55-pbacmemberof.update                             |   10 
 install/updates/Makefile.am                                        |    7 
 ipa-client/Makefile.am                                             |    3 
 ipa-client/config.c                                                |   20 
 ipa-client/configure.ac                                            |   15 
 ipa-client/ipa-client-common.h                                     |    1 
 ipa-client/ipa-getkeytab.c                                         |   63 
 ipa-client/ipa-install/ipa-client-install                          |  610 
 ipa-client/ipa-join.c                                              |   92 
 ipa-client/ipa-rmkeytab.c                                          |   14 
 ipa-client/ipaclient/ipadiscovery.py                               |   66 
 ipa-client/man/default.conf.5                                      |   52 
 ipa-client/man/ipa-client-install.1                                |   53 
 ipa.1                                                              |    9 
 ipalib/__init__.py                                                 |    9 
 ipalib/backend.py                                                  |    8 
 ipalib/cli.py                                                      |  227 
 ipalib/compat.py                                                   |   81 
 ipalib/config.py                                                   |    4 
 ipalib/constants.py                                                |   34 
 ipalib/crud.py                                                     |   32 
 ipalib/dn.py                                                       |    2 
 ipalib/encoder.py                                                  |    6 
 ipalib/errors.py                                                   |   54 
 ipalib/frontend.py                                                 |  277 
 ipalib/krb_utils.py                                                |  395 
 ipalib/output.py                                                   |   12 
 ipalib/parameters.py                                               |  430 
 ipalib/plugable.py                                                 |  176 
 ipalib/plugins/aci.py                                              |  127 
 ipalib/plugins/automember.py                                       |   59 
 ipalib/plugins/automount.py                                        |   86 
 ipalib/plugins/baseldap.py                                         |  573 
 ipalib/plugins/batch.py                                            |   23 
 ipalib/plugins/cert.py                                             |   39 
 ipalib/plugins/config.py                                           |  176 
 ipalib/plugins/delegation.py                                       |  106 
 ipalib/plugins/dns.py                                              | 2397 +
 ipalib/plugins/group.py                                            |   18 
 ipalib/plugins/hbacrule.py                                         |   80 
 ipalib/plugins/hbactest.py                                         |  101 
 ipalib/plugins/host.py                                             |  335 
 ipalib/plugins/hostgroup.py                                        |    5 
 ipalib/plugins/internal.py                                         |  204 
 ipalib/plugins/migration.py                                        |  284 
 ipalib/plugins/netgroup.py                                         |   87 
 ipalib/plugins/passwd.py                                           |    2 
 ipalib/plugins/permission.py                                       |   68 
 ipalib/plugins/ping.py                                             |   26 
 ipalib/plugins/privilege.py                                        |    7 
 ipalib/plugins/pwpolicy.py                                         |   40 
 ipalib/plugins/role.py                                             |    6 
 ipalib/plugins/selfservice.py                                      |   59 
 ipalib/plugins/selinuxusermap.py                                   |  450 
 ipalib/plugins/service.py                                          |   31 
 ipalib/plugins/sudorule.py                                         |  358 
 ipalib/plugins/user.py                                             |  271 
 ipalib/rpc.py                                                      |   71 
 ipalib/session.py                                                  | 1294 
 ipalib/util.py                                                     |  316 
 ipalib/x509.py                                                     |   22 
 ipapython/certdb.py                                                |    2 
 ipapython/certmonger.py                                            |   32 
 ipapython/compat.py                                                |   81 
 ipapython/dnsclient.py                                             |   78 
 ipapython/dogtag.py                                                |   18 
 ipapython/ipa_log_manager.py                                       |  223 
 ipapython/ipautil.py                                               |  265 
 ipapython/log_manager.py                                           | 1550 +
 ipapython/nsslib.py                                                |   77 
 ipapython/platform/base.py                                         |    8 
 ipapython/platform/fedora16.py                                     |   28 
 ipapython/platform/redhat.py                                       |   26 
 ipapython/platform/systemd.py                                      |   16 
 ipapython/py_default_encoding/setup.py                             |    7 
 ipapython/sysrestore.py                                            |   69 
 ipaserver/install/bindinstance.py                                  |  116 
 ipaserver/install/cainstance.py                                    |  132 
 ipaserver/install/certs.py                                         |   30 
 ipaserver/install/dsinstance.py                                    |  178 
 ipaserver/install/httpinstance.py                                  |   79 
 ipaserver/install/installutils.py                                  |  173 
 ipaserver/install/krbinstance.py                                   |  227 
 ipaserver/install/ldapupdate.py                                    |  247 
 ipaserver/install/memcacheinstance.py                              |   24 
 ipaserver/install/ntpinstance.py                                   |    5 
 ipaserver/install/plugins/Makefile.am                              |   18 
 ipaserver/install/plugins/__init__.py                              |   28 
 ipaserver/install/plugins/baseupdate.py                            |   68 
 ipaserver/install/plugins/dns.py                                   |  144 
 ipaserver/install/plugins/fix_replica_memberof.py                  |   82 
 ipaserver/install/plugins/rename_managed.py                        |  132 
 ipaserver/install/plugins/updateclient.py                          |  182 
 ipaserver/install/replication.py                                   |  224 
 ipaserver/install/service.py                                       |   51 
 ipaserver/install/upgradeinstance.py                               |   11 
 ipaserver/ipaldap.py                                               |  249 
 ipaserver/plugins/dogtag.py                                        |   16 
 ipaserver/plugins/join.py                                          |    4 
 ipaserver/plugins/ldap2.py                                         |  247 
 ipaserver/plugins/selfsign.py                                      |    3 
 ipaserver/plugins/xmlserver.py                                     |    9 
 ipaserver/rpcserver.py                                             |  610 
 lite-server.py                                                     |    4 
 make-lint                                                          |   56 
 make-test                                                          |   34 
 make-testcert                                                      |    5 
 makeapi                                                            |   75 
 selinux/Makefile                                                   |    5 
 selinux/ipa-server-selinux.spec.in                                 |    5 
 selinux/ipa_httpd/ipa_httpd.te                                     |    2 
 selinux/ipa_kpasswd/ipa_kpasswd.fc                                 |    9 
 selinux/ipa_kpasswd/ipa_kpasswd.te                                 |   86 
 setup.py                                                           |    1 
 tests/i18n.py                                                      |  731 
 tests/test_cmdline/test_cli.py                                     |  237 
 tests/test_install/test_updates.py                                 |   15 
 tests/test_ipalib/test_frontend.py                                 |    3 
 tests/test_ipalib/test_parameters.py                               |  204 
 tests/test_ipalib/test_plugable.py                                 |    2 
 tests/test_ipalib/test_text.py                                     |  163 
 tests/test_ipapython/test_ipautil.py                               |    4 
 tests/test_ipaserver/test_ldap.py                                  |   32 
 tests/test_ipaserver/test_rpcserver.py                             |   69 
 tests/test_xmlrpc/objectclasses.py                                 |   17 
 tests/test_xmlrpc/test_attr.py                                     |  242 
 tests/test_xmlrpc/test_automember_plugin.py                        |   50 
 tests/test_xmlrpc/test_automount_plugin.py                         |   86 
 tests/test_xmlrpc/test_batch_plugin.py                             |  194 
 tests/test_xmlrpc/test_cert.py                                     |   11 
 tests/test_xmlrpc/test_delegation_plugin.py                        |   74 
 tests/test_xmlrpc/test_dns_plugin.py                               |  652 
 tests/test_xmlrpc/test_group_plugin.py                             |   74 
 tests/test_xmlrpc/test_hbac_plugin.py                              |  153 
 tests/test_xmlrpc/test_hbacsvcgroup_plugin.py                      |   13 
 tests/test_xmlrpc/test_hbactest_plugin.py                          |   77 
 tests/test_xmlrpc/test_host_plugin.py                              |  202 
 tests/test_xmlrpc/test_hostgroup_plugin.py                         |   22 
 tests/test_xmlrpc/test_netgroup_plugin.py                          |  188 
 tests/test_xmlrpc/test_passwd_plugin.py                            |    9 
 tests/test_xmlrpc/test_permission_plugin.py                        |  252 
 tests/test_xmlrpc/test_privilege_plugin.py                         |   11 
 tests/test_xmlrpc/test_pwpolicy.py                                 |  195 
 tests/test_xmlrpc/test_pwpolicy_plugin.py                          |  228 
 tests/test_xmlrpc/test_role_plugin.py                              |   40 
 tests/test_xmlrpc/test_selfservice_plugin.py                       |  118 
 tests/test_xmlrpc/test_selinuxusermap_plugin.py                    |  649 
 tests/test_xmlrpc/test_service_plugin.py                           |   55 
 tests/test_xmlrpc/test_sudocmd_plugin.py                           |   21 
 tests/test_xmlrpc/test_sudocmdgroup_plugin.py                      |  118 
 tests/test_xmlrpc/test_sudorule_plugin.py                          |  217 
 tests/test_xmlrpc/test_user_plugin.py                              |  527 
 tests/test_xmlrpc/xmlrpc_test.py                                   |   76 
 tests/util.py                                                      |   15 
 util/ipa_krb5.c                                                    |  492 
 util/ipa_krb5.h                                                    |   33 
 util/ipa_pwd.c                                                     |  656 
 util/ipa_pwd.h                                                     |   74 
 636 files changed, 196897 insertions(+), 138967 deletions(-)

New commits:
commit b16d4340c4b9b9057c980284afe3f03e19bdc8cb
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Wed May 2 20:11:41 2012 -0400

    Become IPA 2.2.0

diff --git a/VERSION b/VERSION
index dfedeef..bc4d906 100644
--- a/VERSION
+++ b/VERSION
@@ -19,8 +19,8 @@
 #  ->  "1.0.0"                                         #
 ########################################################
 IPA_VERSION_MAJOR=2
-IPA_VERSION_MINOR=1
-IPA_VERSION_RELEASE=90
+IPA_VERSION_MINOR=2
+IPA_VERSION_RELEASE=0
 
 ########################################################
 # For 'pre' releases the version will be               #
@@ -40,7 +40,7 @@ IPA_VERSION_PRE_RELEASE=
 # e.g. IPA_VERSION_RC_RELEASE=1                        #
 #  ->  "1.0.0rc1"                                      #
 ########################################################
-IPA_VERSION_RC_RELEASE=1
+IPA_VERSION_RC_RELEASE=
 
 ########################################################
 # To mark GIT snapshots this should be set to 'yes'    #

commit 8fac99634f3be38951dd2ad32ea76f2b0d0ec1b5
Author: Petr Viktorin <pviktori at redhat.com>
Date:   Thu May 3 06:47:17 2012 -0400

    Update hostname validator error messages in tests
    
    A recent patch changed the error message from the hostname
    validator. Update the tests to reflect this change.

diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/tests/test_xmlrpc/test_dns_plugin.py
index 786c496..8aeaede 100644
--- a/tests/test_xmlrpc/test_dns_plugin.py
+++ b/tests/test_xmlrpc/test_dns_plugin.py
@@ -114,7 +114,7 @@ class test_dns(Declarative):
             ),
             expected=errors.ValidationError(name='name',
                 error=u'only letters, numbers, and - are allowed. ' +
-                    u'- must not be the DNS label character'),
+                    u'DNS label may not start or end with -'),
         ),
 
 
@@ -478,7 +478,7 @@ class test_dns(Declarative):
             command=('dnsrecord_add', [dnszone1, u'invalid record'], {'arecord': u'127.0.0.1'}),
             expected=errors.ValidationError(name='name',
                 error=u'only letters, numbers, _, and - are allowed. ' +
-                    u'- must not be the DNS label character'),
+                    u'DNS label may not start or end with -'),
         ),
 
 
@@ -639,7 +639,7 @@ class test_dns(Declarative):
                                                                  'srv_part_target' : u'foo bar'}),
             expected=errors.ValidationError(name='srv_target',
                 error=u'invalid domain-name: only letters, numbers, and - ' +
-                    u'are allowed. - must not be the DNS label character'),
+                    u'are allowed. DNS label may not start or end with -'),
         ),
 
         dict(
@@ -734,7 +734,7 @@ class test_dns(Declarative):
             command=('dnsrecord_add', [dnszone1, dnsres1], {'cnamerecord': u'-.example.com' }),
             expected=errors.ValidationError(name='hostname',
                 error=u'invalid domain-name: only letters, numbers, and - ' +
-                    u'are allowed. - must not be the DNS label character'),
+                    u'are allowed. DNS label may not start or end with -'),
         ),
 
         dict(
@@ -908,7 +908,7 @@ class test_dns(Declarative):
             command=('dnsrecord_add', [revdnszone1, dnsrev1], {'ptrrecord': u'-.example.com' }),
             expected=errors.ValidationError(name='hostname',
                 error=u'invalid domain-name: only letters, numbers, and - ' +
-                    u'are allowed. - must not be the DNS label character'),
+                    u'are allowed. DNS label may not start or end with -'),
         ),
 
         dict(
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py
index b7b3567..8798168 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/tests/test_xmlrpc/test_host_plugin.py
@@ -698,7 +698,7 @@ class test_host(Declarative):
             command=('host_add', [invalidfqdn1], {}),
             expected=errors.ValidationError(name='hostname',
                 error=u'invalid domain-name: only letters, numbers, and - ' +
-                    u'are allowed. - must not be the DNS label character'),
+                    u'are allowed. DNS label may not start or end with -'),
         ),
 
 
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py
index afb2ac7..40ad1ea 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/tests/test_xmlrpc/test_netgroup_plugin.py
@@ -363,7 +363,8 @@ class test_netgroup(Declarative):
             desc='Add invalid host %r to netgroup %r' % (invalidhost, netgroup1),
             command=('netgroup_add_member', [netgroup1], dict(host=invalidhost)),
             expected=errors.ValidationError(name='host',
-             error='only letters, numbers, _, and - are allowed. - must not be the DNS label character'),
+             error='only letters, numbers, _, and - are allowed. ' +
+                    u'DNS label may not start or end with -'),
         ),
 
 

commit 1267d5731d31c80e3b6d06397e23f7070d7eb508
Author: Martin Kosek <mkosek at redhat.com>
Date:   Wed May 2 15:36:04 2012 +0200

    Make ipa 2.2 client capable of joining an older server
    
    IPA server of version 2.2 and higher supports Kerberos S4U2Proxy
    delegation, i.e. ipa command no longer forwards Kerberos TGT to the
    server during authentication. However, when IPA client of version
    2.2 and higher tries to join an older IPA server, the installer
    crashes because the pre-2.2 server expects the TGT to be forwarded.
    
    This patch adds a fallback to ipa-client-install which would detect
    this situation and tries connecting with TGT forwarding enabled
    again. User is informed about this incompatibility.
    
    Missing realm was also added to keytab kinit as it was reported to
    fix occasional install issues.
    
    https://fedorahosted.org/freeipa/ticket/2697

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 7133cce..67279b3 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1374,14 +1374,36 @@ def install(options, env, fstore, statestore):
 
     os.environ['KRB5CCNAME'] = CCACHE_FILE
     try:
-        ipautil.run(['/usr/bin/kinit', '-k', '-t', '/etc/krb5.keytab', 'host/%s' % hostname])
-        api.Backend.xmlclient.connect()
+        ipautil.run(['/usr/bin/kinit', '-k', '-t', '/etc/krb5.keytab', 'host/%s@%s' % (hostname, cli_realm)])
     except CalledProcessError, e:
         print >>sys.stderr, "Failed to obtain host TGT."
         # fail to obtain ticket makes it impossible to login and bind from sssd to LDAP,
         # abort installation and rollback changes
         return CLIENT_INSTALL_ERROR
 
+    # Now, we have a TGT, lets try to connect to the server's XML-RPC interface
+    try:
+        api.Backend.xmlclient.connect()
+    except errors.KerberosError, e:
+        root_logger.debug('Cannot connect to the server due to Kerberos error: %s' % str(e))
+        root_logger.debug('Trying with delegate=True')
+        try:
+            api.Backend.xmlclient.connect(delegate=True)
+            root_logger.debug('Connection with delegate=True successful')
+
+            # The remote server is not capable of Kerberos S4U2Proxy delegation
+            # This features is implemented in IPA server version 2.2 and higher
+            print >>sys.stderr, "Target IPA server has a lower version that the enrolled client"
+            print >>sys.stderr, "Some capabilities including the ipa command capability may not be available"
+        except errors.PublicError, e2:
+            root_logger.debug('Second connect with delegate=True also failed: %s' % str(e2))
+            print >>sys.stderr, "Cannot connect to the IPA server XML-RPC interface: %s" % str(e2)
+            return CLIENT_INSTALL_ERROR
+    except errors.PublicError, e:
+        root_logger.debug('Cannot connect to the server due to generic error: %s' % str(e))
+        print >>sys.stderr, "Cannot connect to the IPA server XML-RPC interface: %s" % str(e)
+        return CLIENT_INSTALL_ERROR
+
     if not options.on_master:
         client_dns(cli_server, hostname, options.dns_updates)
         configure_certmonger(fstore, subject_base, cli_realm, hostname, options)

commit 6321c5ba87ff916bfff7fa15d20cb6d1a18f20f0
Author: Jan Cholasta <jcholast at redhat.com>
Date:   Mon Apr 30 11:58:55 2012 -0400

    Set the "KerberosAuthentication" option in sshd_config to "no" instead of "yes".
    
    Setting it to "yes" causes sshd to handle kinits itself, bypassing SSSD.
    
    ticket 2689

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 563e9c4..7133cce 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -878,7 +878,7 @@ def configure_ssh(fstore, ssh_dir, options):
     fstore.backup_file(sshd_config)
 
     changes = {
-        'KerberosAuthentication': 'yes',
+        'KerberosAuthentication': 'no',
         'GSSAPIAuthentication': 'yes',
         'UsePAM': 'yes',
     }

commit ed99c51117fdc691c65ef9f366862bbe3a9f60ed
Author: Martin Kosek <mkosek at redhat.com>
Date:   Mon Apr 30 13:51:03 2012 +0200

    Improve error message in zonemgr validator
    
    This patch consolidates zonemgr function to move the most of the
    checks to common functions in order to provide consistent output.
    The error messages produced by the validator should now be more
    helpful when identifying the source of error.
    
    https://fedorahosted.org/freeipa/ticket/1966

diff --git a/ipalib/util.py b/ipalib/util.py
index 659e178..6fa69e7 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -223,12 +223,15 @@ def validate_dns_label(dns_label, allow_underscore=False):
     label_regex = r'^[%(chars)s]([%(chars)s-]?[%(chars)s])*$' % dict(chars=label_chars)
     regex = re.compile(label_regex, re.IGNORECASE)
 
+    if not dns_label:
+        raise ValueError(_('empty DNS label'))
+
     if len(dns_label) > 63:
         raise ValueError(_('DNS label cannot be longer that 63 characters'))
 
     if not regex.match(dns_label):
         raise ValueError(_('only letters, numbers,%(underscore)s and - are allowed. ' \
-                           '- must not be the DNS label character') \
+                           'DNS label may not start or end with -') \
                            % dict(underscore=underscore_err_msg))
 
 def validate_domain_name(domain_name, allow_underscore=False):
@@ -246,11 +249,12 @@ def validate_domain_name(domain_name, allow_underscore=False):
 
 def validate_zonemgr(zonemgr):
     """ See RFC 1033, 1035 """
-    regex_domain = re.compile(r'^[a-z0-9]([a-z0-9-]?[a-z0-9])*$', re.IGNORECASE)
-    regex_local_part = re.compile(r'^[a-z0-9]([a-z0-9-_\.]?[a-z0-9])*$',
+    regex_local_part = re.compile(r'^[a-z0-9]([a-z0-9-_]?[a-z0-9])*$',
                                     re.IGNORECASE)
-
-    local_part_errmsg = _('mail account may only include letters, numbers, -, _ and a dot. There may not be consecutive -, _ and . characters')
+    local_part_errmsg = _('mail account may only include letters, numbers, -, _ and a dot. There may not be consecutive -, _ and . characters. Its parts may not start or end with - or _')
+    local_part_sep = '.'
+    local_part = None
+    domain = None
 
     if len(zonemgr) > 255:
         raise ValueError(_('cannot be longer that 255 characters'))
@@ -260,31 +264,31 @@ def validate_zonemgr(zonemgr):
 
     if zonemgr.count('@') == 1:
         local_part, dot, domain = zonemgr.partition('@')
-        if not regex_local_part.match(local_part):
-            raise ValueError(local_part_errmsg)
-        if not domain:
-            raise ValueError(_('missing address domain'))
     elif zonemgr.count('@') > 1:
         raise ValueError(_('too many \'@\' characters'))
     else:
         last_fake_sep = zonemgr.rfind('\\.')
         if last_fake_sep != -1: # there is a 'fake' local-part/domain separator
+            local_part_sep = '\\.'
             sep = zonemgr.find('.', last_fake_sep+2)
-            if sep == -1:
-                raise ValueError(_('missing address domain'))
-            local_part = zonemgr[:sep]
-            domain = zonemgr[sep+1:]
-
-            if not all(regex_local_part.match(part) for part in local_part.split('\\.')):
-                raise ValueError(local_part_errmsg)
+            if sep != -1:
+                local_part = zonemgr[:sep]
+                domain = zonemgr[sep+1:]
         else:
             local_part, dot, domain = zonemgr.partition('.')
 
-            if not regex_local_part.match(local_part):
-                raise ValueError(local_part_errmsg)
+    if not domain:
+        raise ValueError(_('missing address domain'))
 
     validate_domain_name(domain)
 
+    if not local_part:
+        raise ValueError(_('missing mail account'))
+
+    if not all(regex_local_part.match(part) for part in \
+               local_part.split(local_part_sep)):
+        raise ValueError(local_part_errmsg)
+
 def validate_hostname(hostname, check_fqdn=True, allow_underscore=False):
     """ See RFC 952, 1123
 

commit ee8ff3adf8b8214598c51d9b052f68cedf105cd1
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Sun Apr 29 17:38:12 2012 -0400

    Revert "Validate attributes in permission-add"
    
    This reverts commit 1356988b7a40a60af39807db143860efb4a2f435.
    
    We are going to take another approach to this. Instead of erroring
    out on attributes that don't seem to be allowed we are going to
    eventually return a warning.

diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 92203f1..891970d 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -24,7 +24,6 @@ from ipalib import api, _, ngettext
 from ipalib import Flag, Str, StrEnum
 from ipalib.request import context
 from ipalib import errors
-from ipalib.dn import DN
 
 __doc__ = _("""
 Permissions
@@ -91,44 +90,6 @@ output_params = (
     ),
 )
 
-dn_ipaconfig = str(DN('cn=ipaconfig,cn=etc,%s' % api.env.basedn))
-
-
-def check_attrs(attrs, type):
-    # Trying to delete attributes - no need for validation
-    if attrs is None:
-        return True
-    allowed_objcls=[]
-    disallowed_objcls=[]
-    obj=api.Object[type]
-
-    if obj.object_class_config:
-        (dn,objcls)=api.Backend.ldap2.get_entry(
-            dn_ipaconfig,[obj.object_class_config]
-            )
-        allowed_objcls=objcls[obj.object_class_config]
-    else:
-        allowed_objcls=obj.object_class
-    if obj.possible_objectclasses:
-        allowed_objcls+=obj.possible_objectclasses
-    if obj.disallow_object_classes:
-        disallowed_objcls=obj.disallow_object_classes
-
-    allowed_attrs=[]
-    disallowed_attrs=[]
-    if allowed_objcls:
-        allowed_attrs=api.Backend.ldap2.get_allowed_attributes(allowed_objcls)
-    if disallowed_objcls:
-        disallowed_attrs=api.Backend.ldap2.get_allowed_attributes(disallowed_objcls)
-    failed_attrs=[]



More information about the Pkg-freeipa-devel mailing list