- rediff patches

[packages/sssd.git] / samba-4.12.patch

diff --git a/samba-4.12.patch b/samba-4.12.patch
index 5be3f41172312afad0751980252d5bb329d5e9be..d0489414fc8113240cb7106c5c5750d344756572 100644 (file)
--- a/samba-4.12.patch
+++ b/samba-4.12.patch
@@ -1,27 +1,7 @@
-From bc56b10aea999284458dcc293b54cf65288e325d Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Fri, 24 Jan 2020 15:17:39 +0100
-Subject: [PATCH] Fix build failure against samba 4.12.0rc1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The ndr_pull_get_switch() function was dropped, but it was just a wrapper
-around the ndr_token_peek() function, so we can use this approach on both
-old and new versions of libndr.
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
-
-Reviewed-by: Pavel Březina <pbrezina@redhat.com>
----
- src/providers/ad/ad_gpo_ndr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c
-index d57303349..8f405aa62 100644
---- a/src/providers/ad/ad_gpo_ndr.c
-+++ b/src/providers/ad/ad_gpo_ndr.c
-@@ -105,7 +105,7 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr,
+diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/ad/ad_gpo_ndr.c sssd-1.13.4/src/providers/ad/ad_gpo_ndr.c
+--- sssd-1.13.4.org/src/providers/ad/ad_gpo_ndr.c      2021-03-03 21:59:15.132967290 +0100
++++ sssd-1.13.4/src/providers/ad/ad_gpo_ndr.c  2021-03-03 21:59:15.283014840 +0100
+@@ -105,7 +105,7 @@ ndr_pull_security_ace_object_type(struct
                                    union security_ace_object_type *r)
  {
      uint32_t level;
@@ -30,7 +10,7 @@ index d57303349..8f405aa62 100644
      NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
      if (ndr_flags & NDR_SCALARS) {
          NDR_CHECK(ndr_pull_union_align(ndr, 4));
-@@ -135,7 +135,7 @@ ndr_pull_security_ace_object_inherited_type(struct ndr_pull *ndr,
+@@ -135,7 +135,7 @@ ndr_pull_security_ace_object_inherited_t
                                              union security_ace_object_inherited_type *r)
  {
      uint32_t level;
@@ -39,7 +19,7 @@ index d57303349..8f405aa62 100644
      NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
      if (ndr_flags & NDR_SCALARS) {
          NDR_CHECK(ndr_pull_union_align(ndr, 4));
-@@ -198,7 +198,7 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr,
+@@ -198,7 +198,7 @@ ndr_pull_security_ace_object_ctr(struct
                                   union security_ace_object_ctr *r)
  {
      uint32_t level;
@@ -48,6 +28,3 @@ index d57303349..8f405aa62 100644
      NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
      if (ndr_flags & NDR_SCALARS) {
          NDR_CHECK(ndr_pull_union_align(ndr, 4));
--- 
-2.20.1
-