diff options
| author | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-08-09 10:05:38 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-08-09 10:06:38 +0200 |
| commit | 90b26f87640c0ebff53a304b15d168b1aca738dd (patch) | |
| tree | 05a08db3b4bbf6fe2dd53e1e7fcd819cd4fd9179 | |
| parent | d9c3f93f3f9e416930b3e72c6e22bd7f3f7f1c50 (diff) | |
| download | buildroot-90b26f87640c0ebff53a304b15d168b1aca738dd.tar.gz buildroot-90b26f87640c0ebff53a304b15d168b1aca738dd.zip | |
package/samba4: reformat patch 0002 as Git-formatted patch
This commit reformats
0002-patch-source3__libads__kerberos_keytab.c.patch as a Git-formatted
patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch (renamed from package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch) | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch b/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch index 1213659c8d..45d3050a39 100644 --- a/package/samba4/0002-patch-source3__libads__kerberos_keytab.c.patch +++ b/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch @@ -1,5 +1,7 @@ -From: Timur I. Bakeyev <timur@freebsd.org> -Subject: Fix compilation of Samba 4.7.4 with disabled ADS +From da2f2cf8e7a1dfcb661b707e4649cec1e8a0e79c Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Thu, 9 Aug 2018 10:03:06 +0200 +Subject: [PATCH] Fix compilation of Samba 4.7.4 with disabled ADS Downloaded from upstream mailinglist https://lists.samba.org/archive/samba-technical/2017-December/124629.html @@ -8,9 +10,14 @@ Patch originates from FreeBSD: https://svnweb.freebsd.org/ports/head/net/samba47/files/patch-source3__libads__kerberos_keytab.c?revision=457119&view=markup Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + source3/libads/kerberos_keytab.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/source3/libads/kerberos_keytab.c.orig 2017-12-23 14:23:53.247467000 +0100 -+++ b/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 +diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c +index 37ac7ba985e..71250962090 100644 +--- a/source3/libads/kerberos_keytab.c ++++ b/source3/libads/kerberos_keytab.c @@ -32,8 +32,6 @@ #ifdef HAVE_KRB5 @@ -20,7 +27,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> /* 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 @@ +@@ -85,6 +83,8 @@ out: return ret; } @@ -29,3 +36,6 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> /********************************************************************** Adds a single service principal, i.e. 'host' to the system keytab ***********************************************************************/ +-- +2.14.4 + |
