rpms/sssd
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert upstream patch for libwbclient-0.13

Browse Source 
fedora <= 24 has just samba with libwbclient-0.12

(cherry picked from commit b9870a350b)
This commit is contained in:
Lukas Slebodnik 2016-10-20 16:37:43 +02:00
parent 65d0de96df
commit 75cf7a2d6e
2 changed files with 152 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
0500-Revert-libwbclient-sssd-update-interface-to-version-.patch Normal file
View File

@ -0,0 +1,151 @@
From d08e8b94a2ba37e6480349d0e6746fdee0d648b0 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Thu, 20 Oct 2016 16:25:19 +0200
Subject: [PATCH] Revert "libwbclient-sssd: update interface to version 0.13"
This reverts commit f3347a0c72afc75b4d829e9981d1bac6b05a8306.
---
src/conf_macros.m4 | 4 ++--
src/sss_client/libwbclient/wbc_ctx_sssd.c | 7 -------
src/sss_client/libwbclient/wbc_idmap_sssd.c | 26 ------------------------
src/sss_client/libwbclient/wbclient.exports | 6 ------
src/sss_client/libwbclient/wbclient_sssd.h | 31 +----------------------------
5 files changed, 3 insertions(+), 71 deletions(-)
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index 427b0e08d400d6e5628537b28bb93bc2fc6239a4..bc295c5e79d3c699b25cebf38e8c0f0112de010d 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -727,10 +727,10 @@ AC_DEFUN([WITH_LIBWBCLIENT],
if test x"$with_libwbclient" = xyes; then
AC_DEFINE(BUILD_LIBWBCLIENT, 1, [whether to build SSSD implementation of libwbclient])
- libwbclient_version="0.13"
+ libwbclient_version="0.12"
AC_SUBST(libwbclient_version)
- libwbclient_version_info="13:0:13"
+ libwbclient_version_info="12:0:12"
AC_SUBST(libwbclient_version_info)
fi
AM_CONDITIONAL([BUILD_LIBWBCLIENT], [test x"$with_libwbclient" = xyes])
diff --git a/src/sss_client/libwbclient/wbc_ctx_sssd.c b/src/sss_client/libwbclient/wbc_ctx_sssd.c
index 0f5aff473e984fbc630fc0ca8aa1647de51cbde4..1f259ee00e48d68d8da3f6b0abc12175a70c1f20 100644
--- a/src/sss_client/libwbclient/wbc_ctx_sssd.c
+++ b/src/sss_client/libwbclient/wbc_ctx_sssd.c
@@ -167,13 +167,6 @@ wbcErr wbcCtxSidsToUnixIds(struct wbcContext *ctx,
WBC_SSSD_NOT_IMPLEMENTED;
}
-wbcErr wbcCtxUnixIdsToSids(struct wbcContext *ctx,
- const struct wbcUnixId *ids, uint32_t num_ids,
- struct wbcDomainSid *sids)
-{
- WBC_SSSD_NOT_IMPLEMENTED;
-}
-
wbcErr wbcCtxAllocateUid(struct wbcContext *ctx, uid_t *puid)
{
WBC_SSSD_NOT_IMPLEMENTED;
diff --git a/src/sss_client/libwbclient/wbc_idmap_sssd.c b/src/sss_client/libwbclient/wbc_idmap_sssd.c
index c8da9754265a1ad3ef098c545a2b2d8d3c548d4d..6b5f525f0433c948e4d570d177dc6cffd82eff40 100644
--- a/src/sss_client/libwbclient/wbc_idmap_sssd.c
+++ b/src/sss_client/libwbclient/wbc_idmap_sssd.c
@@ -202,29 +202,3 @@ wbcErr wbcSidsToUnixIds(const struct wbcDomainSid *sids, uint32_t num_sids,
return WBC_ERR_SUCCESS;
}
-
-wbcErr wbcUnixIdsToSids(const struct wbcUnixId *ids, uint32_t num_ids,
- struct wbcDomainSid *sids)
-{
- size_t c;
- wbcErr wbc_status;
-
- for (c = 0; c < num_ids; c++) {
- switch (ids[c].type) {
- case WBC_ID_TYPE_UID:
- wbc_status = wbcUidToSid(ids[c].id.uid, &sids[c]);
- break;
- case WBC_ID_TYPE_GID:
- wbc_status = wbcGidToSid(ids[c].id.gid, &sids[c]);
- break;
- default:
- wbc_status = WBC_ERR_INVALID_PARAM;
- }
-
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- sids[c] = (struct wbcDomainSid){ 0 };
- };
- }
-
- return WBC_ERR_SUCCESS;
-}
diff --git a/src/sss_client/libwbclient/wbclient.exports b/src/sss_client/libwbclient/wbclient.exports
index 9d3c2040e7d393c0057d44864826cefc2e3f7a31..574c1d1fe232fad0a4c104de086977515a05ab84 100644
--- a/src/sss_client/libwbclient/wbclient.exports
+++ b/src/sss_client/libwbclient/wbclient.exports
@@ -144,9 +144,3 @@ WBCLIENT_0.12 {
wbcCtxPingDc;
wbcCtxPingDc2;
} WBCLIENT_0.11;
-
-WBCLIENT_0.13 {
- global:
- wbcUnixIdsToSids;
- wbcCtxUnixIdsToSids;
-} WBCLIENT_0.12;
diff --git a/src/sss_client/libwbclient/wbclient_sssd.h b/src/sss_client/libwbclient/wbclient_sssd.h
index 50ba7f84304df5f24a31cbbad857f22d1c70964d..ec6d032814445bff0819b4de0df07ccf4008aefc 100644
--- a/src/sss_client/libwbclient/wbclient_sssd.h
+++ b/src/sss_client/libwbclient/wbclient_sssd.h
@@ -73,10 +73,9 @@ const char *wbcErrorString(wbcErr error);
* 0.10: Added wbcPingDc2()
* 0.11: Extended wbcAuthenticateUserEx to provide PAC parsing
* 0.12: Added wbcCtxCreate and friends
- * 0.13: Added wbcCtxUnixIdsToSids and wbcUnixIdsToSids
**/
#define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 13
+#define WBCLIENT_MINOR_VERSION 12
#define WBCLIENT_VENDOR_VERSION "Samba libwbclient"
struct wbcLibraryDetails {
uint16_t major_version;
@@ -1032,34 +1031,6 @@ wbcErr wbcSidsToUnixIds(const struct wbcDomainSid *sids, uint32_t num_sids,
struct wbcUnixId *ids);
/**
- * @brief Convert a list of unix ids to sids
- *
- * @param ctx wbclient Context
- * @param ids Pointer to an array of UNIX IDs to convert
- * @param num_ids Number of UNIX IDs
- * @param sids Preallocated output array for translated SIDs
- *
- * @return #wbcErr
- *
- **/
-wbcErr wbcCtxUnixIdsToSids(struct wbcContext *ctx,
- const struct wbcUnixId *ids, uint32_t num_ids,
- struct wbcDomainSid *sids);
-
-/**
- * @brief Convert a list of unix ids to sids
- *
- * @param ids Pointer to an array of UNIX IDs to convert
- * @param num_ids Number of UNIX IDs
- * @param sids Preallocated output array for translated SIDs
- *
- * @return #wbcErr
- *
- **/
-wbcErr wbcUnixIdsToSids(const struct wbcUnixId *ids, uint32_t num_ids,
- struct wbcDomainSid *sids);
-
-/**
* @brief Obtain a new uid from Winbind
*
* @param *ctx wbclient Context
--
2.9.3

1
sssd.spec
View File

@ -35,6 +35,7 @@ Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
### Patches ###
Patch0500: 0500-Revert-libwbclient-sssd-update-interface-to-version-.patch
### Dependencies ###