From 7af73eb272311f15d357c1d41a1f49a795eb20b8 Mon Sep 17 00:00:00 2001
From: Benjamin Kaduk <kaduk@mit.edu>
Date: Thu, 9 Jan 2014 23:54:45 -0500
Subject: [PATCH] Disable deprecated warnings for krb5 routines

In OS X 10.9 Mavericks, Apple has marked all of the krb5 routines
as deprecated (in favor of the GSS framework).  We must disable
these warnings in order to allow the buildslave to have a successful
build.

Luckily, Apple has left in rope for us to programmatically disable
the deprecated attribute with a preprocessor macro.  Defining this
macro should be safe everywhere, so do so unconditionally.

This commit touches a few more files than the version on master does,
since the 1.6 branch is using the krb5 library for its rxkad-k5
implementation; the files in auth/ and rxkad/ are specific to 1.6.

Reviewed-on: http://gerrit.openafs.org/10699
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 17c50911f79382e3ba8960e4b6c122b348e9baef)

Change-Id: Id0e806029e25583698574bf3df626ce12a72312a
Reviewed-on: http://gerrit.openafs.org/10735
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---
 src/aklog/aklog.c           | 1 +
 src/aklog/asetkey.c         | 1 +
 src/aklog/klog.c            | 1 +
 src/aklog/krb_util.c        | 1 +
 src/aklog/skipwrap.c        | 1 +
 src/auth/akimpersonate.c    | 1 +
 src/auth/authcon.c          | 1 +
 src/libafscp/afscp_server.c | 1 +
 src/libafscp/afscp_util.c   | 1 +
 src/rxkad/ticket5_keytab.c  | 1 +
 10 files changed, 10 insertions(+)

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index aac7e3352..c282c2471 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -63,6 +63,7 @@
 #include <pwd.h>
 
 #include <afs/stds.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 #ifdef HAVE_COM_ERR_H
 # include <com_err.h>
diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 180b6f9a3..c980a2eb0 100644
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <afs/stds.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 
 #ifndef HAVE_KERBEROSV_HEIM_ERR_H
diff --git a/src/aklog/klog.c b/src/aklog/klog.c
index 89b327f9c..781ea9ab3 100644
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -33,6 +33,7 @@
 #endif
 #include <afs/ptclient.h>
 #include <afs/cmd.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 
 #ifdef HAVE_KRB5_CREDS_KEYBLOCK
diff --git a/src/aklog/krb_util.c b/src/aklog/krb_util.c
index f256803a8..cc451234b 100644
--- a/src/aklog/krb_util.c
+++ b/src/aklog/krb_util.c
@@ -15,6 +15,7 @@
 #include <kerberosIV/mit-copyright.h>
 #endif
 #include <afs/stds.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include "aklog.h"
 #include <krb5.h>
 
diff --git a/src/aklog/skipwrap.c b/src/aklog/skipwrap.c
index 75c63fd63..2fa246bd0 100644
--- a/src/aklog/skipwrap.c
+++ b/src/aklog/skipwrap.c
@@ -32,6 +32,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 #include <stdio.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include "aklog.h"
 #include <krb5.h>
 #include "skipwrap.h"
diff --git a/src/auth/akimpersonate.c b/src/auth/akimpersonate.c
index 195807a91..d5222044d 100644
--- a/src/auth/akimpersonate.c
+++ b/src/auth/akimpersonate.c
@@ -65,6 +65,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 
 #include "akimpersonate.h"
diff --git a/src/auth/authcon.c b/src/auth/authcon.c
index 1a9c26807..d2d49b71d 100644
--- a/src/auth/authcon.c
+++ b/src/auth/authcon.c
@@ -28,6 +28,7 @@
 #include <rx/rxkad.h>
 #if defined(USE_RXKAD_KEYTAB) && !defined(UKERNEL)
 #include <afs/dirpath.h>
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 #endif
 #include <rx/rx.h>
diff --git a/src/libafscp/afscp_server.c b/src/libafscp/afscp_server.c
index 6ebd22bac..2b08e69f6 100644
--- a/src/libafscp/afscp_server.c
+++ b/src/libafscp/afscp_server.c
@@ -37,6 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #include <rx/rx.h>
 #ifdef HAVE_KERBEROS
+# define KERBEROS_APPLE_DEPRECATED(x)
 # include <krb5.h>
 #endif
 #include "afscp.h"
diff --git a/src/libafscp/afscp_util.c b/src/libafscp/afscp_util.c
index 424354b02..ac74252ad 100644
--- a/src/libafscp/afscp_util.c
+++ b/src/libafscp/afscp_util.c
@@ -37,6 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rx/rx_null.h>
 #include <rx/rxkad.h>
 #ifdef HAVE_KERBEROS
+# define KERBEROS_APPLE_DEPRECATED(x)
 # include <krb5.h>
 #endif
 #include "afscp.h"
diff --git a/src/rxkad/ticket5_keytab.c b/src/rxkad/ticket5_keytab.c
index 329140c09..ca75fed00 100644
--- a/src/rxkad/ticket5_keytab.c
+++ b/src/rxkad/ticket5_keytab.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include <krb5.h>
 
 #ifdef  RX_ENABLE_LOCKS
-- 
2.39.5