Patchwork Patch to get cifs.upcall to compile with Heimdal

login
register
mail settings
Submitter Torsten Kurbad
Date April 1, 2010, 12:29 p.m.
Message ID <20100401142928.60c58900@atalante.iwm-kmrc.de>
Download mbox | patch
Permalink /patch/49211/
State New
Headers show

Comments

Torsten Kurbad - April 1, 2010, 12:29 p.m.
Hi Jeff,

I now split up the patches and reintroduced the first variant for
krb5.h inclusion.

Best regards,
Torsten
Jeff Layton - April 2, 2010, 2:14 a.m.
On Thu, 1 Apr 2010 14:29:28 +0200
Torsten Kurbad <samba-technical@tk-webart.de> wrote:

> Hi Jeff,
> 
> I now split up the patches and reintroduced the first variant for
> krb5.h inclusion.
> 
> Best regards,
> Torsten

Committed.

Thanks,

Patch

From 9b7f69afc1f5eef1f338ea02f7cec98719ed6163 Mon Sep 17 00:00:00 2001
From: Torsten Kurbad <torsten@tk-webart.de>
Date: Thu, 1 Apr 2010 14:15:34 +0200
Subject: [PATCH 2/2] cifs-upcall krb5.h inclusion quick fix

---
 cifs.upcall.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cifs.upcall.c b/cifs.upcall.c
index 7c8d586..55ff574 100644
--- a/cifs.upcall.c
+++ b/cifs.upcall.c
@@ -31,7 +31,11 @@  create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 
 #include <string.h>
 #include <getopt.h>
+#ifdef HAVE_KRB5_KRB5_H
 #include <krb5/krb5.h>
+#elif defined(HAVE_KRB5_H)
+#include <krb5.h>
+#endif
 #include <syslog.h>
 #include <dirent.h>
 #include <sys/types.h>
-- 
1.7.0.3