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

@@ -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)

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,

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,

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,

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,

lib/gssapi/ntlm/context_time.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/crypto.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/delete_sec_context.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

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 */

lib/gssapi/ntlm/display_name.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/display_status.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/duplicate_name.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

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,

lib/gssapi/ntlm/export_sec_context.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/external.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/import_name.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/import_sec_context.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/indicate_mechs.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/init_sec_context.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/inquire_context.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/inquire_cred.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/inquire_cred_by_mech.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/inquire_mechs_for_name.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/inquire_names_for_mech.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

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 */

lib/gssapi/ntlm/process_context_token.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/release_cred.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");
 

lib/gssapi/ntlm/release_name.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntlm/ntlm.h"
+#include "ntlm.h"
 
 RCSID("$Id$");