From ec91a059a774a30af83927f114e7c4fa0d2b7623 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@fedoraproject.org>
Date: Fri, 20 Oct 2017 18:09:42 +0200
Subject: [PATCH] Revert "libwbclient-sssd: update interface to version 0.14"

This reverts commit d1b2a3394e496f749151ccd5aca29507ca69214b.
---
 src/conf_macros.m4                          | 4 ++--
 src/sss_client/libwbclient/wbclient.exports | 3 ---
 src/sss_client/libwbclient/wbclient_sssd.h  | 9 ++-------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index 323830b4246cb94cba74042f0169f78b09087f17..2fa7ae9c4dec1007924f44a8d043909e378a6dd3 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -743,10 +743,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.14"
+        libwbclient_version="0.13"
         AC_SUBST(libwbclient_version)
 
-        libwbclient_version_info="14:0:14"
+        libwbclient_version_info="13:0:13"
         AC_SUBST(libwbclient_version_info)
     fi
     AM_CONDITIONAL([BUILD_LIBWBCLIENT], [test x"$with_libwbclient" = xyes])
diff --git a/src/sss_client/libwbclient/wbclient.exports b/src/sss_client/libwbclient/wbclient.exports
index 7abbaba6036c604177f247521e877c86720a1b4d..9d3c2040e7d393c0057d44864826cefc2e3f7a31 100644
--- a/src/sss_client/libwbclient/wbclient.exports
+++ b/src/sss_client/libwbclient/wbclient.exports
@@ -150,6 +150,3 @@ WBCLIENT_0.13 {
         wbcUnixIdsToSids;
         wbcCtxUnixIdsToSids;
 } WBCLIENT_0.12;
-
-WBCLIENT_0.14 {
-} WBCLIENT_0.13;
diff --git a/src/sss_client/libwbclient/wbclient_sssd.h b/src/sss_client/libwbclient/wbclient_sssd.h
index f2fe8fe60e2ff55399e408056ccfbbfff044b88b..50ba7f84304df5f24a31cbbad857f22d1c70964d 100644
--- a/src/sss_client/libwbclient/wbclient_sssd.h
+++ b/src/sss_client/libwbclient/wbclient_sssd.h
@@ -74,11 +74,9 @@ const char *wbcErrorString(wbcErr error);
  *  0.11: Extended wbcAuthenticateUserEx to provide PAC parsing
  *  0.12: Added wbcCtxCreate and friends
  *  0.13: Added wbcCtxUnixIdsToSids and wbcUnixIdsToSids
- *  0.14: Added "authoritative" to wbcAuthErrorInfo
- *        Added WBC_SID_NAME_LABEL
  **/
 #define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 14
+#define WBCLIENT_MINOR_VERSION 13
 #define WBCLIENT_VENDOR_VERSION "Samba libwbclient"
 struct wbcLibraryDetails {
     uint16_t major_version;
@@ -140,8 +138,7 @@ enum wbcSidType {
     WBC_SID_NAME_DELETED=6,
     WBC_SID_NAME_INVALID=7,
     WBC_SID_NAME_UNKNOWN=8,
-    WBC_SID_NAME_COMPUTER=9,
-    WBC_SID_NAME_LABEL=10
+    WBC_SID_NAME_COMPUTER=9
 };
 
 /**
@@ -319,7 +316,6 @@ struct wbcChangePasswordParams {
 #define WBC_MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT         0x00000020
 #define WBC_MSV1_0_RETURN_PROFILE_PATH                0x00000200
 #define WBC_MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT    0x00000800
-#define WBC_MSV1_0_ALLOW_MSVCHAPV2                    0x00010000
 
 /* wbcAuthUserParams->flags */
 
@@ -422,7 +418,6 @@ struct wbcAuthErrorInfo {
     char *nt_string;
     int32_t pam_error;
     char *display_string;
-    uint8_t authoritative;
 };
 
 /**
-- 
2.14.2