[dovecot-cvs] dovecot/src/auth auth-cache.c, 1.15, 1.16 auth-cache.h, 1.4, 1.5 auth-client-connection.c, 1.38, 1.39 auth-master-connection.c, 1.38, 1.39 auth-master-listener.c, 1.3, 1.4 auth-master-listener.h, 1.1, 1.2 auth-request-handler.c, 1.9, 1.10 auth-request-handler.h, 1.5, 1.6 auth-request.c, 1.42, 1.43 auth-request.h, 1.20, 1.21 auth-worker-client.c, 1.19, 1.20 auth.c, 1.22, 1.23 auth.h, 1.15, 1.16 common.h, 1.12, 1.13 db-ldap.c, 1.35, 1.36 db-ldap.h, 1.18, 1.19 db-passwd-file.c, 1.16, 1.17 db-passwd-file.h, 1.7, 1.8 main.c, 1.51, 1.52 mech-apop.c, 1.19, 1.20 mech-cram-md5.c, 1.22, 1.23 mech-digest-md5.c, 1.36, 1.37 mech-ntlm.c, 1.22, 1.23 mech-rpa.c, 1.22, 1.23 passdb-bsdauth.c, 1.13, 1.14 passdb-cache.c, 1.14, 1.15 passdb-cache.h, 1.5, 1.6 passdb-pam.c, 1.32, 1.33 passdb-passwd.c, 1.16, 1.17 passdb-shadow.c, 1.17, 1.18 passdb.h, 1.30, 1.31 password-scheme.c, 1.18, 1.19 password-scheme.h, 1.7, 1.8 userdb-ldap.c, 1.37, 1.38 userdb-prefetch.c, 1.1, 1.2 userdb.h, 1.24, 1.25

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv27808/src/auth

Modified Files:
	auth-cache.c auth-cache.h auth-client-connection.c 
	auth-master-connection.c auth-master-listener.c 
	auth-master-listener.h auth-request-handler.c 
	auth-request-handler.h auth-request.c auth-request.h 
	auth-worker-client.c auth.c auth.h common.h db-ldap.c 
	db-ldap.h db-passwd-file.c db-passwd-file.h main.c mech-apop.c 
	mech-cram-md5.c mech-digest-md5.c mech-ntlm.c mech-rpa.c 
	passdb-bsdauth.c passdb-cache.c passdb-cache.h passdb-pam.c 
	passdb-passwd.c passdb-shadow.c passdb.h password-scheme.c 
	password-scheme.h userdb-ldap.c userdb-prefetch.c userdb.h 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: auth-cache.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-cache.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- auth-cache.c	28 Oct 2005 12:02:36 -0000	1.15
+++ auth-cache.c	13 Jan 2006 20:25:57 -0000	1.16
@@ -152,7 +152,7 @@
 
 const char *auth_cache_lookup(struct auth_cache *cache,
 			      const struct auth_request *request,
-			      const char *key, int *expired_r)
+			      const char *key, bool *expired_r)
 {
 	string_t *str;
 	struct cache_node *node;

Index: auth-cache.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-cache.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- auth-cache.h	28 Oct 2005 12:02:36 -0000	1.4
+++ auth-cache.h	13 Jan 2006 20:25:57 -0000	1.5
@@ -21,7 +21,7 @@
    auth_cache_parse_key(). */
 const char *auth_cache_lookup(struct auth_cache *cache,
 			      const struct auth_request *request,
-			      const char *key, int *expired_r);
+			      const char *key, bool *expired_r);
 /* Insert key => value into cache. */
 void auth_cache_insert(struct auth_cache *cache,
 		       const struct auth_request *request,

Index: auth-client-connection.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-client-connection.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- auth-client-connection.c	29 Jul 2005 09:21:27 -0000	1.38
+++ auth-client-connection.c	13 Jan 2006 20:25:57 -0000	1.39
@@ -69,7 +69,7 @@
 	auth_client_send(conn, "%s", reply);
 }
 
-static int
+static bool
 auth_client_input_cpid(struct auth_client_connection *conn, const char *args)
 {
         struct auth_client_connection *old;
@@ -130,7 +130,7 @@
 	return 1;
 }
 
