diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-04-17 10:09:47 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-04-17 10:09:47 +0200 |
commit | 948d49c06a25b88eed648e723677e6134d8ba473 (patch) | |
tree | cbe2b6fa7d1ece8c51d8235cf4fb0c8b2393749a /net-fs/samba/files | |
parent | sys-fs/multipath-tools: remove unused patch (diff) | |
download | gentoo-948d49c06a25b88eed648e723677e6134d8ba473.tar.gz gentoo-948d49c06a25b88eed648e723677e6134d8ba473.tar.bz2 gentoo-948d49c06a25b88eed648e723677e6134d8ba473.zip |
net-fs/samba: Replaced no_ads patch with official upstream version.
Package-Manager: Portage-2.3.29, Repoman-2.3.9
Diffstat (limited to 'net-fs/samba/files')
-rw-r--r-- | net-fs/samba/files/samba-4.6-no_ads.patch | 37 | ||||
-rw-r--r-- | net-fs/samba/files/samba-4.7.4-no_ads.patch | 22 |
2 files changed, 37 insertions, 22 deletions
diff --git a/net-fs/samba/files/samba-4.6-no_ads.patch b/net-fs/samba/files/samba-4.6-no_ads.patch new file mode 100644 index 000000000000..e3f3dfd03058 --- /dev/null +++ b/net-fs/samba/files/samba-4.6-no_ads.patch @@ -0,0 +1,37 @@ +From 655504d97a98541bebac812953fd48c49526312d Mon Sep 17 00:00:00 2001 +From: Volker Lendecke <vl@samba.org> +Date: Sat, 3 Feb 2018 07:07:24 +0100 +Subject: [PATCH] libads: Fix the build --without-ads + +Signed-off-by: Volker Lendecke <vl@samba.org> +Reviewed-by: David Disseldorp <ddiss@samba.org> + +Autobuild-User(master): David Disseldorp <ddiss@samba.org> +Autobuild-Date(master): Tue Feb 6 02:47:44 CET 2018 on sn-devel-144 + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13273 + +(cherry picked from commit 859698d29b547217356851094ed8188236e717b6) +--- + source3/libads/kerberos_keytab.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c +index ffd100c..37ac7ba 100644 +--- a/source3/libads/kerberos_keytab.c ++++ b/source3/libads/kerberos_keytab.c +@@ -640,7 +640,11 @@ int ads_keytab_list(const char *keytab_name) + } + + if (keytab_name == NULL) { ++#ifdef HAVE_ADS + ret = ads_keytab_open(context, &keytab); ++#else ++ ret = ENOENT; ++#endif + } else { + ret = smb_krb5_kt_open(context, keytab_name, False, &keytab); + } +-- +1.9.1 + diff --git a/net-fs/samba/files/samba-4.7.4-no_ads.patch b/net-fs/samba/files/samba-4.7.4-no_ads.patch deleted file mode 100644 index d4c26a39a737..000000000000 --- a/net-fs/samba/files/samba-4.7.4-no_ads.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://lists.samba.org/archive/samba-technical/2017-December/124629.html - ---- a/source3/libads/kerberos_keytab.c -+++ b/source3/libads/kerberos_keytab.c -@@ -32,8 +32,6 @@ - - #ifdef HAVE_KRB5 - --#ifdef HAVE_ADS -- - /* This MAX_NAME_LEN is a constant defined in krb5.h */ - #ifndef MAX_KEYTAB_NAME_LEN - #define MAX_KEYTAB_NAME_LEN 1100 -@@ -85,6 +83,8 @@ - return ret; - } - -+#ifdef HAVE_ADS -+ - /********************************************************************** - Adds a single service principal, i.e. 'host' to the system keytab - ***********************************************************************/ |