On (15/11/13 17:28), Michal Židek wrote:
On 11/14/2013 01:14 PM, Lukas Slebodnik wrote:>>From
>> >- ((uint32_t *)body)[0] = num-skipped; /* num results */
>> >- ((uint32_t *)body)[1] = 0; /* reserved */
>> >+ SAFEALIGN_SETMEM_UINT32(body, num - skipped, NULL); /* num
results */
>> >+ SAFEALIGN_SETMEM_UINT32(body + sizeof(uint32_t), 0, NULL);
/* reserved */
> Here is an conflict due to patch "NSS: Set packet length for initgroups"
Resolved.
>
>> >
>> > return EOK;
>> >}
New patch is attached.
Michal
From 29f8a7522d60949cb1d37b0e66669509f39fb71a Mon Sep 17 00:00:00
2001
From: Michal Zidek <mzidek(a)redhat.com>
Date: Wed, 28 Aug 2013 12:46:58 +0200
Subject: [PATCH 4/7] responder: Use SAFEALIGN macros where appropriate.
https://fedorahosted.org/sssd/ticket/1359
---
src/responder/autofs/autofssrv_cmd.c | 8 ++++--
src/responder/common/responder_cmd.c | 20 ++++++++++----
src/responder/nss/nsssrv_cmd.c | 52 +++++++++++++++++++----------------
src/responder/nss/nsssrv_mmap_cache.c | 2 +-
src/responder/nss/nsssrv_netgroup.c | 18 ++++++++----
src/responder/nss/nsssrv_services.c | 9 ++++--
6 files changed, 70 insertions(+), 39 deletions(-)
Few warnings are not fixed in the file src/responder/nss/nsssrv_cmd.c
and patches {0005, 0006} do not change this file.
CC src/responder/nss/nsssrv_cmd.o
src/responder/nss/nsssrv_cmd.c:1017:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[0] = 1; /* num results */
^~~~~~~~~~~~~~~~
src/responder/nss/nsssrv_cmd.c:1018:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[1] = 0; /* reserved */
^~~~~~~~~~~~~~~~
src/responder/nss/nsssrv_cmd.c:1019:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[2] = (uint32_t) SSS_ID_TYPE_GID;
^~~~~~~~~~~~~~~~
src/responder/nss/nsssrv_cmd.c:4400:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[0] = 1; /* num results */
^~~~~~~~~~~~~~~~
src/responder/nss/nsssrv_cmd.c:4401:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[1] = 0; /* reserved */
^~~~~~~~~~~~~~~~
src/responder/nss/nsssrv_cmd.c:4402:6: warning: cast from 'uint8_t *' (aka
'unsigned char *') to
'uint32_t *' (aka 'unsigned int *') increases required alignment
from 1 to 4 [-Wcast-align]
((uint32_t *)body)[2] = (uint32_t) SSS_ID_TYPE_GID;
^~~~~~~~~~~~~~~~
6 warnings generated.
LS