From 26cc8f6525f045a8af1af73e576abd5ba6412030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 25 Jan 2009 20:49:54 +0000
Subject: [PATCH] flatten namespace

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24482 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/ntlm/accept_sec_context.c     | 15 ++++++++++-----
 lib/gssapi/ntlm/acquire_cred.c           |  4 +---
 lib/gssapi/ntlm/add_cred.c               |  4 +---
 lib/gssapi/ntlm/canonicalize_name.c      |  4 +---
 lib/gssapi/ntlm/compare_name.c           |  4 +---
 lib/gssapi/ntlm/context_time.c           |  2 +-
 lib/gssapi/ntlm/crypto.c                 |  2 +-
 lib/gssapi/ntlm/delete_sec_context.c     |  2 +-
 lib/gssapi/ntlm/digest.c                 |  6 +++++-
 lib/gssapi/ntlm/display_name.c           |  2 +-
 lib/gssapi/ntlm/display_status.c         |  2 +-
 lib/gssapi/ntlm/duplicate_name.c         |  2 +-
 lib/gssapi/ntlm/export_name.c            |  4 +---
 lib/gssapi/ntlm/export_sec_context.c     |  2 +-
 lib/gssapi/ntlm/external.c               |  2 +-
 lib/gssapi/ntlm/import_name.c            |  2 +-
 lib/gssapi/ntlm/import_sec_context.c     |  2 +-
 lib/gssapi/ntlm/indicate_mechs.c         |  2 +-
 lib/gssapi/ntlm/init_sec_context.c       |  2 +-
 lib/gssapi/ntlm/inquire_context.c        |  2 +-
 lib/gssapi/ntlm/inquire_cred.c           |  2 +-
 lib/gssapi/ntlm/inquire_cred_by_mech.c   |  2 +-
 lib/gssapi/ntlm/inquire_mechs_for_name.c |  2 +-
 lib/gssapi/ntlm/inquire_names_for_mech.c |  2 +-
 lib/gssapi/ntlm/ntlm.h                   |  4 +---
 lib/gssapi/ntlm/process_context_token.c  |  2 +-
 lib/gssapi/ntlm/release_cred.c           |  2 +-
 lib/gssapi/ntlm/release_name.c           |  2 +-
 28 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/lib/gssapi/ntlm/accept_sec_context.c b/lib/gssapi/ntlm/accept_sec_context.c