-static int
+static bool
 auth_client_handle_line(struct auth_client_connection *conn, const char *line)
 {
 	if (conn->auth->verbose_debug)
@@ -153,7 +153,7 @@
 {
 	struct auth_client_connection *conn = context;
 	char *line;
-	int ret;
+	bool ret;
 
 	switch (i_stream_read(conn->input)) {
 	case 0:

Index: auth-master-connection.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-master-connection.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- auth-master-connection.c	5 Oct 2005 19:44:05 -0000	1.38
+++ auth-master-connection.c	13 Jan 2006 20:25:57 -0000	1.39
@@ -46,7 +46,7 @@
 	(void)o_stream_sendv(conn->output, iov, 2);
 }
 
-static int
+static bool
 master_input_request(struct auth_master_connection *conn, const char *args)
 {
 	struct auth_client_connection *client_conn;
@@ -100,7 +100,7 @@
 	auth_request_unref(auth_request);
 }
 
-static int
+static bool
 master_input_user(struct auth_master_connection *conn, const char *args)
 {
 	struct auth_request *auth_request;
@@ -141,7 +141,7 @@
 	return TRUE;
 }
 
-static int
+static bool
 master_input_die(struct auth_master_connection *conn)
 {
 	return TRUE;
@@ -151,7 +151,7 @@
 {
 	struct auth_master_connection *conn = context;
  	char *line;
-	int ret;
+	bool ret;
 
 	switch (i_stream_read(conn->input)) {
 	case 0:

Index: auth-master-listener.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-master-listener.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- auth-master-listener.c	4 Jul 2005 11:32:13 -0000	1.3
+++ auth-master-listener.c	13 Jan 2006 20:25:57 -0000	1.4
@@ -153,7 +153,7 @@
 		auth_master_listener_send_handshakes(listeners[i]);
 }
 
-int auth_master_listeners_masters_left(void)
+bool auth_master_listeners_masters_left(void)
 {
         struct auth_master_listener *const *listeners;
 	unsigned int i, count;

Index: auth-master-listener.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-master-listener.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- auth-master-listener.h	19 Apr 2005 13:11:12 -0000	1.1
+++ auth-master-listener.h	13 Jan 2006 20:25:57 -0000	1.2
@@ -25,7 +25,7 @@
 			      enum listener_type type);
 
 void auth_master_listeners_send_handshake(void);
-int auth_master_listeners_masters_left(void);
+bool auth_master_listeners_masters_left(void);
 
 void auth_master_listeners_init(void);
 void auth_master_listeners_deinit(void);

Index: auth-request-handler.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request-handler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- auth-request-handler.c	7 Aug 2005 11:41:19 -0000	1.9
+++ auth-request-handler.c	13 Jan 2006 20:25:57 -0000	1.10
@@ -232,8 +232,8 @@
 	auth_request_handler_remove(handler, request);
 }
 
-int auth_request_handler_auth_begin(struct auth_request_handler *handler,
-				    const char *args)
+bool auth_request_handler_auth_begin(struct auth_request_handler *handler,
+				     const char *args)
 {
 	struct mech_module *mech;
 	struct auth_request *request;
@@ -242,7 +242,7 @@
 	size_t initial_resp_len;
 	unsigned int id;
 	buffer_t *buf;
-	int valid_client_cert;
+	bool valid_client_cert;
 
 	/* <id> <mechanism> [...] */
 	list = t_strsplit(args, "\t");
@@ -328,8 +328,8 @@
 	return TRUE;
 }
 
-int auth_request_handler_auth_continue(struct auth_request_handler *handler,
-				       const char *args)
+bool auth_request_handler_auth_continue(struct auth_request_handler *handler,
+					const char *args)
 {
 	struct auth_request *request;
 	const char *data;

Index: auth-request-handler.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request-handler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- auth-request-handler.h	29 Jul 2005 09:21:27 -0000	1.5
+++ auth-request-handler.h	13 Jan 2006 20:25:57 -0000	1.6
@@ -18,10 +18,10 @@
 
 void auth_request_handler_check_timeouts(struct auth_request_handler *handler);
 
-int auth_request_handler_auth_begin(struct auth_request_handler *handler,
-				    const char *args);
-int auth_request_handler_auth_continue(struct auth_request_handler *handler,
-				       const char *args);
+bool auth_request_handler_auth_begin(struct auth_request_handler *handler,
+				     const char *args);
+bool auth_request_handler_auth_continue(struct auth_request_handler *handler,
+					const char *args);
 void auth_request_handler_master_request(struct auth_request_handler *handler,
 					 struct auth_master_connection *master,
 					 unsigned int id,

Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- auth-request.c	30 Dec 2005 15:43:41 -0000	1.42
+++ auth-request.c	13 Jan 2006 20:25:57 -0000	1.43
@@ -87,7 +87,7 @@
 	request->refcount++;
 }
 
-int auth_request_unref(struct auth_request *request)
+bool auth_request_unref(struct auth_request *request)
 {
 	i_assert(request->refcount > 0);
 	if (--request->refcount > 0)
@@ -117,8 +117,8 @@
 	}
 }
 
-int auth_request_import(struct auth_request *request,
-			const char *key, const char *value)
+bool auth_request_import(struct auth_request *request,
+			 const char *key, const char *value)
 {
 	if (strcmp(key, "user") == 0)
 		request->user = p_strdup(request->pool, value);
@@ -241,7 +241,7 @@
 	auth_cache_insert(passdb_cache, request, passdb->cache_key, str_c(str));
 }
 
-static int
+static bool
 auth_request_handle_passdb_callback(enum passdb_result *result,
 				    struct auth_request *request)
 {
@@ -471,8 +471,8 @@
 		userdb->iface->lookup(request, auth_request_userdb_callback);
 }
 
-int auth_request_set_username(struct auth_request *request,
-			      const char *username, const char **error_r)
+bool auth_request_set_username(struct auth_request *request,
+			       const char *username, const char **error_r)
 {
 	unsigned char *p;
 

Index: auth-request.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- auth-request.h	20 Oct 2005 09:07:48 -0000	1.20
+++ auth-request.h	13 Jan 2006 20:25:57 -0000	1.21
@@ -69,7 +69,7 @@
 		 mech_callback_t *callback, void *context);
 struct auth_request *auth_request_new_dummy(struct auth *auth);
 void auth_request_ref(struct auth_request *request);
-int auth_request_unref(struct auth_request *request);
+bool auth_request_unref(struct auth_request *request);
 
 void auth_request_success(struct auth_request *request,
 			  const void *data, size_t data_size);
@@ -77,8 +77,8 @@
 void auth_request_internal_failure(struct auth_request *request);
 
 void auth_request_export(struct auth_request *request, string_t *str);
-int auth_request_import(struct auth_request *request,
-			const char *key, const char *value);
+bool auth_request_import(struct auth_request *request,
+			 const char *key, const char *value);
 
 void auth_request_initial(struct auth_request *request,
 			  const unsigned char *data, size_t data_size);
@@ -94,8 +94,8 @@
 void auth_request_lookup_user(struct auth_request *request,
 			      userdb_callback_t *callback);
 
-int auth_request_set_username(struct auth_request *request,
-			      const char *username, const char **error_r);
+bool auth_request_set_username(struct auth_request *request,
+			       const char *username, const char **error_r);
 
 void auth_request_set_field(struct auth_request *request,
 			    const char *name, const char *value,

Index: auth-worker-client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-worker-client.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- auth-worker-client.c	30 Dec 2005 15:43:41 -0000	1.19
+++ auth-worker-client.c	13 Jan 2006 20:25:57 -0000	1.20
@@ -279,7 +279,7 @@
 		lookup(auth_request, lookup_user_callback);
 }
 
-static int
+static bool
 auth_worker_handle_line(struct auth_worker_client *client, const char *line)
 {
 	const char *p;
@@ -306,7 +306,7 @@
 {
 	struct auth_worker_client *client = context;
 	char *line;
-	int ret;
+	bool ret;
 
 	switch (i_stream_read(client->input)) {
 	case 0:

Index: auth.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- auth.c	30 Dec 2005 15:43:41 -0000	1.22
+++ auth.c	13 Jan 2006 20:25:57 -0000	1.23
@@ -101,7 +101,7 @@
 	auth->mech_modules = list;
 }
 
-static int auth_passdb_list_have_plain(struct auth *auth)
+static bool auth_passdb_list_have_plain(struct auth *auth)
 {
 	struct auth_passdb *passdb;
 
@@ -112,7 +112,7 @@
 	return FALSE;
 }
 
-static int auth_passdb_list_have_credentials(struct auth *auth)
+static bool auth_passdb_list_have_credentials(struct auth *auth)
 {
 	struct auth_passdb *passdb;
 

Index: auth.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- auth.h	1 Oct 2005 10:52:14 -0000	1.15
+++ auth.h	13 Jan 2006 20:25:57 -0000	1.16
@@ -41,10 +41,10 @@
 	const char *anonymous_username;
 	char username_chars[256];
         char username_translation[256];
-	int ssl_require_client_cert;
-        int ssl_username_from_cert;
+	bool ssl_require_client_cert;
+        bool ssl_username_from_cert;
 
-	int verbose, verbose_debug;
+	bool verbose, verbose_debug;
 };
 
 const string_t *auth_mechanisms_get_list(struct auth *auth);

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/common.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- common.h	28 Feb 2005 22:19:21 -0000	1.12
+++ common.h	13 Jan 2006 20:25:57 -0000	1.13
@@ -9,7 +9,7 @@
 #define WORKER_SERVER_FD 4
 
 extern struct ioloop *ioloop;
-extern int standalone, worker;
+extern bool standalone, worker;
 extern time_t process_start_time;
 
 #endif

Index: db-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- db-ldap.c	7 Jan 2006 01:25:05 -0000	1.35
+++ db-ldap.c	13 Jan 2006 20:25:57 -0000	1.36
@@ -70,7 +70,7 @@
 
 static struct ldap_connection *ldap_connections = NULL;
 
-static void ldap_conn_close(struct ldap_connection *conn, int flush_requests);
+static void ldap_conn_close(struct ldap_connection *conn, bool flush_requests);
 
 static int deref2str(const char *str)
 {
@@ -212,7 +212,7 @@
 	}
 }
 
-int db_ldap_connect(struct ldap_connection *conn)
+bool db_ldap_connect(struct ldap_connection *conn)
 {
 	int ret, fd;
 
@@ -280,7 +280,7 @@
 	return TRUE;
 }
 
-static void ldap_conn_close(struct ldap_connection *conn, int flush_requests)
+static void ldap_conn_close(struct ldap_connection *conn, bool flush_requests)
 {
 	struct hash_iterate_context *iter;
 	void *key, *value;

Index: db-ldap.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-ldap.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- db-ldap.h	7 Jan 2006 01:25:05 -0000	1.18
+++ db-ldap.h	13 Jan 2006 20:25:57 -0000	1.19
@@ -15,7 +15,7 @@
 	const char *uris;
 	const char *dn;
 	const char *dnpass;
-	int auth_bind;
+	bool auth_bind;
 	const char *auth_bind_userdn;
 	const char *deref;
 	const char *scope;
@@ -31,6 +31,7 @@
 	const char *user_global_uid;
 	const char *user_global_gid;
 
+	/* ... */
 	int ldap_deref, ldap_scope;
 	uid_t uid;
 	gid_t gid;
@@ -74,7 +75,7 @@
 struct ldap_connection *db_ldap_init(const char *config_path);
 void db_ldap_unref(struct ldap_connection *conn);
 
-int db_ldap_connect(struct ldap_connection *conn);
+bool db_ldap_connect(struct ldap_connection *conn);
 
 const char *ldap_escape(const char *str);
 const char *ldap_get_error(struct ldap_connection *conn);

Index: db-passwd-file.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-passwd-file.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- db-passwd-file.c	16 Oct 2005 14:06:59 -0000	1.16
+++ db-passwd-file.c	13 Jan 2006 20:25:57 -0000	1.17
@@ -137,7 +137,7 @@
 	return pw;
 }
 
-static int passwd_file_open(struct passwd_file *pw)
+static bool passwd_file_open(struct passwd_file *pw)
 {
 	const char *no_args = NULL;
 	struct istream *input;
@@ -213,7 +213,7 @@
 	i_free(pw);
 }
 
-static int passwd_file_sync(struct passwd_file *pw)
+static bool passwd_file_sync(struct passwd_file *pw)
 {
 	struct stat st;
 
@@ -246,11 +246,11 @@
 	return NULL;
 }
 
-struct db_passwd_file *db_passwd_file_parse(const char *path, int userdb)
+struct db_passwd_file *db_passwd_file_parse(const char *path, bool userdb)
 {
 	struct db_passwd_file *db;
 	const char *p;
-	int percents = FALSE;
+	bool percents = FALSE;
 
 	db = db_passwd_file_find(path);
 	if (db != NULL) {

Index: db-passwd-file.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-passwd-file.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- db-passwd-file.h	16 Oct 2005 14:06:59 -0000	1.7
+++ db-passwd-file.h	13 Jan 2006 20:25:57 -0000	1.8
@@ -42,7 +42,7 @@
 struct passwd_user *
 db_passwd_file_lookup(struct db_passwd_file *db, struct auth_request *request);
 
-struct db_passwd_file *db_passwd_file_parse(const char *path, int userdb);
+struct db_passwd_file *db_passwd_file_parse(const char *path, bool userdb);
 void db_passwd_file_unref(struct db_passwd_file *db);
 
 #endif

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- main.c	6 Dec 2005 14:53:52 -0000	1.51
+++ main.c	13 Jan 2006 20:25:57 -0000	1.52
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 
 struct ioloop *ioloop;
-int standalone = FALSE, worker = FALSE;
+bool standalone = FALSE, worker = FALSE;
 time_t process_start_time;
 
 static struct auth *auth;
@@ -198,7 +198,7 @@
 	restrict_access_by_env(FALSE);
 }
 
-static void main_init(int nodaemon)
+static void main_init(bool nodaemon)
 {
 	struct auth_master_listener *listener;
 
@@ -284,7 +284,7 @@
 
 int main(int argc __attr_unused__, char *argv[])
 {
-	int foreground = FALSE;
+	bool foreground = FALSE;
 
 #ifdef DEBUG
 	if (getenv("GDB") == NULL)

Index: mech-apop.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-apop.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mech-apop.c	28 Dec 2005 17:15:43 -0000	1.19
+++ mech-apop.c	13 Jan 2006 20:25:57 -0000	1.20
@@ -32,8 +32,8 @@
 	unsigned char digest[16];
 };
 
-static int verify_credentials(struct apop_auth_request *request,
-			      const char *credentials)
+static bool verify_credentials(struct apop_auth_request *request,
+			       const char *credentials)
 {
 	unsigned char digest[16];
 	struct md5_context ctx;

Index: mech-cram-md5.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-cram-md5.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mech-cram-md5.c	28 Dec 2005 17:15:43 -0000	1.22
+++ mech-cram-md5.c	13 Jan 2006 20:25:57 -0000	1.23
@@ -46,8 +46,8 @@
 			       dec2str(ioloop_time), my_hostname);
 }
 
-static int verify_credentials(struct cram_auth_request *request,
-			      const char *credentials)
+static bool verify_credentials(struct cram_auth_request *request,
+			       const char *credentials)
 {
 	
 	unsigned char digest[16], context_digest[32];
@@ -80,9 +80,9 @@
 	return TRUE;
 }
 
-static int parse_cram_response(struct cram_auth_request *request,
-			       const unsigned char *data, size_t size,
-			       const char **error_r)
+static bool parse_cram_response(struct cram_auth_request *request,
+				const unsigned char *data, size_t size,
+				const char **error_r)
 {
 	size_t i, space;
 

Index: mech-digest-md5.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-digest-md5.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mech-digest-md5.c	28 Dec 2005 17:15:43 -0000	1.36
+++ mech-digest-md5.c	13 Jan 2006 20:25:57 -0000	1.37
@@ -59,7 +59,8 @@
 	string_t *str;
 	const char *const *tmp;
 	unsigned char nonce[16];
-	int i, first_qop;
+	int i;
+	bool first_qop;
 
 	/*
 	   realm="hostname" (multiple allowed)
@@ -109,8 +110,8 @@
 	return str;
 }
 
-static int verify_credentials(struct digest_auth_request *request,
-			      const char *credentials)
+static bool verify_credentials(struct digest_auth_request *request,
+			       const char *credentials)
 {
 	struct md5_context ctx;
 	unsigned char digest[16];
@@ -222,7 +223,7 @@
 	return TRUE;
 }
 
-static int verify_realm(struct digest_auth_request *request, const char *realm)
+static bool verify_realm(struct digest_auth_request *request, const char *realm)
 {
 	const char *const *tmp;
 
@@ -238,7 +239,7 @@
 	return FALSE;
 }
 
-static int parse_next(char **data, char **key, char **value)
+static bool parse_next(char **data, char **key, char **value)
 {
 	/* @UNSAFE */
 	char *p, *dest;
@@ -291,8 +292,8 @@
 	return TRUE;
 }
 
-static int auth_handle_response(struct digest_auth_request *request,
-				char *key, char *value, const char **error)
+static bool auth_handle_response(struct digest_auth_request *request,
+				 char *key, char *value, const char **error)
 {
 	int i;
 
@@ -449,12 +450,12 @@
 	return TRUE;
 }
 
-static int parse_digest_response(struct digest_auth_request *request,
-				 const unsigned char *data, size_t size,
-				 const char **error)
+static bool parse_digest_response(struct digest_auth_request *request,
+				  const unsigned char *data, size_t size,
+				  const char **error)
 {
 	char *copy, *key, *value;
-	int failed;
+	bool failed;
 
 	/*
 	   realm="realm"

Index: mech-ntlm.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-ntlm.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mech-ntlm.c	28 Dec 2005 17:15:43 -0000	1.22
+++ mech-ntlm.c	13 Jan 2006 20:25:57 -0000	1.23
@@ -25,8 +25,8 @@
 	pool_t pool;
 
 	/* requested: */
-	int ntlm2_negotiated;
-	int unicode_negotiated;
+	bool ntlm2_negotiated;
+	bool unicode_negotiated;
 	const unsigned char *challenge;
 
 	/* received: */

Index: mech-rpa.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-rpa.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mech-rpa.c	28 Dec 2005 17:15:43 -0000	1.22
+++ mech-rpa.c	13 Jan 2006 20:25:57 -0000	1.23
@@ -177,7 +177,7 @@
 	return p + sizeof(rpa_oid);
 }
 
-static int
+static bool
 rpa_parse_token1(const void *data, size_t data_size, const char **error)
 {
 	const unsigned char *end = ((unsigned char *) data) + data_size;
@@ -238,7 +238,7 @@
 	return len;
 }
 
-static int
+static bool
 rpa_verify_realm(struct rpa_auth_request *request, const char *realm)
 {
 	const char *default_realm;
@@ -254,10 +254,10 @@
 			request->auth_request.auth->default_realm :
 			my_hostname;
 
-	return strcasecmp(realm, default_realm) == 0 ? TRUE : FALSE;
+	return strcasecmp(realm, default_realm) == 0;
 }
 
-static int
+static bool
 rpa_parse_token3(struct rpa_auth_request *request, const void *data,
 		 size_t data_size, const char **error)
 {
@@ -439,8 +439,8 @@
 	return buffer_free_without_data(buf);
 }
 
-static int verify_credentials(struct rpa_auth_request *request,
-			      const char *credentials)
+static bool verify_credentials(struct rpa_auth_request *request,
+			       const char *credentials)
 {
 	unsigned char response[16];
 	buffer_t *hash_buffer;

Index: passdb-bsdauth.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-bsdauth.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- passdb-bsdauth.c	16 Oct 2005 14:06:59 -0000	1.13
+++ passdb-bsdauth.c	13 Jan 2006 20:25:57 -0000	1.14
@@ -40,7 +40,7 @@
 	/* clear the passwords from memory */
 	safe_memset(pw->pw_passwd, 0, strlen(pw->pw_passwd));
 
-	if (!result) {
+	if (result == 0) {
 		auth_request_log_info(request, "bsdauth", "password mismatch");
 		callback(PASSDB_RESULT_PASSWORD_MISMATCH, request);
 		return;

Index: passdb-cache.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-cache.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- passdb-cache.c	6 Dec 2005 14:37:15 -0000	1.14
+++ passdb-cache.c	13 Jan 2006 20:25:57 -0000	1.15
@@ -32,12 +32,13 @@
 	}
 }
 
-int passdb_cache_verify_plain(struct auth_request *request, const char *key,
-			      const char *password,
-			      enum passdb_result *result_r, int use_expired)
+bool passdb_cache_verify_plain(struct auth_request *request, const char *key,
+			       const char *password,
+			       enum passdb_result *result_r, int use_expired)
 {
 	const char *value, *cached_pw, *scheme, *const *list;
-	int ret, expired;
+	int ret;
+	bool expired;
 
 	if (passdb_cache == NULL || key == NULL)
 		return FALSE;
@@ -81,14 +82,14 @@
 	return TRUE;
 }
 
-int passdb_cache_lookup_credentials(struct auth_request *request,
-				    const char *key, const char **password_r,
-				    const char **scheme_r,
-				    enum passdb_result *result_r,
-				    int use_expired)
+bool passdb_cache_lookup_credentials(struct auth_request *request,
+				     const char *key, const char **password_r,
+				     const char **scheme_r,
+				     enum passdb_result *result_r,
+				     bool use_expired)
 {
 	const char *value, *const *list;
-	int expired;
+	bool expired;
 
 	if (passdb_cache == NULL)
 		return FALSE;

Index: passdb-cache.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-cache.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- passdb-cache.h	16 Oct 2005 12:03:37 -0000	1.5
+++ passdb-cache.h	13 Jan 2006 20:25:57 -0000	1.6
@@ -6,14 +6,14 @@
 enum passdb_result;
 extern struct auth_cache *passdb_cache;
 
-int passdb_cache_verify_plain(struct auth_request *request, const char *key,
-			      const char *password,
-			      enum passdb_result *result_r, int use_expired);
-int passdb_cache_lookup_credentials(struct auth_request *request,
-				    const char *key, const char **password_r,
-				    const char **scheme_r,
-				    enum passdb_result *result_r,
-				    int use_expired);
+bool passdb_cache_verify_plain(struct auth_request *request, const char *key,
+			       const char *password,
+			       enum passdb_result *result_r, int use_expired);
+bool passdb_cache_lookup_credentials(struct auth_request *request,
+				     const char *key, const char **password_r,
+				     const char **scheme_r,
+				     enum passdb_result *result_r,
+				     bool use_expired);
 
 void passdb_cache_init(void);
 void passdb_cache_deinit(void);

Index: passdb-pam.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-pam.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- passdb-pam.c	13 Jan 2006 15:11:47 -0000	1.32
+++ passdb-pam.c	13 Jan 2006 20:25:57 -0000	1.33
@@ -61,7 +61,7 @@
 struct pam_passdb_module {
 	struct passdb_module module;
 
-	int pam_session;
+	bool pam_session;
 	const char *service_name, *pam_cache_key;
 	struct timeout *to_wait;
 };

Index: passdb-passwd.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-passwd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- passdb-passwd.c	16 Oct 2005 14:06:59 -0000	1.16
+++ passdb-passwd.c	13 Jan 2006 20:25:57 -0000	1.17
@@ -18,7 +18,7 @@
 		    verify_plain_callback_t *callback)
 {
 	struct passwd *pw;
-	int result;
+	bool result;
 
 	pw = getpwnam(request->user);
 	if (pw == NULL) {

Index: passdb-shadow.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-shadow.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- passdb-shadow.c	16 Oct 2005 14:06:59 -0000	1.17
+++ passdb-shadow.c	13 Jan 2006 20:25:57 -0000	1.18
@@ -18,7 +18,7 @@
 		    verify_plain_callback_t *callback)
 {
 	struct spwd *spw;
-	int result;
+	bool result;
 
 	spw = getspnam(request->user);
 	if (spw == NULL) {

Index: passdb.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- passdb.h	30 Dec 2005 15:43:41 -0000	1.30
+++ passdb.h	13 Jan 2006 20:25:57 -0000	1.31
@@ -60,7 +60,7 @@
 	const char *default_pass_scheme;
 	/* If blocking is set to TRUE, use child processes to access
 	   this passdb. */
-	int blocking;
+	bool blocking;
 
 	struct passdb_module_interface iface;
 };

Index: password-scheme.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/password-scheme.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- password-scheme.c	22 Jul 2005 17:01:47 -0000	1.18
+++ password-scheme.c	13 Jan 2006 20:25:57 -0000	1.19
@@ -100,8 +100,8 @@
 	return NULL;
 }
 
-static int crypt_verify(const char *plaintext, const char *password,
-			const char *user __attr_unused__)
+static bool crypt_verify(const char *plaintext, const char *password,
+			 const char *user __attr_unused__)
 {
 	return strcmp(mycrypt(plaintext, password), password) == 0;
 }
@@ -118,8 +118,8 @@
 	return t_strdup(mycrypt(plaintext, salt));
 }
 
-static int md5_verify(const char *plaintext, const char *password,
-		      const char *user __attr_unused__)
+static bool md5_verify(const char *plaintext, const char *password,
+		       const char *user __attr_unused__)
 {
 	const char *str;
 
@@ -152,8 +152,8 @@
 	return str_c(str);
 }
 
-static int sha1_verify(const char *plaintext, const char *password,
-		      const char *user __attr_unused__)
+static bool sha1_verify(const char *plaintext, const char *password,
+			const char *user __attr_unused__)
 {
 	unsigned char sha1_digest[SHA1_RESULTLEN];
 	const char *data;
@@ -200,8 +200,8 @@
 	return str_c(str);
 }
 
-static int ssha_verify(const char *plaintext, const char *password,
-			    const char *user __attr_unused__)
+static bool ssha_verify(const char *plaintext, const char *password,
+			const char *user __attr_unused__)
 {
 	unsigned char sha1_digest[SHA1_RESULTLEN];
 	buffer_t *buf;
@@ -252,8 +252,8 @@
 	return str_c(str);
 }
 
-static int smd5_verify(const char *plaintext, const char *password,
-		       const char *user __attr_unused__)
+static bool smd5_verify(const char *plaintext, const char *password,
+			const char *user __attr_unused__)
 {
 	unsigned char md5_digest[16];
 	buffer_t *buf;
@@ -284,8 +284,8 @@
 	return memcmp(md5_digest, data, 16) == 0;
 }
 
-static int plain_verify(const char *plaintext, const char *password,
-			const char *user __attr_unused__)
+static bool plain_verify(const char *plaintext, const char *password,
+			 const char *user __attr_unused__)
 {
 	return strcmp(password, plaintext) == 0;
 }
@@ -296,8 +296,8 @@
 	return plaintext;
 }
 
-static int hmac_md5_verify(const char *plaintext, const char *password,
-			   const char *user __attr_unused__)
+static bool hmac_md5_verify(const char *plaintext, const char *password,
+			    const char *user __attr_unused__)
 {
 	return strcmp(password_generate_cram_md5(plaintext), password) == 0;
 }
@@ -308,8 +308,8 @@
 	return password_generate_cram_md5(plaintext);
 }
 
-static int digest_md5_verify(const char *plaintext, const char *password,
-			     const char *user)
+static bool digest_md5_verify(const char *plaintext, const char *password,
+			      const char *user)
 {
 	unsigned char digest[16];
 	const char *realm, *str;
@@ -344,8 +344,8 @@
 	return binary_to_hex(digest, sizeof(digest));
 }
 
-static int plain_md5_verify(const char *plaintext, const char *password,
-			    const char *user __attr_unused__)
+static bool plain_md5_verify(const char *plaintext, const char *password,
+			     const char *user __attr_unused__)
 {
 	unsigned char digest[16];
 	const char *str;
@@ -376,8 +376,8 @@
 	return str_c(str);
 }
 
-static int ldap_md5_verify(const char *plaintext, const char *password,
-			   const char *user __attr_unused__)
+static bool ldap_md5_verify(const char *plaintext, const char *password,
+			    const char *user __attr_unused__)
 {
 	unsigned char md5_digest[16];
 	buffer_t *buf;
@@ -405,8 +405,8 @@
 	return memcmp(md5_digest, data, 16) == 0;
 }
 
-static int lm_verify(const char *plaintext, const char *password,
-		       const char *user __attr_unused__)
+static bool lm_verify(const char *plaintext, const char *password,
+		      const char *user __attr_unused__)
 {
 	return strcasecmp(password, password_generate_lm(plaintext)) == 0;
 }
@@ -417,8 +417,8 @@
 	return password_generate_lm(plaintext);
 }
 
-static int ntlm_verify(const char *plaintext, const char *password,
-		       const char *user __attr_unused__)
+static bool ntlm_verify(const char *plaintext, const char *password,
+			const char *user __attr_unused__)
 {
 	return strcasecmp(password, password_generate_ntlm(plaintext)) == 0;
 }
@@ -429,8 +429,8 @@
 	return password_generate_ntlm(plaintext);
 }
 
-static int rpa_verify(const char *plaintext, const char *password,
-		      const char *user __attr_unused__)
+static bool rpa_verify(const char *plaintext, const char *password,
+		       const char *user __attr_unused__)
 {
 	return strcasecmp(password, password_generate_rpa(plaintext)) == 0;
 }

Index: password-scheme.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/password-scheme.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- password-scheme.h	19 Aug 2004 03:56:02 -0000	1.7
+++ password-scheme.h	13 Jan 2006 20:25:57 -0000	1.8
@@ -4,8 +4,8 @@
 struct password_scheme {
 	const char *name;
 
-	int (*password_verify)(const char *plaintext, const char *password,
-			       const char *user);
+	bool (*password_verify)(const char *plaintext, const char *password,
+				const char *user);
 	const char *(*password_generate)(const char *plaintext,
 					 const char *user);
 };

Index: userdb-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/userdb-ldap.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- userdb-ldap.c	30 Dec 2005 15:43:41 -0000	1.37
+++ userdb-ldap.c	13 Jan 2006 20:25:57 -0000	1.38
@@ -29,9 +29,9 @@
 	"", "home", "mail", "system_user", "uid", "gid", NULL
 };
 
-static int append_uid_list(struct auth_request *auth_request,
-                           struct auth_stream_reply *reply,
-			   const char *name, char **vals)
+static bool append_uid_list(struct auth_request *auth_request,
+			    struct auth_stream_reply *reply,
+			    const char *name, char **vals)
 {
 	uid_t uid;
 
@@ -46,9 +46,9 @@
 	return TRUE;
 }
 
-static int append_gid_list(struct auth_request *auth_request,
-                           struct auth_stream_reply *reply,
-			   const char *name, char **vals)
+static bool append_gid_list(struct auth_request *auth_request,
+			    struct auth_stream_reply *reply,
+			    const char *name, char **vals)
 {
 	gid_t gid;
 
@@ -72,7 +72,7 @@
 	const char *name;
 	char *attr, **vals;
 	unsigned int i;
-	int seen_uid = FALSE, seen_gid = FALSE;
+	bool seen_uid = FALSE, seen_gid = FALSE;
 
 	reply = auth_stream_reply_init(auth_request);
 	auth_stream_reply_add(reply, NULL, auth_request->user);

Index: userdb-prefetch.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/userdb-prefetch.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- userdb-prefetch.c	19 Oct 2005 13:38:36 -0000	1.1
+++ userdb-prefetch.c	13 Jan 2006 20:25:57 -0000	1.2
@@ -17,7 +17,7 @@
 	string_t *str;
 	uid_t uid;
 	gid_t gid;
-	int uid_seen, gid_seen;
+	bool uid_seen, gid_seen;
 
 	if (auth_request->extra_fields == NULL) {
 		auth_request_log_error(auth_request, "prefetch",

Index: userdb.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/userdb.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- userdb.h	16 Oct 2005 14:34:40 -0000	1.24
+++ userdb.h	13 Jan 2006 20:25:57 -0000	1.25
@@ -11,7 +11,7 @@
 struct userdb_module {
 	/* If blocking is set to TRUE, use child processes to access
 	   this userdb. */
-	int blocking;
+	bool blocking;
 
 	const struct userdb_module_interface *iface;
 };