Removed dependecies on Heimdal

diff --git a/spnegokrb5/Makefile b/spnegokrb5/Makefile
index 85ae838..010fa1a 100644 (file)
--- a/spnegokrb5/Makefile
+++ b/spnegokrb5/Makefile
@@ -1,6 +1,6 @@
-KRB5_ROOT = /usr/heimdal
+include ../makefile.include
 
-CPPFLAGS = -I. -I$(KRB5_ROOT)/include
+CPPFLAGS = -I. -I$(KRB5_ROOT)/include -I$(KRB5_ROOT)/include/gssapi
 CFLAGS = -Wall -g
 
 gen_files =                    \

diff --git a/spnegokrb5/asn1_err.et b/spnegokrb5/asn1_err.et
new file mode 100644 (file)
index 0000000..739a314
--- /dev/null
+++ b/spnegokrb5/asn1_err.et
@@ -0,0 +1,20 @@
+#
+# Error messages for the asn.1 library
+#
+# This might look like a com_err file, but is not
+#
+id "$Id$"
+
+error_table asn1
+prefix ASN1
+error_code BAD_TIMEFORMAT,     "ASN.1 failed call to system time library"
+error_code MISSING_FIELD,      "ASN.1 structure is missing a required field"
+error_code MISPLACED_FIELD,    "ASN.1 unexpected field number"
+error_code TYPE_MISMATCH,      "ASN.1 type numbers are inconsistent"
+error_code OVERFLOW,           "ASN.1 value too large"
+error_code OVERRUN,            "ASN.1 encoding ended unexpectedly"
+error_code BAD_ID,             "ASN.1 identifier doesn't match expected value"
+error_code BAD_LENGTH,         "ASN.1 length doesn't match expected value"
+error_code BAD_FORMAT,         "ASN.1 badly-formatted encoding"
+error_code PARSE_ERROR,                "ASN.1 parse error"
+end

diff --git a/spnegokrb5/asn1_err.h b/spnegokrb5/asn1_err.h
new file mode 100644 (file)
index 0000000..2270ed2
--- /dev/null
+++ b/spnegokrb5/asn1_err.h
@@ -0,0 +1,29 @@
+/* Generated from ../../../lib/asn1/asn1_err.et */
+/* $Id$ */
+
+#ifndef __asn1_err_h__
+#define __asn1_err_h__
+
+struct et_list;
+
+void initialize_asn1_error_table_r(struct et_list **);
+
+void initialize_asn1_error_table(void);
+#define init_asn1_err_tbl initialize_asn1_error_table
+
+typedef enum asn1_error_number{
+       ASN1_BAD_TIMEFORMAT = 1859794432,
+       ASN1_MISSING_FIELD = 1859794433,
+       ASN1_MISPLACED_FIELD = 1859794434,
+       ASN1_TYPE_MISMATCH = 1859794435,
+       ASN1_OVERFLOW = 1859794436,
+       ASN1_OVERRUN = 1859794437,
+       ASN1_BAD_ID = 1859794438,
+       ASN1_BAD_LENGTH = 1859794439,
+       ASN1_BAD_FORMAT = 1859794440,
+       ASN1_PARSE_ERROR = 1859794441
+} asn1_error_number;
+
+#define ERROR_TABLE_BASE_asn1 1859794432
+
+#endif /* __asn1_err_h__ */

diff --git a/spnegokrb5/der_locl.h b/spnegokrb5/der_locl.h
index ad5787c..2b5bd67 100644 (file)
--- a/spnegokrb5/der_locl.h
+++ b/spnegokrb5/der_locl.h
@@ -47,7 +47,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <errno.h>
-#include <roken.h>
+/* #include <roken.h> */
 
 #include <asn1-common.h>
 #include <asn1_err.h>

diff --git a/spnegokrb5/parse_units.h b/spnegokrb5/parse_units.h
new file mode 100644 (file)
index 0000000..c80c3fd
--- /dev/null
+++ b/spnegokrb5/parse_units.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1997 - 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: 
+ *
+ * 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. 
+ *
+ * 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. 
+ */
+
+/* $Id$ */
+
+#ifndef __PARSE_UNITS_H__
+#define __PARSE_UNITS_H__
+
+#include <stdio.h>
+#include <stddef.h>
+
+struct units {
+    const char *name;
+    unsigned mult;
+};
+
+int
+parse_units (const char *s, const struct units *units,
+            const char *def_unit);
+
+void
+print_units_table (const struct units *units, FILE *f);
+
+int
+parse_flags (const char *s, const struct units *units,
+            int orig);
+
+int
+unparse_units (int num, const struct units *units, char *s, size_t len);
+
+int
+unparse_units_approx (int num, const struct units *units, char *s,
+                     size_t len);
+
+int
+unparse_flags (int num, const struct units *units, char *s, size_t len);
+
+void
+print_flags_table (const struct units *units, FILE *f);
+
+#endif /* __PARSE_UNITS_H__ */