s4: import lorikeet-heimdal-200810271034

metze

1 files changed, 48 insertions, 25 deletions

diff --git a/source4/heimdal/lib/krb5/codec.c b/source4/heimdal/lib/krb5/codec.c
index 478f77ecef..bd0dcc5371 100644
--- a/source4/heimdal/lib/krb5/codec.c
+++ b/source4/heimdal/lib/krb5/codec.c
@@ -1,46 +1,52 @@
 /*
- * Copyright (c) 1998 - 2001 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
+ * Copyright (c) 1998 - 2001 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include "krb5_locl.h"
 
+#undef __attribute__
+#define __attribute__(x)
+
 RCSID("$Id$");
 
+#ifndef HEIMDAL_SMALLER
+
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_decode_EncTicketPart (krb5_context context,
 			   const void *data,
 			   size_t length,
 			   EncTicketPart *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return decode_EncTicketPart(data, length, t, len);
 }
@@ -51,6 +57,7 @@ krb5_encode_EncTicketPart (krb5_context context,
 			   size_t length,
 			   EncTicketPart *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return encode_EncTicketPart(data, length, t, len);
 }
@@ -61,6 +68,7 @@ krb5_decode_EncASRepPart (krb5_context context,
 			  size_t length,
 			  EncASRepPart *t,
 			  size_t *len)
+    __attribute__((deprecated))
 {
     return decode_EncASRepPart(data, length, t, len);
 }
@@ -71,6 +79,7 @@ krb5_encode_EncASRepPart (krb5_context context,
 			  size_t length,
 			  EncASRepPart *t,
 			  size_t *len)
+    __attribute__((deprecated))
 {
     return encode_EncASRepPart(data, length, t, len);
 }
@@ -81,6 +90,7 @@ krb5_decode_EncTGSRepPart (krb5_context context,
 			   size_t length,
 			   EncTGSRepPart *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return decode_EncTGSRepPart(data, length, t, len);
 }
@@ -91,6 +101,7 @@ krb5_encode_EncTGSRepPart (krb5_context context,
 			   size_t length,
 			   EncTGSRepPart *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return encode_EncTGSRepPart(data, length, t, len);
 }
@@ -101,6 +112,7 @@ krb5_decode_EncAPRepPart (krb5_context context,
 			  size_t length,
 			  EncAPRepPart *t,
 			  size_t *len)
+    __attribute__((deprecated))
 {
     return decode_EncAPRepPart(data, length, t, len);
 }
@@ -111,6 +123,7 @@ krb5_encode_EncAPRepPart (krb5_context context,
 			  size_t length,
 			  EncAPRepPart *t,
 			  size_t *len)
+    __attribute__((deprecated))
 {
     return encode_EncAPRepPart(data, length, t, len);
 }
@@ -121,6 +134,7 @@ krb5_decode_Authenticator (krb5_context context,
 			   size_t length,
 			   Authenticator *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return decode_Authenticator(data, length, t, len);
 }
@@ -131,6 +145,7 @@ krb5_encode_Authenticator (krb5_context context,
 			   size_t length,
 			   Authenticator *t,
 			   size_t *len)
+    __attribute__((deprecated))
 {
     return encode_Authenticator(data, length, t, len);
 }
@@ -141,6 +156,7 @@ krb5_decode_EncKrbCredPart (krb5_context context,
 			    size_t length,
 			    EncKrbCredPart *t,
 			    size_t *len)
+    __attribute__((deprecated))
 {
     return decode_EncKrbCredPart(data, length, t, len);
 }
@@ -151,6 +167,7 @@ krb5_encode_EncKrbCredPart (krb5_context context,
 			    size_t length,
 			    EncKrbCredPart *t,
 			    size_t *len)
+    __attribute__((deprecated))
 {
     return encode_EncKrbCredPart (data, length, t, len);
 }
@@ -161,6 +178,7 @@ krb5_decode_ETYPE_INFO (krb5_context context,
 			size_t length,
 			ETYPE_INFO *t,
 			size_t *len)
+    __attribute__((deprecated))
 {
     return decode_ETYPE_INFO(data, length, t, len);
 }
@@ -171,6 +189,7 @@ krb5_encode_ETYPE_INFO (krb5_context context,
 			size_t length,
 			ETYPE_INFO *t,
 			size_t *len)
+    __attribute__((deprecated))
 {
     return encode_ETYPE_INFO (data, length, t, len);
 }
@@ -181,6 +200,7 @@ krb5_decode_ETYPE_INFO2 (krb5_context context,
 			size_t length,
 			ETYPE_INFO2 *t,
 			size_t *len)
+    __attribute__((deprecated))
 {
     return decode_ETYPE_INFO2(data, length, t, len);
 }
@@ -191,6 +211,9 @@ krb5_encode_ETYPE_INFO2 (krb5_context context,
 			 size_t length,
 			 ETYPE_INFO2 *t,
 			 size_t *len)
+    __attribute__((deprecated))
 {
     return encode_ETYPE_INFO2 (data, length, t, len);
 }
+
+#endif /* HEIMDAL_SMALLER */