index 12ba31cad..c784ed4d5 100644
--- a/lib/gssapi/ntlm/accept_sec_context.c
+++ b/lib/gssapi/ntlm/accept_sec_context.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 /*
  *
@@ -43,10 +41,17 @@ OM_uint32
 _gss_ntlm_allocate_ctx(OM_uint32 *minor_status, ntlm_ctx *ctx)
 {
     OM_uint32 maj_stat;
-
+    struct ntlm_server_interface *interface = NULL;
+    
+#ifdef DIGEST
+    interface = &ntlmsspi_kdc_digest;
+#endif
+    if (interface == NULL)
+	return GSS_S_FAILURE;
+    
     *ctx = calloc(1, sizeof(**ctx));
 
-    (*ctx)->server = &ntlmsspi_kdc_digest;
+    (*ctx)->server = interface;
 
     maj_stat = (*(*ctx)->server->nsi_init)(minor_status, &(*ctx)->ictx);
     if (maj_stat != GSS_S_COMPLETE)
diff --git a/lib/gssapi/ntlm/acquire_cred.c b/lib/gssapi/ntlm/acquire_cred.c
index d70af7511..e4fb8ff21 100644
--- a/lib/gssapi/ntlm/acquire_cred.c
+++ b/lib/gssapi/ntlm/acquire_cred.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 OM_uint32 _gss_ntlm_acquire_cred
            (OM_uint32 * min_stat,
diff --git a/lib/gssapi/ntlm/add_cred.c b/lib/gssapi/ntlm/add_cred.c
index 1093de981..4bb7f2c1f 100644
--- a/lib/gssapi/ntlm/add_cred.c
+++ b/lib/gssapi/ntlm/add_cred.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 OM_uint32 _gss_ntlm_add_cred (
      OM_uint32           *minor_status,
diff --git a/lib/gssapi/ntlm/canonicalize_name.c b/lib/gssapi/ntlm/canonicalize_name.c
index afc8a8382..d70018f44 100644
--- a/lib/gssapi/ntlm/canonicalize_name.c
+++ b/lib/gssapi/ntlm/canonicalize_name.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 OM_uint32 _gss_ntlm_canonicalize_name (
             OM_uint32 * minor_status,
diff --git a/lib/gssapi/ntlm/compare_name.c b/lib/gssapi/ntlm/compare_name.c
index 75f71d1a5..f987c8ddd 100644
--- a/lib/gssapi/ntlm/compare_name.c
+++ b/lib/gssapi/ntlm/compare_name.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 OM_uint32 _gss_ntlm_compare_name
            (OM_uint32 * minor_status,
diff --git a/lib/gssapi/ntlm/context_time.c b/lib/gssapi/ntlm/context_time.c
index 0c594c990..34a4c794a 100644
--- a/lib/gssapi/ntlm/context_time.c
+++ b/lib/gssapi/ntlm/context_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/crypto.c b/lib/gssapi/ntlm/crypto.c
index 41be6180a..a5a4c2006 100644
--- a/lib/gssapi/ntlm/crypto.c
+++ b/lib/gssapi/ntlm/crypto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/delete_sec_context.c b/lib/gssapi/ntlm/delete_sec_context.c
index f6e669bc4..a4910faa2 100644
--- a/lib/gssapi/ntlm/delete_sec_context.c
+++ b/lib/gssapi/ntlm/delete_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/digest.c b/lib/gssapi/ntlm/digest.c
index efd4ad69b..d95b97e13 100644
--- a/lib/gssapi/ntlm/digest.c
+++ b/lib/gssapi/ntlm/digest.c
@@ -31,10 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
+#ifdef DIGEST
+
 /*
  *
  */
@@ -434,3 +436,5 @@ struct ntlm_server_interface ntlmsspi_kdc_digest = {
     kdc_type3,
     kdc_free_buffer
 };
