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 a23792bd78d1f55288d08bc983d13270e2afafe5..77d95483be7406cc64af5b45be9630dda2f9a06c 100644 (file)
--- 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 7cbcba5bdf1b9d34cca7c08ca76660eb4046dcff..603a6e9502bca9e543cb56a126931a041efd9f47 100644 (file)
--- 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 fd65ee146755425ad5ae788d0eabc7207d30d9f4..48fd483454f5d36960dad114b02a8ed0a5079c75 100644 (file)
--- 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 be47e688a6674d8b112c198df239885e075893d3..ea6673246ed7a143c7786510fb2b7cc61da94294 100644 (file)
--- 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 7c00dcbc010966db51b9495b69cd2fd0e4991eb6..4bda0588eb729d30772a65f12d13a1b0b487c46a 100644 (file)
--- 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 c8b3fd7d810b9bb9e923842b452baae2bab3a715..49792b4a9d14812eb4ffa29a4e43c079c9935c5d 100644 (file)
--- 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 0e9e3aaaf1e59d80b6eedd2e6a233890dd276ef7..47fcfcd567b58f9f1b1aeccfbf26c63f3bf48124 100644 (file)
--- 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"