* Removed all narrow types and references to wide.h and narrow.h

	* base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno,
        	krb5_addrtype, krb5_keytyp, krb5_enctype, krb5_cksumtype,
                and krb5_authdatatype as int.

        * kdb.h Made keytype in krb5_encrypted_keyblock explicitly short
            	for backwards compatibility.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4835 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 19 insertions, 53 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index fd52961bc..873b46075 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 25 17:07:17 1995  Chris Provenzano  (proven@mit.edu)
+
+	* Removed all narrow types and references to wide.h and narrow.h
+	* base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno,
+		krb5_addrtype, krb5_keytyp, krb5_enctype, krb5_cksumtype,
+		and krb5_authdatatype as int.
+	* kdb.h Made keytype in krb5_encrypted_keyblock explicitly short
+		for backwards compatibility. 
+
 Sun Jan 22 18:17:06 1995  John Gilmore  (gnu@cygnus.com)
 
 	* preauth.h, rsa-md5.h:  Protect against multiple inclusion.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 3ef187234..548e1b9df 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -5,8 +5,7 @@ KRB5_HEADERS = asn1.h base-defs.h ccache.h crc-32.h encryption.h \
 		error_def.h errors.h ext-proto.h fieldbits.h \
 		free.h func-proto.h hostaddr.h kdb.h kdb_dbm.h \
 		keytab.h krb5.h libos.h los-proto.h macros.h mit-des.h \
-		narrow.h proto.h rcache.h rsa-md4.h safepriv.h \
-		sysincl.h widen.h wordsize.h
+		proto.h rcache.h rsa-md4.h safepriv.h sysincl.h wordsize.h
 # these are installed here for the build from lib/krb5/error_tables but 
 # also need to be in the installed tree
 ET_HEADERS = adm_err.h asn1_err.h isode_err.h kdb5_err.h krb5_err.h
diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 12bd76309..2f7851df6 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -24,7 +24,6 @@
  * Basic definitions for Kerberos V5 library
  */
 
-
 #ifndef KRB5_BASE_DEFS__
 #define KRB5_BASE_DEFS__
 
@@ -37,15 +36,15 @@
 #define	TRUE	1
 #endif
 
-typedef krb5_octet	krb5_boolean;
-typedef	krb5_octet	krb5_msgtype;
-typedef	krb5_octet	krb5_kvno;
+typedef	int		krb5_boolean;
+typedef	int		krb5_msgtype;	
+typedef	int		krb5_kvno;	
 
-typedef	krb5_ui_2	krb5_addrtype;
-typedef krb5_ui_2	krb5_keytype;
-typedef krb5_ui_2	krb5_enctype;
-typedef krb5_ui_2	krb5_cksumtype;
-typedef krb5_ui_2	krb5_authdatatype;
+typedef	int		krb5_addrtype;
+typedef int		krb5_keytype;
+typedef int		krb5_enctype;
+typedef int		krb5_cksumtype;
+typedef int		krb5_authdatatype;
 
 typedef krb5_int32	krb5_preauthtype; /* This may change, later on */
 typedef	krb5_int32	krb5_flags;
diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index 0e538cc14..fc8b1906a 100644
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -58,8 +58,6 @@ typedef struct _krb5_enc_data {
     krb5_data ciphertext;
 } krb5_enc_data;
 
-#include <krb5/widen.h>
-
 /* could be used in a table to find an etype and initialize a block */
 typedef struct _krb5_cryptosystem_entry {
     krb5_magic magic;
@@ -98,8 +96,6 @@ typedef struct _krb5_cryptosystem_entry {
 					    table index) */
 } krb5_cryptosystem_entry;
 
-#include <krb5/narrow.h>
-
 typedef struct _krb5_cs_table_entry {
     krb5_magic magic;
     krb5_cryptosystem_entry *system;
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index b4b6245e7..bf798c40d 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -391,7 +391,6 @@ void krb5_free_ap_rep_enc_part
 void krb5_free_tkt_authent
 	PROTOTYPE((krb5_context,
 		   krb5_tkt_authent *));
-#include <krb5/widen.h>
 
 /* Only put things which don't have pointers to the narrow types in this
    section */
@@ -562,25 +561,13 @@ krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
 		   krb5_ticket **,
 		   krb5_authenticator **));
 
