The branch, master has been updated
via 64e2b859d2ed9c2428219617c3864c64cd6ed909 (commit)
from b97d85c5e4db00a6cfc0a191907e88d2623c6681 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 64e2b859d2ed9c2428219617c3864c64cd6ed909
Author: Andrew Bartlett <abart...@samba.org>
Date: Thu Aug 6 08:17:09 2009 +1000
s4:heimdal: import lorikeet-heimdal-200908052208 (commit
370a73a74199a5a55188340906e15fd795f67a74)
This removes some of the portability changes made to code under
heimdal/
If these are still required, then we will re-add them with code under
heimdal_build/ (so that we can simply 'drop in' future heimdal
releases).
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal/kuser/kinit.c | 2 --
source4/heimdal/kuser/kuser_locl.h | 2 +-
source4/heimdal/lib/gssapi/krb5/cfx.c | 9 +++++----
source4/heimdal/lib/hcrypto/aes.c | 3 ---
source4/heimdal/lib/hcrypto/bn.c | 3 ---
source4/heimdal/lib/hcrypto/des.c | 3 ---
source4/heimdal/lib/hcrypto/dh-imath.c | 2 --
source4/heimdal/lib/hcrypto/dh.c | 2 --
source4/heimdal/lib/hcrypto/dsa.c | 4 ----
source4/heimdal/lib/hcrypto/engine.c | 4 ----
source4/heimdal/lib/hcrypto/evp-hcrypto.c | 4 ----
source4/heimdal/lib/hcrypto/md2.c | 4 ----
source4/heimdal/lib/hcrypto/md4.c | 4 ----
source4/heimdal/lib/hcrypto/md5.c | 4 ----
source4/heimdal/lib/hcrypto/pkcs12.c | 4 ----
source4/heimdal/lib/hcrypto/pkcs5.c | 4 ----
source4/heimdal/lib/hcrypto/rand-egd.c | 4 ----
source4/heimdal/lib/hcrypto/rand-fortuna.c | 4 ----
source4/heimdal/lib/hcrypto/rand-timer.c | 4 ----
source4/heimdal/lib/hcrypto/rand-unix.c | 4 ----
source4/heimdal/lib/hcrypto/rand.c | 4 ----
source4/heimdal/lib/hcrypto/rc2.c | 3 ---
source4/heimdal/lib/hcrypto/rc4.c | 4 ----
source4/heimdal/lib/hcrypto/rijndael-alg-fst.c | 3 ---
source4/heimdal/lib/hcrypto/rnd_keys.c | 3 ---
source4/heimdal/lib/hcrypto/rsa-imath.c | 4 ----
source4/heimdal/lib/hcrypto/rsa.c | 4 ----
source4/heimdal/lib/hcrypto/sha.c | 4 ----
source4/heimdal/lib/hcrypto/sha256.c | 4 ----
source4/heimdal/lib/hcrypto/ui.c | 3 ---
source4/heimdal/lib/krb5/context.c | 12 ------------
source4/heimdal/lib/krb5/krb5_locl.h | 2 +-
source4/heimdal/lib/roken/vis.hin | 24 ++++++++++++++++++++++++
33 files changed, 31 insertions(+), 117 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/kuser/kinit.c b/source4/heimdal/kuser/kinit.c
index 350988d..4208fa8 100644
--- a/source4/heimdal/kuser/kinit.c
+++ b/source4/heimdal/kuser/kinit.c
@@ -768,10 +768,8 @@ main (int argc, char **argv)
setprogname (argv[0]);
setlocale (LC_ALL, "");
-#if defined(HEIMDAL_LOCALEDIR)
bindtextdomain ("heimdal_kuser", HEIMDAL_LOCALEDIR);
textdomain("heimdal_kuser");
-#endif
ret = krb5_init_context (&context);
if (ret == KRB5_CONFIG_BADFORMAT)
diff --git a/source4/heimdal/kuser/kuser_locl.h
b/source4/heimdal/kuser/kuser_locl.h
index eafffe9..1bf682b 100644
--- a/source4/heimdal/kuser/kuser_locl.h
+++ b/source4/heimdal/kuser/kuser_locl.h
@@ -88,7 +88,7 @@
#include <locale.h>
#endif
-#ifdef HAVE_LIBINTL_H
+#ifdef LIBINTL
#include <libintl.h>
#define N_(x,y) gettext(x)
#define NP_(x,y) (x)
diff --git a/source4/heimdal/lib/gssapi/krb5/cfx.c
b/source4/heimdal/lib/gssapi/krb5/cfx.c
index 35e5a9e..7cc7ee1 100755
--- a/source4/heimdal/lib/gssapi/krb5/cfx.c
+++ b/source4/heimdal/lib/gssapi/krb5/cfx.c
@@ -41,10 +41,10 @@
#define CFXAcceptorSubkey (1 << 2)
krb5_error_code
-_gsskrb5cfx_wrap_length_cfx(const gsskrb5_ctx context_handle,
- krb5_context context,
+_gsskrb5cfx_wrap_length_cfx(krb5_context context,
krb5_crypto crypto,
int conf_req_flag,
+ int dce_style,
size_t input_length,
size_t *output_length,
size_t *cksumsize,
@@ -71,7 +71,7 @@ _gsskrb5cfx_wrap_length_cfx(const gsskrb5_ctx context_handle,
/* Header is concatenated with data before encryption */
input_length += sizeof(gss_cfx_wrap_token_desc);
- if (IS_DCE_STYLE(context_handle)) {
+ if (dce_style) {
ret = krb5_crypto_getblocksize(context, crypto, &padsize);
} else {
ret = krb5_crypto_getpadsize(context, crypto, &padsize);
@@ -972,8 +972,9 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status,
int32_t seq_number;
u_char *p;
- ret = _gsskrb5cfx_wrap_length_cfx(ctx, context,
+ ret = _gsskrb5cfx_wrap_length_cfx(context,
ctx->crypto, conf_req_flag,
+ IS_DCE_STYLE(ctx),
input_message_buffer->length,
&wrapped_len, &cksumsize, &padlength);
if (ret != 0) {
diff --git a/source4/heimdal/lib/hcrypto/aes.c
b/source4/heimdal/lib/hcrypto/aes.c
index bc9c9ca..b3049c1 100644
--- a/source4/heimdal/lib/hcrypto/aes.c
+++ b/source4/heimdal/lib/hcrypto/aes.c
@@ -31,11 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
#ifdef KRB5
#include <krb5-types.h>
diff --git a/source4/heimdal/lib/hcrypto/bn.c b/source4/heimdal/lib/hcrypto/bn.c
index 179595a..545d952 100644
--- a/source4/heimdal/lib/hcrypto/bn.c
+++ b/source4/heimdal/lib/hcrypto/bn.c
@@ -31,11 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/des.c
b/source4/heimdal/lib/hcrypto/des.c
index 5e258df..7dc4823 100644
--- a/source4/heimdal/lib/hcrypto/des.c
+++ b/source4/heimdal/lib/hcrypto/des.c
@@ -82,10 +82,7 @@
* thanks to his work. Thank you Richard.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-RCSID("$Id$");
-#endif
#define HC_DEPRECATED
diff --git a/source4/heimdal/lib/hcrypto/dh-imath.c
b/source4/heimdal/lib/hcrypto/dh-imath.c
index 4725281..822d5a3 100644
--- a/source4/heimdal/lib/hcrypto/dh-imath.c
+++ b/source4/heimdal/lib/hcrypto/dh-imath.c
@@ -43,8 +43,6 @@
#include "imath/imath.h"
-RCSID("$Id$");
-
static void
BN2mpz(mpz_t *s, const BIGNUM *bn)
{
diff --git a/source4/heimdal/lib/hcrypto/dh.c b/source4/heimdal/lib/hcrypto/dh.c
index b029939..d42ac34 100644
--- a/source4/heimdal/lib/hcrypto/dh.c
+++ b/source4/heimdal/lib/hcrypto/dh.c
@@ -35,8 +35,6 @@
#include <config.h>
#endif
-RCSID("$Id$");
-
#include <stdio.h>
#include <stdlib.h>
#include <dh.h>
diff --git a/source4/heimdal/lib/hcrypto/dsa.c
b/source4/heimdal/lib/hcrypto/dsa.c
index 6606a5e..a5bdbab 100644
--- a/source4/heimdal/lib/hcrypto/dsa.c
+++ b/source4/heimdal/lib/hcrypto/dsa.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/engine.c
b/source4/heimdal/lib/hcrypto/engine.c
index 61d5f93..8066d59 100644
--- a/source4/heimdal/lib/hcrypto/engine.c
+++ b/source4/heimdal/lib/hcrypto/engine.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/evp-hcrypto.c
b/source4/heimdal/lib/hcrypto/evp-hcrypto.c
index 6897385..d176e2e 100644
--- a/source4/heimdal/lib/hcrypto/evp-hcrypto.c
+++ b/source4/heimdal/lib/hcrypto/evp-hcrypto.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#define HC_DEPRECATED
diff --git a/source4/heimdal/lib/hcrypto/md2.c
b/source4/heimdal/lib/hcrypto/md2.c
index e82169c..26254ac 100644
--- a/source4/heimdal/lib/hcrypto/md2.c
+++ b/source4/heimdal/lib/hcrypto/md2.c
@@ -31,12 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include "hash.h"
#include "md2.h"
diff --git a/source4/heimdal/lib/hcrypto/md4.c
b/source4/heimdal/lib/hcrypto/md4.c
index 56e2ac9..435e662 100644
--- a/source4/heimdal/lib/hcrypto/md4.c
+++ b/source4/heimdal/lib/hcrypto/md4.c
@@ -31,12 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include "hash.h"
#include "md4.h"
diff --git a/source4/heimdal/lib/hcrypto/md5.c
b/source4/heimdal/lib/hcrypto/md5.c
index ffc7bb9..f990787 100644
--- a/source4/heimdal/lib/hcrypto/md5.c
+++ b/source4/heimdal/lib/hcrypto/md5.c
@@ -31,12 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include "hash.h"
#include "md5.h"
diff --git a/source4/heimdal/lib/hcrypto/pkcs12.c
b/source4/heimdal/lib/hcrypto/pkcs12.c
index 11afa0b..92a40fa 100644
--- a/source4/heimdal/lib/hcrypto/pkcs12.c
+++ b/source4/heimdal/lib/hcrypto/pkcs12.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/pkcs5.c
b/source4/heimdal/lib/hcrypto/pkcs5.c
index 6537561..18045e2 100644
--- a/source4/heimdal/lib/hcrypto/pkcs5.c
+++ b/source4/heimdal/lib/hcrypto/pkcs5.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#ifdef KRB5
#include <krb5-types.h>
diff --git a/source4/heimdal/lib/hcrypto/rand-egd.c
b/source4/heimdal/lib/hcrypto/rand-egd.c
index 168c151..00d3286 100644
--- a/source4/heimdal/lib/hcrypto/rand-egd.c
+++ b/source4/heimdal/lib/hcrypto/rand-egd.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <sys/types.h>
#ifdef HAVE_SYS_UN_H
diff --git a/source4/heimdal/lib/hcrypto/rand-fortuna.c
b/source4/heimdal/lib/hcrypto/rand-fortuna.c
index ebb4e6e..c39c713 100644
--- a/source4/heimdal/lib/hcrypto/rand-fortuna.c
+++ b/source4/heimdal/lib/hcrypto/rand-fortuna.c
@@ -29,11 +29,7 @@
* $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.8 2006/10/04 00:29:46
momjian Exp $
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/rand-timer.c
b/source4/heimdal/lib/hcrypto/rand-timer.c
index 86ff22c..994c321 100644
--- a/source4/heimdal/lib/hcrypto/rand-timer.c
+++ b/source4/heimdal/lib/hcrypto/rand-timer.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/rand-unix.c
b/source4/heimdal/lib/hcrypto/rand-unix.c
index 07d81eb..2bfa265 100644
--- a/source4/heimdal/lib/hcrypto/rand-unix.c
+++ b/source4/heimdal/lib/hcrypto/rand-unix.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/rand.c
b/source4/heimdal/lib/hcrypto/rand.c
index a61c9cd..3cd6598 100644
--- a/source4/heimdal/lib/hcrypto/rand.c
+++ b/source4/heimdal/lib/hcrypto/rand.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/rc2.c
b/source4/heimdal/lib/hcrypto/rc2.c
index 9179149..dcfe42d 100644
--- a/source4/heimdal/lib/hcrypto/rc2.c
+++ b/source4/heimdal/lib/hcrypto/rc2.c
@@ -31,10 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-RCSID("$Id$");
-#endif
#include "rc2.h"
#include <stdio.h>
diff --git a/source4/heimdal/lib/hcrypto/rc4.c
b/source4/heimdal/lib/hcrypto/rc4.c
index 9e696f7..81cf093 100644
--- a/source4/heimdal/lib/hcrypto/rc4.c
+++ b/source4/heimdal/lib/hcrypto/rc4.c
@@ -33,12 +33,8 @@
/* implemented from description in draft-kaukonen-cipher-arcfour-03.txt */
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include <rc4.h>
#define SWAP(k,x,y) \
diff --git a/source4/heimdal/lib/hcrypto/rijndael-alg-fst.c
b/source4/heimdal/lib/hcrypto/rijndael-alg-fst.c
index 57f1317..3dd2555 100644
--- a/source4/heimdal/lib/hcrypto/rijndael-alg-fst.c
+++ b/source4/heimdal/lib/hcrypto/rijndael-alg-fst.c
@@ -28,11 +28,8 @@
/* "$NetBSD: rijndael-alg-fst.c,v 1.5 2001/11/13 01:40:10 lukem Exp $" */
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
#ifdef KRB5
#include <krb5-types.h>
diff --git a/source4/heimdal/lib/hcrypto/rnd_keys.c
b/source4/heimdal/lib/hcrypto/rnd_keys.c
index 9437051..9baf002 100644
--- a/source4/heimdal/lib/hcrypto/rnd_keys.c
+++ b/source4/heimdal/lib/hcrypto/rnd_keys.c
@@ -31,11 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
#define HC_DEPRECATED
diff --git a/source4/heimdal/lib/hcrypto/rsa-imath.c
b/source4/heimdal/lib/hcrypto/rsa-imath.c
index 5240279..2641dc1 100644
--- a/source4/heimdal/lib/hcrypto/rsa-imath.c
+++ b/source4/heimdal/lib/hcrypto/rsa-imath.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/rsa.c
b/source4/heimdal/lib/hcrypto/rsa.c
index f3095e7..9b9ecea 100644
--- a/source4/heimdal/lib/hcrypto/rsa.c
+++ b/source4/heimdal/lib/hcrypto/rsa.c
@@ -31,11 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/sha.c
b/source4/heimdal/lib/hcrypto/sha.c
index fd48672..062f705 100644
--- a/source4/heimdal/lib/hcrypto/sha.c
+++ b/source4/heimdal/lib/hcrypto/sha.c
@@ -31,12 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include "hash.h"
#include "sha.h"
diff --git a/source4/heimdal/lib/hcrypto/sha256.c
b/source4/heimdal/lib/hcrypto/sha256.c
index 922fb05..baa87d1 100644
--- a/source4/heimdal/lib/hcrypto/sha256.c
+++ b/source4/heimdal/lib/hcrypto/sha256.c
@@ -31,12 +31,8 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-RCSID("$Id$");
-#endif
-
#include "hash.h"
#include "sha.h"
diff --git a/source4/heimdal/lib/hcrypto/ui.c b/source4/heimdal/lib/hcrypto/ui.c
index 91abf76..ca8c844 100644
--- a/source4/heimdal/lib/hcrypto/ui.c
+++ b/source4/heimdal/lib/hcrypto/ui.c
@@ -31,10 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-RCSID("$Id$");
-#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/krb5/context.c
b/source4/heimdal/lib/krb5/context.c
index fe94135..9ece38e 100644
--- a/source4/heimdal/lib/krb5/context.c
+++ b/source4/heimdal/lib/krb5/context.c
@@ -291,9 +291,7 @@ krb5_init_context(krb5_context *context)
*context = NULL;
--
Samba Shared Repository
