Merge ~ahasenack/ubuntu/+source/sssd:cosmic-sssd-dep8-1793882 into ubuntu/+source/sssd:ubuntu/devel

Proposed by Andreas Hasenack on 2018-09-23
Status: Merged
Approved by: Andreas Hasenack on 2018-10-04
Approved revision: fe2245ddc6b6a96d26902d9325b602a41d9b8ff4
Merge reported by: Andreas Hasenack
Merged at revision: fe2245ddc6b6a96d26902d9325b602a41d9b8ff4
Proposed branch: ~ahasenack/ubuntu/+source/sssd:cosmic-sssd-dep8-1793882
Merge into: ubuntu/+source/sssd:ubuntu/devel
Diff against target: 62086 lines (+16004/-8507) (has conflicts)
183 files modified
0001-common.dirs-common.postinst-Add-dir-for-secrets-with.patch (+61/-0)
Makefile.am (+73/-2)
Makefile.in (+401/-53)
build/ar-lib (+1/-1)
build/compile (+1/-1)
build/config.guess (+1/-1)
build/config.sub (+1/-1)
build/depcomp (+1/-1)
build/ltmain.sh (+3/-1)
build/missing (+1/-1)
build/mkinstalldirs (+1/-1)
build/test-driver (+1/-1)
config.h.in (+3/-0)
configure (+27/-10)
contrib/sssd.spec.in (+50/-15)
debian/changelog (+22/-0)
debian/control (+5/-0)
debian/libsss-sudo.postinst (+3/-2)
debian/patches/series (+3/-0)
debian/tests/common-tests.sh (+26/-0)
debian/tests/control (+7/-0)
debian/tests/ldap-user-group-krb5-auth (+35/-0)
debian/tests/ldap-user-group-ldap-auth (+29/-0)
debian/tests/login.exp (+74/-0)
debian/tests/util.sh (+256/-0)
dev/null (+0/-96)
po/bg.po (+14/-10)
po/ca.po (+14/-10)
po/de.po (+14/-10)
po/es.po (+14/-10)
po/eu.po (+14/-10)
po/fr.po (+14/-10)
po/hu.po (+14/-10)
po/id.po (+14/-10)
po/it.po (+14/-10)
po/ja.po (+14/-10)
po/nb.po (+14/-10)
po/nl.po (+14/-10)
po/pl.po (+14/-10)
po/pt.po (+14/-10)
po/pt_BR.po (+14/-10)
po/ru.po (+14/-10)
po/sssd.pot (+14/-10)
po/sv.po (+14/-10)
po/tg.po (+14/-10)
po/tr.po (+14/-10)
po/uk.po (+14/-10)
po/zh_CN.po (+14/-10)
po/zh_TW.po (+14/-10)
src/confdb/confdb.c (+8/-4)
src/config/setup.py (+1/-1)
src/db/sysdb_search.c (+53/-63)
src/external/samba.m4 (+8/-0)
src/krb5_plugin/sssd_krb5_locator_plugin.c (+280/-97)
src/man/de/sss_ssh_knownhostsproxy.1.xml (+10/-0)
src/man/de/sssd-ldap.5.xml (+14/-6)
src/man/fr/sss_ssh_knownhostsproxy.1.xml (+10/-0)
src/man/fr/sssd-ldap.5.xml (+14/-5)
src/man/ja/sss_ssh_knownhostsproxy.1.xml (+10/-0)
src/man/po/br.po (+488/-350)
src/man/po/ca.po (+523/-352)
src/man/po/cs.po (+484/-350)
src/man/po/de.po (+539/-356)
src/man/po/es.po (+540/-356)
src/man/po/eu.po (+482/-350)
src/man/po/fi.po (+484/-350)
src/man/po/fr.po (+541/-356)
src/man/po/ja.po (+521/-352)
src/man/po/lv.po (+482/-350)
src/man/po/nl.po (+495/-352)
src/man/po/pt.po (+490/-350)
src/man/po/pt_BR.po (+482/-350)
src/man/po/ru.po (+482/-350)
src/man/po/sssd-docs.pot (+474/-344)
src/man/po/sv.po (+488/-350)
src/man/po/tg.po (+482/-350)
src/man/po/uk.po (+544/-357)
src/man/po/zh_CN.po (+488/-350)
src/man/sss_ssh_knownhostsproxy.1.xml (+10/-0)
src/man/sssd-ipa.5.xml (+92/-0)
src/man/sssd-ldap.5.xml (+12/-1)
src/man/sssd.conf.5.xml (+7/-10)
src/man/uk/sss_ssh_knownhostsproxy.1.xml (+10/-0)
src/man/uk/sssd-ipa.5.xml (+82/-0)
src/man/uk/sssd-ldap.5.xml (+14/-6)
src/man/uk/sssd.conf.5.xml (+5/-9)
src/p11_child/p11_child_nss.c (+1/-1)
src/p11_child/p11_child_openssl.c (+1/-1)
src/providers/ad/ad_common.c (+12/-20)
src/providers/ad/ad_common.h (+1/-0)
src/providers/ad/ad_id.c (+2/-115)
src/providers/ad/ad_init.c (+1/-0)
src/providers/ad/ad_pac.c (+107/-23)
src/providers/ad/ad_srv.c (+15/-6)
src/providers/ad/ad_srv.h (+4/-0)
src/providers/ad/ad_subdomains.c (+302/-23)
src/providers/backend.h (+1/-0)
src/providers/data_provider_be.c (+1/-0)
src/providers/data_provider_callbacks.c (+28/-8)
src/providers/ipa/ipa_common.c (+73/-23)
src/providers/ipa/ipa_common.h (+7/-0)
src/providers/ipa/ipa_deskprofile_rules_util.c (+2/-2)
src/providers/ipa/ipa_deskprofile_rules_util.h (+15/-0)
src/providers/ipa/ipa_init.c (+1/-58)
src/providers/ipa/ipa_opts.c (+6/-0)
src/providers/ipa/ipa_opts.h (+2/-0)
src/providers/ipa/ipa_s2n_exop.c (+0/-49)
src/providers/ipa/ipa_session.c (+1/-1)
src/providers/ipa/ipa_subdomains.c (+716/-2)
src/providers/ipa/ipa_subdomains_server.c (+24/-17)
src/providers/krb5/krb5_common.c (+188/-112)
src/providers/krb5/krb5_common.h (+11/-4)
src/providers/krb5/krb5_init_shared.c (+0/-6)
src/providers/ldap/ldap_common.c (+0/-104)
src/providers/ldap/ldap_common.h (+0/-5)
src/providers/ldap/ldap_id.c (+0/-121)
src/providers/ldap/sdap.c (+10/-0)
src/providers/ldap/sdap.h (+3/-1)
src/providers/ldap/sdap_async.c (+0/-174)
src/providers/ldap/sdap_async.h (+0/-13)
src/providers/ldap/sdap_async_connection.c (+20/-1)
src/providers/ldap/sdap_async_enum.c (+2/-103)
src/providers/ldap/sdap_async_initgroups.c (+7/-5)
src/providers/ldap/sdap_async_sudo.c (+37/-7)
src/providers/ldap/sdap_utils.c (+0/-22)
src/python/pyhbac.c (+1/-1)
src/python/pysss.c (+1/-1)
src/resolv/async_resolv.c (+187/-0)
src/resolv/async_resolv.h (+30/-0)
src/responder/common/cache_req/cache_req_domain.c (+14/-1)
src/responder/common/responder_common.c (+26/-14)
src/responder/common/responder_dp.c (+18/-13)
src/responder/common/responder_utils.c (+10/-6)
src/responder/nss/nss_protocol_grent.c (+5/-10)
src/responder/nss/nss_protocol_pwent.c (+13/-8)
src/responder/pam/pamsrv.c (+7/-0)
src/responder/sudo/sudosrv.c (+27/-3)
src/sss_client/nss_mc_group.c (+1/-3)
src/sss_client/nss_mc_initgr.c (+1/-4)
src/sss_client/nss_mc_passwd.c (+1/-3)
src/sss_client/ssh/sss_ssh_authorizedkeys.c (+13/-9)
src/sss_client/ssh/sss_ssh_knownhostsproxy.c (+23/-1)
src/sss_client/sudo_testcli/sudo_testcli.c (+35/-15)
src/sysv/systemd/sssd-kcm.socket.in (+1/-1)
src/sysv/systemd/sssd-secrets.socket.in (+1/-1)
src/sysv/systemd/sssd-sudo.socket.in (+1/-1)
src/tests/cmocka/sss_nss_idmap-tests.c (+8/-7)
src/tests/cmocka/test_ad_common.c (+95/-0)
src/tests/cmocka/test_deskprofile_utils.c (+162/-0)
src/tests/cmocka/test_domain_resolution_order.c (+228/-0)
src/tests/cmocka/test_ipa_subdomains_server.c (+21/-23)
src/tests/cmocka/test_sssd_krb5_locator_plugin.c (+631/-0)
src/tests/cmocka/test_utils.c (+0/-21)
src/tests/cmocka/wrap_sss_nss_make_request_timeout.c (+37/-0)
src/tests/crypto-tests.c (+32/-0)
src/tests/dlopen-tests.c (+2/-1)
src/tests/intg/Makefile.am (+6/-0)
src/tests/intg/Makefile.in (+6/-0)
src/tests/intg/config.py.m4 (+2/-1)
src/tests/intg/data/ssh_schema.ldif (+11/-0)
src/tests/intg/data/sudo_schema.ldif (+11/-0)
src/tests/intg/ds_openldap.py (+19/-0)
src/tests/intg/ldap_ent.py (+43/-4)
src/tests/intg/test_files_provider.py (+35/-0)
src/tests/intg/test_ldap.py (+64/-0)
src/tests/intg/test_pam_responder.py (+130/-0)
src/tests/intg/test_ssh_pubkey.py (+290/-0)
src/tests/intg/test_sudo.py (+280/-0)
src/tests/test_ssh_client.c (+138/-0)
src/tools/sss_seed.c (+1/-2)
src/util/cert/cert_common_p11_child.c (+3/-0)
src/util/crypto/libcrypto/crypto_hmac_sha1.c (+3/-1)
src/util/crypto/libcrypto/crypto_sha512crypt.c (+1/-0)
src/util/crypto/nss/nss_hmac_sha1.c (+1/-1)
src/util/crypto/nss/nss_sha512crypt.c (+1/-0)
src/util/domain_info_utils.c (+6/-27)
src/util/find_uid.c (+7/-1)
src/util/sss_semanage.c (+4/-0)
src/util/sss_ssh.c (+55/-0)
src/util/sss_ssh.h (+3/-0)
src/util/util.h (+7/-1)
src/util/util_preauth.c (+86/-0)
version.m4 (+1/-1)
Conflict in debian/changelog
Conflict in debian/control
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Robie Basak 2018-09-30 Approve on 2018-10-04
Christian Ehrhardt  2018-09-23 Needs Information on 2018-09-24
Canonical Server Team 2018-09-23 Pending
Review via email: mp+355524@code.launchpad.net

Description of the change

The LP diff isn't correct. Please use git tools to review.

This adds the same DEP8 tests that I proposed for debian at https://salsa.debian.org/sssd-team/sssd/merge_requests/2.

Since they weren't reviewed there, and we are approaching another freeze, I figured we should add them to ubuntu now. This should be an easily droppable delta in the future, as I hope debian will adopt it.

Bileto ticket with all green: https://bileto.ubuntu.com/#/ticket/3429

To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

Hi,
great work with the setup of certs and krb5 and such.
Always a pain manually and a pleasure if that would be tested in autopkgtest.
Also thanks for already Bileto-Testing them on all arches, that is really good.

I only found a few minor things, but even small things can make it better.

debian/tests/util has a few trailing whitespace.
line 86: after " } | ldapmodify -H ldapi:/// -Y EXTERNAL -Q· "
The last line (257 atm) is an empty line

In functions of util like check_getent_group check_getent_user you use var "output" I wonder if you should make that a "local" var as well as you did with most others to avoid any later issues clobbering a global one.

I saw that in some tests the expect seems "too fast".
For example https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-cosmic-ci-train-ppa-service-3429/cosmic/amd64/s/sssd/20180923_232734_50b78@/log.gz
There you see the answer of "id -un" and the "klist" on one line.

You might consider some sleeps, but since sleeps always suck I checked what I added in the past and found that I used this most of the time:
  set send_human {.1 .3 1 .05 2}
You might give that (or sleeps) a consideration and let me know what you think about it.

Eventually there also is another style question, I realized that for
$ wc -l debian/tests/ldap-user-group-*
  57 debian/tests/ldap-user-group-krb5-auth
  51 debian/tests/ldap-user-group-ldap-auth
 108 total
It is only
$ diff -Naur debian/tests/ldap-user-group-* | diffstat
 ldap-user-group-ldap-auth | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
So I wonder, should these two maybe better be ONE file with an argument?

The latter is a call up to you, I currently feel a single file would be better, but maybe you had more planned in the future that would make these differ more?

review: Needs Information
bd2e12d... by Andreas Hasenack on 2018-09-27

Remove empty spaces

b8aa998... by Andreas Hasenack on 2018-09-27

Declare the output variable as local scope

b76972f... by Andreas Hasenack on 2018-09-27

Factor out common tests to a separate file

9719f08... by Andreas Hasenack on 2018-09-27

Source common-tests file

Andreas Hasenack (ahasenack) wrote :

Thanks for all the comments.

i switched from puts to send, and used set send_human {.1 .3 1 .05 2}, but need to finetune it a bit more:

testuser1@ldap:~$ id -un
testuser1k
testuser1@ldap:~$ klist
...

534dda3... by Andreas Hasenack on 2018-09-27

Wait for the prompt before sending logout or klist

Andreas Hasenack (ahasenack) wrote :

Ah, I know what the problem is. I'm not waiting for a prompt between the id command and issuing the klist one.

Andreas Hasenack (ahasenack) wrote :

Tests are running, we'll see tomorrow how they went.

Andreas Hasenack (ahasenack) wrote :

Now it's good:
...
testuser1@ldap:~$ id -un
testuser1
testuser1@ldap:~$ klist
Ticket cache: FILE:/tmp/krb5cc_10001_4DIfOK
Default principal: <email address hidden> [00:17:39]: test ldap-user-group-krb5-auth: -----------------------]
autopkgtest [00:17:40]: test ldap-user-group-krb5-auth: - - - - - - - - - - results - - - - - - - - - -
ldap-user-group-krb5-auth PASS

Could you take another look please? I can squash the changes after you checked them

Andreas Hasenack (ahasenack) wrote :

Robie, could you please take a look at this since Christian is now on PTO?

Robie Basak (racb) wrote :

The tests look really well written - thanks!