-
-#ifdef NARROW_PROTOTYPES
-krb5_error_code krb5_walk_realm_tree
-    	PROTOTYPE((krb5_context,
-		   const krb5_data *,
-	       const krb5_data *,
-	       krb5_principal **,
-	       char));
-#else
 krb5_error_code krb5_walk_realm_tree
     	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 	       const krb5_data *,
 	       krb5_principal **,
 	       int));
-#endif
 
 #define KRB5_REALM_BRANCH_CHAR '.'
 
-#include <krb5/narrow.h>
-
 #endif /* KRB5_FUNC_PROTO__ */
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 2f954fd29..a4c9a09c4 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -34,7 +34,7 @@
 
 typedef struct _krb5_encrypted_keyblock {
     krb5_magic magic;
-    krb5_keytype keytype;
+    short keytype;				/* XXX this is SO ugly --- proven */
     int length;
     krb5_octet *contents;
 } krb5_encrypted_keyblock;
@@ -188,15 +188,6 @@ krb5_error_code krb5_db_unlock
 
 /* need to play games here, since we take a pointer and the real thing,
    and it might be narrow. */
-#ifdef NARROW_PROTOTYPES
-krb5_error_code krb5_db_set_nonblocking
-	PROTOTYPE((krb5_context,
-		   krb5_boolean,
-		   krb5_boolean * ));
-krb5_boolean krb5_db_set_lockmode
-	PROTOTYPE((krb5_context,
-		   krb5_boolean ));
-#else
 krb5_error_code krb5_db_set_nonblocking
 	PROTOTYPE((krb5_context,
 		   int, /* krb5_boolean */
@@ -204,11 +195,6 @@ krb5_error_code krb5_db_set_nonblocking
 krb5_boolean krb5_db_set_lockmode
 	PROTOTYPE((krb5_context,
 		   int /* krb5_boolean */ ));
-#endif /* NARROW_PROTOTYPES */
-#include <krb5/widen.h>
-
-/* Only put things which don't have pointers to the narrow types in this
-   section */
 
 krb5_error_code	krb5_db_fetch_mkey
 	PROTOTYPE((krb5_context,
@@ -218,8 +204,6 @@ krb5_error_code	krb5_db_fetch_mkey
 		   krb5_boolean, 
 		   krb5_data *, 
 		   krb5_keyblock * ));
-#include <krb5/narrow.h>
-
 
 #define KRB5_KDB_DEF_FLAGS	0
 
diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h
index f9e6ce98f..e8fb58b41 100644
--- a/src/include/krb5/keytab.h
+++ b/src/include/krb5/keytab.h
@@ -50,9 +50,6 @@ typedef struct _krb5_kt {
 } *krb5_keytab;
 
 
-/* widen prototypes, if needed */
-#include <krb5/widen.h>
-
 typedef struct _krb5_kt_ops {
     krb5_magic magic;
     char *prefix;
@@ -99,9 +96,6 @@ typedef struct _krb5_kt_ops {
 		  krb5_keytab_entry *));
 } krb5_kt_ops;
 
-/* and back to narrow */
-#include <krb5/narrow.h>
-
 #define krb5_kt_get_name(context, keytab, name, namelen) (*(keytab)->ops->get_name)(context, keytab,name,namelen)
 #define krb5_kt_close(context, keytab) (*(keytab)->ops->close)(context, keytab)
 #define krb5_kt_get_entry(context, keytab, principal, vno, entry) (*(keytab)->ops->get)(context, keytab, principal, vno, entry)
diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index ed2d4e431..3dc63e260 100644
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -134,13 +134,11 @@ krb5_error_code krb5_write_message
 		   krb5_pointer, 
 		   krb5_data *));
 
-#include <krb5/widen.h>
 krb5_error_code krb5_sname_to_principal
     PROTOTYPE((krb5_context,
 		   const char *,
 	       const char *,
 	       krb5_int32,
 	       krb5_principal *));
-#include <krb5/narrow.h>
 
 #endif /* KRB5_LIBOS_PROTO__ */