File 0029-winbind-idmap-plugin-Fix-struct-idmap_doma... of Package sssd.19130

Overview Repositories Revisions Requests Users Attributes Meta

File 0029-winbind-idmap-plugin-Fix-struct-idmap_domain-definit.patch of Package sssd.19130

From 0afa3a4a3a4657a291ec1d0f805cc9e3414de3f5 Mon Sep 17 00:00:00 2001
From: Samuel Cabrero <scabrero@suse.de>
Date: Tue, 17 Nov 2020 12:35:03 +0100
Subject: [PATCH] winbind idmap plugin: Fix struct idmap_domain definition

The patch for samba bug 13052 was backported to samba >= 4.7.4 adding
the dom_sid field to the idmap_domain struct.

This missmatch in the struct definition causes the plugin to fail
all unixids_to_sids and sids_to_unixids calls with
NT_STATUS_INVALID_PARAMETER for samba versions between 4.7.4 and 4.8.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>

Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit 08c9ec70826480d81b8b5c575d59fc3ace3430d3)
---
 src/external/samba.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/external/samba.m4 b/src/external/samba.m4
index f4c8056cd..6d0b773c9 100644
--- a/src/external/samba.m4
+++ b/src/external/samba.m4
@@ -126,7 +126,9 @@ int main(void)
     samba_minor_version=`echo -e '#include <samba/version.h>\nSAMBA_VERSION_MINOR' | $CPP $SMBCLIENT_CFLAGS -P -`
     samba_release_version=`echo -e '#include <samba/version.h>\nSAMBA_VERSION_RELEASE' | $CPP $SMBCLIENT_CFLAGS -P -`
     AC_MSG_NOTICE([Samba version: $samba_major_version $samba_minor_version $samba_release_version])
-    if test $samba_major_version -ge 4 -a $samba_minor_version -ge 8 ; then
+    if ([[ $samba_major_version -gt 4 ]]) ||
+       ([[ $samba_major_version -eq 4 ]] && [[ $samba_minor_version -ge 8 ]]) ||
+       ([[ $samba_major_version -eq 4 ]] && [[ $samba_minor_version -eq 7 ]] && [[ $samba_release_version -ge 4 ]]); then
         AC_DEFINE_UNQUOTED(SMB_IDMAP_DOMAIN_HAS_DOM_SID, 1,
                            [Samba's struct idmap_domain has dom_sid member])
         AC_MSG_NOTICE([Samba's struct idmap_domain has dom_sid member])
-- 
2.29.2

Places

File 0029-winbind-idmap-plugin-Fix-struct-idmap_domain-definit.patch of Package sssd.19130

Places