From 26151dabf9cb68b0bba9c86cb330365f150752e8 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: May 30 2012 19:10:43 +0000 Subject: Fix regression in endianness patch --- diff --git a/0022-Revert-the-client-packet-length-too-after-reverting-.patch b/0022-Revert-the-client-packet-length-too-after-reverting-.patch new file mode 100644 index 0000000..af7850d --- /dev/null +++ b/0022-Revert-the-client-packet-length-too-after-reverting-.patch @@ -0,0 +1,26 @@ +From 00347425aa105f2374ae46271c2a02ea4f78101a Mon Sep 17 00:00:00 2001 +From: Jakub Hrozek +Date: Tue, 29 May 2012 17:35:23 +0200 +Subject: [PATCH 22/22] Revert the client packet length, too, after reverting + the packet protocol + +--- + src/sss_client/nss_services.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sss_client/nss_services.c b/src/sss_client/nss_services.c +index 159583d747fdd5b6dfbbda2c7a44b19a83ed1a1d..5f98d8dc983a197939c501baad54aa62cdb5176b 100644 +--- a/src/sss_client/nss_services.c ++++ b/src/sss_client/nss_services.c +@@ -286,7 +286,7 @@ _nss_sss_getservbyport_r(int port, const char *protocol, + } + } + +- rd.len = sizeof(uint16_t)*2 + proto_len + 1; ++ rd.len = sizeof(uint32_t)*2 + proto_len + 1; + data = malloc(sizeof(uint8_t)*rd.len); + if (data == NULL) { + nret = NSS_STATUS_TRYAGAIN; +-- +1.7.10.2 + diff --git a/sssd.spec b/sssd.spec index 9a641cf..2aae801 100644 --- a/sssd.spec +++ b/sssd.spec @@ -16,7 +16,7 @@ Name: sssd Version: 1.9.0 -Release: 3%{?dist}.beta1 +Release: 4%{?dist}.beta1 Group: Applications/System Summary: System Security Services Daemon License: GPLv3+ @@ -49,6 +49,7 @@ Patch0018: 0018-Fixed-issue-in-SELinux-user-maps.patch Patch0019: 0019-NSS-Fix-segfault-when-mmap-cache-cannot-be-initializ.patch Patch0020: 0020-Send-16bit-protocol-numbers-from-the-sss_client.patch Patch0021: 0021-NSS-Restore-original-protocol-for-getservbyport.patch +Patch0022: 0022-Revert-the-client-packet-length-too-after-reverting-.patch ### Dependencies ### @@ -511,6 +512,9 @@ fi %postun -n libipa_hbac -p /sbin/ldconfig %changelog +* Tue May 29 2012 Stephen Gallagher - 1.9.0-4.beta1 +- Fix regression in endianness patch + * Tue May 29 2012 Stephen Gallagher - 1.9.0-3.beta1 - Rebuild SSSD against ding-libs 0.3.0beta1 - Fix endianness bug in service map protocol