+
+#endif /* DIGEST */
diff --git a/lib/gssapi/ntlm/display_name.c b/lib/gssapi/ntlm/display_name.c
index d54b67698..8360429ac 100644
--- a/lib/gssapi/ntlm/display_name.c
+++ b/lib/gssapi/ntlm/display_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/display_status.c b/lib/gssapi/ntlm/display_status.c
index 2706f450f..c8ecb47a1 100644
--- a/lib/gssapi/ntlm/display_status.c
+++ b/lib/gssapi/ntlm/display_status.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/duplicate_name.c b/lib/gssapi/ntlm/duplicate_name.c
index ff5dc6d1a..823c0e954 100644
--- a/lib/gssapi/ntlm/duplicate_name.c
+++ b/lib/gssapi/ntlm/duplicate_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/export_name.c b/lib/gssapi/ntlm/export_name.c
index a2fff7fcd..e8f9aba61 100644
--- a/lib/gssapi/ntlm/export_name.c
+++ b/lib/gssapi/ntlm/export_name.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
-
-RCSID("$Id$");
+#include "ntlm.h"
 
 OM_uint32 _gss_ntlm_export_name
            (OM_uint32  * minor_status,
diff --git a/lib/gssapi/ntlm/export_sec_context.c b/lib/gssapi/ntlm/export_sec_context.c
index 7e34bd6b6..c5ed7c3d5 100644
--- a/lib/gssapi/ntlm/export_sec_context.c
+++ b/lib/gssapi/ntlm/export_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/external.c b/lib/gssapi/ntlm/external.c
index 7508e51e0..cd0292490 100644
--- a/lib/gssapi/ntlm/external.c
+++ b/lib/gssapi/ntlm/external.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/import_name.c b/lib/gssapi/ntlm/import_name.c
index 3e1f016ae..40e022266 100644
--- a/lib/gssapi/ntlm/import_name.c
+++ b/lib/gssapi/ntlm/import_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/import_sec_context.c b/lib/gssapi/ntlm/import_sec_context.c
index d660fc8f6..1f0cb9456 100644
--- a/lib/gssapi/ntlm/import_sec_context.c
+++ b/lib/gssapi/ntlm/import_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/indicate_mechs.c b/lib/gssapi/ntlm/indicate_mechs.c
index fc7afc6e1..ddd35ef75 100644
--- a/lib/gssapi/ntlm/indicate_mechs.c
+++ b/lib/gssapi/ntlm/indicate_mechs.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/init_sec_context.c b/lib/gssapi/ntlm/init_sec_context.c
index 78051a97a..20aa18a30 100644
--- a/lib/gssapi/ntlm/init_sec_context.c
+++ b/lib/gssapi/ntlm/init_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/inquire_context.c b/lib/gssapi/ntlm/inquire_context.c
index e28bfb70d..9de50385d 100644
--- a/lib/gssapi/ntlm/inquire_context.c
+++ b/lib/gssapi/ntlm/inquire_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/inquire_cred.c b/lib/gssapi/ntlm/inquire_cred.c
index 542333a05..b3720722d 100644
--- a/lib/gssapi/ntlm/inquire_cred.c
+++ b/lib/gssapi/ntlm/inquire_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/inquire_cred_by_mech.c b/lib/gssapi/ntlm/inquire_cred_by_mech.c
index 358457b29..7977bf6b1 100644
--- a/lib/gssapi/ntlm/inquire_cred_by_mech.c
+++ b/lib/gssapi/ntlm/inquire_cred_by_mech.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/inquire_mechs_for_name.c b/lib/gssapi/ntlm/inquire_mechs_for_name.c
index 30bfad7ec..191676ab7 100644
--- a/lib/gssapi/ntlm/inquire_mechs_for_name.c
+++ b/lib/gssapi/ntlm/inquire_mechs_for_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/inquire_names_for_mech.c b/lib/gssapi/ntlm/inquire_names_for_mech.c
index ac3b82936..d9d19fda2 100644
--- a/lib/gssapi/ntlm/inquire_names_for_mech.c
+++ b/lib/gssapi/ntlm/inquire_names_for_mech.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/ntlm.h b/lib/gssapi/ntlm/ntlm.h
index 1bc1207ab..62f6f0a2e 100644
--- a/lib/gssapi/ntlm/ntlm.h
+++ b/lib/gssapi/ntlm/ntlm.h
@@ -36,9 +36,7 @@
 #ifndef NTLM_NTLM_H
 #define NTLM_NTLM_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -134,7 +132,7 @@ typedef struct {
     char *domain;
 } *ntlm_name;
 
-#include <ntlm/ntlm-private.h>
+#include <ntlm-private.h>
 
 
 #endif /* NTLM_NTLM_H */
diff --git a/lib/gssapi/ntlm/process_context_token.c b/lib/gssapi/ntlm/process_context_token.c
index c7b41f8e5..b72e496f9 100644
--- a/lib/gssapi/ntlm/process_context_token.c
+++ b/lib/gssapi/ntlm/process_context_token.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/release_cred.c b/lib/gssapi/ntlm/release_cred.c
index e6a1833aa..f07bcaa91 100644
--- a/lib/gssapi/ntlm/release_cred.c
+++ b/lib/gssapi/ntlm/release_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/ntlm/release_name.c b/lib/gssapi/ntlm/release_name.c
index 0f07a6d1b..eff83c2e5 100644
--- a/lib/gssapi/ntlm/release_name.c
+++ b/lib/gssapi/ntlm/release_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");