From: Benjamin Kaduk <kaduk@mit.edu>
Date: Fri, 10 Jan 2014 04:54:45 +0000 (-0500)
Subject: Disable deprecated warnings for krb5 routines
X-Git-Tag: upstream/1.8.0_pre1^2~832
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=17c50911f79382e3ba8960e4b6c122b348e9baef;p=packages%2Fo%2Fopenafs.git

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.

Change-Id: Iedc920001fdc5731254336424b0ab7b27274555c
Reviewed-on: http://gerrit.openafs.org/10699
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index a23792bd7..77d95483b 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -45,6 +45,7 @@
 #include <afs/ktc.h>
 #include <afs/token.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 7cbcba5bd..603a6e950 100644
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -12,6 +12,7 @@
 
 #include <roken.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 fd65ee146..48fd48345 100644
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -24,6 +24,7 @@
 #include <afs/cmd.h>
 #include <afs/ptuser.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 be47e688a..ea6673246 100644
--- a/src/aklog/krb_util.c
+++ b/src/aklog/krb_util.c
@@ -14,6 +14,7 @@
 
 #include <roken.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 7c00dcbc0..4bda0588e 100644
--- a/src/aklog/skipwrap.c
+++ b/src/aklog/skipwrap.c
@@ -34,6 +34,7 @@
 
 #include <roken.h>
 
+#define KERBEROS_APPLE_DEPRECATED(x)
 #include "aklog.h"
 #include <krb5.h>
 #include "skipwrap.h"
diff --git a/src/libafscp/afscp_server.c b/src/libafscp/afscp_server.c
index c8b3fd7d8..49792b4a9 100644
--- a/src/libafscp/afscp_server.c
+++ b/src/libafscp/afscp_server.c
@@ -39,6 +39,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 0e9e3aaaf..47fcfcd56 100644
--- a/src/libafscp/afscp_util.c
+++ b/src/libafscp/afscp_util.c
@@ -41,6 +41,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"