From 6d370601d4c2155a85e19f9500127138b4a2f92d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 6 Feb 2018 12:57:05 +0100 Subject: [PATCH] Revert "Workaround for BZ1537183" This reverts commit 0a5a3926849e0a9100ecb8d11ff233666df36ced. nsupdate is fixed on rawhide.i686 --- ...-unit-test-with-missing-features-in-.patch | 43 ------------------- sssd.spec | 1 - 2 files changed, 44 deletions(-) delete mode 100644 0506-dyndns_tests-Fix-unit-test-with-missing-features-in-.patch diff --git a/0506-dyndns_tests-Fix-unit-test-with-missing-features-in-.patch b/0506-dyndns_tests-Fix-unit-test-with-missing-features-in-.patch deleted file mode 100644 index c5805a8..0000000 --- a/0506-dyndns_tests-Fix-unit-test-with-missing-features-in-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8bf5237eea4f1afea3656a3385aa4fcdc2f28ffd Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Mon, 22 Jan 2018 17:23:32 +0100 -Subject: [PATCH] dyndns_tests: Fix unit test with missing features in nsupdate - -We return different string in the function nsupdate_msg_add_realm_cmd -if realm command is not supported by nsupdate. -However cmocka based unit test did not expect such string and failed. ---- - src/tests/cmocka/test_dyndns.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/tests/cmocka/test_dyndns.c b/src/tests/cmocka/test_dyndns.c -index fafd4d8a595cc608447d4068eeb0cee2ba819d89..a105dd6e6093c63686ed30384b42d6a942d1ee9f 100644 ---- a/src/tests/cmocka/test_dyndns.c -+++ b/src/tests/cmocka/test_dyndns.c -@@ -406,7 +406,11 @@ void dyndns_test_create_fwd_msg(void **state) - - assert_string_equal(msg, - "server Winterfell\n" -+#ifdef HAVE_NSUPDATE_REALM - "realm North\n" -+#else -+ "\n" -+#endif - "update delete bran_stark. in A\n" - "update add bran_stark. 1234 in A 192.168.0.2\n" - "send\n" -@@ -423,7 +427,11 @@ void dyndns_test_create_fwd_msg(void **state) - assert_int_equal(ret, EOK); - - assert_string_equal(msg, -+#ifdef HAVE_NSUPDATE_REALM - "realm North\n" -+#else -+ "\n" -+#endif - "update delete bran_stark. in A\n" - "update add bran_stark. 1234 in A 192.168.0.2\n" - "send\n" --- -2.15.1 - diff --git a/sssd.spec b/sssd.spec index 1f37a46..3f2fac6 100644 --- a/sssd.spec +++ b/sssd.spec @@ -126,7 +126,6 @@ Patch0502: 0502-SYSTEMD-Use-capabilities.patch Patch0503: 0503-Disable-stopping-idle-socket-activated-responders.patch Patch0504: 0504-KCM-temporary-increase-hardcoded-buffers.patch Patch0505: 0505-libnfsidmap-Use-public-plugin-header-file-if-availab.patch -Patch0506: 0506-dyndns_tests-Fix-unit-test-with-missing-features-in-.patch ### Dependencies ###