flatten include headers

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24382 ec53bebd-3082-4978-b11e-865c3cabbd6b
2009-01-25 00:35:00 +00:00
parent a265538dd9
commit 269a7a057b
65 changed files with 69 additions and 70 deletions
--- a/lib/gssapi/krb5/8003.c
+++ b/lib/gssapi/krb5/8003.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/acquire_cred.c
+++ b/lib/gssapi/krb5/acquire_cred.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/add_cred.c
+++ b/lib/gssapi/krb5/add_cred.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/address_to_krb5addr.c
+++ b/lib/gssapi/krb5/address_to_krb5addr.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 #include <roken.h>

--- a/lib/gssapi/krb5/aeap.c
+++ b/lib/gssapi/krb5/aeap.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 #include <roken.h>

--- a/lib/gssapi/krb5/arcfour.c
+++ b/lib/gssapi/krb5/arcfour.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/canonicalize_name.c
+++ b/lib/gssapi/krb5/canonicalize_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/ccache_name.c
+++ b/lib/gssapi/krb5/ccache_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/cfx.c
+++ b/lib/gssapi/krb5/cfx.c
@@ -30,7 +30,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/compare_name.c
+++ b/lib/gssapi/krb5/compare_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/compat.c
+++ b/lib/gssapi/krb5/compat.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/context_time.c
+++ b/lib/gssapi/krb5/context_time.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/copy_ccache.c
+++ b/lib/gssapi/krb5/copy_ccache.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/decapsulate.c
+++ b/lib/gssapi/krb5/decapsulate.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/delete_sec_context.c
+++ b/lib/gssapi/krb5/delete_sec_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/display_name.c
+++ b/lib/gssapi/krb5/display_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/display_status.c
+++ b/lib/gssapi/krb5/display_status.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/duplicate_name.c
+++ b/lib/gssapi/krb5/duplicate_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/encapsulate.c
+++ b/lib/gssapi/krb5/encapsulate.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/export_name.c
+++ b/lib/gssapi/krb5/export_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/export_sec_context.c
+++ b/lib/gssapi/krb5/export_sec_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/external.c
+++ b/lib/gssapi/krb5/external.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"
 #include <gssapi_mech.h>

 RCSID("$Id$");
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/get_mic.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/gsskrb5_locl.h
+++ b/lib/gssapi/krb5/gsskrb5_locl.h
@@ -36,14 +36,13 @@
 #ifndef GSSKRB5_LOCL_H
 #define GSSKRB5_LOCL_H

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <krb5_locl.h>
 #include <gkrb5_err.h>
 #include <gssapi.h>
 #include <gssapi_mech.h>
+#include <gssapi_krb5.h>
 #include <assert.h>

 #include "cfx.h"
@@ -121,7 +120,7 @@ struct gssapi_thr_context {
 * Prototypes
 */

-#include <krb5/gsskrb5-private.h>
+#include <gsskrb5-private.h>

 #define GSSAPI_KRB5_INIT(ctx) do {				\
    krb5_error_code kret_gss_init;				\
--- a/lib/gssapi/krb5/import_name.c
+++ b/lib/gssapi/krb5/import_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/import_sec_context.c
+++ b/lib/gssapi/krb5/import_sec_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/indicate_mechs.c
+++ b/lib/gssapi/krb5/indicate_mechs.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/init.c
+++ b/lib/gssapi/krb5/init.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_context.c
+++ b/lib/gssapi/krb5/inquire_context.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_cred.c
+++ b/lib/gssapi/krb5/inquire_cred.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_cred_by_mech.c
+++ b/lib/gssapi/krb5/inquire_cred_by_mech.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_cred_by_oid.c
+++ b/lib/gssapi/krb5/inquire_cred_by_oid.c
@@ -30,7 +30,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_mechs_for_name.c
+++ b/lib/gssapi/krb5/inquire_mechs_for_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_names_for_mech.c
+++ b/lib/gssapi/krb5/inquire_names_for_mech.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/inquire_sec_context_by_oid.c
+++ b/lib/gssapi/krb5/inquire_sec_context_by_oid.c
@@ -30,7 +30,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/prf.c
+++ b/lib/gssapi/krb5/prf.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/process_context_token.c
+++ b/lib/gssapi/krb5/process_context_token.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/release_buffer.c
+++ b/lib/gssapi/krb5/release_buffer.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/release_cred.c
+++ b/lib/gssapi/krb5/release_cred.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/release_name.c
+++ b/lib/gssapi/krb5/release_name.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/sequence.c
+++ b/lib/gssapi/krb5/sequence.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/set_cred_option.c
+++ b/lib/gssapi/krb5/set_cred_option.c
@@ -30,7 +30,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/set_sec_context_option.c
+++ b/lib/gssapi/krb5/set_sec_context_option.c
@@ -34,7 +34,7 @@
 *  glue routine for _gsskrb5_inquire_sec_context_by_oid
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/test_acquire_cred.c
+++ b/lib/gssapi/krb5/test_acquire_cred.c
@@ -31,7 +31,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"
 #include <err.h>

 RCSID("$Id$");
--- a/lib/gssapi/krb5/test_cfx.c
+++ b/lib/gssapi/krb5/test_cfx.c
@@ -31,7 +31,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/test_cred.c
+++ b/lib/gssapi/krb5/test_cred.c
@@ -31,7 +31,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"
 #include <err.h>
 #include <getarg.h>

--- a/lib/gssapi/krb5/test_kcred.c
+++ b/lib/gssapi/krb5/test_kcred.c
@@ -31,7 +31,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"
 #include <err.h>
 #include <getarg.h>

--- a/lib/gssapi/krb5/test_oid.c
+++ b/lib/gssapi/krb5/test_oid.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/test_sequence.c
+++ b/lib/gssapi/krb5/test_sequence.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/ticket_flags.c
+++ b/lib/gssapi/krb5/ticket_flags.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/v1.c
+++ b/lib/gssapi/krb5/v1.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");

--- a/lib/gssapi/krb5/wrap.c
+++ b/lib/gssapi/krb5/wrap.c
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 */

-#include "krb5/gsskrb5_locl.h"
+#include "gsskrb5_locl.h"

 RCSID("$Id$");