* base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno,

                krb5_addrtype, krb5_keytyp, krb5_enctype, krb5_cksumtype,
                and krb5_authdatatype as unsigned int.
	* kdb_dbm.h krb5_dbm_db_set_lockmode(), krb5_dbm_db_set_nonblocking()
		Fix prototypes to use krb5_boolean and not int.
	* kdb.h krb5_db_set_lockmode(), krb5_db_set_nonblocking()
		Fix prototypes to use krb5_boolean and not int.

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

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 2f7851df651a98e267169b18844554ff3131aee0..05638ebd0ed0ab2694fd8a4a414c27f5d07c3158 100644 (file)
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -36,15 +36,15 @@
 #define        TRUE    1
 #endif
 
-typedef        int             krb5_boolean;
-typedef        int             krb5_msgtype;   
-typedef        int             krb5_kvno;      
-
-typedef        int             krb5_addrtype;
-typedef int            krb5_keytype;
-typedef int            krb5_enctype;
-typedef int            krb5_cksumtype;
-typedef int            krb5_authdatatype;
+typedef        unsigned int krb5_boolean;
+typedef        unsigned int krb5_msgtype;      
+typedef        unsigned int krb5_kvno; 
+
+typedef        unsigned int krb5_addrtype;
+typedef unsigned int krb5_keytype;
+typedef unsigned int krb5_enctype;
+typedef unsigned int krb5_cksumtype;
+typedef unsigned int krb5_authdatatype;
 
 typedef krb5_int32     krb5_preauthtype; /* This may change, later on */
 typedef        krb5_int32      krb5_flags;

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index a4c9a09c495361609ac372cdd8b6ba437e79cf0f..d0622d4c0eac1dcdc008b745ec5601b3c954c7c1 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -185,17 +185,13 @@ krb5_error_code krb5_db_lock
                   int ));
 krb5_error_code krb5_db_unlock
        PROTOTYPE((krb5_context));
-
-/* need to play games here, since we take a pointer and the real thing,
-   and it might be narrow. */
 krb5_error_code krb5_db_set_nonblocking
        PROTOTYPE((krb5_context,
-                  int, /* krb5_boolean */
+                  krb5_boolean,
                   krb5_boolean * ));
 krb5_boolean krb5_db_set_lockmode
        PROTOTYPE((krb5_context,
-                  int /* krb5_boolean */ ));
-
+                  krb5_boolean));
 krb5_error_code        krb5_db_fetch_mkey
        PROTOTYPE((krb5_context,
                   krb5_principal, 

diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index 2e516d50a5dac4b1f2878e0fe1371639f3a84092..628ca73913c8b8c999f7d45f7748b69ed9a14de9 100644 (file)
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -97,10 +97,6 @@ krb5_error_code krb5_dbm_db_iterate
                   krb5_error_code (*) PROTOTYPE((krb5_pointer,
                                                  krb5_db_entry *)),
                   krb5_pointer ));
-
-/* 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_dbm_db_set_nonblocking 
        PROTOTYPE((krb5_context,
                   krb5_boolean,
@@ -108,16 +104,6 @@ krb5_error_code krb5_dbm_db_set_nonblocking
 krb5_boolean krb5_dbm_db_set_lockmode
        PROTOTYPE((krb5_context,
                   krb5_boolean ));
-#else
-krb5_error_code krb5_dbm_db_set_nonblocking 
-       PROTOTYPE((krb5_context,
-                  int, /* krb5_boolean */
-                   krb5_boolean * ));
-krb5_boolean krb5_dbm_db_set_lockmode
-       PROTOTYPE((krb5_context,
-                  int /* krb5_boolean */ ));
-#endif /* NARROW_PROTOTYPES */
-
 krb5_error_code krb5_dbm_db_open_database 
        PROTOTYPE((krb5_context));
 krb5_error_code krb5_dbm_db_close_database