One comment on style, which I'll leave to you to decide. It seems redundant for common-tests and util to have shebangs since they're not marked executable (and don't need to be). I would indicate that they're for POSIX sh using a .sh extension.

So I suggest (but don't mandate):

Remove shebangs from common-tests and util
Rename to common-tests.sh and util.sh
Change where they're sourced from to match the renames

review: Approve
45c0ec3... by Andreas Hasenack on 2018-10-04

common-tests, util: drop shebang

fe2245d... by Andreas Hasenack on 2018-10-04

Add .sh suffix to sourced files util and common-tests

Andreas Hasenack (ahasenack) wrote :

Thanks for the suggestions, I think they make sense and applied them.

Just kicked a new test run to make sure nothing broke.

Robie Basak (racb) wrote :

15:45 <ahasenack> rbasak: I applied your suggestions and ran the tests again, all good. Could you take another look? https://code.launchpad.net/~ahasenack/ubuntu/+source/sssd/+git/sssd/+merge/355524

15:45 <ahasenack> rbasak: and, do you have a preference whether to squash it all now or later? I think it's easier to review leaving as is

+1

Feel free to squash on the next merge instead of this one. Agreed it's easier to review as-is. IMHO, it should get squashed eventually so we carry forward the minimal delta most easily, but carrying this part forward doesn't add any extra work and can be squashed on the next merge, so I agree that your approach is the easiest for everyone.

review: Approve
Andreas Hasenack (ahasenack) wrote :

Tagged and uploaded.

Andreas Hasenack (ahasenack) wrote :

Package was accepted and is in migration, marking branch as merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/0001-common.dirs-common.postinst-Add-dir-for-secrets-with.patch b/0001-common.dirs-common.postinst-Add-dir-for-secrets-with.patch
2new file mode 100644
3index 0000000..804c6ac
4--- /dev/null
5+++ b/0001-common.dirs-common.postinst-Add-dir-for-secrets-with.patch
6@@ -0,0 +1,61 @@
7+From 738ab758400eceee11a57279cb1970ba60762bf2 Mon Sep 17 00:00:00 2001
8+From: Timo Aaltonen <tjaalton@debian.org>
9+Date: Thu, 8 Mar 2018 10:27:10 +0200
10+Subject: [PATCH] common.dirs, common.postinst: Add dir for secrets with
11+ correct permissions. (Closes: #892315)
12+
13+---
14+ debian/changelog | 7 +++++++
15+ debian/sssd-common.dirs | 1 +
16+ debian/sssd-common.postinst | 3 ++-
17+ 3 files changed, 10 insertions(+), 1 deletion(-)
18+
19+diff --git a/debian/changelog b/debian/changelog
20+index ee807265e..47a1cc41d 100644
21+--- a/debian/changelog
22++++ b/debian/changelog
23+@@ -1,3 +1,10 @@
24++sssd (1.16.0-4) UNRELEASED; urgency=medium
25++
26++ * common.dirs, common.postinst: Add dir for secrets with correct
27++ permissions. (Closes: #892315)
28++
29++ -- Timo Aaltonen <tjaalton@debian.org> Thu, 08 Mar 2018 10:26:48 +0200
30++
31+ sssd (1.16.0-3) unstable; urgency=medium
32+
33+ * Install responder service and socket files again.
34+diff --git a/debian/sssd-common.dirs b/debian/sssd-common.dirs
35+index 93dad48f0..c7f4de51b 100644
36+--- a/debian/sssd-common.dirs
37++++ b/debian/sssd-common.dirs
38+@@ -7,4 +7,5 @@ var/lib/sss/mc
39+ var/lib/sss/pipes
40+ var/lib/sss/pipes/private
41+ var/lib/sss/pubconf
42++var/lib/sss/secrets
43+ var/log/sssd
44+diff --git a/debian/sssd-common.postinst b/debian/sssd-common.postinst
45+index 47d08845a..32500d2e1 100644
46+--- a/debian/sssd-common.postinst
47++++ b/debian/sssd-common.postinst
48+@@ -37,6 +37,7 @@ case "$1" in
49+ $HOME/pipes \
50+ $HOME/pipes/private \
51+ $HOME/pubconf \
52++ $HOME/secrets \
53+ /etc/sssd \
54+ /var/log/sssd
55+ chown root:sssd $LIBDIR/p11_child
56+@@ -45,7 +46,7 @@ case "$1" in
57+ chmod 755 $HOME/gpo_cache $HOME/mc $HOME/pipes $HOME/pubconf
58+ chmod 750 /var/log/sssd
59+ chmod 711 /etc/sssd
60+- chmod 700 $HOME/db $HOME/pipes/private
61++ chmod 700 $HOME/db $HOME/pipes/private $HOME/secrets
62+ if [ -f /etc/sssd/sssd.conf ]; then
63+ chown root:root /etc/sssd/sssd.conf
64+ chmod 0600 /etc/sssd/sssd.conf
65+--
66+2.15.1
67+
68diff --git a/Makefile.am b/Makefile.am
69index 9539b3c..484b449 100644
70--- a/Makefile.am
71+++ b/Makefile.am
72@@ -241,7 +241,9 @@ if HAVE_CMOCKA
73 test-negcache \
74 test-authtok \
75 sss_nss_idmap-tests \
76+ deskprofile_utils-tests \
77 dyndns-tests \
78+ domain_resolution_order-tests \
79 fqnames-tests \
80 nestedgroups-tests \
81 test_sss_idmap \
82@@ -288,6 +290,7 @@ if HAVE_CMOCKA
83 krb5_common_test \
84 test_iobuf \
85 sss_certmap_test \
86+ test_sssd_krb5_locator_plugin \
87 $(NULL)
88
89
90@@ -330,6 +333,7 @@ endif # HAVE_CMOCKA
91 check_PROGRAMS = \
92 stress-tests \
93 krb5-child-test \
94+ test_ssh_client \
95 $(non_interactive_cmocka_based_tests) \
96 $(non_interactive_check_based_tests)
97
98@@ -970,11 +974,17 @@ libsss_cert_la_CFLAGS = \
99 $(AM_CFLAGS) \
100 $(SSS_CERT_CFLAGS) \
101 $(NULL)
102+# NOTE:
103+# There is a dependency between libsss_cert and libsss_child which should
104+# always be declared explicitly and if missing might cause issue in some
105+# environments (e.g. Gentoo or OpenSUSE build service), even if it is
106+# resolved otherwise while linking the binaries.
107 libsss_cert_la_LIBADD = \
108 $(SSS_CERT_LIBS) \
109 $(TALLOC_LIBS) \
110 $(TEVENT_LIBS) \
111 libsss_crypt.la \
112+ libsss_child.la \
113 libsss_debug.la \
114 libsss_certmap.la \
115 $(NULL)
116@@ -1019,6 +1029,7 @@ libsss_util_la_SOURCES = \
117 src/sbus/sssd_dbus_utils.c \
118 src/util/util.c \
119 src/util/util_ext.c \
120+ src/util/util_preauth.c \
121 src/util/memory.c \
122 src/util/safe-format-string.c \
123 src/util/server.c \
124@@ -1892,8 +1903,14 @@ check_LTLIBRARIES += \
125 $(NULL)
126 endif
127
128+# libdlopen_test_providers is a helper library to provide missing symbols for
129+# dlopen_tests. It is mainly used for the backend modules but is used as well
130+# to provide __wrap_sss_nss_make_request_timeout needed make make dlopen_tests
131+# pass for libsss_nss_idmap_tests.
132 libdlopen_test_providers_la_SOURCES = \
133- $(sssd_be_SOURCES)
134+ $(sssd_be_SOURCES) \
135+ src/tests/cmocka/wrap_sss_nss_make_request_timeout.c \
136+ $(NULL)
137 libdlopen_test_providers_la_CFLAGS = \
138 $(AM_CFLAGS) \
139 $(CHECK_CFLAGS) \
140@@ -1921,6 +1938,7 @@ libsss_nss_idmap_tests_la_LDFLAGS = \
141 $(libsss_nss_idmap_la_LDFLAGS) \
142 -shared \
143 -rpath $(libdir) \
144+ -Wl,-wrap,sss_nss_make_request_timeout \
145 -Wl,--version-script,$(srcdir)/src/sss_client/idmap/sss_nss_idmap.unit_tests
146
147 dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.unit_tests
148@@ -2290,6 +2308,18 @@ krb5_child_test_LDADD = \
149 $(SSSD_INTERNAL_LTLIBS) \
150 libsss_test_common.la
151
152+test_ssh_client_SOURCES = \
153+ src/tests/test_ssh_client.c \
154+ $(NULL)
155+test_ssh_client_CFLAGS = \
156+ $(AM_CFLAGS) \
157+ -DSSH_CLIENT_DIR=\"$(abs_top_builddir)\" \
158+ $(NULL)
159+test_ssh_client_LDADD = \
160+ $(SSSD_INTERNAL_LTLIBS) \
161+ $(SSSD_LIBS) \
162+ $(NULL)
163+
164 if BUILD_DBUS_TESTS
165
166 sbus_tests_SOURCES = \
167@@ -2585,6 +2615,17 @@ sss_nss_idmap_tests_LDADD = \
168 libsss_nss_idmap_tests.la \
169 $(NULL)
170
171+deskprofile_utils_tests_SOURCES = \
172+ src/tests/cmocka/test_deskprofile_utils.c \
173+ src/providers/ipa/ipa_deskprofile_rules_util.c \
174+ src/providers/ipa/ipa_rules_common.c
175+deskprofile_utils_tests_CFLAGS = \
176+ $(AM_CFLAGS)
177+deskprofile_utils_tests_LDADD = \
178+ $(CMOCKA_LIBS) \
179+ $(SSSD_INTERNAL_LTLIBS) \
180+ libsss_test_common.la
181+
182 EXTRA_dyndns_tests_DEPENDENCIES = \
183 $(ldblib_LTLIBRARIES)
184 dyndns_tests_SOURCES = \
185@@ -2606,6 +2647,16 @@ dyndns_tests_LDADD = \
186 $(SSSD_INTERNAL_LTLIBS) \
187 libsss_test_common.la
188
189+domain_resolution_order_tests_SOURCES = \
190+ src/tests/cmocka/test_domain_resolution_order.c \
191+ src/responder/common/cache_req/cache_req_domain.c
192+domain_resolution_order_tests_CFLAGS = \
193+ $(AM_CFLAGS)
194+domain_resolution_order_tests_LDADD = \
195+ $(CMOCKA_LIBS) \
196+ $(SSSD_INTERNAL_LTLIBS) \
197+ libsss_test_common.la
198+
199 fqnames_tests_SOURCES = \
200 src/tests/cmocka/test_fqnames.c
201 fqnames_tests_CFLAGS = \
202@@ -3445,7 +3496,6 @@ test_iobuf_LDADD = \
203 $(SSSD_LIBS) \
204 $(NULL)
205
206-
207 EXTRA_simple_access_tests_DEPENDENCIES = \
208 $(ldblib_LTLIBRARIES)
209 simple_access_tests_SOURCES = \
210@@ -3518,6 +3568,25 @@ sss_certmap_test_LDADD = \
211 libsss_certmap.la \
212 $(NULL)
213
214+test_sssd_krb5_locator_plugin_SOURCES = \
215+ src/tests/cmocka/test_sssd_krb5_locator_plugin.c \
216+ src/krb5_plugin/sssd_krb5_locator_plugin.c \
217+ $(NULL)
218+test_sssd_krb5_locator_plugin_CFLAGS = \
219+ $(AM_CFLAGS) \
220+ $(POPT_CFLAGS) \
221+ $(TALLOC_CFLAGS) \
222+ $(KRB5_CFLAGS) \
223+ -DTEST_PUBCONF_PATH=\"$(abs_builddir)/src/tests/cmocka/pubconf\" \
224+ $(NULL)
225+test_sssd_krb5_locator_plugin_LDADD = \
226+ $(CMOCKA_LIBS) \
227+ $(POPT_LIBS) \
228+ $(TALLOC_LIBS) \
229+ $(KRB5_LIBS) \
230+ libsss_test_common.la \
231+ $(NULL)
232+
233 if BUILD_KCM
234 test_kcm_json_SOURCES = \
235 src/tests/cmocka/test_kcm_json_marshalling.c \
236@@ -3635,6 +3704,7 @@ intgcheck-prepare:
237 $(INTGCHECK_CONFIGURE_FLAGS) \
238 CFLAGS="-O2 -g $$CFLAGS -DKCM_PEER_UID=$$(id -u)"; \
239 $(MAKE) $(AM_MAKEFLAGS) ; \
240+ $(MAKE) $(AM_MAKEFLAGS) test_ssh_client; \
241 : Force single-thread install to workaround concurrency issues; \
242 $(MAKE) $(AM_MAKEFLAGS) -j1 install; \
243 : Remove .la files from LDB module directory to avoid loader warnings; \
244@@ -4635,6 +4705,7 @@ edit_cmd = $(SED) \
245 -e 's|@sbindir[@]|$(sbindir)|g' \
246 -e 's|@environment_file[@]|$(environment_file)|g' \
247 -e 's|@localstatedir[@]|$(localstatedir)|g' \
248+ -e 's|@runstatedir[@]|$(runstatedir)|g' \
249 -e 's|@logpath[@]|$(logpath)|g' \
250 -e 's|@libexecdir[@]|$(libexecdir)|g' \
251 -e 's|@pipepath[@]|$(pipepath)|g' \
252diff --git a/Makefile.in b/Makefile.in
253index 03a03aa..98fec41 100644
254--- a/Makefile.in
255+++ b/Makefile.in
256@@ -153,7 +153,8 @@ sssdlibexec_PROGRAMS = sssd_nss$(EXEEXT) sssd_pam$(EXEEXT) \
257
258 @BUILD_KRB5_LOCALAUTH_PLUGIN_TRUE@@HAVE_CMOCKA_TRUE@am__append_24 = test_sssd_krb5_localauth_plugin
259 check_PROGRAMS = stress-tests$(EXEEXT) krb5-child-test$(EXEEXT) \
260- $(am__EXEEXT_7) $(am__EXEEXT_10) $(am__EXEEXT_11)
261+ test_ssh_client$(EXEEXT) $(am__EXEEXT_7) $(am__EXEEXT_10) \
262+ $(am__EXEEXT_11)
263 @HAVE_CMOCKA_TRUE@am__append_25 = dummy-child
264 @BUILD_PYTHON2_BINDINGS_TRUE@am__append_26 = src/config/SSSDConfigTest.py2.sh \
265 @BUILD_PYTHON2_BINDINGS_TRUE@ src/tests/pyhbac-test.py2.sh \
266@@ -698,7 +699,8 @@ am__libdlopen_test_providers_la_SOURCES_DIST = \
267 src/providers/data_provider/dp_target_auth.c \
268 src/util/session_recording.c src/providers/fail_over.c \
269 src/providers/fail_over_srv.c src/resolv/async_resolv.c \
270- src/resolv/async_resolv_utils.c
271+ src/resolv/async_resolv_utils.c \
272+ src/tests/cmocka/wrap_sss_nss_make_request_timeout.c
273 am__objects_11 = \
274 src/resolv/libdlopen_test_providers_la-async_resolv.lo \
275 src/resolv/libdlopen_test_providers_la-async_resolv_utils.lo
276@@ -740,7 +742,8 @@ am__objects_13 = \
277 src/util/libdlopen_test_providers_la-session_recording.lo \
278 $(am__objects_12)
279 @HAVE_CHECK_TRUE@am_libdlopen_test_providers_la_OBJECTS = \
280-@HAVE_CHECK_TRUE@ $(am__objects_13)
281+@HAVE_CHECK_TRUE@ $(am__objects_13) \
282+@HAVE_CHECK_TRUE@ src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo
283 libdlopen_test_providers_la_OBJECTS = \
284 $(am_libdlopen_test_providers_la_OBJECTS)
285 libdlopen_test_providers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
286@@ -881,7 +884,7 @@ libsss_autofs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
287 @HAVE_NSS_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
288 libsss_cert_la_DEPENDENCIES = $(am__DEPENDENCIES_8) \
289 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libsss_crypt.la \
290- libsss_debug.la libsss_certmap.la
291+ libsss_child.la libsss_debug.la libsss_certmap.la
292 am__libsss_cert_la_SOURCES_DIST = src/util/cert/cert_common.c \
293 src/util/cert/cert_common_p11_child.c \
294 src/util/cert/libcrypto/cert.c src/util/cert/nss/cert.c
295@@ -1419,13 +1422,13 @@ am__libsss_util_la_SOURCES_DIST = src/confdb/confdb.c src/db/sysdb.c \
296 src/sbus/sssd_dbus_properties.c src/sbus/sssd_dbus_request.c \
297 src/sbus/sssd_dbus_server.c src/sbus/sssd_dbus_signals.c \
298 src/sbus/sssd_dbus_common_signals.c src/sbus/sssd_dbus_utils.c \
299- src/util/util.c src/util/util_ext.c src/util/memory.c \
300- src/util/safe-format-string.c src/util/server.c \
301- src/util/signal.c src/util/usertools.c src/util/backup_file.c \
302- src/util/strtonum.c src/util/check_and_open.c \
303- src/util/refcount.c src/util/sss_nss.c src/util/sss_utf8.c \
304- src/util/sss_tc_utf8.c src/util/murmurhash3.c \
305- src/util/atomic_io.c src/util/authtok.c \
306+ src/util/util.c src/util/util_ext.c src/util/util_preauth.c \
307+ src/util/memory.c src/util/safe-format-string.c \
308+ src/util/server.c src/util/signal.c src/util/usertools.c \
309+ src/util/backup_file.c src/util/strtonum.c \
310+ src/util/check_and_open.c src/util/refcount.c \
311+ src/util/sss_nss.c src/util/sss_utf8.c src/util/sss_tc_utf8.c \
312+ src/util/murmurhash3.c src/util/atomic_io.c src/util/authtok.c \
313 src/util/authtok-utils.c src/util/sss_selinux.c \
314 src/util/domain_info_utils.c src/util/util_lock.c \
315 src/util/util_errors.c src/util/find_uid.c src/util/sss_ini.c \
316@@ -1472,6 +1475,7 @@ am_libsss_util_la_OBJECTS = src/confdb/libsss_util_la-confdb.lo \
317 src/sbus/libsss_util_la-sssd_dbus_utils.lo \
318 src/util/libsss_util_la-util.lo \
319 src/util/libsss_util_la-util_ext.lo \
320+ src/util/libsss_util_la-util_preauth.lo \
321 src/util/libsss_util_la-memory.lo \
322 src/util/libsss_util_la-safe-format-string.lo \
323 src/util/libsss_util_la-server.lo \
324@@ -1663,7 +1667,10 @@ winbind_idmap_sss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
325 @HAVE_CMOCKA_TRUE@ test-find-uid$(EXEEXT) test-io$(EXEEXT) \
326 @HAVE_CMOCKA_TRUE@ test-negcache$(EXEEXT) test-authtok$(EXEEXT) \
327 @HAVE_CMOCKA_TRUE@ sss_nss_idmap-tests$(EXEEXT) \
328-@HAVE_CMOCKA_TRUE@ dyndns-tests$(EXEEXT) fqnames-tests$(EXEEXT) \
329+@HAVE_CMOCKA_TRUE@ deskprofile_utils-tests$(EXEEXT) \
330+@HAVE_CMOCKA_TRUE@ dyndns-tests$(EXEEXT) \
331+@HAVE_CMOCKA_TRUE@ domain_resolution_order-tests$(EXEEXT) \
332+@HAVE_CMOCKA_TRUE@ fqnames-tests$(EXEEXT) \
333 @HAVE_CMOCKA_TRUE@ nestedgroups-tests$(EXEEXT) \
334 @HAVE_CMOCKA_TRUE@ test_sss_idmap$(EXEEXT) \
335 @HAVE_CMOCKA_TRUE@ test_ipa_idmap$(EXEEXT) test_utils$(EXEEXT) \
336@@ -1706,10 +1713,11 @@ winbind_idmap_sss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
337 @HAVE_CMOCKA_TRUE@ simple-access-tests$(EXEEXT) \
338 @HAVE_CMOCKA_TRUE@ krb5_common_test$(EXEEXT) \
339 @HAVE_CMOCKA_TRUE@ test_iobuf$(EXEEXT) \
340-@HAVE_CMOCKA_TRUE@ sss_certmap_test$(EXEEXT) $(am__EXEEXT_1) \
341-@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3) \
342-@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_4) $(am__EXEEXT_5) \
343-@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_6)
344+@HAVE_CMOCKA_TRUE@ sss_certmap_test$(EXEEXT) \
345+@HAVE_CMOCKA_TRUE@ test_sssd_krb5_locator_plugin$(EXEEXT) \
346+@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) \
347+@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_3) $(am__EXEEXT_4) \
348+@HAVE_CMOCKA_TRUE@ $(am__EXEEXT_5) $(am__EXEEXT_6)
349 @BUILD_SSH_TRUE@@HAVE_CHECK_TRUE@am__EXEEXT_8 = \
350 @BUILD_SSH_TRUE@@HAVE_CHECK_TRUE@ sysdb_ssh-tests$(EXEEXT)
351 @BUILD_DBUS_TESTS_TRUE@@HAVE_CHECK_TRUE@am__EXEEXT_9 = \
352@@ -1904,6 +1912,22 @@ debug_tests_OBJECTS = $(am_debug_tests_OBJECTS)
353 debug_tests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
354 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(debug_tests_CFLAGS) \
355 $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
356+am__deskprofile_utils_tests_SOURCES_DIST = \
357+ src/tests/cmocka/test_deskprofile_utils.c \
358+ src/providers/ipa/ipa_deskprofile_rules_util.c \
359+ src/providers/ipa/ipa_rules_common.c
360+@HAVE_CMOCKA_TRUE@am_deskprofile_utils_tests_OBJECTS = src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.$(OBJEXT) \
361+@HAVE_CMOCKA_TRUE@ src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.$(OBJEXT) \
362+@HAVE_CMOCKA_TRUE@ src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.$(OBJEXT)
363+deskprofile_utils_tests_OBJECTS = \
364+ $(am_deskprofile_utils_tests_OBJECTS)
365+@HAVE_CMOCKA_TRUE@deskprofile_utils_tests_DEPENDENCIES = \
366+@HAVE_CMOCKA_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
367+@HAVE_CMOCKA_TRUE@ libsss_test_common.la
368+deskprofile_utils_tests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
369+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
370+ $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
371+ $(LDFLAGS) -o $@
372 am__dlopen_tests_SOURCES_DIST = src/tests/dlopen-tests.c
373 @HAVE_CHECK_TRUE@am_dlopen_tests_OBJECTS = src/tests/dlopen_tests-dlopen-tests.$(OBJEXT)
374 dlopen_tests_OBJECTS = $(am_dlopen_tests_OBJECTS)
375@@ -1912,6 +1936,20 @@ dlopen_tests_OBJECTS = $(am_dlopen_tests_OBJECTS)
376 dlopen_tests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
377 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(dlopen_tests_CFLAGS) \
378 $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
379+am__domain_resolution_order_tests_SOURCES_DIST = \
380+ src/tests/cmocka/test_domain_resolution_order.c \
381+ src/responder/common/cache_req/cache_req_domain.c
382+@HAVE_CMOCKA_TRUE@am_domain_resolution_order_tests_OBJECTS = src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.$(OBJEXT) \
383+@HAVE_CMOCKA_TRUE@ src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.$(OBJEXT)
384+domain_resolution_order_tests_OBJECTS = \
385+ $(am_domain_resolution_order_tests_OBJECTS)
386+@HAVE_CMOCKA_TRUE@domain_resolution_order_tests_DEPENDENCIES = \
387+@HAVE_CMOCKA_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
388+@HAVE_CMOCKA_TRUE@ libsss_test_common.la
389+domain_resolution_order_tests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
390+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
391+ $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) \
392+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
393 am__dp_opt_tests_SOURCES_DIST = src/providers/data_provider_opts.c \
394 src/tests/cmocka/test_dp_opts.c
395 @HAVE_CMOCKA_TRUE@am_dp_opt_tests_OBJECTS = src/providers/dp_opt_tests-data_provider_opts.$(OBJEXT) \
396@@ -4681,6 +4719,15 @@ test_search_bases_OBJECTS = $(am_test_search_bases_OBJECTS)
397 @HAVE_CMOCKA_TRUE@ $(am__DEPENDENCIES_2) libsss_ldap_common.la \
398 @HAVE_CMOCKA_TRUE@ libsss_test_common.la \
399 @HAVE_CMOCKA_TRUE@ libdlopen_test_providers.la
400+am_test_ssh_client_OBJECTS = \
401+ src/tests/test_ssh_client-test_ssh_client.$(OBJEXT)
402+test_ssh_client_OBJECTS = $(am_test_ssh_client_OBJECTS)
403+test_ssh_client_DEPENDENCIES = $(am__DEPENDENCIES_2) \
404+ $(am__DEPENDENCIES_5)
405+test_ssh_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
406+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
407+ $(test_ssh_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
408+ -o $@
409 am__test_sss_idmap_SOURCES_DIST = src/tests/cmocka/test_sss_idmap.c
410 @HAVE_CMOCKA_TRUE@am_test_sss_idmap_OBJECTS = src/tests/cmocka/test_sss_idmap-test_sss_idmap.$(OBJEXT)
411 test_sss_idmap_OBJECTS = $(am_test_sss_idmap_OBJECTS)
412@@ -4705,6 +4752,21 @@ test_sssd_krb5_localauth_plugin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
413 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
414 $(test_sssd_krb5_localauth_plugin_CFLAGS) $(CFLAGS) \
415 $(AM_LDFLAGS) $(LDFLAGS) -o $@
416+am__test_sssd_krb5_locator_plugin_SOURCES_DIST = \
417+ src/tests/cmocka/test_sssd_krb5_locator_plugin.c \
418+ src/krb5_plugin/sssd_krb5_locator_plugin.c
419+@HAVE_CMOCKA_TRUE@am_test_sssd_krb5_locator_plugin_OBJECTS = src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.$(OBJEXT) \
420+@HAVE_CMOCKA_TRUE@ src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.$(OBJEXT)
421+test_sssd_krb5_locator_plugin_OBJECTS = \
422+ $(am_test_sssd_krb5_locator_plugin_OBJECTS)
423+@HAVE_CMOCKA_TRUE@test_sssd_krb5_locator_plugin_DEPENDENCIES = \
424+@HAVE_CMOCKA_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
425+@HAVE_CMOCKA_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
426+@HAVE_CMOCKA_TRUE@ libsss_test_common.la
427+test_sssd_krb5_locator_plugin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
428+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
429+ $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) \
430+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
431 am__test_sysdb_certmap_SOURCES_DIST = \
432 src/tests/cmocka/test_sysdb_certmap.c
433 @HAVE_CMOCKA_TRUE@am_test_sysdb_certmap_OBJECTS = src/tests/cmocka/test_sysdb_certmap-test_sysdb_certmap.$(OBJEXT)
434@@ -4917,19 +4979,20 @@ SOURCES = $(_py2hbac_la_SOURCES) $(_py2sss_la_SOURCES) \
435 $(auth_tests_SOURCES) $(autofs_test_client_SOURCES) \
436 $(check_and_open_tests_SOURCES) $(config_check_tests_SOURCES) \
437 $(crypto_tests_SOURCES) $(debug_tests_SOURCES) \
438- $(dlopen_tests_SOURCES) $(dp_opt_tests_SOURCES) \
439- $(dummy_child_SOURCES) $(dyndns_tests_SOURCES) \
440- $(fail_over_tests_SOURCES) $(files_tests_SOURCES) \
441- $(find_uid_tests_SOURCES) $(fqnames_tests_SOURCES) \
442- $(gpo_child_SOURCES) $(ifp_tests_SOURCES) \
443- $(ipa_hbac_tests_SOURCES) $(ipa_ldap_opt_tests_SOURCES) \
444- $(krb5_child_test_SOURCES) $(krb5_utils_tests_SOURCES) \
445- $(krb5_child_SOURCES) $(krb5_common_test_SOURCES) \
446- $(ldap_child_SOURCES) $(nestedgroups_tests_SOURCES) \
447- $(nss_srv_tests_SOURCES) $(p11_child_SOURCES) \
448- $(pam_srv_tests_SOURCES) $(proxy_child_SOURCES) \
449- $(refcount_tests_SOURCES) $(resolv_tests_SOURCES) \
450- $(responder_get_domains_tests_SOURCES) \
451+ $(deskprofile_utils_tests_SOURCES) $(dlopen_tests_SOURCES) \
452+ $(domain_resolution_order_tests_SOURCES) \
453+ $(dp_opt_tests_SOURCES) $(dummy_child_SOURCES) \
454+ $(dyndns_tests_SOURCES) $(fail_over_tests_SOURCES) \
455+ $(files_tests_SOURCES) $(find_uid_tests_SOURCES) \
456+ $(fqnames_tests_SOURCES) $(gpo_child_SOURCES) \
457+ $(ifp_tests_SOURCES) $(ipa_hbac_tests_SOURCES) \
458+ $(ipa_ldap_opt_tests_SOURCES) $(krb5_child_test_SOURCES) \
459+ $(krb5_utils_tests_SOURCES) $(krb5_child_SOURCES) \
460+ $(krb5_common_test_SOURCES) $(ldap_child_SOURCES) \
461+ $(nestedgroups_tests_SOURCES) $(nss_srv_tests_SOURCES) \
462+ $(p11_child_SOURCES) $(pam_srv_tests_SOURCES) \
463+ $(proxy_child_SOURCES) $(refcount_tests_SOURCES) \
464+ $(resolv_tests_SOURCES) $(responder_get_domains_tests_SOURCES) \
465 $(responder_cache_req_tests_SOURCES) \
466 $(responder_socket_access_tests_SOURCES) \
467 $(safe_format_tests_SOURCES) $(sbus_internal_tests_SOURCES) \
468@@ -4971,8 +5034,9 @@ SOURCES = $(_py2hbac_la_SOURCES) $(_py2sss_la_SOURCES) \
469 $(test_resolv_fake_SOURCES) $(test_sbus_opath_SOURCES) \
470 $(test_sdap_access_SOURCES) $(test_sdap_certmap_SOURCES) \
471 $(test_sdap_initgr_SOURCES) $(test_search_bases_SOURCES) \
472- $(test_sss_idmap_SOURCES) \
473+ $(test_ssh_client_SOURCES) $(test_sss_idmap_SOURCES) \
474 $(test_sssd_krb5_localauth_plugin_SOURCES) \
475+ $(test_sssd_krb5_locator_plugin_SOURCES) \
476 $(test_sysdb_certmap_SOURCES) \
477 $(test_sysdb_domain_resolution_order_SOURCES) \
478 $(test_sysdb_subdomains_SOURCES) $(test_sysdb_sudo_SOURCES) \
479@@ -5023,7 +5087,9 @@ DIST_SOURCES = $(_py2hbac_la_SOURCES) $(_py2sss_la_SOURCES) \
480 $(am__config_check_tests_SOURCES_DIST) \
481 $(am__crypto_tests_SOURCES_DIST) \
482 $(am__debug_tests_SOURCES_DIST) \
483+ $(am__deskprofile_utils_tests_SOURCES_DIST) \
484 $(am__dlopen_tests_SOURCES_DIST) \
485+ $(am__domain_resolution_order_tests_SOURCES_DIST) \
486 $(am__dp_opt_tests_SOURCES_DIST) \
487 $(am__dummy_child_SOURCES_DIST) \
488 $(am__dyndns_tests_SOURCES_DIST) \
489@@ -5105,8 +5171,9 @@ DIST_SOURCES = $(_py2hbac_la_SOURCES) $(_py2sss_la_SOURCES) \
490 $(am__test_sdap_certmap_SOURCES_DIST) \
491 $(am__test_sdap_initgr_SOURCES_DIST) \
492 $(am__test_search_bases_SOURCES_DIST) \
493- $(am__test_sss_idmap_SOURCES_DIST) \
494+ $(test_ssh_client_SOURCES) $(am__test_sss_idmap_SOURCES_DIST) \
495 $(am__test_sssd_krb5_localauth_plugin_SOURCES_DIST) \
496+ $(am__test_sssd_krb5_locator_plugin_SOURCES_DIST) \
497 $(am__test_sysdb_certmap_SOURCES_DIST) \
498 $(am__test_sysdb_domain_resolution_order_SOURCES_DIST) \
499 $(am__test_sysdb_subdomains_SOURCES_DIST) \
500@@ -6004,7 +6071,8 @@ ACLOCAL_AMFLAGS = -I m4 -I .
501 @HAVE_CMOCKA_TRUE@non_interactive_cmocka_based_tests = nss-srv-tests \
502 @HAVE_CMOCKA_TRUE@ test-find-uid test-io test-negcache \
503 @HAVE_CMOCKA_TRUE@ test-authtok sss_nss_idmap-tests \
504-@HAVE_CMOCKA_TRUE@ dyndns-tests fqnames-tests \
505+@HAVE_CMOCKA_TRUE@ deskprofile_utils-tests dyndns-tests \
506+@HAVE_CMOCKA_TRUE@ domain_resolution_order-tests fqnames-tests \
507 @HAVE_CMOCKA_TRUE@ nestedgroups-tests test_sss_idmap \
508 @HAVE_CMOCKA_TRUE@ test_ipa_idmap test_utils dp_opt_tests \
509 @HAVE_CMOCKA_TRUE@ responder-get-domains-tests \
510@@ -6026,7 +6094,8 @@ ACLOCAL_AMFLAGS = -I m4 -I .
511 @HAVE_CMOCKA_TRUE@ test_data_provider_be test_dp_request_table \
512 @HAVE_CMOCKA_TRUE@ test_dp_request test_dp_builtin test_ipa_dn \
513 @HAVE_CMOCKA_TRUE@ simple-access-tests krb5_common_test \
514-@HAVE_CMOCKA_TRUE@ test_iobuf sss_certmap_test $(NULL) \
515+@HAVE_CMOCKA_TRUE@ test_iobuf sss_certmap_test \
516+@HAVE_CMOCKA_TRUE@ test_sssd_krb5_locator_plugin $(NULL) \
517 @HAVE_CMOCKA_TRUE@ $(am__append_19) $(am__append_20) \
518 @HAVE_CMOCKA_TRUE@ $(am__append_21) $(am__append_22) \
519 @HAVE_CMOCKA_TRUE@ $(am__append_23) $(am__append_24)
520@@ -6536,11 +6605,17 @@ libsss_cert_la_CFLAGS = \
521 $(SSS_CERT_CFLAGS) \
522 $(NULL)
523
524+# NOTE:
525+# There is a dependency between libsss_cert and libsss_child which should
526+# always be declared explicitly and if missing might cause issue in some
527+# environments (e.g. Gentoo or OpenSUSE build service), even if it is
528+# resolved otherwise while linking the binaries.
529 libsss_cert_la_LIBADD = \
530 $(SSS_CERT_LIBS) \
531 $(TALLOC_LIBS) \
532 $(TEVENT_LIBS) \
533 libsss_crypt.la \
534+ libsss_child.la \
535 libsss_debug.la \
536 libsss_certmap.la \
537 $(NULL)
538@@ -6566,13 +6641,13 @@ libsss_util_la_SOURCES = src/confdb/confdb.c src/db/sysdb.c \
539 src/sbus/sssd_dbus_properties.c src/sbus/sssd_dbus_request.c \
540 src/sbus/sssd_dbus_server.c src/sbus/sssd_dbus_signals.c \
541 src/sbus/sssd_dbus_common_signals.c src/sbus/sssd_dbus_utils.c \
542- src/util/util.c src/util/util_ext.c src/util/memory.c \
543- src/util/safe-format-string.c src/util/server.c \
544- src/util/signal.c src/util/usertools.c src/util/backup_file.c \
545- src/util/strtonum.c src/util/check_and_open.c \
546- src/util/refcount.c src/util/sss_nss.c src/util/sss_utf8.c \
547- src/util/sss_tc_utf8.c src/util/murmurhash3.c \
548- src/util/atomic_io.c src/util/authtok.c \
549+ src/util/util.c src/util/util_ext.c src/util/util_preauth.c \
550+ src/util/memory.c src/util/safe-format-string.c \
551+ src/util/server.c src/util/signal.c src/util/usertools.c \
552+ src/util/backup_file.c src/util/strtonum.c \
553+ src/util/check_and_open.c src/util/refcount.c \
554+ src/util/sss_nss.c src/util/sss_utf8.c src/util/sss_tc_utf8.c \
555+ src/util/murmurhash3.c src/util/atomic_io.c src/util/authtok.c \
556 src/util/authtok-utils.c src/util/sss_selinux.c \
557 src/util/domain_info_utils.c src/util/util_lock.c \
558 src/util/util_errors.c src/util/find_uid.c src/util/sss_ini.c \
559@@ -7271,8 +7346,15 @@ libsss_test_common_la_LIBADD = \
560 $(SSSD_INTERNAL_LTLIBS) \
561 $(NULL)
562
563+
564+# libdlopen_test_providers is a helper library to provide missing symbols for
565+# dlopen_tests. It is mainly used for the backend modules but is used as well
566+# to provide __wrap_sss_nss_make_request_timeout needed make make dlopen_tests
567+# pass for libsss_nss_idmap_tests.
568 @HAVE_CHECK_TRUE@libdlopen_test_providers_la_SOURCES = \
569-@HAVE_CHECK_TRUE@ $(sssd_be_SOURCES)
570+@HAVE_CHECK_TRUE@ $(sssd_be_SOURCES) \
571+@HAVE_CHECK_TRUE@ src/tests/cmocka/wrap_sss_nss_make_request_timeout.c \
572+@HAVE_CHECK_TRUE@ $(NULL)
573
574 @HAVE_CHECK_TRUE@libdlopen_test_providers_la_CFLAGS = \
575 @HAVE_CHECK_TRUE@ $(AM_CFLAGS) \
576@@ -7296,6 +7378,7 @@ libsss_test_common_la_LIBADD = \
577 @HAVE_CHECK_TRUE@ $(libsss_nss_idmap_la_LDFLAGS) \
578 @HAVE_CHECK_TRUE@ -shared \
579 @HAVE_CHECK_TRUE@ -rpath $(libdir) \
580+@HAVE_CHECK_TRUE@ -Wl,-wrap,sss_nss_make_request_timeout \
581 @HAVE_CHECK_TRUE@ -Wl,--version-script,$(srcdir)/src/sss_client/idmap/sss_nss_idmap.unit_tests
582
583 @HAVE_CHECK_TRUE@libsss_ad_tests_la_SOURCES = $(libsss_ad_la_SOURCES)
584@@ -7698,6 +7781,20 @@ krb5_child_test_LDADD = \
585 $(SSSD_INTERNAL_LTLIBS) \
586 libsss_test_common.la
587
588+test_ssh_client_SOURCES = \
589+ src/tests/test_ssh_client.c \
590+ $(NULL)
591+
592+test_ssh_client_CFLAGS = \
593+ $(AM_CFLAGS) \
594+ -DSSH_CLIENT_DIR=\"$(abs_top_builddir)\" \
595+ $(NULL)
596+
597+test_ssh_client_LDADD = \
598+ $(SSSD_INTERNAL_LTLIBS) \
599+ $(SSSD_LIBS) \
600+ $(NULL)
601+
602 @BUILD_DBUS_TESTS_TRUE@sbus_tests_SOURCES = \
603 @BUILD_DBUS_TESTS_TRUE@ src/tests/common_dbus.c \
604 @BUILD_DBUS_TESTS_TRUE@ src/tests/sbus_tests.c
605@@ -8017,6 +8114,19 @@ krb5_child_test_LDADD = \
606 @HAVE_CMOCKA_TRUE@ libsss_nss_idmap_tests.la \
607 @HAVE_CMOCKA_TRUE@ $(NULL)
608
609+@HAVE_CMOCKA_TRUE@deskprofile_utils_tests_SOURCES = \
610+@HAVE_CMOCKA_TRUE@ src/tests/cmocka/test_deskprofile_utils.c \
611+@HAVE_CMOCKA_TRUE@ src/providers/ipa/ipa_deskprofile_rules_util.c \
612+@HAVE_CMOCKA_TRUE@ src/providers/ipa/ipa_rules_common.c
613+
614+@HAVE_CMOCKA_TRUE@deskprofile_utils_tests_CFLAGS = \
615+@HAVE_CMOCKA_TRUE@ $(AM_CFLAGS)
616+
617+@HAVE_CMOCKA_TRUE@deskprofile_utils_tests_LDADD = \
618+@HAVE_CMOCKA_TRUE@ $(CMOCKA_LIBS) \
619+@HAVE_CMOCKA_TRUE@ $(SSSD_INTERNAL_LTLIBS) \
620+@HAVE_CMOCKA_TRUE@ libsss_test_common.la
621+
622 @HAVE_CMOCKA_TRUE@EXTRA_dyndns_tests_DEPENDENCIES = \
623 @HAVE_CMOCKA_TRUE@ $(ldblib_LTLIBRARIES)
624
625@@ -8042,6 +8152,18 @@ krb5_child_test_LDADD = \
626 @HAVE_CMOCKA_TRUE@ $(SSSD_INTERNAL_LTLIBS) \
627 @HAVE_CMOCKA_TRUE@ libsss_test_common.la
628
629+@HAVE_CMOCKA_TRUE@domain_resolution_order_tests_SOURCES = \
630+@HAVE_CMOCKA_TRUE@ src/tests/cmocka/test_domain_resolution_order.c \
631+@HAVE_CMOCKA_TRUE@ src/responder/common/cache_req/cache_req_domain.c
632+
633+@HAVE_CMOCKA_TRUE@domain_resolution_order_tests_CFLAGS = \
634+@HAVE_CMOCKA_TRUE@ $(AM_CFLAGS)
635+
636+@HAVE_CMOCKA_TRUE@domain_resolution_order_tests_LDADD = \
637+@HAVE_CMOCKA_TRUE@ $(CMOCKA_LIBS) \
638+@HAVE_CMOCKA_TRUE@ $(SSSD_INTERNAL_LTLIBS) \
639+@HAVE_CMOCKA_TRUE@ libsss_test_common.la
640+
641 @HAVE_CMOCKA_TRUE@fqnames_tests_SOURCES = \
642 @HAVE_CMOCKA_TRUE@ src/tests/cmocka/test_fqnames.c
643
644@@ -9041,6 +9163,27 @@ krb5_child_test_LDADD = \
645 @HAVE_CMOCKA_TRUE@ libsss_certmap.la \
646 @HAVE_CMOCKA_TRUE@ $(NULL)
647
648+@HAVE_CMOCKA_TRUE@test_sssd_krb5_locator_plugin_SOURCES = \
649+@HAVE_CMOCKA_TRUE@ src/tests/cmocka/test_sssd_krb5_locator_plugin.c \
650+@HAVE_CMOCKA_TRUE@ src/krb5_plugin/sssd_krb5_locator_plugin.c \
651+@HAVE_CMOCKA_TRUE@ $(NULL)
652+
653+@HAVE_CMOCKA_TRUE@test_sssd_krb5_locator_plugin_CFLAGS = \
654+@HAVE_CMOCKA_TRUE@ $(AM_CFLAGS) \
655+@HAVE_CMOCKA_TRUE@ $(POPT_CFLAGS) \
656+@HAVE_CMOCKA_TRUE@ $(TALLOC_CFLAGS) \
657+@HAVE_CMOCKA_TRUE@ $(KRB5_CFLAGS) \
658+@HAVE_CMOCKA_TRUE@ -DTEST_PUBCONF_PATH=\"$(abs_builddir)/src/tests/cmocka/pubconf\" \
659+@HAVE_CMOCKA_TRUE@ $(NULL)
660+
661+@HAVE_CMOCKA_TRUE@test_sssd_krb5_locator_plugin_LDADD = \
662+@HAVE_CMOCKA_TRUE@ $(CMOCKA_LIBS) \
663+@HAVE_CMOCKA_TRUE@ $(POPT_LIBS) \
664+@HAVE_CMOCKA_TRUE@ $(TALLOC_LIBS) \
665+@HAVE_CMOCKA_TRUE@ $(KRB5_LIBS) \
666+@HAVE_CMOCKA_TRUE@ libsss_test_common.la \
667+@HAVE_CMOCKA_TRUE@ $(NULL)
668+
669 @BUILD_KCM_TRUE@@HAVE_CMOCKA_TRUE@test_kcm_json_SOURCES = \
670 @BUILD_KCM_TRUE@@HAVE_CMOCKA_TRUE@ src/tests/cmocka/test_kcm_json_marshalling.c \
671 @BUILD_KCM_TRUE@@HAVE_CMOCKA_TRUE@ src/responder/kcm/kcmsrv_ccache_json.c \
672@@ -9935,6 +10078,7 @@ edit_cmd = $(SED) \
673 -e 's|@sbindir[@]|$(sbindir)|g' \
674 -e 's|@environment_file[@]|$(environment_file)|g' \
675 -e 's|@localstatedir[@]|$(localstatedir)|g' \
676+ -e 's|@runstatedir[@]|$(runstatedir)|g' \
677 -e 's|@logpath[@]|$(logpath)|g' \
678 -e 's|@libexecdir[@]|$(libexecdir)|g' \
679 -e 's|@pipepath[@]|$(pipepath)|g' \
680@@ -10937,6 +11081,15 @@ src/resolv/libdlopen_test_providers_la-async_resolv.lo: \
681 src/resolv/libdlopen_test_providers_la-async_resolv_utils.lo: \
682 src/resolv/$(am__dirstamp) \
683 src/resolv/$(DEPDIR)/$(am__dirstamp)
684+src/tests/cmocka/$(am__dirstamp):
685+ @$(MKDIR_P) src/tests/cmocka
686+ @: > src/tests/cmocka/$(am__dirstamp)
687+src/tests/cmocka/$(DEPDIR)/$(am__dirstamp):
688+ @$(MKDIR_P) src/tests/cmocka/$(DEPDIR)
689+ @: > src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
690+src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo: \
691+ src/tests/cmocka/$(am__dirstamp) \
692+ src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
693
694 libdlopen_test_providers.la: $(libdlopen_test_providers_la_OBJECTS) $(libdlopen_test_providers_la_DEPENDENCIES) $(EXTRA_libdlopen_test_providers_la_DEPENDENCIES)
695 $(AM_V_CCLD)$(libdlopen_test_providers_la_LINK) $(am_libdlopen_test_providers_la_rpath) $(libdlopen_test_providers_la_OBJECTS) $(libdlopen_test_providers_la_LIBADD) $(LIBS)
696@@ -11891,6 +12044,8 @@ src/util/libsss_util_la-util.lo: src/util/$(am__dirstamp) \
697 src/util/$(DEPDIR)/$(am__dirstamp)
698 src/util/libsss_util_la-util_ext.lo: src/util/$(am__dirstamp) \
699 src/util/$(DEPDIR)/$(am__dirstamp)
700+src/util/libsss_util_la-util_preauth.lo: src/util/$(am__dirstamp) \
701+ src/util/$(DEPDIR)/$(am__dirstamp)
702 src/util/libsss_util_la-memory.lo: src/util/$(am__dirstamp) \
703 src/util/$(DEPDIR)/$(am__dirstamp)
704 src/util/libsss_util_la-safe-format-string.lo: \
705@@ -12278,12 +12433,6 @@ clean-sssdlibexecPROGRAMS:
706 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
707 echo " rm -f" $$list; \
708 rm -f $$list
709-src/tests/cmocka/$(am__dirstamp):
710- @$(MKDIR_P) src/tests/cmocka
711- @: > src/tests/cmocka/$(am__dirstamp)
712-src/tests/cmocka/$(DEPDIR)/$(am__dirstamp):
713- @$(MKDIR_P) src/tests/cmocka/$(DEPDIR)
714- @: > src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
715 src/tests/cmocka/test_ad_access_filter.$(OBJEXT): \
716 src/tests/cmocka/$(am__dirstamp) \
717 src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
718@@ -12425,12 +12574,41 @@ src/tests/debug_tests-common.$(OBJEXT): src/tests/$(am__dirstamp) \
719 debug-tests$(EXEEXT): $(debug_tests_OBJECTS) $(debug_tests_DEPENDENCIES) $(EXTRA_debug_tests_DEPENDENCIES)
720 @rm -f debug-tests$(EXEEXT)
721 $(AM_V_CCLD)$(debug_tests_LINK) $(debug_tests_OBJECTS) $(debug_tests_LDADD) $(LIBS)
722+src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.$(OBJEXT): \
723+ src/tests/cmocka/$(am__dirstamp) \
724+ src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
725+src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.$(OBJEXT): \
726+ src/providers/ipa/$(am__dirstamp) \
727+ src/providers/ipa/$(DEPDIR)/$(am__dirstamp)
728+src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.$(OBJEXT): \
729+ src/providers/ipa/$(am__dirstamp) \
730+ src/providers/ipa/$(DEPDIR)/$(am__dirstamp)
731+
732+deskprofile_utils-tests$(EXEEXT): $(deskprofile_utils_tests_OBJECTS) $(deskprofile_utils_tests_DEPENDENCIES) $(EXTRA_deskprofile_utils_tests_DEPENDENCIES)
733+ @rm -f deskprofile_utils-tests$(EXEEXT)
734+ $(AM_V_CCLD)$(deskprofile_utils_tests_LINK) $(deskprofile_utils_tests_OBJECTS) $(deskprofile_utils_tests_LDADD) $(LIBS)
735 src/tests/dlopen_tests-dlopen-tests.$(OBJEXT): \
736 src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
737
738 dlopen-tests$(EXEEXT): $(dlopen_tests_OBJECTS) $(dlopen_tests_DEPENDENCIES) $(EXTRA_dlopen_tests_DEPENDENCIES)
739 @rm -f dlopen-tests$(EXEEXT)
740 $(AM_V_CCLD)$(dlopen_tests_LINK) $(dlopen_tests_OBJECTS) $(dlopen_tests_LDADD) $(LIBS)
741+src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.$(OBJEXT): \
742+ src/tests/cmocka/$(am__dirstamp) \
743+ src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
744+src/responder/common/cache_req/$(am__dirstamp):
745+ @$(MKDIR_P) src/responder/common/cache_req
746+ @: > src/responder/common/cache_req/$(am__dirstamp)
747+src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp):
748+ @$(MKDIR_P) src/responder/common/cache_req/$(DEPDIR)
749+ @: > src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp)
750+src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.$(OBJEXT): \
751+ src/responder/common/cache_req/$(am__dirstamp) \
752+ src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp)
753+
754+domain_resolution_order-tests$(EXEEXT): $(domain_resolution_order_tests_OBJECTS) $(domain_resolution_order_tests_DEPENDENCIES) $(EXTRA_domain_resolution_order_tests_DEPENDENCIES)
755+ @rm -f domain_resolution_order-tests$(EXEEXT)
756+ $(AM_V_CCLD)$(domain_resolution_order_tests_LINK) $(domain_resolution_order_tests_OBJECTS) $(domain_resolution_order_tests_LDADD) $(LIBS)
757 src/providers/dp_opt_tests-data_provider_opts.$(OBJEXT): \
758 src/providers/$(am__dirstamp) \
759 src/providers/$(DEPDIR)/$(am__dirstamp)
760@@ -12577,12 +12755,6 @@ src/responder/common/ifp_tests-responder_utils.$(OBJEXT): \
761 src/responder/common/$(DEPDIR)/$(am__dirstamp)
762 src/util/ifp_tests-session_recording.$(OBJEXT): \
763 src/util/$(am__dirstamp) src/util/$(DEPDIR)/$(am__dirstamp)
764-src/responder/common/cache_req/$(am__dirstamp):
765- @$(MKDIR_P) src/responder/common/cache_req
766- @: > src/responder/common/cache_req/$(am__dirstamp)
767-src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp):
768- @$(MKDIR_P) src/responder/common/cache_req/$(DEPDIR)
769- @: > src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp)
770 src/responder/common/cache_req/ifp_tests-cache_req.$(OBJEXT): \
771 src/responder/common/cache_req/$(am__dirstamp) \
772 src/responder/common/cache_req/$(DEPDIR)/$(am__dirstamp)
773@@ -15810,6 +15982,12 @@ src/tests/cmocka/test_search_bases.$(OBJEXT): \
774 test_search_bases$(EXEEXT): $(test_search_bases_OBJECTS) $(test_search_bases_DEPENDENCIES) $(EXTRA_test_search_bases_DEPENDENCIES)
775 @rm -f test_search_bases$(EXEEXT)
776 $(AM_V_CCLD)$(LINK) $(test_search_bases_OBJECTS) $(test_search_bases_LDADD) $(LIBS)
777+src/tests/test_ssh_client-test_ssh_client.$(OBJEXT): \
778+ src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
779+
780+test_ssh_client$(EXEEXT): $(test_ssh_client_OBJECTS) $(test_ssh_client_DEPENDENCIES) $(EXTRA_test_ssh_client_DEPENDENCIES)
781+ @rm -f test_ssh_client$(EXEEXT)
782+ $(AM_V_CCLD)$(test_ssh_client_LINK) $(test_ssh_client_OBJECTS) $(test_ssh_client_LDADD) $(LIBS)
783 src/tests/cmocka/test_sss_idmap-test_sss_idmap.$(OBJEXT): \
784 src/tests/cmocka/$(am__dirstamp) \
785 src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
786@@ -15827,6 +16005,16 @@ src/krb5_plugin/test_sssd_krb5_localauth_plugin-sssd_krb5_localauth_plugin.$(OBJ
787 test_sssd_krb5_localauth_plugin$(EXEEXT): $(test_sssd_krb5_localauth_plugin_OBJECTS) $(test_sssd_krb5_localauth_plugin_DEPENDENCIES) $(EXTRA_test_sssd_krb5_localauth_plugin_DEPENDENCIES)
788 @rm -f test_sssd_krb5_localauth_plugin$(EXEEXT)
789 $(AM_V_CCLD)$(test_sssd_krb5_localauth_plugin_LINK) $(test_sssd_krb5_localauth_plugin_OBJECTS) $(test_sssd_krb5_localauth_plugin_LDADD) $(LIBS)
790+src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.$(OBJEXT): \
791+ src/tests/cmocka/$(am__dirstamp) \
792+ src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
793+src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.$(OBJEXT): \
794+ src/krb5_plugin/$(am__dirstamp) \
795+ src/krb5_plugin/$(DEPDIR)/$(am__dirstamp)
796+
797+test_sssd_krb5_locator_plugin$(EXEEXT): $(test_sssd_krb5_locator_plugin_OBJECTS) $(test_sssd_krb5_locator_plugin_DEPENDENCIES) $(EXTRA_test_sssd_krb5_locator_plugin_DEPENDENCIES)
798+ @rm -f test_sssd_krb5_locator_plugin$(EXEEXT)
799+ $(AM_V_CCLD)$(test_sssd_krb5_locator_plugin_LINK) $(test_sssd_krb5_locator_plugin_OBJECTS) $(test_sssd_krb5_locator_plugin_LDADD) $(LIBS)
800 src/tests/cmocka/test_sysdb_certmap-test_sysdb_certmap.$(OBJEXT): \
801 src/tests/cmocka/$(am__dirstamp) \
802 src/tests/cmocka/$(DEPDIR)/$(am__dirstamp)
803@@ -16116,6 +16304,7 @@ mostlyclean-compile:
804 -rm -f src/tests/*.$(OBJEXT)
805 -rm -f src/tests/*.lo
806 -rm -f src/tests/cmocka/*.$(OBJEXT)
807+ -rm -f src/tests/cmocka/*.lo
808 -rm -f src/tests/cmocka/data_provider/*.$(OBJEXT)
809 -rm -f src/tools/*.$(OBJEXT)
810 -rm -f src/tools/*.lo
811@@ -16171,6 +16360,7 @@ distclean-compile:
812 @AMDEP_TRUE@@am__include@ @am__quote@src/krb5_plugin/$(DEPDIR)/sssd_krb5_localauth_plugin_la-sssd_krb5_localauth_plugin.Plo@am__quote@
813 @AMDEP_TRUE@@am__include@ @am__quote@src/krb5_plugin/$(DEPDIR)/sssd_krb5_locator_plugin_la-sssd_krb5_locator_plugin.Plo@am__quote@
814 @AMDEP_TRUE@@am__include@ @am__quote@src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_localauth_plugin-sssd_krb5_localauth_plugin.Po@am__quote@
815+@AMDEP_TRUE@@am__include@ @am__quote@src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Po@am__quote@
816 @AMDEP_TRUE@@am__include@ @am__quote@src/ldb_modules/$(DEPDIR)/memberof_la-memberof.Plo@am__quote@
817 @AMDEP_TRUE@@am__include@ @am__quote@src/lib/certmap/$(DEPDIR)/libsss_certmap_la-sss_cert_content_common.Plo@am__quote@
818 @AMDEP_TRUE@@am__include@ @am__quote@src/lib/certmap/$(DEPDIR)/libsss_certmap_la-sss_cert_content_crypto.Plo@am__quote@
819@@ -16364,6 +16554,8 @@ distclean-compile:
820 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/files/$(DEPDIR)/libsss_files_la-files_id.Plo@am__quote@
821 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/files/$(DEPDIR)/libsss_files_la-files_init.Plo@am__quote@
822 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/files/$(DEPDIR)/libsss_files_la-files_ops.Plo@am__quote@
823+@AMDEP_TRUE@@am__include@ @am__quote@src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Po@am__quote@
824+@AMDEP_TRUE@@am__include@ @am__quote@src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Po@am__quote@
825 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/ipa/$(DEPDIR)/ipa_dn.Po@am__quote@
826 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/ipa/$(DEPDIR)/ipa_ldap_opt_tests-ipa_opts.Po@am__quote@
827 @AMDEP_TRUE@@am__include@ @am__quote@src/providers/ipa/$(DEPDIR)/libsss_ipa_la-ipa_access.Plo@am__quote@
828@@ -16670,6 +16862,7 @@ distclean-compile:
829 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/cache_req_result.Po@am__quote@
830 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/cache_req_search.Po@am__quote@
831 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/cache_req_sr_overlay.Po@am__quote@
832+@AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Po@am__quote@
833 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/ifp_tests-cache_req.Po@am__quote@
834 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/ifp_tests-cache_req_data.Po@am__quote@
835 @AMDEP_TRUE@@am__include@ @am__quote@src/responder/common/cache_req/$(DEPDIR)/ifp_tests-cache_req_domain.Po@am__quote@
836@@ -17232,11 +17425,14 @@ distclean-compile:
837 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/sysdb_tests-sysdb-tests.Po@am__quote@
838 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/tcurl_test_tool-tcurl_test_tool.Po@am__quote@
839 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_io-common.Po@am__quote@
840+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Po@am__quote@
841 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/util_tests-util-tests.Po@am__quote@
842 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/ad_common_tests-common_mock_krb5.Po@am__quote@
843 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/ad_common_tests-test_ad_common.Po@am__quote@
844 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/ad_gpo_tests-test_ad_gpo.Po@am__quote@
845 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/config_check_tests-test_config_check.Po@am__quote@
846+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Po@am__quote@
847+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Po@am__quote@
848 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/dp_opt_tests-test_dp_opts.Po@am__quote@
849 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/dummy_child.Po@am__quote@
850 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/dyndns_tests-common_mock_be.Po@am__quote@
851@@ -17246,6 +17442,7 @@ distclean-compile:
852 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/ifp_tests-common_mock_resp_dp.Po@am__quote@
853 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/ifp_tests-test_ifp.Po@am__quote@
854 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/krb5_common_test-test_krb5_common.Po@am__quote@
855+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.Plo@am__quote@
856 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/nestedgroups_tests-common_mock_be.Po@am__quote@
857 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/nestedgroups_tests-common_mock_sdap.Po@am__quote@
858 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/nestedgroups_tests-common_mock_sysdb_objects.Po@am__quote@
859@@ -17316,6 +17513,7 @@ distclean-compile:
860 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_search_bases.Po@am__quote@
861 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sss_idmap-test_sss_idmap.Po@am__quote@
862 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_localauth_plugin-test_sssd_krb5_localauth_plugin.Po@am__quote@
863+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Po@am__quote@
864 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sysdb_certmap-test_sysdb_certmap.Po@am__quote@
865 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sysdb_domain_resolution_order-test_sysdb_domain_resolution_order.Po@am__quote@
866 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/cmocka/$(DEPDIR)/test_sysdb_subdomains-test_sysdb_subdomains.Po@am__quote@
867@@ -17503,6 +17701,7 @@ distclean-compile:
868 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_errors.Plo@am__quote@
869 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_ext.Plo@am__quote@
870 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_lock.Plo@am__quote@
871+@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_preauth.Plo@am__quote@
872 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_sss_idmap.Plo@am__quote@
873 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-util_watchdog.Plo@am__quote@
874 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libsss_util_la-well_known_sids.Plo@am__quote@
875@@ -18054,6 +18253,13 @@ src/resolv/libdlopen_test_providers_la-async_resolv_utils.lo: src/resolv/async_r
876 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
877 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdlopen_test_providers_la_CFLAGS) $(CFLAGS) -c -o src/resolv/libdlopen_test_providers_la-async_resolv_utils.lo `test -f 'src/resolv/async_resolv_utils.c' || echo '$(srcdir)/'`src/resolv/async_resolv_utils.c
878
879+src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo: src/tests/cmocka/wrap_sss_nss_make_request_timeout.c
880+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdlopen_test_providers_la_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo -MD -MP -MF src/tests/cmocka/$(DEPDIR)/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.Tpo -c -o src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo `test -f 'src/tests/cmocka/wrap_sss_nss_make_request_timeout.c' || echo '$(srcdir)/'`src/tests/cmocka/wrap_sss_nss_make_request_timeout.c
881+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.Tpo src/tests/cmocka/$(DEPDIR)/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.Plo
882+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/wrap_sss_nss_make_request_timeout.c' object='src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo' libtool=yes @AMDEPBACKSLASH@
883+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
884+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdlopen_test_providers_la_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/libdlopen_test_providers_la-wrap_sss_nss_make_request_timeout.lo `test -f 'src/tests/cmocka/wrap_sss_nss_make_request_timeout.c' || echo '$(srcdir)/'`src/tests/cmocka/wrap_sss_nss_make_request_timeout.c
885+
886 src/lib/winbind_idmap_sss/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.lo: src/lib/winbind_idmap_sss/libdlopen-test-winbind-idmap.c
887 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdlopen_test_winbind_idmap_la_CFLAGS) $(CFLAGS) -MT src/lib/winbind_idmap_sss/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.lo -MD -MP -MF src/lib/winbind_idmap_sss/$(DEPDIR)/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.Tpo -c -o src/lib/winbind_idmap_sss/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.lo `test -f 'src/lib/winbind_idmap_sss/libdlopen-test-winbind-idmap.c' || echo '$(srcdir)/'`src/lib/winbind_idmap_sss/libdlopen-test-winbind-idmap.c
888 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/lib/winbind_idmap_sss/$(DEPDIR)/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.Tpo src/lib/winbind_idmap_sss/$(DEPDIR)/libdlopen_test_winbind_idmap_la-libdlopen-test-winbind-idmap.Plo
889@@ -19692,6 +19898,13 @@ src/util/libsss_util_la-util_ext.lo: src/util/util_ext.c
890 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
891 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsss_util_la_CFLAGS) $(CFLAGS) -c -o src/util/libsss_util_la-util_ext.lo `test -f 'src/util/util_ext.c' || echo '$(srcdir)/'`src/util/util_ext.c
892
893+src/util/libsss_util_la-util_preauth.lo: src/util/util_preauth.c
894+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsss_util_la_CFLAGS) $(CFLAGS) -MT src/util/libsss_util_la-util_preauth.lo -MD -MP -MF src/util/$(DEPDIR)/libsss_util_la-util_preauth.Tpo -c -o src/util/libsss_util_la-util_preauth.lo `test -f 'src/util/util_preauth.c' || echo '$(srcdir)/'`src/util/util_preauth.c
895+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libsss_util_la-util_preauth.Tpo src/util/$(DEPDIR)/libsss_util_la-util_preauth.Plo
896+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/util_preauth.c' object='src/util/libsss_util_la-util_preauth.lo' libtool=yes @AMDEPBACKSLASH@
897+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
898+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsss_util_la_CFLAGS) $(CFLAGS) -c -o src/util/libsss_util_la-util_preauth.lo `test -f 'src/util/util_preauth.c' || echo '$(srcdir)/'`src/util/util_preauth.c
899+
900 src/util/libsss_util_la-memory.lo: src/util/memory.c
901 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsss_util_la_CFLAGS) $(CFLAGS) -MT src/util/libsss_util_la-memory.lo -MD -MP -MF src/util/$(DEPDIR)/libsss_util_la-memory.Tpo -c -o src/util/libsss_util_la-memory.lo `test -f 'src/util/memory.c' || echo '$(srcdir)/'`src/util/memory.c
902 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libsss_util_la-memory.Tpo src/util/$(DEPDIR)/libsss_util_la-memory.Plo
903@@ -20595,6 +20808,48 @@ src/tests/debug_tests-common.obj: src/tests/common.c
904 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
905 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(debug_tests_CFLAGS) $(CFLAGS) -c -o src/tests/debug_tests-common.obj `if test -f 'src/tests/common.c'; then $(CYGPATH_W) 'src/tests/common.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/common.c'; fi`
906
907+src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.o: src/tests/cmocka/test_deskprofile_utils.c
908+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.o -MD -MP -MF src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Tpo -c -o src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.o `test -f 'src/tests/cmocka/test_deskprofile_utils.c' || echo '$(srcdir)/'`src/tests/cmocka/test_deskprofile_utils.c
909+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Tpo src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Po
910+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_deskprofile_utils.c' object='src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.o' libtool=no @AMDEPBACKSLASH@
911+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
912+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.o `test -f 'src/tests/cmocka/test_deskprofile_utils.c' || echo '$(srcdir)/'`src/tests/cmocka/test_deskprofile_utils.c
913+
914+src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.obj: src/tests/cmocka/test_deskprofile_utils.c
915+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.obj -MD -MP -MF src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Tpo -c -o src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.obj `if test -f 'src/tests/cmocka/test_deskprofile_utils.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_deskprofile_utils.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_deskprofile_utils.c'; fi`
916+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Tpo src/tests/cmocka/$(DEPDIR)/deskprofile_utils_tests-test_deskprofile_utils.Po
917+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_deskprofile_utils.c' object='src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.obj' libtool=no @AMDEPBACKSLASH@
918+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
919+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/deskprofile_utils_tests-test_deskprofile_utils.obj `if test -f 'src/tests/cmocka/test_deskprofile_utils.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_deskprofile_utils.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_deskprofile_utils.c'; fi`
920+
921+src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.o: src/providers/ipa/ipa_deskprofile_rules_util.c
922+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.o -MD -MP -MF src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Tpo -c -o src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.o `test -f 'src/providers/ipa/ipa_deskprofile_rules_util.c' || echo '$(srcdir)/'`src/providers/ipa/ipa_deskprofile_rules_util.c
923+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Tpo src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Po
924+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/providers/ipa/ipa_deskprofile_rules_util.c' object='src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.o' libtool=no @AMDEPBACKSLASH@
925+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
926+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.o `test -f 'src/providers/ipa/ipa_deskprofile_rules_util.c' || echo '$(srcdir)/'`src/providers/ipa/ipa_deskprofile_rules_util.c
927+
928+src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.obj: src/providers/ipa/ipa_deskprofile_rules_util.c
929+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.obj -MD -MP -MF src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Tpo -c -o src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.obj `if test -f 'src/providers/ipa/ipa_deskprofile_rules_util.c'; then $(CYGPATH_W) 'src/providers/ipa/ipa_deskprofile_rules_util.c'; else $(CYGPATH_W) '$(srcdir)/src/providers/ipa/ipa_deskprofile_rules_util.c'; fi`
930+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Tpo src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_deskprofile_rules_util.Po
931+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/providers/ipa/ipa_deskprofile_rules_util.c' object='src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.obj' libtool=no @AMDEPBACKSLASH@
932+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
933+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/providers/ipa/deskprofile_utils_tests-ipa_deskprofile_rules_util.obj `if test -f 'src/providers/ipa/ipa_deskprofile_rules_util.c'; then $(CYGPATH_W) 'src/providers/ipa/ipa_deskprofile_rules_util.c'; else $(CYGPATH_W) '$(srcdir)/src/providers/ipa/ipa_deskprofile_rules_util.c'; fi`
934+
935+src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.o: src/providers/ipa/ipa_rules_common.c
936+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.o -MD -MP -MF src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Tpo -c -o src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.o `test -f 'src/providers/ipa/ipa_rules_common.c' || echo '$(srcdir)/'`src/providers/ipa/ipa_rules_common.c
937+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Tpo src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Po
938+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/providers/ipa/ipa_rules_common.c' object='src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.o' libtool=no @AMDEPBACKSLASH@
939+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
940+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.o `test -f 'src/providers/ipa/ipa_rules_common.c' || echo '$(srcdir)/'`src/providers/ipa/ipa_rules_common.c
941+
942+src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.obj: src/providers/ipa/ipa_rules_common.c
943+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -MT src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.obj -MD -MP -MF src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Tpo -c -o src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.obj `if test -f 'src/providers/ipa/ipa_rules_common.c'; then $(CYGPATH_W) 'src/providers/ipa/ipa_rules_common.c'; else $(CYGPATH_W) '$(srcdir)/src/providers/ipa/ipa_rules_common.c'; fi`
944+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Tpo src/providers/ipa/$(DEPDIR)/deskprofile_utils_tests-ipa_rules_common.Po
945+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/providers/ipa/ipa_rules_common.c' object='src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.obj' libtool=no @AMDEPBACKSLASH@
946+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
947+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deskprofile_utils_tests_CFLAGS) $(CFLAGS) -c -o src/providers/ipa/deskprofile_utils_tests-ipa_rules_common.obj `if test -f 'src/providers/ipa/ipa_rules_common.c'; then $(CYGPATH_W) 'src/providers/ipa/ipa_rules_common.c'; else $(CYGPATH_W) '$(srcdir)/src/providers/ipa/ipa_rules_common.c'; fi`
948+
949 src/tests/dlopen_tests-dlopen-tests.o: src/tests/dlopen-tests.c
950 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dlopen_tests_CFLAGS) $(CFLAGS) -MT src/tests/dlopen_tests-dlopen-tests.o -MD -MP -MF src/tests/$(DEPDIR)/dlopen_tests-dlopen-tests.Tpo -c -o src/tests/dlopen_tests-dlopen-tests.o `test -f 'src/tests/dlopen-tests.c' || echo '$(srcdir)/'`src/tests/dlopen-tests.c
951 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/dlopen_tests-dlopen-tests.Tpo src/tests/$(DEPDIR)/dlopen_tests-dlopen-tests.Po
952@@ -20609,6 +20864,34 @@ src/tests/dlopen_tests-dlopen-tests.obj: src/tests/dlopen-tests.c
953 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
954 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dlopen_tests_CFLAGS) $(CFLAGS) -c -o src/tests/dlopen_tests-dlopen-tests.obj `if test -f 'src/tests/dlopen-tests.c'; then $(CYGPATH_W) 'src/tests/dlopen-tests.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/dlopen-tests.c'; fi`
955
956+src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.o: src/tests/cmocka/test_domain_resolution_order.c
957+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.o -MD -MP -MF src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Tpo -c -o src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.o `test -f 'src/tests/cmocka/test_domain_resolution_order.c' || echo '$(srcdir)/'`src/tests/cmocka/test_domain_resolution_order.c
958+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Tpo src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Po
959+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_domain_resolution_order.c' object='src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.o' libtool=no @AMDEPBACKSLASH@
960+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
961+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.o `test -f 'src/tests/cmocka/test_domain_resolution_order.c' || echo '$(srcdir)/'`src/tests/cmocka/test_domain_resolution_order.c
962+
963+src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.obj: src/tests/cmocka/test_domain_resolution_order.c
964+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.obj -MD -MP -MF src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Tpo -c -o src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.obj `if test -f 'src/tests/cmocka/test_domain_resolution_order.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_domain_resolution_order.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_domain_resolution_order.c'; fi`
965+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Tpo src/tests/cmocka/$(DEPDIR)/domain_resolution_order_tests-test_domain_resolution_order.Po
966+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_domain_resolution_order.c' object='src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.obj' libtool=no @AMDEPBACKSLASH@
967+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
968+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/domain_resolution_order_tests-test_domain_resolution_order.obj `if test -f 'src/tests/cmocka/test_domain_resolution_order.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_domain_resolution_order.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_domain_resolution_order.c'; fi`
969+
970+src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.o: src/responder/common/cache_req/cache_req_domain.c
971+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -MT src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.o -MD -MP -MF src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Tpo -c -o src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.o `test -f 'src/responder/common/cache_req/cache_req_domain.c' || echo '$(srcdir)/'`src/responder/common/cache_req/cache_req_domain.c
972+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Tpo src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Po
973+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/responder/common/cache_req/cache_req_domain.c' object='src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.o' libtool=no @AMDEPBACKSLASH@
974+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
975+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -c -o src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.o `test -f 'src/responder/common/cache_req/cache_req_domain.c' || echo '$(srcdir)/'`src/responder/common/cache_req/cache_req_domain.c
976+
977+src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.obj: src/responder/common/cache_req/cache_req_domain.c
978+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -MT src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.obj -MD -MP -MF src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Tpo -c -o src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.obj `if test -f 'src/responder/common/cache_req/cache_req_domain.c'; then $(CYGPATH_W) 'src/responder/common/cache_req/cache_req_domain.c'; else $(CYGPATH_W) '$(srcdir)/src/responder/common/cache_req/cache_req_domain.c'; fi`
979+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Tpo src/responder/common/cache_req/$(DEPDIR)/domain_resolution_order_tests-cache_req_domain.Po
980+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/responder/common/cache_req/cache_req_domain.c' object='src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.obj' libtool=no @AMDEPBACKSLASH@
981+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
982+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(domain_resolution_order_tests_CFLAGS) $(CFLAGS) -c -o src/responder/common/cache_req/domain_resolution_order_tests-cache_req_domain.obj `if test -f 'src/responder/common/cache_req/cache_req_domain.c'; then $(CYGPATH_W) 'src/responder/common/cache_req/cache_req_domain.c'; else $(CYGPATH_W) '$(srcdir)/src/responder/common/cache_req/cache_req_domain.c'; fi`
983+
984 src/providers/dp_opt_tests-data_provider_opts.o: src/providers/data_provider_opts.c
985 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dp_opt_tests_CFLAGS) $(CFLAGS) -MT src/providers/dp_opt_tests-data_provider_opts.o -MD -MP -MF src/providers/$(DEPDIR)/dp_opt_tests-data_provider_opts.Tpo -c -o src/providers/dp_opt_tests-data_provider_opts.o `test -f 'src/providers/data_provider_opts.c' || echo '$(srcdir)/'`src/providers/data_provider_opts.c
986 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/providers/$(DEPDIR)/dp_opt_tests-data_provider_opts.Tpo src/providers/$(DEPDIR)/dp_opt_tests-data_provider_opts.Po
987@@ -32803,6 +33086,20 @@ src/tests/cmocka/test_sdap_initgr-test_sdap_initgr.obj: src/tests/cmocka/test_sd
988 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
989 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sdap_initgr_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/test_sdap_initgr-test_sdap_initgr.obj `if test -f 'src/tests/cmocka/test_sdap_initgr.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_sdap_initgr.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_sdap_initgr.c'; fi`
990
991+src/tests/test_ssh_client-test_ssh_client.o: src/tests/test_ssh_client.c
992+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssh_client_CFLAGS) $(CFLAGS) -MT src/tests/test_ssh_client-test_ssh_client.o -MD -MP -MF src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Tpo -c -o src/tests/test_ssh_client-test_ssh_client.o `test -f 'src/tests/test_ssh_client.c' || echo '$(srcdir)/'`src/tests/test_ssh_client.c
993+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Tpo src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Po
994+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test_ssh_client.c' object='src/tests/test_ssh_client-test_ssh_client.o' libtool=no @AMDEPBACKSLASH@
995+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
996+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssh_client_CFLAGS) $(CFLAGS) -c -o src/tests/test_ssh_client-test_ssh_client.o `test -f 'src/tests/test_ssh_client.c' || echo '$(srcdir)/'`src/tests/test_ssh_client.c
997+
998+src/tests/test_ssh_client-test_ssh_client.obj: src/tests/test_ssh_client.c
999+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssh_client_CFLAGS) $(CFLAGS) -MT src/tests/test_ssh_client-test_ssh_client.obj -MD -MP -MF src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Tpo -c -o src/tests/test_ssh_client-test_ssh_client.obj `if test -f 'src/tests/test_ssh_client.c'; then $(CYGPATH_W) 'src/tests/test_ssh_client.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test_ssh_client.c'; fi`
1000+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Tpo src/tests/$(DEPDIR)/test_ssh_client-test_ssh_client.Po
1001+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test_ssh_client.c' object='src/tests/test_ssh_client-test_ssh_client.obj' libtool=no @AMDEPBACKSLASH@
1002+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1003+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ssh_client_CFLAGS) $(CFLAGS) -c -o src/tests/test_ssh_client-test_ssh_client.obj `if test -f 'src/tests/test_ssh_client.c'; then $(CYGPATH_W) 'src/tests/test_ssh_client.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test_ssh_client.c'; fi`
1004+
1005 src/tests/cmocka/test_sss_idmap-test_sss_idmap.o: src/tests/cmocka/test_sss_idmap.c
1006 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sss_idmap_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/test_sss_idmap-test_sss_idmap.o -MD -MP -MF src/tests/cmocka/$(DEPDIR)/test_sss_idmap-test_sss_idmap.Tpo -c -o src/tests/cmocka/test_sss_idmap-test_sss_idmap.o `test -f 'src/tests/cmocka/test_sss_idmap.c' || echo '$(srcdir)/'`src/tests/cmocka/test_sss_idmap.c
1007 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/test_sss_idmap-test_sss_idmap.Tpo src/tests/cmocka/$(DEPDIR)/test_sss_idmap-test_sss_idmap.Po
1008@@ -32845,6 +33142,34 @@ src/krb5_plugin/test_sssd_krb5_localauth_plugin-sssd_krb5_localauth_plugin.obj:
1009 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1010 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_localauth_plugin_CFLAGS) $(CFLAGS) -c -o src/krb5_plugin/test_sssd_krb5_localauth_plugin-sssd_krb5_localauth_plugin.obj `if test -f 'src/krb5_plugin/sssd_krb5_localauth_plugin.c'; then $(CYGPATH_W) 'src/krb5_plugin/sssd_krb5_localauth_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/krb5_plugin/sssd_krb5_localauth_plugin.c'; fi`
1011
1012+src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.o: src/tests/cmocka/test_sssd_krb5_locator_plugin.c
1013+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.o -MD -MP -MF src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Tpo -c -o src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.o `test -f 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c' || echo '$(srcdir)/'`src/tests/cmocka/test_sssd_krb5_locator_plugin.c
1014+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Tpo src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Po
1015+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_sssd_krb5_locator_plugin.c' object='src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.o' libtool=no @AMDEPBACKSLASH@
1016+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1017+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.o `test -f 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c' || echo '$(srcdir)/'`src/tests/cmocka/test_sssd_krb5_locator_plugin.c
1018+
1019+src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.obj: src/tests/cmocka/test_sssd_krb5_locator_plugin.c
1020+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.obj -MD -MP -MF src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Tpo -c -o src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.obj `if test -f 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; fi`
1021+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Tpo src/tests/cmocka/$(DEPDIR)/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.Po
1022+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/cmocka/test_sssd_krb5_locator_plugin.c' object='src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.obj' libtool=no @AMDEPBACKSLASH@
1023+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1024+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -c -o src/tests/cmocka/test_sssd_krb5_locator_plugin-test_sssd_krb5_locator_plugin.obj `if test -f 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; then $(CYGPATH_W) 'src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/cmocka/test_sssd_krb5_locator_plugin.c'; fi`
1025+
1026+src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.o: src/krb5_plugin/sssd_krb5_locator_plugin.c
1027+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -MT src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.o -MD -MP -MF src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Tpo -c -o src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.o `test -f 'src/krb5_plugin/sssd_krb5_locator_plugin.c' || echo '$(srcdir)/'`src/krb5_plugin/sssd_krb5_locator_plugin.c
1028+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Tpo src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Po
1029+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/krb5_plugin/sssd_krb5_locator_plugin.c' object='src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.o' libtool=no @AMDEPBACKSLASH@
1030+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1031+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -c -o src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.o `test -f 'src/krb5_plugin/sssd_krb5_locator_plugin.c' || echo '$(srcdir)/'`src/krb5_plugin/sssd_krb5_locator_plugin.c
1032+
1033+src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.obj: src/krb5_plugin/sssd_krb5_locator_plugin.c
1034+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -MT src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.obj -MD -MP -MF src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Tpo -c -o src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.obj `if test -f 'src/krb5_plugin/sssd_krb5_locator_plugin.c'; then $(CYGPATH_W) 'src/krb5_plugin/sssd_krb5_locator_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/krb5_plugin/sssd_krb5_locator_plugin.c'; fi`
1035+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Tpo src/krb5_plugin/$(DEPDIR)/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.Po
1036+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/krb5_plugin/sssd_krb5_locator_plugin.c' object='src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.obj' libtool=no @AMDEPBACKSLASH@
1037+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1038+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sssd_krb5_locator_plugin_CFLAGS) $(CFLAGS) -c -o src/krb5_plugin/test_sssd_krb5_locator_plugin-sssd_krb5_locator_plugin.obj `if test -f 'src/krb5_plugin/sssd_krb5_locator_plugin.c'; then $(CYGPATH_W) 'src/krb5_plugin/sssd_krb5_locator_plugin.c'; else $(CYGPATH_W) '$(srcdir)/src/krb5_plugin/sssd_krb5_locator_plugin.c'; fi`
1039+
1040 src/tests/cmocka/test_sysdb_certmap-test_sysdb_certmap.o: src/tests/cmocka/test_sysdb_certmap.c
1041 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sysdb_certmap_CFLAGS) $(CFLAGS) -MT src/tests/cmocka/test_sysdb_certmap-test_sysdb_certmap.o -MD -MP -MF src/tests/cmocka/$(DEPDIR)/test_sysdb_certmap-test_sysdb_certmap.Tpo -c -o src/tests/cmocka/test_sysdb_certmap-test_sysdb_certmap.o `test -f 'src/tests/cmocka/test_sysdb_certmap.c' || echo '$(srcdir)/'`src/tests/cmocka/test_sysdb_certmap.c
1042 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/cmocka/$(DEPDIR)/test_sysdb_certmap-test_sysdb_certmap.Tpo src/tests/cmocka/$(DEPDIR)/test_sysdb_certmap-test_sysdb_certmap.Po
1043@@ -33160,6 +33485,7 @@ clean-libtool:
1044 -rm -rf src/sss_client/nfs/.libs src/sss_client/nfs/_libs
1045 -rm -rf src/sss_client/sudo/.libs src/sss_client/sudo/_libs
1046 -rm -rf src/tests/.libs src/tests/_libs
1047+ -rm -rf src/tests/cmocka/.libs src/tests/cmocka/_libs
1048 -rm -rf src/tools/.libs src/tools/_libs
1049 -rm -rf src/tools/common/.libs src/tools/common/_libs
1050 -rm -rf src/util/.libs src/util/_libs
1051@@ -33777,6 +34103,13 @@ sss_nss_idmap-tests.log: sss_nss_idmap-tests$(EXEEXT)
1052 --log-file $$b.log --trs-file $$b.trs \
1053 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1054 "$$tst" $(AM_TESTS_FD_REDIRECT)
1055+deskprofile_utils-tests.log: deskprofile_utils-tests$(EXEEXT)
1056+ @p='deskprofile_utils-tests$(EXEEXT)'; \
1057+ b='deskprofile_utils-tests'; \
1058+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1059+ --log-file $$b.log --trs-file $$b.trs \
1060+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1061+ "$$tst" $(AM_TESTS_FD_REDIRECT)
1062 dyndns-tests.log: dyndns-tests$(EXEEXT)
1063 @p='dyndns-tests$(EXEEXT)'; \
1064 b='dyndns-tests'; \
1065@@ -33784,6 +34117,13 @@ dyndns-tests.log: dyndns-tests$(EXEEXT)
1066 --log-file $$b.log --trs-file $$b.trs \
1067 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1068 "$$tst" $(AM_TESTS_FD_REDIRECT)
1069+domain_resolution_order-tests.log: domain_resolution_order-tests$(EXEEXT)
1070+ @p='domain_resolution_order-tests$(EXEEXT)'; \
1071+ b='domain_resolution_order-tests'; \
1072+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1073+ --log-file $$b.log --trs-file $$b.trs \
1074+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1075+ "$$tst" $(AM_TESTS_FD_REDIRECT)
1076 fqnames-tests.log: fqnames-tests$(EXEEXT)
1077 @p='fqnames-tests$(EXEEXT)'; \
1078 b='fqnames-tests'; \
1079@@ -34106,6 +34446,13 @@ sss_certmap_test.log: sss_certmap_test$(EXEEXT)
1080 --log-file $$b.log --trs-file $$b.trs \
1081 $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1082 "$$tst" $(AM_TESTS_FD_REDIRECT)
1083+test_sssd_krb5_locator_plugin.log: test_sssd_krb5_locator_plugin$(EXEEXT)
1084+ @p='test_sssd_krb5_locator_plugin$(EXEEXT)'; \
1085+ b='test_sssd_krb5_locator_plugin'; \
1086+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1087+ --log-file $$b.log --trs-file $$b.trs \
1088+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1089+ "$$tst" $(AM_TESTS_FD_REDIRECT)
1090 test_resolv_fake.log: test_resolv_fake$(EXEEXT)
1091 @p='test_resolv_fake$(EXEEXT)'; \
1092 b='test_resolv_fake'; \
1093@@ -35006,6 +35353,7 @@ intgcheck-prepare:
1094 $(INTGCHECK_CONFIGURE_FLAGS) \
1095 CFLAGS="-O2 -g $$CFLAGS -DKCM_PEER_UID=$$(id -u)"; \
1096 $(MAKE) $(AM_MAKEFLAGS) ; \
1097+ $(MAKE) $(AM_MAKEFLAGS) test_ssh_client; \
1098 : Force single-thread install to workaround concurrency issues; \
1099 $(MAKE) $(AM_MAKEFLAGS) -j1 install; \
1100 : Remove .la files from LDB module directory to avoid loader warnings; \
1101diff --git a/build/ar-lib b/build/ar-lib
1102index 05094d3..92bbe08 100755
1103--- a/build/ar-lib
1104+++ b/build/ar-lib
1105@@ -1,4 +1,4 @@
1106-#! /bin/sh
1107+#!/bin/sh
1108 # Wrapper for Microsoft lib.exe
1109
1110 me=ar-lib
1111diff --git a/build/compile b/build/compile
1112index 2ab71e4..de0005d 100755
1113--- a/build/compile
1114+++ b/build/compile
1115@@ -1,4 +1,4 @@
1116-#! /bin/sh
1117+#!/bin/sh
1118 # Wrapper for compilers which do not understand '-c -o'.
1119
1120 scriptversion=2016-01-11.22; # UTC
1121diff --git a/build/config.guess b/build/config.guess
1122index a744844..717b228 100755
1123--- a/build/config.guess
1124+++ b/build/config.guess
1125@@ -1,4 +1,4 @@
1126-#! /bin/sh
1127+#!/bin/sh
1128 # Attempt to guess a canonical system name.
1129 # Copyright 1992-2017 Free Software Foundation, Inc.
1130
1131diff --git a/build/config.sub b/build/config.sub
1132index 932128b..f4bafc1 100755
1133--- a/build/config.sub
1134+++ b/build/config.sub
1135@@ -1,4 +1,4 @@
1136-#! /bin/sh
1137+#!/bin/sh
1138 # Configuration validation subroutine script.
1139 # Copyright 1992-2017 Free Software Foundation, Inc.
1140
1141diff --git a/build/depcomp b/build/depcomp
1142index b39f98f..30379e2 100755
1143--- a/build/depcomp
1144+++ b/build/depcomp
1145@@ -1,4 +1,4 @@
1146-#! /bin/sh
1147+#!/bin/sh
1148 # depcomp - compile a program generating dependencies as side-effects
1149
1150 scriptversion=2016-01-11.22; # UTC
1151diff --git a/build/ltmain.sh b/build/ltmain.sh
1152index 0f0a2da..30be9c8 100644
1153--- a/build/ltmain.sh
1154+++ b/build/ltmain.sh
1155@@ -7272,10 +7272,12 @@ func_mode_link ()
1156 # -tp=* Portland pgcc target processor selection
1157 # --sysroot=* for sysroot support
1158 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
1159+ # -specs=* GCC specs files
1160 # -stdlib=* select c++ std lib with clang
1161 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
1162 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
1163- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
1164+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
1165+ -specs=*)
1166 func_quote_for_eval "$arg"
1167 arg=$func_quote_for_eval_result
1168 func_append compile_command " $arg"
1169diff --git a/build/missing b/build/missing
1170index c6e3795..b7e571e 100755
1171--- a/build/missing
1172+++ b/build/missing
1173@@ -1,4 +1,4 @@
1174-#! /bin/sh
1175+#!/bin/sh
1176 # Common wrapper for a few potentially missing GNU programs.
1177
1178 scriptversion=2016-01-11.22; # UTC
1179diff --git a/build/mkinstalldirs b/build/mkinstalldirs
1180index a31ce6d..a1c49d4 100755
1181--- a/build/mkinstalldirs
1182+++ b/build/mkinstalldirs
1183@@ -1,4 +1,4 @@
1184-#! /bin/sh
1185+#!/bin/sh
1186 # mkinstalldirs --- make directory hierarchy
1187
1188 scriptversion=2016-01-11.22; # UTC
1189diff --git a/build/test-driver b/build/test-driver
1190index 0218a01..de1e61d 100755
1191--- a/build/test-driver
1192+++ b/build/test-driver
1193@@ -1,4 +1,4 @@
1194-#! /bin/sh
1195+#!/bin/sh
1196 # test-driver - basic testsuite driver script.
1197
1198 scriptversion=2016-01-11.22; # UTC
1199diff --git a/config.h.in b/config.h.in
1200index 9743383..051ed45 100644
1201--- a/config.h.in
1202+++ b/config.h.in
1203@@ -467,6 +467,9 @@
1204 /* Define to 1 if `lc_arg' is a member of `struct ldap_conncb'. */
1205 #undef HAVE_STRUCT_LDAP_CONNCB_LC_ARG
1206
1207+/* Define to 1 if `resource_groups' is a member of `struct PAC_LOGON_INFO'. */
1208+#undef HAVE_STRUCT_PAC_LOGON_INFO_RESOURCE_GROUPS
1209+
1210 /* Define to 1 if `gid' is a member of `struct ucred'. */
1211 #undef HAVE_STRUCT_UCRED_GID
1212
1213diff --git a/configure b/configure
1214index 876390b..2974327 100755
1215--- a/configure
1216+++ b/configure
1217@@ -1,6 +1,6 @@
1218 #! /bin/sh
1219 # Guess values for system-dependent variables and create Makefiles.
1220-# Generated by GNU Autoconf 2.69 for sssd 1.16.2.
1221+# Generated by GNU Autoconf 2.69 for sssd 1.16.3.
1222 #
1223 # Report bugs to <sssd-devel@lists.fedorahosted.org>.
1224 #
1225@@ -590,8 +590,8 @@ MAKEFLAGS=
1226 # Identity of this package.
1227 PACKAGE_NAME='sssd'
1228 PACKAGE_TARNAME='sssd'
1229-PACKAGE_VERSION='1.16.2'
1230-PACKAGE_STRING='sssd 1.16.2'
1231+PACKAGE_VERSION='1.16.3'
1232+PACKAGE_STRING='sssd 1.16.3'
1233 PACKAGE_BUGREPORT='sssd-devel@lists.fedorahosted.org'
1234 PACKAGE_URL=''
1235
1236@@ -1785,7 +1785,7 @@ if test "$ac_init_help" = "long"; then
1237 # Omit some internal or obsolete options to make the list less imposing.
1238 # This message is too long to be a string in the A/UX 3.1 sh.
1239 cat <<_ACEOF
1240-\`configure' configures sssd 1.16.2 to adapt to many kinds of systems.
1241+\`configure' configures sssd 1.16.3 to adapt to many kinds of systems.
1242
1243 Usage: $0 [OPTION]... [VAR=VALUE]...
1244
1245@@ -1855,7 +1855,7 @@ fi
1246
1247 if test -n "$ac_init_help"; then
1248 case $ac_init_help in
1249- short | recursive ) echo "Configuration of sssd 1.16.2:";;
1250+ short | recursive ) echo "Configuration of sssd 1.16.3:";;
1251 esac
1252 cat <<\_ACEOF
1253
1254@@ -2325,7 +2325,7 @@ fi
1255 test -n "$ac_init_help" && exit $ac_status
1256 if $ac_init_version; then
1257 cat <<\_ACEOF
1258-sssd configure 1.16.2
1259+sssd configure 1.16.3
1260 generated by GNU Autoconf 2.69
1261
1262 Copyright (C) 2012 Free Software Foundation, Inc.
1263@@ -3034,7 +3034,7 @@ cat >config.log <<_ACEOF
1264 This file contains any messages produced by compilers while
1265 running configure, to aid debugging if configure makes a mistake.
1266
1267-It was created by sssd $as_me 1.16.2, which was
1268+It was created by sssd $as_me 1.16.3, which was
1269 generated by GNU Autoconf 2.69. Invocation command line was
1270
1271 $ $0 $@
1272@@ -5273,7 +5273,7 @@ fi
1273
1274 # Define the identity of the package.
1275 PACKAGE='sssd'
1276- VERSION='1.16.2'
1277+ VERSION='1.16.3'
1278
1279
1280 cat >>confdefs.h <<_ACEOF
1281@@ -21554,6 +21554,23 @@ _ACEOF
1282
1283 fi
1284
1285+SAVE_CFLAGS=$CFLAGS
1286+CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS $NDR_NBT_CFLAGS $NDR_KRB5PAC_CFLAGS -I/usr/include/samba-4.0"
1287+ac_fn_c_check_member "$LINENO" "struct PAC_LOGON_INFO" "resource_groups" "ac_cv_member_struct_PAC_LOGON_INFO_resource_groups" " #include <ndr.h>
1288+ #include <gen_ndr/krb5pac.h>
1289+ #include <gen_ndr/krb5pac.h>
1290+"
1291+if test "x$ac_cv_member_struct_PAC_LOGON_INFO_resource_groups" = xyes; then :
1292+
1293+cat >>confdefs.h <<_ACEOF
1294+#define HAVE_STRUCT_PAC_LOGON_INFO_RESOURCE_GROUPS 1
1295+_ACEOF
1296+
1297+
1298+fi
1299+
1300+CFLAGS=$SAVE_CFLAGS
1301+
1302
1303
1304
1305@@ -28548,7 +28565,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1306 # report actual input values of CONFIG_FILES etc. instead of their
1307 # values after options handling.
1308 ac_log="
1309-This file was extended by sssd $as_me 1.16.2, which was
1310+This file was extended by sssd $as_me 1.16.3, which was
1311 generated by GNU Autoconf 2.69. Invocation command line was
1312
1313 CONFIG_FILES = $CONFIG_FILES
1314@@ -28614,7 +28631,7 @@ _ACEOF
1315 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1316 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1317 ac_cs_version="\\
1318-sssd config.status 1.16.2
1319+sssd config.status 1.16.3
1320 configured by $0, generated by GNU Autoconf 2.69,
1321 with options \\"\$ac_cs_config\\"
1322
1323diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
1324index f516a94..89e4d75 100644
1325--- a/contrib/sssd.spec.in
1326+++ b/contrib/sssd.spec.in
1327@@ -107,12 +107,18 @@
1328 %global with_python3_option --without-python3-bindings
1329 %endif
1330
1331+%if (0%{?fedora} > 28 || 0%{?rhel} > 7)
1332+ %global with_python2_option --without-python2-bindings
1333+%else
1334+ %global with_python2 1
1335+%endif
1336+
1337 %global enable_systemtap 1
1338 %if (0%{?enable_systemtap} == 1)
1339 %global enable_systemtap_opt --enable-systemtap
1340 %endif
1341
1342-%if (0%{?fedora} || (0%{?rhel} >= 7 && 0%{rhel7_minor} >= 4))
1343+%if (0%{?fedora} || 0%{?rhel} >= 7)
1344 %global with_secrets 1
1345 %else
1346 %global with_secret_responder --without-secrets
1347@@ -125,7 +131,7 @@
1348 %global with_kcm_option --without-kcm
1349 %endif
1350
1351-%if (0%{?fedora} >= 27 || (0%{?rhel} >= 7 && 0%{?rhel7_minor} > 4))
1352+%if (0%{?fedora} >= 27 || 0%{?rhel} >= 7)
1353 %global with_gdm_pam_extensions 1
1354 %else
1355 %global with_gdm_pam_extensions 0
1356@@ -195,6 +201,10 @@ BuildRequires: dbus-devel
1357 BuildRequires: dbus-libs
1358 BuildRequires: openldap-devel
1359 BuildRequires: pam-devel
1360+%if (0%{?use_openssl} == 1)
1361+BuildRequires: p11-kit-devel
1362+BuildRequires: openssl-devel
1363+%endif
1364 BuildRequires: nss-devel
1365 BuildRequires: nspr-devel
1366 BuildRequires: pcre-devel
1367@@ -203,7 +213,9 @@ BuildRequires: libxml2
1368 BuildRequires: docbook-style-xsl
1369 BuildRequires: krb5-devel
1370 BuildRequires: c-ares-devel
1371+%if (0%{?with_python2} == 1)
1372 BuildRequires: python2-devel
1373+%endif
1374 %if (0%{?with_python3} == 1)
1375 BuildRequires: python3-devel
1376 %endif
1377@@ -233,8 +245,6 @@ BuildRequires: nss_wrapper
1378 # slots with are flagged as 'removable' softhsm version 2.1.0 or higher is
1379 # needed.
1380 %if (0%{?use_openssl} == 1)
1381-BuildRequires: p11-kit-devel
1382-BuildRequires: openssl-devel
1383 BuildRequires: gnutls-utils
1384 BuildRequires: softhsm >= 2.1.0
1385 %endif
1386@@ -372,6 +382,7 @@ Also provides several other administrative tools:
1387 * sss_obfuscate for generating an obfuscated LDAP password
1388 * sssctl -- an sssd status and control utility
1389
1390+%if (0%{?with_python2} == 1)
1391 %package -n python2-sssdconfig
1392 Summary: SSSD and IPA configuration file manipulation classes and functions
1393 Group: Applications/System
1394@@ -381,6 +392,7 @@ BuildArch: noarch
1395
1396 %description -n python2-sssdconfig
1397 Provides python2 files for manipulation SSSD and IPA configuration files.
1398+%endif
1399
1400 %if (0%{?with_python3} == 1)
1401 %package -n python3-sssdconfig
1402@@ -394,6 +406,7 @@ BuildArch: noarch
1403 Provides python3 files for manipulation SSSD and IPA configuration files.
1404 %endif
1405
1406+%if (0%{?with_python2} == 1)
1407 %package -n python2-sss
1408 Summary: Python2 bindings for sssd
1409 Group: Development/Libraries
1410@@ -408,6 +421,7 @@ SSSD when using id_provider = local in /etc/sssd/sssd.conf.
1411 Also provides several other useful python2 bindings:
1412 * function for retrieving list of groups user belongs to.
1413 * class for obfuscation of passwords
1414+%endif
1415
1416 %if (0%{?with_python3} == 1)
1417 %package -n python3-sss
1418@@ -426,6 +440,7 @@ Also provides several other useful python3 bindings:
1419 * class for obfuscation of passwords
1420 %endif
1421
1422+%if (0%{?with_python2} == 1)
1423 %package -n python2-sss-murmur
1424 Summary: Python2 bindings for murmur hash function
1425 Group: Development/Libraries
1426@@ -434,6 +449,7 @@ License: LGPLv3+
1427
1428 %description -n python2-sss-murmur
1429 Provides python2 module for calculating the murmur hash version 3
1430+%endif
1431
1432 %if (0%{?with_python3} == 1)
1433 %package -n python3-sss-murmur
1434@@ -570,6 +586,7 @@ Requires: libipa_hbac = %{version}-%{release}
1435 %description -n libipa_hbac-devel
1436 Utility library to validate FreeIPA HBAC rules for authorization requests
1437
1438+%if (0%{?with_python2} == 1)
1439 %package -n python2-libipa_hbac
1440 Summary: Python2 bindings for the FreeIPA HBAC Evaluator library
1441 Group: Development/Libraries
1442@@ -582,6 +599,7 @@ Obsoletes: libipa_hbac-python < 1.12.90
1443 %description -n python2-libipa_hbac
1444 The python2-libipa_hbac contains the bindings so that libipa_hbac can be
1445 used by Python applications.
1446+%endif
1447
1448 %if (0%{?with_python3} == 1)
1449 %package -n python3-libipa_hbac
1450@@ -615,6 +633,7 @@ Requires: libsss_nss_idmap = %{version}-%{release}
1451 %description -n libsss_nss_idmap-devel
1452 Utility library for SID and certificate based lookups
1453
1454+%if (0%{?with_python2} == 1)
1455 %package -n python2-libsss_nss_idmap
1456 Summary: Python2 bindings for libsss_nss_idmap
1457 Group: Development/Libraries
1458@@ -627,6 +646,7 @@ Obsoletes: libsss_nss_idmap-python < 1.12.90
1459 %description -n python2-libsss_nss_idmap
1460 The python2-libsss_nss_idmap contains the bindings so that libsss_nss_idmap can
1461 be used by Python applications.
1462+%endif
1463
1464 %if (0%{?with_python3} == 1)
1465 %package -n python3-libsss_nss_idmap
1466@@ -782,6 +802,7 @@ autoreconf -ivf
1467 %{with_initscript} \
1468 %{?with_syslog} \
1469 %{?with_cifs_utils_plugin_option} \
1470+ %{?with_python2_option} \
1471 %{?with_python3_option} \
1472 %{?enable_polkit_rules_option} \
1473 %{?enable_systemtap_opt} \
1474@@ -832,10 +853,12 @@ rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}
1475
1476 # Older versions of rpmbuild can only handle one -f option
1477 # So we need to append to the sssd*.lang file
1478+%if (0%{?with_python2} == 1)
1479 for file in `ls $RPM_BUILD_ROOT/%{python2_sitelib}/*.egg-info 2> /dev/null`
1480 do
1481 echo %{python2_sitelib}/`basename $file` >> python2_sssdconfig.lang
1482 done
1483+%endif
1484
1485 %if (0%{?with_python3} == 1)
1486 for file in `ls $RPM_BUILD_ROOT/%{python3_sitelib}/*.egg-info 2> /dev/null`
1487@@ -914,8 +937,10 @@ done
1488 echo "sssd.lang:"
1489 cat sssd.lang
1490
1491+%if (0%{?with_python2} == 1)
1492 echo "python2_sssdconfig.lang:"
1493 cat python2_sssdconfig.lang
1494+%endif
1495
1496 %if (0%{?with_python3} == 1)
1497 echo "python3_sssdconfig.lang:"
1498@@ -960,8 +985,6 @@ done
1499 %{_unitdir}/sssd-ssh.service
1500 %{_unitdir}/sssd-sudo.socket
1501 %{_unitdir}/sssd-sudo.service
1502-%{_unitdir}/sssd-secrets.socket
1503-%{_unitdir}/sssd-secrets.service
1504 %else
1505 %{_initrddir}/%{name}
1506 %endif
1507@@ -971,9 +994,6 @@ done
1508 %{_libexecdir}/%{servicename}/sssd_nss
1509 %{_libexecdir}/%{servicename}/sssd_pam
1510 %{_libexecdir}/%{servicename}/sssd_autofs
1511-%if (0%{?with_secrets} == 1)
1512-%{_libexecdir}/%{servicename}/sssd_secrets
1513-%endif
1514 %{_libexecdir}/%{servicename}/sssd_ssh
1515 %{_libexecdir}/%{servicename}/sssd_sudo
1516 %{_libexecdir}/%{servicename}/p11_child
1517@@ -1006,9 +1026,6 @@ done
1518 %dir %{_localstatedir}/cache/krb5rcache
1519 %attr(700,sssd,sssd) %dir %{dbpath}
1520 %attr(755,sssd,sssd) %dir %{mcpath}
1521-%if (0%{?with_secrets} == 1)
1522-%attr(700,root,root) %dir %{secdbpath}
1523-%endif
1524 %attr(751,sssd,sssd) %dir %{deskprofilepath}
1525 %ghost %attr(0644,sssd,sssd) %verify(not md5 size mtime) %{mcpath}/passwd
1526 %ghost %attr(0644,sssd,sssd) %verify(not md5 size mtime) %{mcpath}/group
1527@@ -1043,9 +1060,6 @@ done
1528 %{_mandir}/man5/sssd-simple.5*
1529 %{_mandir}/man5/sssd-sudo.5*
1530 %{_mandir}/man5/sssd-session-recording.5*
1531-%if (0%{?with_secrets} == 1)
1532-%{_mandir}/man5/sssd-secrets.5*
1533-%endif
1534 %{_mandir}/man8/sssd.8*
1535 %{_mandir}/man8/sss_cache.8*
1536 %if (0%{?enable_systemtap} == 1)
1537@@ -1192,10 +1206,12 @@ done
1538 %{_mandir}/man8/sss_seed.8*
1539 %{_mandir}/man8/sssctl.8*
1540
1541+%if (0%{?with_python2} == 1)
1542 %files -n python2-sssdconfig -f python2_sssdconfig.lang
1543 %defattr(-,root,root,-)
1544 %dir %{python2_sitelib}/SSSDConfig
1545 %{python2_sitelib}/SSSDConfig/*.py*
1546+%endif
1547
1548 %if (0%{?with_python3} == 1)
1549 %files -n python3-sssdconfig -f python3_sssdconfig.lang
1550@@ -1206,9 +1222,11 @@ done
1551 %{python3_sitelib}/SSSDConfig/__pycache__/*.py*
1552 %endif
1553
1554+%if (0%{?with_python2} == 1)
1555 %files -n python2-sss
1556 %defattr(-,root,root,-)
1557 %{python2_sitearch}/pysss.so
1558+%endif
1559
1560 %if (0%{?with_python3} == 1)
1561 %files -n python3-sss
1562@@ -1216,9 +1234,11 @@ done
1563 %{python3_sitearch}/pysss.so
1564 %endif
1565
1566+%if (0%{?with_python2} == 1)
1567 %files -n python2-sss-murmur
1568 %defattr(-,root,root,-)
1569 %{python2_sitearch}/pysss_murmur.so
1570+%endif
1571
1572 %if (0%{?with_python3} == 1)
1573 %files -n python3-sss-murmur
1574@@ -1262,9 +1282,11 @@ done
1575 %{_libdir}/libsss_nss_idmap.so
1576 %{_libdir}/pkgconfig/sss_nss_idmap.pc
1577
1578+%if (0%{?with_python2} == 1)
1579 %files -n python2-libsss_nss_idmap
1580 %defattr(-,root,root,-)
1581 %{python2_sitearch}/pysss_nss_idmap.so
1582+%endif
1583
1584 %if (0%{?with_python3} == 1)
1585 %files -n python3-libsss_nss_idmap
1586@@ -1272,9 +1294,11 @@ done
1587 %{python3_sitearch}/pysss_nss_idmap.so
1588 %endif
1589
1590+%if (0%{?with_python2} == 1)
1591 %files -n python2-libipa_hbac
1592 %defattr(-,root,root,-)
1593 %{python2_sitearch}/pyhbac.so
1594+%endif
1595
1596 %if (0%{?with_python3} == 1)
1597 %files -n python3-libipa_hbac
1598@@ -1318,12 +1342,23 @@ done
1599
1600 %if (0%{?with_kcm} == 1)
1601 %files kcm -f sssd_kcm.lang
1602+%if (0%{?with_secrets} == 1)
1603+%attr(700,root,root) %dir %{secdbpath}
1604+%endif
1605 %{_libexecdir}/%{servicename}/sssd_kcm
1606+%if (0%{?with_secrets} == 1)
1607+%{_libexecdir}/%{servicename}/sssd_secrets
1608+%endif
1609 %dir %{_datadir}/sssd-kcm
1610 %{_datadir}/sssd-kcm/kcm_default_ccache
1611 %{_unitdir}/sssd-kcm.socket
1612 %{_unitdir}/sssd-kcm.service
1613+%{_unitdir}/sssd-secrets.socket
1614+%{_unitdir}/sssd-secrets.service
1615 %{_mandir}/man8/sssd-kcm.8*
1616+%if (0%{?with_secrets} == 1)
1617+%{_mandir}/man5/sssd-secrets.5*
1618+%endif
1619 %endif
1620
1621 %pre common
1622diff --git a/debian/changelog b/debian/changelog
1623index df16eea..43beef3 100644
1624--- a/debian/changelog
1625+++ b/debian/changelog
1626@@ -1,3 +1,4 @@
1627+<<<<<<< debian/changelog
1628 sssd (1.16.2-1ubuntu1) cosmic; urgency=medium
1629
1630 * Merge with Debian unstable.
1631@@ -13,6 +14,27 @@ sssd (1.16.2-1ubuntu1) cosmic; urgency=medium
1632 which fail in Ubuntu because of the -Bsymbolic-functions linker flag.
1633
1634 -- Andreas Hasenack <andreas@canonical.com> Wed, 08 Aug 2018 10:49:35 -0300
1635+=======
1636+sssd (1.16.3-1ubuntu1) cosmic; urgency=medium
1637+
1638+ * Add DEP8 tests (LP: #1793882):
1639+ - d/t/{ldap-user-group-ldap-auth,control,login.exp,util}: LDAP DEP8 test
1640+ - d/t/{util,login.exp,ldap-user-group-krb5-auth,control}: krb5 DEP8 test
1641+
1642+ -- Andreas Hasenack <andreas@canonical.com> Sat, 22 Sep 2018 15:35:01 +0200
1643+
1644+sssd (1.16.3-1) unstable; urgency=medium
1645+
1646+ * New upstream release.
1647+ * control: Add python-sss to sssd-tools depends. (Closes: #905220)
1648+ * libsss-sudo: Add sss entry to nsswitch only on initial install.
1649+ (Closes: #903917)
1650+ * control: Update list address.
1651+ * disable-tests.diff: Dropped, all tests pass on a proper buildd setup
1652+ which should have /etc/{hosts,networks} populated.
1653+
1654+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 22 Aug 2018 16:34:01 +0300
1655+>>>>>>> debian/changelog
1656
1657 sssd (1.16.2-1) unstable; urgency=medium
1658
1659diff --git a/debian/control b/debian/control
1660index 28853e2..d0a4a9c 100644
1661--- a/debian/control
1662+++ b/debian/control
1663@@ -2,7 +2,11 @@ Source: sssd
1664 Section: utils
1665 Priority: optional
1666 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1667+<<<<<<< debian/control
1668 XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@lists.alioth.debian.org>
1669+=======
1670+XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@alioth-lists.debian.net>
1671+>>>>>>> debian/control
1672 Uploaders: Timo Aaltonen <tjaalton@debian.org>
1673 Build-Depends:
1674 autopoint,
1675@@ -234,6 +238,7 @@ Package: sssd-tools
1676 Architecture: any
1677 Depends:
1678 python,
1679+ python-sss,
1680 sssd-common (= ${binary:Version}),
1681 ${misc:Depends},
1682 ${shlibs:Depends}
1683diff --git a/debian/libsss-sudo.postinst b/debian/libsss-sudo.postinst
1684index a9c061e..272e68f 100644
1685--- a/debian/libsss-sudo.postinst
1686+++ b/debian/libsss-sudo.postinst
1687@@ -33,7 +33,8 @@ insert_nss_entry() {
1688 fi
1689 }
1690
1691-insert_nss_entry
1692-
1693+if [ "$1" = configure ] && [ -z "$2" ]; then
1694+ insert_nss_entry
1695+fi
1696
1697 exit 0
1698diff --git a/debian/patches/disable-tests.diff b/debian/patches/disable-tests.diff
1699deleted file mode 100644
1700index ce52738..0000000
1701--- a/debian/patches/disable-tests.diff
1702+++ /dev/null
1703@@ -1,26 +0,0 @@
1704---- a/Makefile.am
1705-+++ b/Makefile.am
1706-@@ -201,7 +201,6 @@ endif
1707- if HAVE_CHECK
1708- non_interactive_check_based_tests = \
1709- dlopen-tests \
1710-- sysdb-tests \
1711- strtonum-tests \
1712- resolv-tests \
1713- krb5-utils-tests \
1714-@@ -261,7 +260,6 @@ if HAVE_CMOCKA
1715- test_sysdb_views \
1716- test_sysdb_subdomains \
1717- test_sysdb_certmap \
1718-- test_sysdb_sudo \
1719- test_sysdb_utils \
1720- test_sysdb_domain_resolution_order \
1721- test_wbc_calls \
1722-@@ -269,7 +267,6 @@ if HAVE_CMOCKA
1723- test_copy_ccache \
1724- test_copy_keytab \
1725- test_child_common \
1726-- responder_cache_req-tests \
1727- test_sbus_opath \
1728- test_fo_srv \
1729- pam-srv-tests \
1730diff --git a/debian/patches/series b/debian/patches/series
1731index 99828b4..963f999 100644
1732--- a/debian/patches/series
1733+++ b/debian/patches/series
1734@@ -1,4 +1,7 @@
1735 #placeholder
1736+<<<<<<< debian/patches/series
1737 disable-tests.diff
1738 libsss-dependency.diff
1739 disable-sss_nss_idmap-tests.diff
1740+=======
1741+>>>>>>> debian/patches/series
1742diff --git a/debian/tests/common-tests.sh b/debian/tests/common-tests.sh
1743new file mode 100644
1744index 0000000..d0fb86f
1745--- /dev/null
1746+++ b/debian/tests/common-tests.sh
1747@@ -0,0 +1,26 @@
1748+run_common_tests() {
1749+ echo "Assert local user databases do not have our LDAP test data"
1750+ check_local_user "${ldap_user}"
1751+ check_local_group "${ldap_user}"
1752+ check_local_group "${ldap_group}"
1753+
1754+ echo "The LDAP user is known to the system via getent"
1755+ check_getent_user "${ldap_user}"
1756+
1757+ echo "The LDAP user's private group is known to the system via getent"
1758+ check_getent_group "${ldap_user}"
1759+
1760+ echo "The LDAP group ${ldap_group} is known to the system via getent"
1761+ check_getent_group "${ldap_group}"
1762+
1763+ echo "The id(1) command can resolve the group membership of the LDAP user"
1764+ #$ id -Gn testuser1
1765+ #testuser1 ldapusers
1766+ output=$(id -Gn ${ldap_user})
1767+ # XXX couldn't find a better way to make this comparison using just /bin/sh
1768+ if [ "${output}" != "${ldap_user} ${ldap_group}" ]; then
1769+ if [ "${output}" != "${ldap_group} ${ldap_user}" ]; then
1770+ die "Output doesn't match expected group membership: ${output}"
1771+ fi
1772+ fi
1773+}
1774diff --git a/debian/tests/control b/debian/tests/control
1775new file mode 100644
1776index 0000000..93ed50a
1777--- /dev/null
1778+++ b/debian/tests/control
1779@@ -0,0 +1,7 @@
1780+Tests: ldap-user-group-ldap-auth
1781+Depends: @, slapd, ldap-utils, openssl, expect, lsb-release
1782+Restrictions: isolation-container, needs-root, allow-stderr
1783+
1784+Tests: ldap-user-group-krb5-auth
1785+Depends: @, slapd, ldap-utils, openssl, expect, lsb-release, krb5-user, krb5-admin-server, krb5-kdc
1786+Restrictions: isolation-container, needs-root, allow-stderr
1787diff --git a/debian/tests/ldap-user-group-krb5-auth b/debian/tests/ldap-user-group-krb5-auth
1788new file mode 100755
1789index 0000000..a744640
1790--- /dev/null
1791+++ b/debian/tests/ldap-user-group-krb5-auth
1792@@ -0,0 +1,35 @@
1793+#!/bin/sh
1794+
1795+set -ex
1796+
1797+. debian/tests/util.sh
1798+. debian/tests/common-tests.sh
1799+
1800+mydomain="example.com"
1801+myhostname="ldap.${mydomain}"
1802+mysuffix="dc=example,dc=com"
1803+myrealm="EXAMPLE.COM"
1804+admin_dn="cn=admin,${mysuffix}"
1805+admin_pw="secret"
1806+ldap_user="testuser1"
1807+ldap_user_pw="testuser1secret"
1808+kerberos_principal_pw="testuser1kerberos"
1809+ldap_group="ldapusers"
1810+
1811+adjust_hostname "${myhostname}"
1812+reconfigure_slapd
1813+generate_certs "${myhostname}"
1814+enable_ldap_ssl
1815+populate_ldap_rfc2307
1816+create_realm "${myrealm}" "${myhostname}"
1817+create_krb_principal "${ldap_user}" "${kerberos_principal_pw}"
1818+configure_sssd_ldap_rfc2307_krb5_auth
1819+enable_pam_mkhomedir
1820+
1821+# tests begin here
1822+run_common_tests
1823+
1824+# login works with the kerneros password
1825+echo "The Kerberos principal can login on a terminal"
1826+kdestroy > /dev/null 2>&1 || /bin/true
1827+/usr/bin/expect -f debian/tests/login.exp "${ldap_user}" "${kerberos_principal_pw}" "${ldap_user}"@"${myrealm}"
1828diff --git a/debian/tests/ldap-user-group-ldap-auth b/debian/tests/ldap-user-group-ldap-auth
1829new file mode 100755
1830index 0000000..80876c5
1831--- /dev/null
1832+++ b/debian/tests/ldap-user-group-ldap-auth
1833@@ -0,0 +1,29 @@
1834+#!/bin/sh
1835+
1836+set -ex
1837+
1838+. debian/tests/util.sh
1839+. debian/tests/common-tests.sh
1840+
1841+mydomain="example.com"
1842+myhostname="ldap.${mydomain}"
1843+mysuffix="dc=example,dc=com"
1844+admin_dn="cn=admin,${mysuffix}"
1845+admin_pw="secret"
1846+ldap_user="testuser1"
1847+ldap_user_pw="testuser1secret"
1848+ldap_group="ldapusers"
1849+
1850+adjust_hostname "${myhostname}"
1851+reconfigure_slapd
1852+generate_certs "${myhostname}"
1853+enable_ldap_ssl
1854+populate_ldap_rfc2307
1855+configure_sssd_ldap_rfc2307
1856+enable_pam_mkhomedir
1857+
1858+# tests begin here
1859+run_common_tests
1860+
1861+echo "The LDAP user can login on a terminal"
1862+/usr/bin/expect -f debian/tests/login.exp "${ldap_user}" "${ldap_user_pw}"
1863diff --git a/debian/tests/login.exp b/debian/tests/login.exp
1864new file mode 100755
1865index 0000000..63c25ab
1866--- /dev/null
1867+++ b/debian/tests/login.exp
1868@@ -0,0 +1,74 @@
1869+#!/usr/bin/expect
1870+
1871+set timeout 10
1872+set user [lindex $argv 0]
1873+set password [lindex $argv 1]
1874+set principal [lindex $argv 2]
1875+
1876+set distribution [exec "lsb_release" "-is"]
1877+
1878+if { $distribution == "Ubuntu" } {
1879+ set welcome "Welcome to"
1880+} elseif { $distribution == "Debian" } {
1881+ set welcome "Debian GNU/Linux comes"
1882+} else {
1883+ puts "Unsupported linux distribution $distribution"
1884+ exit 1
1885+}
1886+
1887+spawn login
1888+expect "login:"
1889+send "$user\r"
1890+expect "Password:"
1891+send "$password\r"
1892+expect {
1893+ timeout
1894+ {
1895+ puts "Expect error: timeout after password\r\r"
1896+ exit 1
1897+ }
1898+ "Login incorrect"
1899+ {
1900+ puts "Expect error: incorrect credentials\r\r"
1901+ exit 1
1902+ }
1903+ "$welcome"
1904+}
1905+expect {
1906+ timeout
1907+ {
1908+ puts "Expect error: timeout waiting for prompt\r\r"
1909+ exit 1
1910+ }
1911+ "$ "
1912+}
1913+send "id -un\r"
1914+expect {
1915+ timeout
1916+ {
1917+ puts "Expect error: timeout waiting for 'id' result\r\r"
1918+ exit 1
1919+ }
1920+ "$user"
1921+}
1922+expect {
1923+ timeout
1924+ {
1925+ puts "Expect error: timeout waiting for prompt\r\r"
1926+ exit 1
1927+ }
1928+ "$ "
1929+}
1930+if { $principal != "" } {
1931+ send "klist\r"
1932+ expect {
1933+ timeout
1934+ {
1935+ puts "Expect error: timeout waiting for klist output\r\r"
1936+ exit 1
1937+ }
1938+ "Default principal: $principal"
1939+ }
1940+}
1941+send "logout\r"
1942+exit 0
1943diff --git a/debian/tests/util.sh b/debian/tests/util.sh
1944new file mode 100644
1945index 0000000..c74fba8
1946--- /dev/null
1947+++ b/debian/tests/util.sh
1948@@ -0,0 +1,256 @@
1949+reconfigure_slapd() {
1950+ debconf-set-selections << EOF
1951+slapd slapd/domain string ${mydomain}
1952+slapd shared/organization string ${mydomain}
1953+slapd slapd/password1 password ${admin_pw}
1954+slapd slapd/password2 password ${admin_pw}
1955+EOF
1956+ rm -rf /var/backups/*slapd* /var/backups/unknown*ldapdb
1957+ dpkg-reconfigure -fnoninteractive -pcritical slapd
1958+}
1959+
1960+die() {
1961+ echo "ERROR"
1962+ echo "$@"
1963+ exit 1
1964+}
1965+
1966+enable_pam_mkhomedir() {
1967+ if ! grep -qE "^session.*pam_mkhomedir\.so" /etc/pam.d/common-session; then
1968+ echo "session optional pam_mkhomedir.so" >> /etc/pam.d/common-session
1969+ fi
1970+}
1971+
1972+adjust_hostname() {
1973+ local myhostname="$1"
1974+
1975+ echo "${myhostname}" > /etc/hostname
1976+ hostname "${myhostname}"
1977+ if ! grep -qE "${myhostname}" /etc/hosts; then
1978+ # just so it's resolvable
1979+ echo "127.0.1.10 ${myhostname}" >> /etc/hosts
1980+ fi
1981+}
1982+
1983+generate_certs() {
1984+ local cn="$1"
1985+ local cert="/etc/ldap/server.pem"
1986+ local key="/etc/ldap/server.key"
1987+ local cnf="/etc/ldap/openssl.cnf"
1988+
1989+ cat > "$cnf" <<EOF
1990+RANDFILE = /dev/urandom
1991+[ req ]
1992+default_bits = 1024
1993+default_keyfile = privkey.pem
1994+distinguished_name = req_distinguished_name
1995+prompt = no
1996+policy = policy_anything
1997+
1998+[ req_distinguished_name ]
1999+commonName = ${cn}
2000+EOF
2001+ openssl req -new -x509 -nodes -out "$cert" -keyout "$key" -config "$cnf"
2002+ chmod 0640 "$key"
2003+ chgrp openldap "$key"
2004+ if [ ! -f "$cert" ]; then
2005+ echo "ERROR, failed to generate certificate for ldap test"
2006+ exit 1
2007+ fi
2008+ if [ ! -f "$key" ]; then
2009+ echo "ERROR, failed to generate key for ldap test"
2010+ exit 1
2011+ fi
2012+}
2013+
2014+enable_ldap_ssl() {
2015+ cat > /etc/ldap/ldap.conf <<EOF
2016+BASE ${mysuffix}
2017+URI ldap://${myhostname}
2018+TLS_CACERT /etc/ldap/server.pem
2019+EOF
2020+ {
2021+ cat <<EOF
2022+dn: cn=config
2023+add: olcTLSCACertificateFile
2024+olcTLSCACertificateFile: /etc/ldap/server.pem
2025+-
2026+add: olcTLSCertificateFile
2027+olcTLSCertificateFile: /etc/ldap/server.pem
2028+-
2029+add: olcTLSCertificateKeyFile
2030+olcTLSCertificateKeyFile: /etc/ldap/server.key
2031+EOF
2032+ } | ldapmodify -H ldapi:/// -Y EXTERNAL -Q
2033+}
2034+
2035+populate_ldap_rfc2307() {
2036+ {
2037+ cat <<EOF
2038+dn: ou=People,${mysuffix}
2039+ou: People
2040+objectClass: organizationalUnit
2041+
2042+dn: ou=Group,${mysuffix}
2043+ou: Group
2044+objectClass: organizationalUnit
2045+
2046+dn: uid=${ldap_user},ou=People,${mysuffix}
2047+uid: ${ldap_user}
2048+objectClass: inetOrgPerson
2049+objectClass: posixAccount
2050+cn: ${ldap_user}
2051+sn: ${ldap_user}
2052+givenName: ${ldap_user}
2053+mail: ${ldap_user}@${mydomain}
2054+userPassword: ${ldap_user_pw}
2055+uidNumber: 10001
2056+gidNumber: 10001
2057+loginShell: /bin/bash
2058+homeDirectory: /home/${ldap_user}
2059+
2060+dn: cn=${ldap_user},ou=Group,${mysuffix}
2061+cn: ${ldap_user}
2062+objectClass: posixGroup
2063+gidNumber: 10001
2064+memberUid: ${ldap_user}
2065+
2066+dn: cn=${ldap_group},ou=Group,${mysuffix}
2067+cn: ${ldap_group}
2068+objectClass: posixGroup
2069+gidNumber: 10100
2070+memberUid: ${ldap_user}
2071+EOF
2072+ } | ldapadd -x -D "${admin_dn}" -w "${admin_pw}"
2073+}
2074+
2075+configure_sssd_ldap_rfc2307_krb5_auth() {
2076+ cat > /etc/sssd/sssd.conf <<EOF
2077+[sssd]
2078+config_file_version = 2
2079+services = nss, pam
2080+domains = LDAP
2081+
2082+[domain/LDAP]
2083+id_provider = ldap
2084+ldap_uri = ldap://${myhostname}
2085+auth_provider = krb5
2086+krb5_server = ${myhostname}
2087+krb5_realm = ${myrealm}
2088+cache_credentials = True
2089+ldap_search_base = ${mysuffix}
2090+EOF
2091+ chmod 0600 /etc/sssd/sssd.conf
2092+ systemctl restart sssd
2093+}
2094+
2095+configure_sssd_ldap_rfc2307() {
2096+ cat > /etc/sssd/sssd.conf <<EOF
2097+[sssd]
2098+config_file_version = 2
2099+services = nss, pam
2100+domains = LDAP
2101+
2102+[domain/LDAP]
2103+id_provider = ldap
2104+ldap_uri = ldap://${myhostname}
2105+cache_credentials = True
2106+ldap_search_base = ${mysuffix}
2107+EOF
2108+ chmod 0600 /etc/sssd/sssd.conf
2109+ systemctl restart sssd
2110+}
2111+
2112+check_local_user() {
2113+ local local_user="$1"
2114+
2115+ if grep -q "^${local_user}" /etc/passwd; then
2116+ die "Found ${local_user} in /etc/passwd"
2117+ fi
2118+}
2119+
2120+check_local_group() {
2121+ local local_group="$1"
2122+
2123+ if grep -q "^${local_group}" /etc/group; then
2124+ die "Found ${local_group} in /etc/group"
2125+ fi
2126+}
2127+
2128+check_getent_user() {
2129+ local getent_user="$1"
2130+ local output
2131+
2132+ output=$(getent passwd ${getent_user})
2133+ if [ -z "${output}" ]; then
2134+ die "${getent_user} not found via getent passwd"
2135+ fi
2136+}
2137+
2138+check_getent_group() {
2139+ local getent_group="$1"
2140+ local output
2141+
2142+ output=$(getent group ${getent_group})
2143+ if [ -z "${output}" ]; then
2144+ die "${getent_group} not found via getent group"
2145+ fi
2146+}
2147+
2148+create_realm() {
2149+ local realm_name="$1"
2150+ local kerberos_server="$2"
2151+
2152+ # start fresh
2153+ rm -rf /var/lib/krb5kdc/*
2154+ rm -rf /etc/krb5kdc/*
2155+ rm -f /etc/krb5.keytab
2156+
2157+ # setup some defaults
2158+ cat > /etc/krb5kdc/kdc.conf <<EOF
2159+[kdcdefaults]
2160+ kdc_ports = 750,88
2161+[realms]
2162+ ${realm_name} = {
2163+ database_name = /var/lib/krb5kdc/principal
2164+ admin_keytab = FILE:/etc/krb5kdc/kadm5.keytab
2165+ acl_file = /etc/krb5kdc/kadm5.acl
2166+ key_stash_file = /etc/krb5kdc/stash
2167+ kdc_ports = 750,88
2168+ max_life = 10h 0m 0s
2169+ max_renewable_life = 7d 0h 0m 0s
2170+ master_key_type = des3-hmac-sha1
2171+ #supported_enctypes = aes256-cts:normal aes128-cts:normal
2172+ default_principal_flags = +preauth
2173+ }
2174+EOF
2175+
2176+ cat > /etc/krb5.conf <<EOF
2177+[libdefaults]
2178+ default_realm = ${realm_name}
2179+ kdc_timesync = 1
2180+ ccache_type = 4
2181+ forwardable = true
2182+ proxiable = true
2183+ fcc-mit-ticketflags = true
2184+[realms]
2185+ ${realm_name} = {
2186+ kdc = ${kerberos_server}
2187+ admin_server = ${kerberos_server}
2188+ }
2189+EOF
2190+ echo "# */admin *" > /etc/krb5kdc/kadm5.acl
2191+
2192+ # create the realm
2193+ kdb5_util create -s -P secretpassword
2194+
2195+ # restart services
2196+ systemctl restart krb5-kdc.service krb5-admin-server.service
2197+}
2198+
2199+create_krb_principal() {
2200+ local principal="$1"
2201+ local password="$2"
2202+
2203+ kadmin.local -q "addprinc -pw ${password} ${principal}"
2204+}
2205diff --git a/po/bg.gmo b/po/bg.gmo
2206index c742f35..3b1a190 100644
2207Binary files a/po/bg.gmo and b/po/bg.gmo differ
2208diff --git a/po/bg.po b/po/bg.po
2209index e914cf8..c6f1311 100644
2210--- a/po/bg.po
2211+++ b/po/bg.po
2212@@ -8,7 +8,7 @@ msgid ""
2213 msgstr ""
2214 "Project-Id-Version: PACKAGE VERSION\n"
2215 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2216-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2217+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2218 "PO-Revision-Date: 2014-12-14 11:44+0000\n"
2219 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2220 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/sssd/language/"
2221@@ -1559,7 +1559,7 @@ msgstr ""
2222 msgid "Use custom version of krb5_get_init_creds_password"
2223 msgstr ""
2224
2225-#: src/providers/data_provider_be.c:555
2226+#: src/providers/data_provider_be.c:556
2227 msgid "Domain of the information provider (mandatory)"
2228 msgstr ""
2229
2230@@ -1676,8 +1676,8 @@ msgstr "Текуща парола:"
2231 msgid "Password expired. Change your password now."
2232 msgstr "Паролата Ви е остаряла. Сменете я сега."
2233
2234-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2235-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2236+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2237+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2238 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2239 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2240 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2241@@ -1685,8 +1685,8 @@ msgstr "Паролата Ви е остаряла. Сменете я сега."
2242 msgid "The debug level to run with"
2243 msgstr "Нивото на debug записи при работа"
2244
2245-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2246-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2247+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2248+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2249 msgid "The SSSD domain to use"
2250 msgstr ""
2251
2252@@ -1710,19 +1710,23 @@ msgstr ""
2253 msgid "Error looking up public keys\n"
2254 msgstr ""
2255
2256-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2257+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2258 msgid "The port to use to connect to the host"
2259 msgstr ""
2260
2261-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2262+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2263+msgid "Print the host ssh public keys"
2264+msgstr ""
2265+
2266+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2267 msgid "Invalid port\n"
2268 msgstr ""
2269
2270-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2271+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2272 msgid "Host not specified\n"
2273 msgstr ""
2274
2275-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2276+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2277 msgid "The path to the proxy command must be absolute\n"
2278 msgstr ""
2279
2280diff --git a/po/ca.gmo b/po/ca.gmo
2281index 631198b..6b03dcb 100644
2282Binary files a/po/ca.gmo and b/po/ca.gmo differ
2283diff --git a/po/ca.po b/po/ca.po
2284index 49db1d4..a732746 100644
2285--- a/po/ca.po
2286+++ b/po/ca.po
2287@@ -14,7 +14,7 @@ msgid ""
2288 msgstr ""
2289 "Project-Id-Version: PACKAGE VERSION\n"
2290 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2291-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2292+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2293 "PO-Revision-Date: 2017-10-15 03:02+0000\n"
2294 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
2295 "Language-Team: Catalan (http://www.transifex.com/projects/p/sssd/language/"
2296@@ -1677,7 +1677,7 @@ msgstr ""
2297 msgid "Use custom version of krb5_get_init_creds_password"
2298 msgstr ""
2299
2300-#: src/providers/data_provider_be.c:555
2301+#: src/providers/data_provider_be.c:556
2302 msgid "Domain of the information provider (mandatory)"
2303 msgstr "Domini del proveïdor d'informació (obligatori)"
2304
2305@@ -1798,8 +1798,8 @@ msgstr "Contrasenya actual: "
2306 msgid "Password expired. Change your password now."
2307 msgstr "La contrasenya ha vençut. Canvieu ara la vostra contrasenya."
2308
2309-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2310-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2311+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2312+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2313 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2314 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2315 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2316@@ -1807,8 +1807,8 @@ msgstr "La contrasenya ha vençut. Canvieu ara la vostra contrasenya."
2317 msgid "The debug level to run with"
2318 msgstr "El nivell de depuració amb què s'executa"
2319
2320-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2321-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2322+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2323+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2324 msgid "The SSSD domain to use"
2325 msgstr "El domini SSSD a utilitzar"
2326
2327@@ -1832,19 +1832,23 @@ msgstr "No s'ha especificat l'usuari\n"
2328 msgid "Error looking up public keys\n"
2329 msgstr "S'ha produït un error en cercar les claus públiques\n"
2330
2331-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2332+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2333 msgid "The port to use to connect to the host"
2334 msgstr "El port a utilitzar per connectar-se a l'amfitrió"
2335
2336-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2337+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2338+msgid "Print the host ssh public keys"
2339+msgstr ""
2340+
2341+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2342 msgid "Invalid port\n"
2343 msgstr "Port no vàlid\n"
2344
2345-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2346+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2347 msgid "Host not specified\n"
2348 msgstr "No s'ha especificat l'amfitrió\n"
2349
2350-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2351+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2352 msgid "The path to the proxy command must be absolute\n"
2353 msgstr "El camí a l'ordre proxy ha de ser absolut\n"
2354
2355diff --git a/po/de.gmo b/po/de.gmo
2356index cabb6d2..ee8d9ac 100644
2357Binary files a/po/de.gmo and b/po/de.gmo differ
2358diff --git a/po/de.po b/po/de.po
2359index 6394d4f..71dfe96 100644
2360--- a/po/de.po
2361+++ b/po/de.po
2362@@ -10,7 +10,7 @@ msgid ""
2363 msgstr ""
2364 "Project-Id-Version: PACKAGE VERSION\n"
2365 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2366-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2367+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2368 "PO-Revision-Date: 2014-12-14 11:45+0000\n"
2369 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2370 "Language-Team: German (http://www.transifex.com/projects/p/sssd/language/"
2371@@ -1641,7 +1641,7 @@ msgstr ""
2372 msgid "Use custom version of krb5_get_init_creds_password"
2373 msgstr ""
2374
2375-#: src/providers/data_provider_be.c:555
2376+#: src/providers/data_provider_be.c:556
2377 msgid "Domain of the information provider (mandatory)"
2378 msgstr "Domain des Informationsanbieters (obligatorisch)"
2379
2380@@ -1762,8 +1762,8 @@ msgstr "Aktuelles Passwort: "
2381 msgid "Password expired. Change your password now."
2382 msgstr "Passwort ist abgelaufen. Ändern Sie Ihr Passwort jetzt."
2383
2384-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2385-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2386+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2387+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2388 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2389 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2390 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2391@@ -1771,8 +1771,8 @@ msgstr "Passwort ist abgelaufen. Ändern Sie Ihr Passwort jetzt."
2392 msgid "The debug level to run with"
2393 msgstr "Stufe, mit der die Fehlerdiagnose ausgeführt werden soll"
2394
2395-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2396-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2397+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2398+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2399 msgid "The SSSD domain to use"
2400 msgstr "Die zu verwendende SSSD-Domain"
2401
2402@@ -1796,19 +1796,23 @@ msgstr "Benutzer nicht angegeben\n"
2403 msgid "Error looking up public keys\n"
2404 msgstr "Fehler beim Nachschlagen der öffentlichen Schlüssel\n"
2405
2406-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2407+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2408 msgid "The port to use to connect to the host"
2409 msgstr "Der Port, der für die Verbindung zum Host benutzt werden soll"
2410
2411-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2412+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2413+msgid "Print the host ssh public keys"
2414+msgstr ""
2415+
2416+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2417 msgid "Invalid port\n"
2418 msgstr "Ungültiger Port\n"
2419
2420-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2421+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2422 msgid "Host not specified\n"
2423 msgstr "Rechner nicht angegeben\n"
2424
2425-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2426+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2427 msgid "The path to the proxy command must be absolute\n"
2428 msgstr "Der Pfad zum Proxy-Befehl muss absolut sein\n"
2429
2430diff --git a/po/es.gmo b/po/es.gmo
2431index 96c710f..b43c5d2 100644
2432Binary files a/po/es.gmo and b/po/es.gmo differ
2433diff --git a/po/es.po b/po/es.po
2434index 80502b0..6debf91 100644
2435--- a/po/es.po
2436+++ b/po/es.po
2437@@ -17,7 +17,7 @@ msgid ""
2438 msgstr ""
2439 "Project-Id-Version: PACKAGE VERSION\n"
2440 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2441-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2442+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2443 "PO-Revision-Date: 2018-06-01 03:11+0000\n"
2444 "Last-Translator: Emilio Herrera <ehespinosa57@gmail.com>\n"
2445 "Language-Team: Spanish (http://www.transifex.com/projects/p/sssd/language/"
2446@@ -1634,7 +1634,7 @@ msgstr ""
2447 msgid "Use custom version of krb5_get_init_creds_password"
2448 msgstr ""
2449
2450-#: src/providers/data_provider_be.c:555
2451+#: src/providers/data_provider_be.c:556
2452 msgid "Domain of the information provider (mandatory)"
2453 msgstr "Dominio del proveedor de información (obligatorio)"
2454
2455@@ -1752,8 +1752,8 @@ msgstr "Contraseña actual: "
2456 msgid "Password expired. Change your password now."
2457 msgstr "La contraseña ha expirado. Modifíquela en este preciso momento."
2458
2459-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2460-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2461+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2462+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2463 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2464 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2465 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2466@@ -1761,8 +1761,8 @@ msgstr "La contraseña ha expirado. Modifíquela en este preciso momento."
2467 msgid "The debug level to run with"
2468 msgstr "Nivel de depuración en que se debe ejecutar"
2469
2470-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2471-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2472+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2473+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2474 msgid "The SSSD domain to use"
2475 msgstr "El dominio SSSD a usar"
2476
2477@@ -1786,19 +1786,23 @@ msgstr "Usuario no especificado\n"
2478 msgid "Error looking up public keys\n"
2479 msgstr "Error buscando claves públicas\n"
2480
2481-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2482+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2483 msgid "The port to use to connect to the host"
2484 msgstr "El puerto a usar para conectar al host"
2485
2486-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2487+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2488+msgid "Print the host ssh public keys"
2489+msgstr ""
2490+
2491+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2492 msgid "Invalid port\n"
2493 msgstr ""
2494
2495-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2496+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2497 msgid "Host not specified\n"
2498 msgstr "Host no especificado\n"
2499
2500-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2501+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2502 msgid "The path to the proxy command must be absolute\n"
2503 msgstr "La ruta al comando proxy debe ser absoluta\n"
2504
2505diff --git a/po/eu.gmo b/po/eu.gmo
2506index fd0f0d1..00331a7 100644
2507Binary files a/po/eu.gmo and b/po/eu.gmo differ
2508diff --git a/po/eu.po b/po/eu.po
2509index e4d5f6d..98f874a 100644
2510--- a/po/eu.po
2511+++ b/po/eu.po
2512@@ -8,7 +8,7 @@ msgid ""
2513 msgstr ""
2514 "Project-Id-Version: PACKAGE VERSION\n"
2515 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2516-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2517+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2518 "PO-Revision-Date: 2014-12-14 11:45+0000\n"
2519 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2520 "Language-Team: Basque (http://www.transifex.com/projects/p/sssd/language/"
2521@@ -1555,7 +1555,7 @@ msgstr ""
2522 msgid "Use custom version of krb5_get_init_creds_password"
2523 msgstr ""
2524
2525-#: src/providers/data_provider_be.c:555
2526+#: src/providers/data_provider_be.c:556
2527 msgid "Domain of the information provider (mandatory)"
2528 msgstr ""
2529
2530@@ -1672,8 +1672,8 @@ msgstr "Uneko pasahitza: "
2531 msgid "Password expired. Change your password now."
2532 msgstr "Pasahitza iraungita. Aldatu zure pasahitza orain."
2533
2534-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2535-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2536+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2537+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2538 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2539 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2540 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2541@@ -1681,8 +1681,8 @@ msgstr "Pasahitza iraungita. Aldatu zure pasahitza orain."
2542 msgid "The debug level to run with"
2543 msgstr ""
2544
2545-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2546-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2547+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2548+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2549 msgid "The SSSD domain to use"
2550 msgstr ""
2551
2552@@ -1706,19 +1706,23 @@ msgstr ""
2553 msgid "Error looking up public keys\n"
2554 msgstr "Errorea gako publikoak bilatzean\n"
2555
2556-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2557+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2558 msgid "The port to use to connect to the host"
2559 msgstr "Ostalarira konektatzeko erabiliko den ataka"
2560
2561-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2562+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2563+msgid "Print the host ssh public keys"
2564+msgstr ""
2565+
2566+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2567 msgid "Invalid port\n"
2568 msgstr ""
2569
2570-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2571+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2572 msgid "Host not specified\n"
2573 msgstr ""
2574
2575-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2576+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2577 msgid "The path to the proxy command must be absolute\n"
2578 msgstr ""
2579
2580diff --git a/po/fr.gmo b/po/fr.gmo
2581index 9c04bf6..abd49e8 100644
2582Binary files a/po/fr.gmo and b/po/fr.gmo differ
2583diff --git a/po/fr.po b/po/fr.po
2584index de6d2ea..c6d964e 100644
2585--- a/po/fr.po
2586+++ b/po/fr.po
2587@@ -13,7 +13,7 @@ msgid ""
2588 msgstr ""
2589 "Project-Id-Version: PACKAGE VERSION\n"
2590 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2591-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2592+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2593 "PO-Revision-Date: 2016-02-24 03:43+0000\n"
2594 "Last-Translator: Jérôme Fenal <jfenal@gmail.com>\n"
2595 "Language-Team: French (http://www.transifex.com/projects/p/sssd/language/"
2596@@ -1661,7 +1661,7 @@ msgstr ""
2597 msgid "Use custom version of krb5_get_init_creds_password"
2598 msgstr ""
2599
2600-#: src/providers/data_provider_be.c:555
2601+#: src/providers/data_provider_be.c:556
2602 msgid "Domain of the information provider (mandatory)"
2603 msgstr "Domaine du fournisseur d'informations (obligatoire)"
2604
2605@@ -1785,8 +1785,8 @@ msgstr "Mot de passe actuel : "
2606 msgid "Password expired. Change your password now."
2607 msgstr "Mot de passe expiré. Changez votre mot de passe maintenant."
2608
2609-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2610-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2611+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2612+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2613 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2614 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2615 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2616@@ -1794,8 +1794,8 @@ msgstr "Mot de passe expiré. Changez votre mot de passe maintenant."
2617 msgid "The debug level to run with"
2618 msgstr "Le niveau de débogage utilisé avec"
2619
2620-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2621-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2622+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2623+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2624 msgid "The SSSD domain to use"
2625 msgstr "Le domaine SSSD à utiliser"
2626
2627@@ -1819,19 +1819,23 @@ msgstr "Utilisateur non spécifié\n"
2628 msgid "Error looking up public keys\n"
2629 msgstr "Erreur lors de la recherche des clés publiques\n"
2630
2631-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2632+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2633 msgid "The port to use to connect to the host"
2634 msgstr "Le port à utiliser pour se connecter à l'hôte"
2635
2636-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2637+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2638+msgid "Print the host ssh public keys"
2639+msgstr ""
2640+
2641+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2642 msgid "Invalid port\n"
2643 msgstr "Port invalide\n"
2644
2645-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2646+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2647 msgid "Host not specified\n"
2648 msgstr "Hôte non spécifié\n"
2649
2650-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2651+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2652 msgid "The path to the proxy command must be absolute\n"
2653 msgstr "Le chemin vers la commande de proxy doit être absolue\n"
2654
2655diff --git a/po/hu.gmo b/po/hu.gmo
2656index 39686a1..d7079e6 100644
2657Binary files a/po/hu.gmo and b/po/hu.gmo differ
2658diff --git a/po/hu.po b/po/hu.po
2659index 4472a34..f9b7c60 100644
2660--- a/po/hu.po
2661+++ b/po/hu.po
2662@@ -10,7 +10,7 @@ msgid ""
2663 msgstr ""
2664 "Project-Id-Version: PACKAGE VERSION\n"
2665 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2666-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2667+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2668 "PO-Revision-Date: 2014-12-14 11:45+0000\n"
2669 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2670 "Language-Team: Hungarian (http://www.transifex.com/projects/p/sssd/language/"
2671@@ -1557,7 +1557,7 @@ msgstr ""
2672 msgid "Use custom version of krb5_get_init_creds_password"
2673 msgstr ""
2674
2675-#: src/providers/data_provider_be.c:555
2676+#: src/providers/data_provider_be.c:556
2677 msgid "Domain of the information provider (mandatory)"
2678 msgstr ""
2679
2680@@ -1674,8 +1674,8 @@ msgstr "Jelenlegi jelszó:"
2681 msgid "Password expired. Change your password now."
2682 msgstr "A jelszava lejárt, változtass meg most."
2683
2684-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2685-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2686+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2687+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2688 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2689 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2690 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2691@@ -1683,8 +1683,8 @@ msgstr "A jelszava lejárt, változtass meg most."
2692 msgid "The debug level to run with"
2693 msgstr ""
2694
2695-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2696-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2697+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2698+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2699 msgid "The SSSD domain to use"
2700 msgstr ""
2701
2702@@ -1708,19 +1708,23 @@ msgstr ""
2703 msgid "Error looking up public keys\n"
2704 msgstr ""
2705
2706-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2707+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2708 msgid "The port to use to connect to the host"
2709 msgstr ""
2710
2711-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2712+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2713+msgid "Print the host ssh public keys"
2714+msgstr ""
2715+
2716+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2717 msgid "Invalid port\n"
2718 msgstr ""
2719
2720-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2721+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2722 msgid "Host not specified\n"
2723 msgstr ""
2724
2725-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2726+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2727 msgid "The path to the proxy command must be absolute\n"
2728 msgstr ""
2729
2730diff --git a/po/id.gmo b/po/id.gmo
2731index 162f5cf..2a95236 100644
2732Binary files a/po/id.gmo and b/po/id.gmo differ
2733diff --git a/po/id.po b/po/id.po
2734index 12cfbd9..80b05a1 100644
2735--- a/po/id.po
2736+++ b/po/id.po
2737@@ -7,7 +7,7 @@ msgid ""
2738 msgstr ""
2739 "Project-Id-Version: PACKAGE VERSION\n"
2740 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2741-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2742+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2743 "PO-Revision-Date: 2014-12-14 11:46+0000\n"
2744 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2745 "Language-Team: Indonesian (http://www.transifex.com/projects/p/sssd/language/"
2746@@ -1554,7 +1554,7 @@ msgstr ""
2747 msgid "Use custom version of krb5_get_init_creds_password"
2748 msgstr ""
2749
2750-#: src/providers/data_provider_be.c:555
2751+#: src/providers/data_provider_be.c:556
2752 msgid "Domain of the information provider (mandatory)"
2753 msgstr ""
2754
2755@@ -1671,8 +1671,8 @@ msgstr "Kata sandi saat ini:"
2756 msgid "Password expired. Change your password now."
2757 msgstr ""
2758
2759-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2760-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2761+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2762+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2763 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2764 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2765 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2766@@ -1680,8 +1680,8 @@ msgstr ""
2767 msgid "The debug level to run with"
2768 msgstr ""
2769
2770-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2771-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2772+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2773+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2774 msgid "The SSSD domain to use"
2775 msgstr ""
2776
2777@@ -1705,19 +1705,23 @@ msgstr ""
2778 msgid "Error looking up public keys\n"
2779 msgstr ""
2780
2781-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2782+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2783 msgid "The port to use to connect to the host"
2784 msgstr ""
2785
2786-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2787+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2788+msgid "Print the host ssh public keys"
2789+msgstr ""
2790+
2791+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2792 msgid "Invalid port\n"
2793 msgstr ""
2794
2795-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2796+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2797 msgid "Host not specified\n"
2798 msgstr ""
2799
2800-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2801+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2802 msgid "The path to the proxy command must be absolute\n"
2803 msgstr ""
2804
2805diff --git a/po/it.gmo b/po/it.gmo
2806index c88e5aa..86c1ff3 100644
2807Binary files a/po/it.gmo and b/po/it.gmo differ
2808diff --git a/po/it.po b/po/it.po
2809index e2cfd6a..63265d7 100644
2810--- a/po/it.po
2811+++ b/po/it.po
2812@@ -8,7 +8,7 @@ msgid ""
2813 msgstr ""
2814 "Project-Id-Version: PACKAGE VERSION\n"
2815 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2816-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2817+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2818 "PO-Revision-Date: 2014-12-14 11:46+0000\n"
2819 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2820 "Language-Team: Italian (http://www.transifex.com/projects/p/sssd/language/"
2821@@ -1565,7 +1565,7 @@ msgstr ""
2822 msgid "Use custom version of krb5_get_init_creds_password"
2823 msgstr ""
2824
2825-#: src/providers/data_provider_be.c:555
2826+#: src/providers/data_provider_be.c:556
2827 msgid "Domain of the information provider (mandatory)"
2828 msgstr "Dominio del provider di informazioni (obbligatorio)"
2829
2830@@ -1682,8 +1682,8 @@ msgstr "Password corrente: "
2831 msgid "Password expired. Change your password now."
2832 msgstr "Password scaduta. Cambiare la password ora."
2833
2834-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2835-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2836+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2837+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2838 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2839 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2840 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2841@@ -1691,8 +1691,8 @@ msgstr "Password scaduta. Cambiare la password ora."
2842 msgid "The debug level to run with"
2843 msgstr "Il livello di debug da utilizzare"
2844
2845-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2846-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2847+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2848+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2849 msgid "The SSSD domain to use"
2850 msgstr ""
2851
2852@@ -1716,19 +1716,23 @@ msgstr ""
2853 msgid "Error looking up public keys\n"
2854 msgstr ""
2855
2856-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2857+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2858 msgid "The port to use to connect to the host"
2859 msgstr ""
2860
2861-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2862+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2863+msgid "Print the host ssh public keys"
2864+msgstr ""
2865+
2866+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2867 msgid "Invalid port\n"
2868 msgstr ""
2869
2870-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2871+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2872 msgid "Host not specified\n"
2873 msgstr ""
2874
2875-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2876+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2877 msgid "The path to the proxy command must be absolute\n"
2878 msgstr ""
2879
2880diff --git a/po/ja.gmo b/po/ja.gmo
2881index 86a4f62..092fe18 100644
2882Binary files a/po/ja.gmo and b/po/ja.gmo differ
2883diff --git a/po/ja.po b/po/ja.po
2884index 5fd0196..a266d44 100644
2885--- a/po/ja.po
2886+++ b/po/ja.po
2887@@ -9,7 +9,7 @@ msgid ""
2888 msgstr ""
2889 "Project-Id-Version: PACKAGE VERSION\n"
2890 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2891-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2892+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2893 "PO-Revision-Date: 2016-08-18 08:06+0000\n"
2894 "Last-Translator: Noriko Mizumoto <noriko@redhat.com>\n"
2895 "Language-Team: Japanese (http://www.transifex.com/projects/p/sssd/language/"
2896@@ -1571,7 +1571,7 @@ msgstr ""
2897 msgid "Use custom version of krb5_get_init_creds_password"
2898 msgstr ""
2899
2900-#: src/providers/data_provider_be.c:555
2901+#: src/providers/data_provider_be.c:556
2902 msgid "Domain of the information provider (mandatory)"
2903 msgstr "情報プロバイダーのドメイン (必須)"
2904
2905@@ -1688,8 +1688,8 @@ msgstr "現在のパスワード: "
2906 msgid "Password expired. Change your password now."
2907 msgstr "パスワードの期限が切れました。いますぐパスワードを変更してください。"
2908
2909-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2910-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2911+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2912+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2913 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2914 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2915 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2916@@ -1697,8 +1697,8 @@ msgstr "パスワードの期限が切れました。いますぐパスワード
2917 msgid "The debug level to run with"
2918 msgstr "実行するデバッグレベル"
2919
2920-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2921-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2922+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2923+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2924 msgid "The SSSD domain to use"
2925 msgstr "使用する SSSD ドメイン"
2926
2927@@ -1722,19 +1722,23 @@ msgstr "ユーザーが指定されていません\n"
2928 msgid "Error looking up public keys\n"
2929 msgstr "公開鍵の検索中にエラーが発生しました\n"
2930
2931-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
2932+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
2933 msgid "The port to use to connect to the host"
2934 msgstr "ホストへの接続に使用するポート"
2935
2936-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
2937+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
2938+msgid "Print the host ssh public keys"
2939+msgstr ""
2940+
2941+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
2942 msgid "Invalid port\n"
2943 msgstr "無効なポート\n"
2944
2945-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
2946+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
2947 msgid "Host not specified\n"
2948 msgstr "ホストが指定されていません\n"
2949
2950-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
2951+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
2952 msgid "The path to the proxy command must be absolute\n"
2953 msgstr "プロキシーコマンドへのパスは絶対パスにする必要があります\n"
2954
2955diff --git a/po/nb.gmo b/po/nb.gmo
2956index f50ca24..e2a147c 100644
2957Binary files a/po/nb.gmo and b/po/nb.gmo differ
2958diff --git a/po/nb.po b/po/nb.po
2959index 29a8ca2..b1d4584 100644
2960--- a/po/nb.po
2961+++ b/po/nb.po
2962@@ -8,7 +8,7 @@ msgid ""
2963 msgstr ""
2964 "Project-Id-Version: PACKAGE VERSION\n"
2965 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
2966-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
2967+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
2968 "PO-Revision-Date: 2014-12-14 11:46+0000\n"
2969 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
2970 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/sssd/"
2971@@ -1555,7 +1555,7 @@ msgstr ""
2972 msgid "Use custom version of krb5_get_init_creds_password"
2973 msgstr ""
2974
2975-#: src/providers/data_provider_be.c:555
2976+#: src/providers/data_provider_be.c:556
2977 msgid "Domain of the information provider (mandatory)"
2978 msgstr ""
2979
2980@@ -1672,8 +1672,8 @@ msgstr ""
2981 msgid "Password expired. Change your password now."
2982 msgstr ""
2983
2984-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
2985-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
2986+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
2987+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
2988 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
2989 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
2990 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
2991@@ -1681,8 +1681,8 @@ msgstr ""
2992 msgid "The debug level to run with"
2993 msgstr ""
2994
2995-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
2996-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
2997+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
2998+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
2999 msgid "The SSSD domain to use"
3000 msgstr ""
3001
3002@@ -1706,19 +1706,23 @@ msgstr ""
3003 msgid "Error looking up public keys\n"
3004 msgstr ""
3005
3006-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3007+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3008 msgid "The port to use to connect to the host"
3009 msgstr ""
3010
3011-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3012+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3013+msgid "Print the host ssh public keys"
3014+msgstr ""
3015+
3016+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3017 msgid "Invalid port\n"
3018 msgstr ""
3019
3020-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3021+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3022 msgid "Host not specified\n"
3023 msgstr ""
3024
3025-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3026+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3027 msgid "The path to the proxy command must be absolute\n"
3028 msgstr ""
3029
3030diff --git a/po/nl.gmo b/po/nl.gmo
3031index a5a3403..6cf7081 100644
3032Binary files a/po/nl.gmo and b/po/nl.gmo differ
3033diff --git a/po/nl.po b/po/nl.po
3034index f3217f6..0595141 100644
3035--- a/po/nl.po
3036+++ b/po/nl.po
3037@@ -13,7 +13,7 @@ msgid ""
3038 msgstr ""
3039 "Project-Id-Version: PACKAGE VERSION\n"
3040 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3041-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3042+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3043 "PO-Revision-Date: 2014-12-14 11:47+0000\n"
3044 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3045 "Language-Team: Dutch (http://www.transifex.com/projects/p/sssd/language/"
3046@@ -1625,7 +1625,7 @@ msgstr ""
3047 msgid "Use custom version of krb5_get_init_creds_password"
3048 msgstr ""
3049
3050-#: src/providers/data_provider_be.c:555
3051+#: src/providers/data_provider_be.c:556
3052 msgid "Domain of the information provider (mandatory)"
3053 msgstr "Domein voor de informatie provider (verplicht)"
3054
3055@@ -1744,8 +1744,8 @@ msgstr "Huidig wachtwoord:"
3056 msgid "Password expired. Change your password now."
3057 msgstr "Wachtwoord verlopen. Verander nu uw wachtwoord."
3058
3059-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3060-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3061+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3062+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3063 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3064 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3065 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3066@@ -1753,8 +1753,8 @@ msgstr "Wachtwoord verlopen. Verander nu uw wachtwoord."
3067 msgid "The debug level to run with"
3068 msgstr "Het debugniveau waarmee gestart wordt"
3069
3070-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3071-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3072+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3073+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3074 msgid "The SSSD domain to use"
3075 msgstr "Hrt te gebruiken SSSD domein"
3076
3077@@ -1778,19 +1778,23 @@ msgstr "Gebruiker niet gespecificeerd\n"
3078 msgid "Error looking up public keys\n"
3079 msgstr "Fout bij het opzoeken van publieke sleutels\n"
3080
3081-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3082+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3083 msgid "The port to use to connect to the host"
3084 msgstr "De te gebruiken poort voor het verbinden met de host"
3085
3086-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3087+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3088+msgid "Print the host ssh public keys"
3089+msgstr ""
3090+
3091+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3092 msgid "Invalid port\n"
3093 msgstr "Ongeldige poort\n"
3094
3095-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3096+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3097 msgid "Host not specified\n"
3098 msgstr "Host niet gespecificeerd\n"
3099
3100-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3101+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3102 msgid "The path to the proxy command must be absolute\n"
3103 msgstr "Het pad naar het proxy commando moet absoluut zijn\n"
3104
3105diff --git a/po/pl.gmo b/po/pl.gmo
3106index 30467db..21045f3 100644
3107Binary files a/po/pl.gmo and b/po/pl.gmo differ
3108diff --git a/po/pl.po b/po/pl.po
3109index 634026d..100b874 100644
3110--- a/po/pl.po
3111+++ b/po/pl.po
3112@@ -13,7 +13,7 @@ msgid ""
3113 msgstr ""
3114 "Project-Id-Version: PACKAGE VERSION\n"
3115 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3116-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3117+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3118 "PO-Revision-Date: 2018-03-09 11:38+0000\n"
3119 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
3120 "Language-Team: Polish (http://www.transifex.com/projects/p/sssd/language/"
3121@@ -1657,7 +1657,7 @@ msgstr "Żąda ujednolicenie nazwy naczelnika"
3122 msgid "Use custom version of krb5_get_init_creds_password"
3123 msgstr "Użycie niestandardowej wersji krb5_get_init_creds_password"
3124
3125-#: src/providers/data_provider_be.c:555
3126+#: src/providers/data_provider_be.c:556
3127 msgid "Domain of the information provider (mandatory)"
3128 msgstr "Domena dostawcy informacji (wymagane)"
3129
3130@@ -1776,8 +1776,8 @@ msgstr "Bieżące hasło: "
3131 msgid "Password expired. Change your password now."
3132 msgstr "Hasło wygasło. Proszę je zmienić teraz."
3133
3134-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3135-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3136+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3137+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3138 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3139 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3140 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3141@@ -1785,8 +1785,8 @@ msgstr "Hasło wygasło. Proszę je zmienić teraz."
3142 msgid "The debug level to run with"
3143 msgstr "Poziom debugowania, z jakim uruchomić"
3144
3145-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3146-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3147+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3148+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3149 msgid "The SSSD domain to use"
3150 msgstr "Używana domena SSSD"
3151
3152@@ -1810,19 +1810,23 @@ msgstr "Nie podano użytkownika\n"
3153 msgid "Error looking up public keys\n"
3154 msgstr "Błąd podczas wyszukiwania kluczy publicznych\n"
3155
3156-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3157+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3158 msgid "The port to use to connect to the host"
3159 msgstr "Port do użycia do połączenia z komputerem"
3160
3161-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3162+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3163+msgid "Print the host ssh public keys"
3164+msgstr ""
3165+
3166+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3167 msgid "Invalid port\n"
3168 msgstr "Nieprawidłowy port\n"
3169
3170-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3171+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3172 msgid "Host not specified\n"
3173 msgstr "Nie podano komputera\n"
3174
3175-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3176+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3177 msgid "The path to the proxy command must be absolute\n"
3178 msgstr "Ścieżka do polecenia pośrednika musi być bezwzględna\n"
3179
3180diff --git a/po/pt.gmo b/po/pt.gmo
3181index 6a8ed58..0623e59 100644
3182Binary files a/po/pt.gmo and b/po/pt.gmo differ
3183diff --git a/po/pt.po b/po/pt.po
3184index e01392e..0bc7a16 100644
3185--- a/po/pt.po
3186+++ b/po/pt.po
3187@@ -7,7 +7,7 @@ msgid ""
3188 msgstr ""
3189 "Project-Id-Version: PACKAGE VERSION\n"
3190 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3191-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3192+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3193 "PO-Revision-Date: 2014-12-14 11:47+0000\n"
3194 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3195 "Language-Team: Portuguese (http://www.transifex.com/projects/p/sssd/language/"
3196@@ -1565,7 +1565,7 @@ msgstr ""
3197 msgid "Use custom version of krb5_get_init_creds_password"
3198 msgstr ""
3199
3200-#: src/providers/data_provider_be.c:555
3201+#: src/providers/data_provider_be.c:556
3202 msgid "Domain of the information provider (mandatory)"
3203 msgstr "Domínio do fornecedor de informação (obrigatório)"
3204
3205@@ -1682,8 +1682,8 @@ msgstr "Senha actual: "
3206 msgid "Password expired. Change your password now."
3207 msgstr "A senha expirou. Altere a sua senha agora."
3208
3209-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3210-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3211+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3212+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3213 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3214 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3215 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3216@@ -1691,8 +1691,8 @@ msgstr "A senha expirou. Altere a sua senha agora."
3217 msgid "The debug level to run with"
3218 msgstr "O nível de depuração a utilizar durante a execução"
3219
3220-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3221-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3222+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3223+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3224 msgid "The SSSD domain to use"
3225 msgstr ""
3226
3227@@ -1716,19 +1716,23 @@ msgstr ""
3228 msgid "Error looking up public keys\n"
3229 msgstr ""
3230
3231-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3232+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3233 msgid "The port to use to connect to the host"
3234 msgstr ""
3235
3236-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3237+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3238+msgid "Print the host ssh public keys"
3239+msgstr ""
3240+
3241+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3242 msgid "Invalid port\n"
3243 msgstr ""
3244
3245-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3246+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3247 msgid "Host not specified\n"
3248 msgstr ""
3249
3250-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3251+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3252 msgid "The path to the proxy command must be absolute\n"
3253 msgstr ""
3254
3255diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
3256index 3a0d074..98bf32e 100644
3257Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
3258diff --git a/po/pt_BR.po b/po/pt_BR.po
3259index 7e36a70..fc6466c 100644
3260--- a/po/pt_BR.po
3261+++ b/po/pt_BR.po
3262@@ -3,7 +3,7 @@ msgid ""
3263 msgstr ""
3264 "Project-Id-Version: PACKAGE VERSION\n"
3265 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3266-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3267+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3268 "PO-Revision-Date: 2015-10-27 08:15+0000\n"
3269 "Last-Translator: Marco Aurélio Krause <ouesten@me.com>\n"
3270 "Language-Team: Portuguese (Brazil)\n"
3271@@ -1549,7 +1549,7 @@ msgstr ""
3272 msgid "Use custom version of krb5_get_init_creds_password"
3273 msgstr ""
3274
3275-#: src/providers/data_provider_be.c:555
3276+#: src/providers/data_provider_be.c:556
3277 msgid "Domain of the information provider (mandatory)"
3278 msgstr ""
3279
3280@@ -1666,8 +1666,8 @@ msgstr ""
3281 msgid "Password expired. Change your password now."
3282 msgstr ""
3283
3284-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3285-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3286+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3287+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3288 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3289 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3290 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3291@@ -1675,8 +1675,8 @@ msgstr ""
3292 msgid "The debug level to run with"
3293 msgstr ""
3294
3295-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3296-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3297+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3298+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3299 msgid "The SSSD domain to use"
3300 msgstr ""
3301
3302@@ -1700,19 +1700,23 @@ msgstr ""
3303 msgid "Error looking up public keys\n"
3304 msgstr ""
3305
3306-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3307+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3308 msgid "The port to use to connect to the host"
3309 msgstr ""
3310
3311-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3312+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3313+msgid "Print the host ssh public keys"
3314+msgstr ""
3315+
3316+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3317 msgid "Invalid port\n"
3318 msgstr ""
3319
3320-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3321+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3322 msgid "Host not specified\n"
3323 msgstr ""
3324
3325-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3326+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3327 msgid "The path to the proxy command must be absolute\n"
3328 msgstr ""
3329
3330diff --git a/po/ru.gmo b/po/ru.gmo
3331index 50f70fa..a340bac 100644
3332Binary files a/po/ru.gmo and b/po/ru.gmo differ
3333diff --git a/po/ru.po b/po/ru.po
3334index abe92df..2e1deed 100644
3335--- a/po/ru.po
3336+++ b/po/ru.po
3337@@ -9,7 +9,7 @@ msgid ""
3338 msgstr ""
3339 "Project-Id-Version: PACKAGE VERSION\n"
3340 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3341-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3342+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3343 "PO-Revision-Date: 2016-02-23 10:04+0000\n"
3344 "Last-Translator: Oleksii Levan <exlevan@gmail.com>\n"
3345 "Language-Team: Russian (http://www.transifex.com/projects/p/sssd/language/"
3346@@ -1583,7 +1583,7 @@ msgstr ""
3347 msgid "Use custom version of krb5_get_init_creds_password"
3348 msgstr ""
3349
3350-#: src/providers/data_provider_be.c:555
3351+#: src/providers/data_provider_be.c:556
3352 msgid "Domain of the information provider (mandatory)"
3353 msgstr "Домен поставщика информации (обязательный)"
3354
3355@@ -1702,8 +1702,8 @@ msgstr "Текущий пароль:"
3356 msgid "Password expired. Change your password now."
3357 msgstr "Срок действия пароля истёк. Необходимо сейчас изменить ваш пароль."
3358
3359-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3360-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3361+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3362+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3363 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3364 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3365 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3366@@ -1711,8 +1711,8 @@ msgstr "Срок действия пароля истёк. Необходимо
3367 msgid "The debug level to run with"
3368 msgstr "Уровень отладки для запуска"
3369
3370-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3371-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3372+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3373+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3374 msgid "The SSSD domain to use"
3375 msgstr ""
3376
3377@@ -1736,19 +1736,23 @@ msgstr ""
3378 msgid "Error looking up public keys\n"
3379 msgstr ""
3380
3381-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3382+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3383 msgid "The port to use to connect to the host"
3384 msgstr ""
3385
3386-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3387+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3388+msgid "Print the host ssh public keys"
3389+msgstr ""
3390+
3391+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3392 msgid "Invalid port\n"
3393 msgstr ""
3394
3395-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3396+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3397 msgid "Host not specified\n"
3398 msgstr ""
3399
3400-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3401+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3402 msgid "The path to the proxy command must be absolute\n"
3403 msgstr ""
3404
3405diff --git a/po/sssd.pot b/po/sssd.pot
3406index 85f578f..940968b 100644
3407--- a/po/sssd.pot
3408+++ b/po/sssd.pot
3409@@ -8,7 +8,7 @@ msgid ""
3410 msgstr ""
3411 "Project-Id-Version: PACKAGE VERSION\n"
3412 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3413-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3414+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3415 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3416 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3417 "Language-Team: LANGUAGE <LL@li.org>\n"
3418@@ -1552,7 +1552,7 @@ msgstr ""
3419 msgid "Use custom version of krb5_get_init_creds_password"
3420 msgstr ""
3421
3422-#: src/providers/data_provider_be.c:555
3423+#: src/providers/data_provider_be.c:556
3424 msgid "Domain of the information provider (mandatory)"
3425 msgstr ""
3426
3427@@ -1669,8 +1669,8 @@ msgstr ""
3428 msgid "Password expired. Change your password now."
3429 msgstr ""
3430
3431-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3432-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3433+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3434+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3435 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3436 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3437 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3438@@ -1678,8 +1678,8 @@ msgstr ""
3439 msgid "The debug level to run with"
3440 msgstr ""
3441
3442-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3443-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3444+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3445+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3446 msgid "The SSSD domain to use"
3447 msgstr ""
3448
3449@@ -1703,19 +1703,23 @@ msgstr ""
3450 msgid "Error looking up public keys\n"
3451 msgstr ""
3452
3453-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3454+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3455 msgid "The port to use to connect to the host"
3456 msgstr ""
3457
3458-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3459+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3460+msgid "Print the host ssh public keys"
3461+msgstr ""
3462+
3463+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3464 msgid "Invalid port\n"
3465 msgstr ""
3466
3467-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3468+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3469 msgid "Host not specified\n"
3470 msgstr ""
3471
3472-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3473+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3474 msgid "The path to the proxy command must be absolute\n"
3475 msgstr ""
3476
3477diff --git a/po/sv.gmo b/po/sv.gmo
3478index 97fb17e..ee8d694 100644
3479Binary files a/po/sv.gmo and b/po/sv.gmo differ
3480diff --git a/po/sv.po b/po/sv.po
3481index 6a42b99..bde18a8 100644
3482--- a/po/sv.po
3483+++ b/po/sv.po
3484@@ -9,7 +9,7 @@ msgid ""
3485 msgstr ""
3486 "Project-Id-Version: PACKAGE VERSION\n"
3487 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3488-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3489+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3490 "PO-Revision-Date: 2018-06-03 04:06+0000\n"
3491 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
3492 "Language-Team: Swedish (http://www.transifex.com/projects/p/sssd/language/"
3493@@ -1621,7 +1621,7 @@ msgstr "Begär kanonisering av huvudmannanamnet"
3494 msgid "Use custom version of krb5_get_init_creds_password"
3495 msgstr "Använd en anpassad version av krb5_get_init_creds_password"
3496
3497-#: src/providers/data_provider_be.c:555
3498+#: src/providers/data_provider_be.c:556
3499 msgid "Domain of the information provider (mandatory)"
3500 msgstr "Domän för informationsleverantören (obligatoriskt)"
3501
3502@@ -1740,8 +1740,8 @@ msgstr "Nuvarande lösenord: "
3503 msgid "Password expired. Change your password now."
3504 msgstr "Lösenordet har gått ut. Ändra ditt lösenord nu."
3505
3506-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3507-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3508+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3509+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3510 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3511 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3512 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3513@@ -1749,8 +1749,8 @@ msgstr "Lösenordet har gått ut. Ändra ditt lösenord nu."
3514 msgid "The debug level to run with"
3515 msgstr "Felsökningsnivån att köra med"
3516
3517-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3518-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3519+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3520+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3521 msgid "The SSSD domain to use"
3522 msgstr "SSSD-domäner att använda"
3523
3524@@ -1774,19 +1774,23 @@ msgstr "Ingen användare angiven\n"
3525 msgid "Error looking up public keys\n"
3526 msgstr "Fel vid uppslagning av publika nycklar\n"
3527
3528-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3529+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3530 msgid "The port to use to connect to the host"
3531 msgstr "Porten att använda för att ansluta till värden"
3532
3533-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3534+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3535+msgid "Print the host ssh public keys"
3536+msgstr ""
3537+
3538+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3539 msgid "Invalid port\n"
3540 msgstr "Felaktig port\n"
3541
3542-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3543+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3544 msgid "Host not specified\n"
3545 msgstr "Värden inte angiven\n"
3546
3547-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3548+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3549 msgid "The path to the proxy command must be absolute\n"
3550 msgstr "Sökvägen till proxy-kommandot måste vara absolut\n"
3551
3552diff --git a/po/tg.gmo b/po/tg.gmo
3553index 16a5654..5d2cf79 100644
3554Binary files a/po/tg.gmo and b/po/tg.gmo differ
3555diff --git a/po/tg.po b/po/tg.po
3556index 69d38b6..e77ce96 100644
3557--- a/po/tg.po
3558+++ b/po/tg.po
3559@@ -7,7 +7,7 @@ msgid ""
3560 msgstr ""
3561 "Project-Id-Version: PACKAGE VERSION\n"
3562 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3563-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3564+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3565 "PO-Revision-Date: 2014-12-14 11:48+0000\n"
3566 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3567 "Language-Team: Tajik (http://www.transifex.com/projects/p/sssd/language/"
3568@@ -1554,7 +1554,7 @@ msgstr ""
3569 msgid "Use custom version of krb5_get_init_creds_password"
3570 msgstr ""
3571
3572-#: src/providers/data_provider_be.c:555
3573+#: src/providers/data_provider_be.c:556
3574 msgid "Domain of the information provider (mandatory)"
3575 msgstr ""
3576
3577@@ -1671,8 +1671,8 @@ msgstr ""
3578 msgid "Password expired. Change your password now."
3579 msgstr ""
3580
3581-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3582-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3583+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3584+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3585 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3586 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3587 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3588@@ -1680,8 +1680,8 @@ msgstr ""
3589 msgid "The debug level to run with"
3590 msgstr ""
3591
3592-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3593-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3594+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3595+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3596 msgid "The SSSD domain to use"
3597 msgstr ""
3598
3599@@ -1705,19 +1705,23 @@ msgstr ""
3600 msgid "Error looking up public keys\n"
3601 msgstr ""
3602
3603-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3604+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3605 msgid "The port to use to connect to the host"
3606 msgstr ""
3607
3608-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3609+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3610+msgid "Print the host ssh public keys"
3611+msgstr ""
3612+
3613+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3614 msgid "Invalid port\n"
3615 msgstr ""
3616
3617-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3618+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3619 msgid "Host not specified\n"
3620 msgstr ""
3621
3622-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3623+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3624 msgid "The path to the proxy command must be absolute\n"
3625 msgstr ""
3626
3627diff --git a/po/tr.gmo b/po/tr.gmo
3628index 94c9252..0d9559f 100644
3629Binary files a/po/tr.gmo and b/po/tr.gmo differ
3630diff --git a/po/tr.po b/po/tr.po
3631index 4871681..21f70ad 100644
3632--- a/po/tr.po
3633+++ b/po/tr.po
3634@@ -8,7 +8,7 @@ msgid ""
3635 msgstr ""
3636 "Project-Id-Version: PACKAGE VERSION\n"
3637 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3638-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3639+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3640 "PO-Revision-Date: 2014-12-14 11:49+0000\n"
3641 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3642 "Language-Team: Turkish (http://www.transifex.com/projects/p/sssd/language/"
3643@@ -1555,7 +1555,7 @@ msgstr ""
3644 msgid "Use custom version of krb5_get_init_creds_password"
3645 msgstr ""
3646
3647-#: src/providers/data_provider_be.c:555
3648+#: src/providers/data_provider_be.c:556
3649 msgid "Domain of the information provider (mandatory)"
3650 msgstr ""
3651
3652@@ -1672,8 +1672,8 @@ msgstr ""
3653 msgid "Password expired. Change your password now."
3654 msgstr ""
3655
3656-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3657-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3658+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3659+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3660 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3661 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3662 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3663@@ -1681,8 +1681,8 @@ msgstr ""
3664 msgid "The debug level to run with"
3665 msgstr ""
3666
3667-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3668-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3669+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3670+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3671 msgid "The SSSD domain to use"
3672 msgstr ""
3673
3674@@ -1706,19 +1706,23 @@ msgstr ""
3675 msgid "Error looking up public keys\n"
3676 msgstr ""
3677
3678-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3679+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3680 msgid "The port to use to connect to the host"
3681 msgstr ""
3682
3683-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3684+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3685+msgid "Print the host ssh public keys"
3686+msgstr ""
3687+
3688+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3689 msgid "Invalid port\n"
3690 msgstr ""
3691
3692-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3693+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3694 msgid "Host not specified\n"
3695 msgstr ""
3696
3697-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3698+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3699 msgid "The path to the proxy command must be absolute\n"
3700 msgstr ""
3701
3702diff --git a/po/uk.gmo b/po/uk.gmo
3703index c29fbee..ca0ef60 100644
3704Binary files a/po/uk.gmo and b/po/uk.gmo differ
3705diff --git a/po/uk.po b/po/uk.po
3706index 592bf73..b76256b 100644
3707--- a/po/uk.po
3708+++ b/po/uk.po
3709@@ -13,7 +13,7 @@ msgid ""
3710 msgstr ""
3711 "Project-Id-Version: PACKAGE VERSION\n"
3712 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3713-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3714+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3715 "PO-Revision-Date: 2018-03-09 08:59+0000\n"
3716 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3717 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/sssd/language/"
3718@@ -1700,7 +1700,7 @@ msgstr "Вимагає перетворення реєстраційного з�
3719 msgid "Use custom version of krb5_get_init_creds_password"
3720 msgstr "Використовувати нетипову версію krb5_get_init_creds_password"
3721
3722-#: src/providers/data_provider_be.c:555
3723+#: src/providers/data_provider_be.c:556
3724 msgid "Domain of the information provider (mandatory)"
3725 msgstr "Домен надання відомостей (обов’язковий)"
3726
3727@@ -1819,8 +1819,8 @@ msgstr "Поточний пароль: "
3728 msgid "Password expired. Change your password now."
3729 msgstr "Строк дії пароля вичерпано. Змініть ваш пароль."
3730
3731-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3732-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3733+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3734+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3735 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3736 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3737 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3738@@ -1828,8 +1828,8 @@ msgstr "Строк дії пароля вичерпано. Змініть ваш
3739 msgid "The debug level to run with"
3740 msgstr "Рівень діагностики під час запуску"
3741
3742-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3743-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3744+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3745+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3746 msgid "The SSSD domain to use"
3747 msgstr "Домен SSSD, який слід використовувати"
3748
3749@@ -1853,19 +1853,23 @@ msgstr "Не вказано користувача\n"
3750 msgid "Error looking up public keys\n"
3751 msgstr "Помилка під час спроби пошуку відкритих ключів\n"
3752
3753-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3754+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3755 msgid "The port to use to connect to the host"
3756 msgstr "Порт, яким слід користуватися для встановлення з’єднань з вузлом"
3757
3758-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3759+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3760+msgid "Print the host ssh public keys"
3761+msgstr ""
3762+
3763+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3764 msgid "Invalid port\n"
3765 msgstr "Некоректний порт.\n"
3766
3767-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3768+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3769 msgid "Host not specified\n"
3770 msgstr "Не вказано вузол\n"
3771
3772-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3773+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3774 msgid "The path to the proxy command must be absolute\n"
3775 msgstr "Має бути вказано абсолютний шлях до команди проксі-сервера\n"
3776
3777diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
3778index 480e778..c2c8640 100644
3779Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
3780diff --git a/po/zh_CN.po b/po/zh_CN.po
3781index 1ebcb39..c99de03 100644
3782--- a/po/zh_CN.po
3783+++ b/po/zh_CN.po
3784@@ -8,7 +8,7 @@ msgid ""
3785 msgstr ""
3786 "Project-Id-Version: PACKAGE VERSION\n"
3787 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3788-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3789+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3790 "PO-Revision-Date: 2014-12-14 11:50+0000\n"
3791 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3792 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/sssd/"
3793@@ -1555,7 +1555,7 @@ msgstr ""
3794 msgid "Use custom version of krb5_get_init_creds_password"
3795 msgstr ""
3796
3797-#: src/providers/data_provider_be.c:555
3798+#: src/providers/data_provider_be.c:556
3799 msgid "Domain of the information provider (mandatory)"
3800 msgstr ""
3801
3802@@ -1672,8 +1672,8 @@ msgstr ""
3803 msgid "Password expired. Change your password now."
3804 msgstr ""
3805
3806-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3807-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3808+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3809+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3810 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3811 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3812 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3813@@ -1681,8 +1681,8 @@ msgstr ""
3814 msgid "The debug level to run with"
3815 msgstr ""
3816
3817-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3818-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3819+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3820+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3821 msgid "The SSSD domain to use"
3822 msgstr ""
3823
3824@@ -1706,19 +1706,23 @@ msgstr ""
3825 msgid "Error looking up public keys\n"
3826 msgstr ""
3827
3828-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3829+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3830 msgid "The port to use to connect to the host"
3831 msgstr ""
3832
3833-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3834+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3835+msgid "Print the host ssh public keys"
3836+msgstr ""
3837+
3838+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3839 msgid "Invalid port\n"
3840 msgstr "无效端口\n"
3841
3842-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3843+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3844 msgid "Host not specified\n"
3845 msgstr ""
3846
3847-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3848+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3849 msgid "The path to the proxy command must be absolute\n"
3850 msgstr ""
3851
3852diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
3853index 06e9a8a..e5b1597 100644
3854Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
3855diff --git a/po/zh_TW.po b/po/zh_TW.po
3856index 026491b..9a2ac19 100644
3857--- a/po/zh_TW.po
3858+++ b/po/zh_TW.po
3859@@ -7,7 +7,7 @@ msgid ""
3860 msgstr ""
3861 "Project-Id-Version: PACKAGE VERSION\n"
3862 "Report-Msgid-Bugs-To: sssd-devel@lists.fedorahosted.org\n"
3863-"POT-Creation-Date: 2018-06-08 21:01+0200\n"
3864+"POT-Creation-Date: 2018-08-12 13:03+0000\n"
3865 "PO-Revision-Date: 2014-12-14 11:50+0000\n"
3866 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
3867 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/sssd/"
3868@@ -1554,7 +1554,7 @@ msgstr ""
3869 msgid "Use custom version of krb5_get_init_creds_password"
3870 msgstr ""
3871
3872-#: src/providers/data_provider_be.c:555
3873+#: src/providers/data_provider_be.c:556
3874 msgid "Domain of the information provider (mandatory)"
3875 msgstr ""
3876
3877@@ -1671,8 +1671,8 @@ msgstr "目前的密碼:"
3878 msgid "Password expired. Change your password now."
3879 msgstr "密碼已過期。請立刻變更您的密碼。"
3880
3881-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
3882-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
3883+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
3884+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
3885 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
3886 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
3887 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
3888@@ -1680,8 +1680,8 @@ msgstr "密碼已過期。請立刻變更您的密碼。"
3889 msgid "The debug level to run with"
3890 msgstr ""
3891
3892-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
3893-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
3894+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
3895+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
3896 msgid "The SSSD domain to use"
3897 msgstr ""
3898
3899@@ -1705,19 +1705,23 @@ msgstr ""
3900 msgid "Error looking up public keys\n"
3901 msgstr ""
3902
3903-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
3904+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
3905 msgid "The port to use to connect to the host"
3906 msgstr ""
3907
3908-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
3909+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:210
3910+msgid "Print the host ssh public keys"
3911+msgstr ""
3912+
3913+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
3914 msgid "Invalid port\n"
3915 msgstr ""
3916
3917-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
3918+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
3919 msgid "Host not specified\n"
3920 msgstr ""
3921
3922-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
3923+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
3924 msgid "The path to the proxy command must be absolute\n"
3925 msgstr ""
3926
3927diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
3928index 5b4cbec..a3eb9c6 100644
3929--- a/src/confdb/confdb.c
3930+++ b/src/confdb/confdb.c
3931@@ -998,7 +998,7 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
3932 "Interpreting as true\n", domain->name);
3933 domain->enumerate = true;
3934 } else { /* assume the new format */
3935- enum_default = strcasecmp(domain->provider, "files") == 0 ? true : false;
3936+ enum_default = is_files_provider(domain);
3937
3938 ret = get_entry_as_bool(res->msgs[0], &domain->enumerate,
3939 CONFDB_DOMAIN_ENUMERATE, enum_default);
3940@@ -1009,7 +1009,7 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
3941 }
3942 }
3943
3944- if (strcasecmp(domain->provider, "files") == 0) {
3945+ if (is_files_provider(domain)) {
3946 /* The password field must be reported as 'x', else pam_unix won't
3947 * authenticate this entry. See man pwconv(8) for more details.
3948 */
3949@@ -1283,7 +1283,9 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
3950
3951 tmp = ldb_msg_find_attr_as_string(res->msgs[0],
3952 CONFDB_NSS_OVERRIDE_HOMEDIR, NULL);
3953- if (tmp != NULL) {
3954+ /* Here we skip the files provider as it should always return *only*
3955+ * what's in the files and nothing else. */
3956+ if (tmp != NULL && !is_files_provider(domain)) {
3957 domain->override_homedir = talloc_strdup(domain, tmp);
3958 if (!domain->override_homedir) {
3959 ret = ENOMEM;
3960@@ -1324,7 +1326,9 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
3961
3962 tmp = ldb_msg_find_attr_as_string(res->msgs[0],
3963 CONFDB_NSS_OVERRIDE_SHELL, NULL);
3964- if (tmp != NULL) {
3965+ /* Here we skip the files provider as it should always return *only*
3966+ * what's in the files and nothing else. */
3967+ if (tmp != NULL && !is_files_provider(domain)) {
3968 domain->override_shell = talloc_strdup(domain, tmp);
3969 if (!domain->override_shell) {
3970 ret = ENOMEM;
3971diff --git a/src/config/setup.py b/src/config/setup.py
3972index d788741..e176716 100644
3973--- a/src/config/setup.py
3974+++ b/src/config/setup.py
3975@@ -25,7 +25,7 @@ from distutils.core import setup
3976
3977 setup(
3978 name='SSSDConfig',
3979- version='1.16.2',
3980+ version='1.16.3',
3981 license='GPLv3+',
3982 url='https://pagure.io/SSSD/sssd/',
3983 packages=['SSSDConfig'],
3984diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c
3985index b2540e5..43341d4 100644
3986--- a/src/db/sysdb_search.c
3987+++ b/src/db/sysdb_search.c
3988@@ -1779,10 +1779,54 @@ done:
3989 return ret;
3990 }
3991
3992+
3993+/* Get string until the first delimiter and strip out
3994+ * leading and trailing whitespaces.
3995+ */
3996+static errno_t sysdb_netgr_split_triple_string(TALLOC_CTX *mem_ctx,
3997+ const char **in,
3998+ const char delimiter,
3999+ char **out)
4000+{
4001+ size_t len;
4002+ const char *p = *in;
4003+ const char *begin;
4004+
4005+ /* Remove any leading whitespace */
4006+ while (*p && isspace(*p)) p++;
4007+ begin = p;
4008+
4009+ /* Find the delimiter */
4010+ while (*p && *p != delimiter) p++;
4011+
4012+ if (!*p) {
4013+ /* No delimiter was found: parse error */
4014+ return EINVAL;
4015+ }
4016+
4017+ len = p - begin;
4018+ /* Remove trailing spaces */
4019+ while (len > 0 && isspace(begin[len - 1])) len--;
4020+
4021+ *out = NULL;
4022+ if (len > 0) {
4023+ /* Copy the output string */
4024+ *out = talloc_strndup(mem_ctx, begin, len);
4025+ if (!*out) {
4026+ return ENOMEM;
4027+ }
4028+ }
4029+ p++;
4030+
4031+ *in = p;
4032+ return EOK;
4033+}
4034+
4035+
4036+
4037 /* This function splits a three-tuple into three strings
4038- * It assumes that any whitespace between the parentheses
4039- * and commas are intentional and does not attempt to
4040- * strip them out. Leading and trailing whitespace is
4041+ * It strips out any whitespace between the parentheses
4042+ * and commas. Leading and trailing whitespace is
4043 * ignored.
4044 *
4045 * This behavior is compatible with nss_ldap's
4046@@ -1797,10 +1841,6 @@ static errno_t sysdb_netgr_split_triple(TALLOC_CTX *mem_ctx,
4047 errno_t ret;
4048 TALLOC_CTX *tmp_ctx;
4049 const char *p = triple;
4050- const char *p_host;
4051- const char *p_user;
4052- const char *p_domain;
4053- size_t len;
4054
4055 char *host = NULL;
4056 char *user = NULL;
4057@@ -1827,72 +1867,22 @@ static errno_t sysdb_netgr_split_triple(TALLOC_CTX *mem_ctx,
4058 goto done;
4059 }
4060 p++;
4061- p_host = p;
4062
4063- /* Find the first comma */
4064- while (*p && *p != ',') p++;
4065-
4066- if (!*p) {
4067- /* No comma was found: parse error */
4068- ret = EINVAL;
4069+ ret = sysdb_netgr_split_triple_string(tmp_ctx, &p, ',', &host);
4070+ if (ret != EOK) {
4071 goto done;
4072 }
4073
4074- len = p - p_host;
4075-
4076- if (len > 0) {
4077- /* Copy the host string */
4078- host = talloc_strndup(tmp_ctx, p_host, len);
4079- if (!host) {
4080- ret = ENOMEM;
4081- goto done;
4082- }
4083- }
4084- p++;
4085- p_user = p;
4086-
4087- /* Find the second comma */
4088- while (*p && *p != ',') p++;
4089-
4090- if (!*p) {
4091- /* No comma was found: parse error */
4092- ret = EINVAL;
4093+ ret = sysdb_netgr_split_triple_string(tmp_ctx, &p, ',', &user);
4094+ if (ret != EOK) {
4095 goto done;
4096 }
4097
4098- len = p - p_user;
4099-
4100- if (len > 0) {
4101- /* Copy the user string */
4102- user = talloc_strndup(tmp_ctx, p_user, len);
4103- if (!user) {
4104- ret = ENOMEM;
4105- goto done;
4106- }
4107- }
4108- p++;
4109- p_domain = p;
4110-
4111- /* Find the closing parenthesis */
4112- while (*p && *p != ')') p++;
4113- if (*p != ')') {
4114- /* No trailing parenthesis: parse error */
4115- ret = EINVAL;
4116+ ret = sysdb_netgr_split_triple_string(tmp_ctx, &p, ')', &domain);
4117+ if (ret != EOK) {
4118 goto done;
4119 }
4120
4121- len = p - p_domain;
4122-
4123- if (len > 0) {
4124- /* Copy the domain string */
4125- domain = talloc_strndup(tmp_ctx, p_domain, len);
4126- if (!domain) {
4127- ret = ENOMEM;
4128- goto done;
4129- }
4130- }
4131- p++;
4132-
4133 /* skip trailing whitespace */
4134 while (*p && isspace(*p)) p++;
4135
4136diff --git a/src/external/samba.m4 b/src/external/samba.m4
4137index 794cac2..7a8c1eb 100644
4138--- a/src/external/samba.m4
4139+++ b/src/external/samba.m4
4140@@ -122,3 +122,11 @@ int main(void)
4141 AC_DEFINE_UNQUOTED(SMB_IDMAP_INTERFACE_VERSION, $idmap_version,
4142 [Detected version of Samba's idmap plugin interface])
4143 fi
4144+
4145+SAVE_CFLAGS=$CFLAGS
4146+CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS $NDR_NBT_CFLAGS $NDR_KRB5PAC_CFLAGS -I/usr/include/samba-4.0"
4147+AC_CHECK_MEMBERS([struct PAC_LOGON_INFO.resource_groups], , ,
4148+ [[ #include <ndr.h>
4149+ #include <gen_ndr/krb5pac.h>
4150+ #include <gen_ndr/krb5pac.h>]])
4151+CFLAGS=$SAVE_CFLAGS
4152diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
4153index 7c17fcb..952d487 100644
4154--- a/src/krb5_plugin/sssd_krb5_locator_plugin.c
4155+++ b/src/krb5_plugin/sssd_krb5_locator_plugin.c
4156@@ -38,11 +38,27 @@
4157
4158 #include "providers/krb5/krb5_common.h"
4159
4160+/* The following override of KDCINFO_TMPL and KPASSWDINFO_TMPL is not very
4161+ * elegant but since they are defined in krb5_common.h with the help of
4162+ * PUBCONF_PATH from config.h and PUBCONF_PATH can by set by a configure
4163+ * options I didn't found another way to change the path for a unit test. */
4164+#ifdef TEST_PUBCONF_PATH
4165+#ifdef KDCINFO_TMPL
4166+#undef KDCINFO_TMPL
4167+#endif
4168+#define KDCINFO_TMPL TEST_PUBCONF_PATH"/kdcinfo.%s"
4169+
4170+#ifdef KPASSWDINFO_TMPL
4171+#undef KPASSWDINFO_TMPL
4172+#endif
4173+#define KPASSWDINFO_TMPL TEST_PUBCONF_PATH"/kpasswdinfo.%s"
4174+#endif /* TEST_PUBCONF_PATH */
4175+
4176 #define DEFAULT_KERBEROS_PORT 88
4177 #define DEFAULT_KADMIN_PORT 749
4178 #define DEFAULT_KPASSWD_PORT 464
4179
4180-#define BUFSIZE 512
4181+#define BUFSIZE 4096
4182 #define PORT_STR_SIZE 7
4183 #define SSSD_KRB5_LOCATOR_DEBUG "SSSD_KRB5_LOCATOR_DEBUG"
4184 #define SSSD_KRB5_LOCATOR_DISABLE "SSSD_KRB5_LOCATOR_DISABLE"
4185@@ -53,12 +69,15 @@
4186 } \
4187 } while(0)
4188
4189+struct addr_port {
4190+ char *addr;
4191+ uint16_t port;
4192+};
4193+
4194 struct sssd_ctx {
4195 char *sssd_realm;
4196- char *kdc_addr;
4197- uint16_t kdc_port;
4198- char *kpasswd_addr;
4199- uint16_t kpasswd_port;
4200+ struct addr_port *kdc_addr;
4201+ struct addr_port *kpasswd_addr;
4202 bool debug;
4203 bool disabled;
4204 };
4205@@ -82,6 +101,201 @@ void plugin_debug_fn(const char *format, ...)
4206 free(s);
4207 }
4208
4209+
4210+static void free_addr_port_list(struct addr_port **list)
4211+{
4212+ size_t c;
4213+
4214+ if (list == NULL || *list == NULL) {
4215+ return;
4216+ }
4217+
4218+ for (c = 0; (*list)[c].addr != NULL; c++) {
4219+ free((*list)[c].addr);
4220+ }
4221+ free(*list);
4222+ *list = NULL;
4223+}
4224+
4225+static int copy_addr_port_list(struct addr_port *src, bool clear_port,
4226+ struct addr_port **dst)
4227+{
4228+ size_t c;
4229+ struct addr_port *d = NULL;
4230+ int ret;
4231+
4232+ /* only copy if dst is initialized to NULL */
4233+ if (dst == NULL || *dst != NULL) {
4234+ return EINVAL;
4235+ }
4236+
4237+ if (src == NULL) {
4238+ return 0;
4239+ }
4240+
4241+ for (c = 0; src[c].addr != NULL; c++);
4242+
4243+ d = calloc((c + 1), sizeof(struct addr_port));
4244+ if (d == NULL) {
4245+ return ENOMEM;
4246+ }
4247+
4248+ for (c = 0; src[c].addr != NULL; c++) {
4249+ d[c].addr = strdup(src[c].addr);
4250+ if (d[c].addr == NULL) {
4251+ ret = ENOMEM;
4252+ goto done;
4253+ }
4254+ if (clear_port) {
4255+ d[c].port = 0;
4256+ } else {
4257+ d[c].port = src[c].port;
4258+ }
4259+ }
4260+
4261+ ret = EOK;
4262+
4263+done:
4264+ if (ret != EOK) {
4265+ free_addr_port_list(&d);
4266+ } else {
4267+ *dst = d;
4268+ }
4269+
4270+ return ret;
4271+}
4272+
4273+static int buf_to_addr_port_list(struct sssd_ctx *ctx,
4274+ uint8_t *buf, size_t buf_size,
4275+ struct addr_port **list)
4276+{
4277+ struct addr_port *l = NULL;
4278+ int ret;
4279+ uint8_t *p;
4280+ uint8_t *pn;
4281+ size_t c;
4282+ size_t len;
4283+ size_t addr_len;
4284+ char *addr_str = NULL;
4285+ char *tmp = NULL;
4286+ char *port_str;
4287+ long port;
4288+ char *endptr;
4289+
4290+ /* only create if list is initialized to NULL */
4291+ if (buf == NULL || buf_size == 0 || list == NULL || *list != NULL) {
4292+ return EINVAL;
4293+ }
4294+
4295+ c = 1; /* to account for a missing \n at the very end */
4296+ p = buf;
4297+ while ((p - buf) < buf_size
4298+ && (p = memchr(p, '\n', buf_size - (p - buf))) != NULL) {
4299+ p++;
4300+ c++;
4301+ }
4302+
4303+ l = calloc((c + 1), sizeof(struct addr_port));
4304+ if (l == NULL) {
4305+ return ENOMEM;
4306+ }
4307+
4308+ c = 0;
4309+ p = buf;
4310+ do {
4311+ pn = memchr(p, '\n', buf_size - (p - buf));
4312+ if (pn != NULL) {
4313+ len = pn - p;
4314+ } else {
4315+ len = buf_size - (p - buf);
4316+ }
4317+ if (len == 0) {
4318+ /* empty line no more processing */
4319+ break;
4320+ }
4321+
4322+ free(tmp);
4323+ tmp = strndup((char *) p, len);
4324+ if (tmp == NULL) {
4325+ ret = ENOMEM;
4326+ goto done;
4327+ }
4328+
4329+ port_str = strrchr(tmp, ':');
4330+ if (port_str == NULL) {
4331+ port = 0;
4332+ } else if (tmp[0] == '[' && *(port_str - 1) != ']') {
4333+ /* IPv6 address without port number */
4334+ port = 0;
4335+ } else {
4336+ *port_str = '\0';
4337+ ++port_str;
4338+
4339+ if (isdigit(*port_str)) {
4340+ errno = 0;
4341+ port = strtol(port_str, &endptr, 10);
4342+ if (errno != 0) {
4343+ ret = errno;
4344+ PLUGIN_DEBUG(("strtol failed on [%s]: [%d][%s], "
4345+ "assuming default.\n", port_str, ret,
4346+ strerror(ret)));
4347+ port = 0;
4348+ }
4349+ if (*endptr != '\0') {
4350+ PLUGIN_DEBUG(("Found additional characters [%s] in port "
4351+ "number [%s], assuming default.\n", endptr,
4352+ port_str));
4353+ port = 0;
4354+ }
4355+
4356+ if (port < 0 || port > 65535) {
4357+ PLUGIN_DEBUG(("Illegal port number [%ld], assuming "
4358+ "default.\n", port));
4359+ port = 0;
4360+ }
4361+ } else {
4362+ PLUGIN_DEBUG(("Illegal port number [%s], assuming default.\n",
4363+ port_str));
4364+ port = 0;
4365+ }
4366+ }
4367+
4368+ /* make sure tmp is not modified so that it can be freed later */
4369+ addr_str = tmp;
4370+ /* strip leading '[' and trailing ']' from IPv6 addresses */
4371+ if (addr_str[0] == '['
4372+ && (addr_len = strlen(addr_str))
4373+ && addr_str[addr_len - 1] == ']') {
4374+ addr_str[addr_len -1] = '\0';
4375+ addr_str++;
4376+ }
4377+
4378+ PLUGIN_DEBUG(("Found [%s][%d].\n", addr_str, port));
4379+
4380+ l[c].addr = strdup(addr_str);
4381+ if (l[c].addr == NULL) {
4382+ ret = ENOMEM;
4383+ goto done;
4384+ }
4385+ l[c].port = port;
4386+
4387+ c++;
4388+ p = pn == NULL ? NULL : (pn + 1);
4389+ } while (p != NULL);
4390+
4391+ ret = EOK;
4392+
4393+done:
4394+ free(tmp);
4395+ if (ret != EOK) {
4396+ free_addr_port_list(&l);
4397+ } else {
4398+ *list = l;
4399+ }
4400+
4401+ return ret;
4402+}
4403+
4404 static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
4405 enum locate_service_type svc)
4406 {
4407@@ -91,9 +305,6 @@ static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
4408 uint8_t buf[BUFSIZE + 1];
4409 int fd = -1;
4410 const char *name_tmpl = NULL;
4411- char *port_str;
4412- long port;
4413- char *endptr;
4414
4415 switch (svc) {
4416 case locate_service_kdc:
4417@@ -148,62 +359,21 @@ static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
4418 PLUGIN_DEBUG(("Content of krb5info file [%s] is [%d] or larger.\n",
4419 krb5info_name, BUFSIZE));
4420 }
4421- PLUGIN_DEBUG(("Found [%s] in [%s].\n", buf, krb5info_name));
4422-
4423- port_str = strrchr((char *) buf, ':');
4424- if (port_str == NULL) {
4425- port = 0;
4426- } else {
4427- *port_str = '\0';
4428- ++port_str;
4429-
4430- if (isdigit(*port_str)) {
4431- errno = 0;
4432- port = strtol(port_str, &endptr, 10);
4433- if (errno != 0) {
4434- ret = errno;
4435- PLUGIN_DEBUG(("strtol failed on [%s]: [%d][%s], "
4436- "assuming default.\n", port_str, ret, strerror(ret)));
4437- port = 0;
4438- }
4439- if (*endptr != '\0') {
4440- PLUGIN_DEBUG(("Found additional characters [%s] in port number "
4441- "[%s], assuming default.\n", endptr, port_str));
4442- port = 0;
4443- }
4444-
4445- if (port < 0 || port > 65535) {
4446- PLUGIN_DEBUG(("Illegal port number [%ld], assuming default.\n",
4447- port));
4448- port = 0;
4449- }
4450- } else {
4451- PLUGIN_DEBUG(("Illegal port number [%s], assuming default.\n",
4452- port_str));
4453- port = 0;
4454- }
4455- }
4456
4457 switch (svc) {
4458 case locate_service_kdc:
4459- free(ctx->kdc_addr);
4460- ctx->kdc_addr = strdup((char *) buf);
4461- if (ctx->kdc_addr == NULL) {
4462- PLUGIN_DEBUG(("strdup failed.\n"));
4463- ret = ENOMEM;
4464+ free_addr_port_list(&(ctx->kdc_addr));
4465+ ret = buf_to_addr_port_list(ctx, buf, len, &(ctx->kdc_addr));
4466+ if (ret != EOK) {
4467 goto done;
4468 }
4469- ctx->kdc_port = (uint16_t) port;
4470 break;
4471 case locate_service_kpasswd:
4472- free(ctx->kpasswd_addr);
4473- ctx->kpasswd_addr = strdup((char *) buf);
4474- if (ctx->kpasswd_addr == NULL) {
4475- PLUGIN_DEBUG(("strdup failed.\n"));
4476- ret = ENOMEM;
4477+ free_addr_port_list(&(ctx->kpasswd_addr));
4478+ ret = buf_to_addr_port_list(ctx, buf, len, &(ctx->kpasswd_addr));
4479+ if (ret != EOK) {
4480 goto done;
4481 }
4482- ctx->kpasswd_port = (uint16_t) port;
4483 break;
4484 default:
4485 PLUGIN_DEBUG(("Unsupported service [%d].\n", svc));
4486@@ -256,8 +426,8 @@ void sssd_krb5_locator_close(void *private_data)
4487 ctx = (struct sssd_ctx *) private_data;
4488 PLUGIN_DEBUG(("sssd_krb5_locator_close called\n"));
4489
4490- free(ctx->kdc_addr);
4491- free(ctx->kpasswd_addr);
4492+ free_addr_port_list(&(ctx->kdc_addr));
4493+ free_addr_port_list(&(ctx->kpasswd_addr));
4494 free(ctx->sssd_realm);
4495 free(ctx);
4496
4497@@ -277,12 +447,18 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
4498 struct sssd_ctx *ctx;
4499 struct addrinfo ai_hints;
4500 uint16_t port = 0;
4501- const char *addr = NULL;
4502+ uint16_t default_port = 0;
4503+ struct addr_port *addr = NULL;
4504 char port_str[PORT_STR_SIZE];
4505+ size_t c;
4506
4507 if (private_data == NULL) return KRB5_PLUGIN_NO_HANDLE;
4508 ctx = (struct sssd_ctx *) private_data;
4509
4510+ if (realm == NULL || cbfunc == NULL || cbdata == NULL) {
4511+ return KRB5_PLUGIN_NO_HANDLE;
4512+ }
4513+
4514 if (ctx->disabled) {
4515 PLUGIN_DEBUG(("Plugin disabled, nothing to do.\n"));
4516 return KRB5_PLUGIN_NO_HANDLE;
4517@@ -308,9 +484,13 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
4518 if (ret != EOK) {
4519 PLUGIN_DEBUG(("reading kpasswd address failed, "
4520 "using kdc address.\n"));
4521- free(ctx->kpasswd_addr);
4522- ctx->kpasswd_addr = strdup(ctx->kdc_addr);
4523- ctx->kpasswd_port = 0;
4524+ free_addr_port_list(&(ctx->kpasswd_addr));
4525+ ret = copy_addr_port_list(ctx->kdc_addr, true,
4526+ &(ctx->kpasswd_addr));
4527+ if (ret != EOK) {
4528+ PLUGIN_DEBUG(("copying address list failed.\n"));
4529+ return KRB5_PLUGIN_NO_HANDLE;
4530+ }
4531 }
4532 }
4533 }
4534@@ -322,19 +502,19 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
4535 switch (svc) {
4536 case locate_service_kdc:
4537 addr = ctx->kdc_addr;
4538- port = ctx->kdc_port ? ctx->kdc_port : DEFAULT_KERBEROS_PORT;
4539+ default_port = DEFAULT_KERBEROS_PORT;
4540 break;
4541 case locate_service_master_kdc:
4542 addr = ctx->kpasswd_addr;
4543- port = DEFAULT_KERBEROS_PORT;
4544+ default_port = DEFAULT_KERBEROS_PORT;
4545 break;
4546 case locate_service_kadmin:
4547 addr = ctx->kpasswd_addr;
4548- port = DEFAULT_KADMIN_PORT;
4549+ default_port = DEFAULT_KADMIN_PORT;
4550 break;
4551 case locate_service_kpasswd:
4552 addr = ctx->kpasswd_addr;
4553- port = ctx->kpasswd_port ? ctx->kpasswd_port : DEFAULT_KPASSWD_PORT;
4554+ default_port = DEFAULT_KPASSWD_PORT;
4555 break;
4556 case locate_service_krb524:
4557 return KRB5_PLUGIN_NO_HANDLE;
4558@@ -362,46 +542,49 @@ krb5_error_code sssd_krb5_locator_lookup(void *private_data,
4559 if (strcmp(realm, ctx->sssd_realm) != 0)
4560 return KRB5_PLUGIN_NO_HANDLE;
4561
4562- memset(port_str, 0, PORT_STR_SIZE);
4563- ret = snprintf(port_str, PORT_STR_SIZE-1, "%u", port);
4564- if (ret < 0 || ret >= (PORT_STR_SIZE-1)) {
4565- PLUGIN_DEBUG(("snprintf failed.\n"));
4566- return KRB5_PLUGIN_NO_HANDLE;
4567- }
4568+ for (c = 0; addr[c].addr != NULL; c++) {
4569+ port = (addr[c].port == 0 ? default_port : addr[c].port);
4570+ memset(port_str, 0, PORT_STR_SIZE);
4571+ ret = snprintf(port_str, PORT_STR_SIZE-1, "%u", port);
4572+ if (ret < 0 || ret >= (PORT_STR_SIZE-1)) {
4573+ PLUGIN_DEBUG(("snprintf failed.\n"));
4574+ return KRB5_PLUGIN_NO_HANDLE;
4575+ }
4576+
4577+ memset(&ai_hints, 0, sizeof(struct addrinfo));
4578+ ai_hints.ai_flags = AI_NUMERICHOST|AI_NUMERICSERV;
4579+ ai_hints.ai_socktype = socktype;
4580
4581- memset(&ai_hints, 0, sizeof(struct addrinfo));
4582- ai_hints.ai_flags = AI_NUMERICHOST|AI_NUMERICSERV;
4583- ai_hints.ai_socktype = socktype;
4584-
4585- ret = getaddrinfo(addr, port_str, &ai_hints, &ai);
4586- if (ret != 0) {
4587- PLUGIN_DEBUG(("getaddrinfo failed [%d][%s].\n", ret,
4588- gai_strerror(ret)));
4589- if (ret == EAI_SYSTEM) {
4590- PLUGIN_DEBUG(("getaddrinfo failed [%d][%s].\n", errno,
4591- strerror(errno)));
4592+ ret = getaddrinfo(addr[c].addr, port_str, &ai_hints, &ai);
4593+ if (ret != 0) {
4594+ PLUGIN_DEBUG(("getaddrinfo failed [%d][%s].\n", ret,
4595+ gai_strerror(ret)));
4596+ if (ret == EAI_SYSTEM) {
4597+ PLUGIN_DEBUG(("getaddrinfo failed [%d][%s].\n",
4598+ errno, strerror(errno)));
4599+ }
4600+ return KRB5_PLUGIN_NO_HANDLE;
4601 }
4602- return KRB5_PLUGIN_NO_HANDLE;
4603- }
4604
4605- PLUGIN_DEBUG(("addr[%s:%s] family[%d] socktype[%d]\n", addr, port_str,
4606- ai->ai_family, ai->ai_socktype));
4607+ PLUGIN_DEBUG(("addr[%s:%s] family[%d] socktype[%d]\n", addr[c].addr,
4608+ port_str, ai->ai_family, ai->ai_socktype));
4609
4610- if ((family == AF_UNSPEC || ai->ai_family == family) &&
4611- ai->ai_socktype == socktype) {
4612+ if ((family == AF_UNSPEC || ai->ai_family == family) &&
4613+ ai->ai_socktype == socktype) {
4614
4615- ret = cbfunc(cbdata, socktype, ai->ai_addr);
4616- if (ret != 0) {
4617- PLUGIN_DEBUG(("cbfunc failed\n"));
4618- freeaddrinfo(ai);
4619- return ret;
4620+ ret = cbfunc(cbdata, socktype, ai->ai_addr);
4621+ if (ret != 0) {
4622+ PLUGIN_DEBUG(("cbfunc failed\n"));
4623+ freeaddrinfo(ai);
4624+ return ret;
4625+ } else {
4626+ PLUGIN_DEBUG(("[%s] used\n", addr[c].addr));
4627+ }
4628 } else {
4629- PLUGIN_DEBUG(("[%s] used\n", addr));
4630+ PLUGIN_DEBUG(("[%s] NOT used\n", addr[c].addr));
4631 }
4632- } else {
4633- PLUGIN_DEBUG(("[%s] NOT used\n", addr));
4634+ freeaddrinfo(ai);
4635 }
4636- freeaddrinfo(ai);
4637
4638 return 0;
4639 }
4640diff --git a/src/man/de/sss_ssh_knownhostsproxy.1.xml b/src/man/de/sss_ssh_knownhostsproxy.1.xml
4641index da67746..9505389 100644
4642--- a/src/man/de/sss_ssh_knownhostsproxy.1.xml
4643+++ b/src/man/de/sss_ssh_knownhostsproxy.1.xml
4644@@ -80,6 +80,16 @@ Schlüsseln für den Rechner.
4645 </para>
4646 </listitem>
4647 </varlistentry>
4648+ <varlistentry>
4649+ <term>
4650+ <option>-k</option>,<option>--pubkeys</option>
4651+ </term>
4652+ <listitem>
4653+ <para>
4654+ Print the host ssh public keys for host <replaceable>HOST</replaceable>.
4655+ </para>
4656+ </listitem>
4657+ </varlistentry>
4658 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/param_help.xml" />
4659 </variablelist>
4660 </refsect1>
4661diff --git a/src/man/de/sssd-ldap.5.xml b/src/man/de/sssd-ldap.5.xml
4662index 9d39267..0e06fb4 100644
4663--- a/src/man/de/sssd-ldap.5.xml
4664+++ b/src/man/de/sssd-ldap.5.xml
4665@@ -1631,12 +1631,20 @@ GSSAPI getestet und wird unterstützt.
4666 <term>ldap_sasl_authid (Zeichenkette)</term>
4667 <listitem>
4668 <para>
4669- gibt an, welche SASL-Berechtigungs-ID benutzt werden soll. Wenn GSSAPI
4670-verwendet wird, steht dies für den Kerberos-Principal, der für die
4671-Authentifizierung zum Verzeichnis benutzt wird. Diese Option kann entweder
4672-den vollständigen Principal (zum Beispiel Rechner/MeinRechner@EXAMPLE.COM)
4673-oder nur den Namen des Principals (zum Beispiel Rechner/MeinRechner)
4674-enthalten.
4675+ Specify the SASL authorization id to use. When GSSAPI is used, this
4676+represents the Kerberos principal used for authentication to the directory.
4677+This option can either contain the full principal (for example
4678+host/myhost@EXAMPLE.COM) or just the principal name (for example
4679+host/myhost). By default, the value is not set and the following principals
4680+are used: <programlisting>
4681+hostname@REALM
4682+netbiosname$@REALM
4683+host/hostname@REALM
4684+*$@REALM
4685+host/*@REALM
4686+host/*
4687+ </programlisting> If none of them are
4688+found, the first principal in keytab is returned.
4689 </para>
4690 <para>
4691 Voreinstellung Rechner/MeinRechner@BEREICH
4692diff --git a/src/man/es/sss_ssh_knownhostsproxy.1.xml b/src/man/es/sss_ssh_knownhostsproxy.1.xml
4693deleted file mode 100644
4694index be7fbee..0000000
4695--- a/src/man/es/sss_ssh_knownhostsproxy.1.xml
4696+++ /dev/null
4697@@ -1,96 +0,0 @@
4698-<?xml version="1.0" encoding="UTF-8"?>
4699-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
4700-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
4701-<reference>
4702-<title>Páginas de manual de SSSD</title>
4703-<refentry>
4704- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/upstream.xml" />
4705-
4706- <refmeta>
4707- <refentrytitle>sss_ssh_knownhostsproxy</refentrytitle>
4708- <manvolnum>1</manvolnum>
4709- </refmeta>
4710-
4711- <refnamediv id='name'>
4712- <refname>sss_ssh_knownhostsproxy</refname>
4713- <refpurpose>obtiene las claves OpenSSH del host</refpurpose>
4714- </refnamediv>
4715-
4716- <refsynopsisdiv id='synopsis'>
4717- <cmdsynopsis>
4718-<command>sss_ssh_knownhostsproxy</command> <arg choice='opt'>
4719-<replaceable>options</replaceable> </arg> <arg
4720-choice='plain'><replaceable>HOST</replaceable></arg> <arg
4721-choice='opt'><replaceable>PROXY_COMMAND</replaceable></arg></cmdsynopsis>
4722- </refsynopsisdiv>
4723-
4724- <refsect1 id='description'>
4725- <title>DESCRIPCION</title>
4726- <para>
4727- <command>sss_ssh_knownhostsproxy</command> acquires SSH host public keys for
4728-host <replaceable>HOST</replaceable>, stores them in a custom OpenSSH
4729-known_hosts file (see the <quote>SSH_KNOWN_HOSTS FILE FORMAT</quote> section
4730-of <citerefentry><refentrytitle>sshd</refentrytitle>
4731-<manvolnum>8</manvolnum></citerefentry> for more information)
4732-<filename>/var/lib/sss/pubconf/known_hosts</filename> and establishes the
4733-connection to the host.
4734- </para>
4735- <para>
4736- Si se especifica <replaceable>PROXY_COMMAND</replaceable>, se usa para crear
4737-la conexión al host en lugar de abrir un socket.
4738- </para>
4739- <para>
4740- <citerefentry><refentrytitle>ssh</refentrytitle>
4741-<manvolnum>1</manvolnum></citerefentry> puede ser configurado para usar
4742-<command>sss_ssh_knownhostsproxy</command> para autenticación de la clave
4743-del host usando las siguientes directivas
4744-<citerefentry><refentrytitle>ssh</refentrytitle>
4745-<manvolnum>1</manvolnum></citerefentry> configuration: <programlisting>
4746-ProxyCommand /usr/bin/sss_ssh_knownhostsproxy -p %p %h
4747-GlobalKnownHostsFile /var/lib/sss/pubconf/known_hosts
4748-</programlisting>
4749- </para>
4750- </refsect1>
4751-
4752- <refsect1 id='options'>
4753- <title>OPCIONES</title>
4754- <variablelist remap='IP'>
4755- <varlistentry>
4756- <term>
4757- <option>-p</option>,<option>--port</option> <replaceable>PORT</replaceable>
4758- </term>
4759- <listitem>
4760- <para>
4761- Usa el puerto <replaceable>PORT</replaceable> para conectar al host. Por
4762-defecto, el puerto usado es el 22.
4763- </para>
4764- </listitem>
4765- </varlistentry>
4766- <varlistentry>
4767- <term>
4768- <option>-d</option>,<option>--domain</option>
4769-<replaceable>DOMINIO</replaceable>
4770- </term>
4771- <listitem>
4772- <para>
4773- Busca las claves públicas del host en el dominio SSSD
4774-<replaceable>DOMAIN</replaceable>.
4775- </para>
4776- </listitem>
4777- </varlistentry>
4778- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/param_help.xml" />
4779- </variablelist>
4780- </refsect1>
4781-
4782- <refsect1 id='exit_status'>
4783- <title>EXIT STATUS</title>
4784- <para>
4785- In case of success, an exit value of 0 is returned. Otherwise, 1 is
4786-returned.
4787- </para>
4788- </refsect1>
4789-
4790- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/seealso.xml" />
4791-
4792-</refentry>
4793-</reference>
4794diff --git a/src/man/fr/sss_ssh_knownhostsproxy.1.xml b/src/man/fr/sss_ssh_knownhostsproxy.1.xml
4795index 367d463..8024ba9 100644
4796--- a/src/man/fr/sss_ssh_knownhostsproxy.1.xml
4797+++ b/src/man/fr/sss_ssh_knownhostsproxy.1.xml
4798@@ -79,6 +79,16 @@ système. Par défaut, le port 22 est utilisé.
4799 </para>
4800 </listitem>
4801 </varlistentry>
4802+ <varlistentry>
4803+ <term>
4804+ <option>-k</option>,<option>--pubkeys</option>
4805+ </term>
4806+ <listitem>
4807+ <para>
4808+ Print the host ssh public keys for host <replaceable>HOST</replaceable>.
4809+ </para>
4810+ </listitem>
4811+ </varlistentry>
4812 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/param_help.xml" />
4813 </variablelist>
4814 </refsect1>
4815diff --git a/src/man/fr/sssd-ldap.5.xml b/src/man/fr/sssd-ldap.5.xml
4816index cd58ed5..3ef052d 100644
4817--- a/src/man/fr/sssd-ldap.5.xml
4818+++ b/src/man/fr/sssd-ldap.5.xml
4819@@ -1620,11 +1620,20 @@ pris en charge.
4820 <term>ldap_sasl_authid (chaîne)</term>
4821 <listitem>
4822 <para>
4823- Définit l'identité à utiliser pour l'autorisation SASL. Lorsque GSSAPI est
4824-utilisé, c'est l'identifiant Kerberos principal utilisé pour s'authentifier
4825-à l'annuaire. Cette option peut soit contenir le principal complet (par
4826-exemple host/myhost@EXAMPLE.COM), soit juste le nom du principal (par
4827-exemple host/myhost).
4828+ Specify the SASL authorization id to use. When GSSAPI is used, this
4829+represents the Kerberos principal used for authentication to the directory.
4830+This option can either contain the full principal (for example
4831+host/myhost@EXAMPLE.COM) or just the principal name (for example
4832+host/myhost). By default, the value is not set and the following principals
4833+are used: <programlisting>
4834+hostname@REALM
4835+netbiosname$@REALM
4836+host/hostname@REALM
4837+*$@REALM
4838+host/*@REALM
4839+host/*
4840+ </programlisting> If none of them are
4841+found, the first principal in keytab is returned.
4842 </para>
4843 <para>
4844 Par défaut : host/hostname@REALM
4845diff --git a/src/man/ja/sss_ssh_knownhostsproxy.1.xml b/src/man/ja/sss_ssh_knownhostsproxy.1.xml
4846index 6c8932d..802d47d 100644
4847--- a/src/man/ja/sss_ssh_knownhostsproxy.1.xml
4848+++ b/src/man/ja/sss_ssh_knownhostsproxy.1.xml
4849@@ -75,6 +75,16 @@ GlobalKnownHostsFile /var/lib/sss/pubconf/known_hosts
4850 </para>
4851 </listitem>
4852 </varlistentry>
4853+ <varlistentry>
4854+ <term>
4855+ <option>-k</option>,<option>--pubkeys</option>
4856+ </term>
4857+ <listitem>
4858+ <para>
4859+ Print the host ssh public keys for host <replaceable>HOST</replaceable>.
4860+ </para>
4861+ </listitem>
4862+ </varlistentry>
4863 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/param_help.xml" />
4864 </variablelist>
4865 </refsect1>
4866diff --git a/src/man/po/br.po b/src/man/po/br.po
4867index 57277e7..014fe0c 100644
4868--- a/src/man/po/br.po
4869+++ b/src/man/po/br.po
4870@@ -8,7 +8,7 @@ msgid ""
4871 msgstr ""
4872 "Project-Id-Version: sssd-docs 1.16.1\n"
4873 "Report-Msgid-Bugs-To: sssd-devel@redhat.com\n"
4874-"POT-Creation-Date: 2018-06-08 21:00+0200\n"
4875+"POT-Creation-Date: 2018-08-12 13:01+0000\n"
4876 "PO-Revision-Date: 2014-12-14 11:51+0000\n"
4877 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
4878 "Language-Team: Breton (http://www.transifex.com/projects/p/sssd/language/"
4879@@ -299,9 +299,9 @@ msgstr ""
4880
4881 #. type: Content of: <reference><refentry><refsect1><variablelist><varlistentry><listitem><para>
4882 #: sssd.conf.5.xml:133 sssd.conf.5.xml:543 sssd.conf.5.xml:839
4883-#: sssd.conf.5.xml:1491 sssd.conf.5.xml:1521 sssd-ldap.5.xml:1840
4884-#: sssd-ldap.5.xml:1937 sssd-ldap.5.xml:1999 sssd-ldap.5.xml:2565
4885-#: sssd-ldap.5.xml:2630 sssd-ldap.5.xml:2648 sssd-ad.5.xml:227
4886+#: sssd.conf.5.xml:1491 sssd.conf.5.xml:1521 sssd-ldap.5.xml:1851
4887+#: sssd-ldap.5.xml:1948 sssd-ldap.5.xml:2010 sssd-ldap.5.xml:2576
4888+#: sssd-ldap.5.xml:2641 sssd-ldap.5.xml:2659 sssd-ad.5.xml:227
4889 #: sssd-ad.5.xml:341 sssd-ad.5.xml:885 sssd-krb5.5.xml:499
4890 #: sssd-secrets.5.xml:351 sssd-secrets.5.xml:364
4891 msgid "Default: true"
4892@@ -321,16 +321,16 @@ msgstr ""
4893
4894 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para>
4895 #: sssd.conf.5.xml:146 sssd.conf.5.xml:540 sssd.conf.5.xml:722
4896-#: sssd.conf.5.xml:1424 sssd.conf.5.xml:2983 sssd-ldap.5.xml:708
4897-#: sssd-ldap.5.xml:1714 sssd-ldap.5.xml:1733 sssd-ldap.5.xml:1909
4898-#: sssd-ldap.5.xml:2335 sssd-ipa.5.xml:151 sssd-ipa.5.xml:238
4899+#: sssd.conf.5.xml:1424 sssd.conf.5.xml:2980 sssd-ldap.5.xml:708
4900+#: sssd-ldap.5.xml:1714 sssd-ldap.5.xml:1733 sssd-ldap.5.xml:1920
4901+#: sssd-ldap.5.xml:2346 sssd-ipa.5.xml:151 sssd-ipa.5.xml:238
4902 #: sssd-ipa.5.xml:559 sssd-krb5.5.xml:266 sssd-krb5.5.xml:300
4903 #: sssd-krb5.5.xml:471
4904 msgid "Default: false"
4905 msgstr ""
4906
4907 #. type: Content of: <reference><refentry><refsect1><refsect2><para>
4908-#: sssd.conf.5.xml:106 sssd.conf.5.xml:157 sssd-ldap.5.xml:2373
4909+#: sssd.conf.5.xml:106 sssd.conf.5.xml:157 sssd-ldap.5.xml:2384
4910 #: sssd-systemtap.5.xml:82 sssd-systemtap.5.xml:143 sssd-systemtap.5.xml:210
4911 #: sssd-systemtap.5.xml:248 sssd-systemtap.5.xml:304
4912 msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
4913@@ -355,7 +355,7 @@ msgid ""
4914 msgstr ""
4915
4916 #. type: Content of: <refsect1><refsect2><refsect3><variablelist><varlistentry><listitem><para>
4917-#: sssd.conf.5.xml:169 sssd.conf.5.xml:1376 sssd.conf.5.xml:2999
4918+#: sssd.conf.5.xml:169 sssd.conf.5.xml:1376 sssd.conf.5.xml:2996
4919 #: sssd-ldap.5.xml:1585 include/ldap_id_mapping.xml:264
4920 msgid "Default: 10"
4921 msgstr ""
4922@@ -371,7 +371,7 @@ msgid "The [sssd] section"
4923 msgstr "Ar rann [sssd]"
4924
4925 #. type: Content of: <reference><refentry><refsect1><refsect2><variablelist><title>
4926-#: sssd.conf.5.xml:191 sssd.conf.5.xml:3088
4927+#: sssd.conf.5.xml:191 sssd.conf.5.xml:3085
4928 msgid "Section parameters"
4929 msgstr "Arventennoù ar rann"
4930
4931@@ -471,12 +471,12 @@ msgid ""
4932 msgstr ""
4933
4934 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><term>
4935-#: sssd.conf.5.xml:276 sssd.conf.5.xml:2648
4936+#: sssd.conf.5.xml:276 sssd.conf.5.xml:2645
4937 msgid "full_name_format (string)"
4938 msgstr "full_name_format (neudennad)"
4939
4940 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para>
4941-#: sssd.conf.5.xml:279 sssd.conf.5.xml:2651
4942+#: sssd.conf.5.xml:279 sssd.conf.5.xml:2648
4943 msgid ""
4944 "A <citerefentry> <refentrytitle>printf</refentrytitle> <manvolnum>3</"
4945 "manvolnum> </citerefentry>-compatible format that describes how to compose a "
4946@@ -484,39 +484,39 @@ msgid ""
4947 msgstr ""
4948
4949 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><term>
4950-#: sssd.conf.5.xml:290 sssd.conf.5.xml:2662
4951+#: sssd.conf.5.xml:290 sssd.conf.5.xml:2659
4952 msgid "%1$s"
4953 msgstr ""
4954
4955 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><listitem><para>
4956-#: sssd.conf.5.xml:291 sssd.conf.5.xml:2663
4957+#: sssd.conf.5.xml:291 sssd.conf.5.xml:2660
4958 msgid "user name"
4959 msgstr ""
4960
4961 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><term>
4962-#: sssd.conf.5.xml:294 sssd.conf.5.xml:2666
4963+#: sssd.conf.5.xml:294 sssd.conf.5.xml:2663
4964 msgid "%2$s"
4965 msgstr ""
4966
4967 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><listitem><para>
4968-#: sssd.conf.5.xml:297 sssd.conf.5.xml:2669
4969+#: sssd.conf.5.xml:297 sssd.conf.5.xml:2666
4970 msgid "domain name as specified in the SSSD config file."
4971 msgstr ""
4972
4973 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><term>
4974-#: sssd.conf.5.xml:303 sssd.conf.5.xml:2675
4975+#: sssd.conf.5.xml:303 sssd.conf.5.xml:2672
4976 msgid "%3$s"
4977 msgstr ""
4978
4979 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para><variablelist><varlistentry><listitem><para>
4980-#: sssd.conf.5.xml:306 sssd.conf.5.xml:2678
4981+#: sssd.conf.5.xml:306 sssd.conf.5.xml:2675
4982 msgid ""
4983 "domain flat name. Mostly usable for Active Directory domains, both directly "
4984 "configured or discovered via IPA trusts."
4985 msgstr ""
4986
4987 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para>
4988-#: sssd.conf.5.xml:287 sssd.conf.5.xml:2659
4989+#: sssd.conf.5.xml:287 sssd.conf.5.xml:2656
4990 msgid ""
4991 "The following expansions are supported: <placeholder type=\"variablelist\" "
4992 "id=\"0\"/>"
4993@@ -834,7 +834,7 @@ msgid ""
4994 msgstr ""
4995
4996 #. type: Content of: <reference><refentry><refsect1><para><variablelist><varlistentry><listitem><para>
4997-#: sssd.conf.5.xml:588 sssd.conf.5.xml:1388 sssd.conf.5.xml:3049
4998+#: sssd.conf.5.xml:588 sssd.conf.5.xml:1388 sssd.conf.5.xml:3046
4999 #: sssd-ad.5.xml:164 sssd-ad.5.xml:302 sssd-ad.5.xml:316
5000 msgid "Default: Not set"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches