[dovecot-cvs] dovecot/src/login-common client-common.c, 1.3, 1.4 client-common.h, 1.8, 1.9 common.h, 1.8, 1.9 main.c, 1.28, 1.29 master.c, 1.14, 1.15 master.h, 1.4, 1.5 sasl-server.c, 1.9, 1.10 ssl-proxy-gnutls.c, 1.11, 1.12 ssl-proxy-openssl.c, 1.30, 1.31 ssl-proxy.c, 1.6, 1.7 ssl-proxy.h, 1.5, 1.6

cras at dovecot.org cras at dovecot.org
Fri Jan 13 22:26:42 EET 2006


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

Modified Files:
	client-common.c client-common.h common.h main.c master.c 
	master.h sasl-server.c ssl-proxy-gnutls.c ssl-proxy-openssl.c 
	ssl-proxy.c ssl-proxy.h 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: client-common.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/client-common.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- client-common.c	22 Jul 2005 11:18:55 -0000	1.3
+++ client-common.c	13 Jan 2006 20:26:39 -0000	1.4
@@ -49,7 +49,7 @@
 	return tab;
 }
 
-static int have_key(const struct var_expand_table *table, const char *str)
+static bool have_key(const struct var_expand_table *table, const char *str)
 {
 	char key;
 	unsigned int i;

Index: client-common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/client-common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- client-common.h	14 May 2005 20:32:06 -0000	1.8
+++ client-common.h	13 Jan 2006 20:26:39 -0000	1.9
@@ -26,7 +26,7 @@
 	/* ... */
 };
 
-struct client *client_create(int fd, int ssl, const struct ip_addr *local_ip,
+struct client *client_create(int fd, bool ssl, const struct ip_addr *local_ip,
 			     const struct ip_addr *ip);
 
 void client_syslog(struct client *client, const char *msg);

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- common.h	14 May 2005 20:32:06 -0000	1.8
+++ common.h	13 Jan 2006 20:26:39 -0000	1.9
@@ -11,8 +11,8 @@
 
 extern const char *login_protocol;
 
-extern int disable_plaintext_auth, process_per_connection, greeting_capability;
-extern int verbose_proctitle, verbose_ssl, verbose_auth;
+extern bool disable_plaintext_auth, process_per_connection, greeting_capability;
+extern bool verbose_proctitle, verbose_ssl, verbose_auth;
 extern const char *greeting, *log_format;
 extern const char *const *log_format_elements;
 extern unsigned int max_logging_users;

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- main.c	2 Dec 2005 12:53:26 -0000	1.28
+++ main.c	13 Jan 2006 20:26:39 -0000	1.29
@@ -18,8 +18,8 @@
 #include <unistd.h>
 #include <syslog.h>
 
-int disable_plaintext_auth, process_per_connection, greeting_capability;
-int verbose_proctitle, verbose_ssl, verbose_auth;
+bool disable_plaintext_auth, process_per_connection, greeting_capability;
+bool verbose_proctitle, verbose_ssl, verbose_auth;
 const char *greeting, *log_format;
 const char *const *log_format_elements;
 unsigned int max_logging_users;
@@ -30,7 +30,7 @@
 static struct ioloop *ioloop;
 static struct io *io_listen, *io_ssl_listen;
 static int main_refcount;
-static int is_inetd, closing_down;
+static bool is_inetd, closing_down;
 
 void main_ref(void)
 {
@@ -133,7 +133,7 @@
 }
 
 static void auth_connect_notify(struct auth_client *client __attr_unused__,
-				int connected, void *context __attr_unused__)
+				bool connected, void *context __attr_unused__)
 {
 	if (connected)
                 clients_notify_auth_connected();
@@ -268,7 +268,8 @@
 	unsigned int local_port;
 	struct ssl_proxy *proxy = NULL;
 	struct client *client;
-	int i, fd = -1, master_fd = -1, ssl = FALSE;
+	int i, fd = -1, master_fd = -1;
+	bool ssl = FALSE;
 
 	is_inetd = getenv("DOVECOT_MASTER") == NULL;
 

Index: master.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/master.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- master.c	9 Jan 2005 16:51:06 -0000	1.14
+++ master.c	13 Jan 2006 20:26:39 -0000	1.15
@@ -225,7 +225,7 @@
 	master_pos = 0;
 }
 
-void master_init(int fd, int notify)
+void master_init(int fd, bool notify)
 {
 	main_ref();
 

Index: master.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/master.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- master.h	22 Aug 2003 02:42:13 -0000	1.4
+++ master.h	13 Jan 2006 20:26:39 -0000	1.5
@@ -5,7 +5,7 @@
 
 #include "../master/master-login-interface.h"
 
-typedef void master_callback_t(struct client *client, int success);
+typedef void master_callback_t(struct client *client, bool success);
 
 void master_request_login(struct client *client, master_callback_t *callback,
 			  unsigned int auth_pid, unsigned int auth_id);
@@ -20,7 +20,7 @@
 /* inetd: Connect to existing master process, or create new one. */
 int master_connect(const char *group_name);
 
-void master_init(int fd, int notify);
+void master_init(int fd, bool notify);
 void master_deinit(void);
 
 #endif

Index: sasl-server.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/sasl-server.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sasl-server.c	1 Oct 2005 10:52:15 -0000	1.9
+++ sasl-server.c	13 Jan 2006 20:26:39 -0000	1.10
@@ -22,7 +22,7 @@
 	return auth_flags;
 }
 
-static void master_callback(struct client *client, int success)
+static void master_callback(struct client *client, bool success)
 {
 	client->authenticating = FALSE;
 	client->sasl_callback(client, success ? SASL_SERVER_REPLY_SUCCESS :
@@ -35,7 +35,7 @@
 {
 	struct client *client = context;
 	unsigned int i;
-	int nologin;
+	bool nologin;
 
 	if (!client->authenticating) {
 		/* client aborted */

Index: ssl-proxy-gnutls.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy-gnutls.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ssl-proxy-gnutls.c	7 Aug 2005 11:41:40 -0000	1.11
+++ ssl-proxy-gnutls.c	13 Jan 2006 20:26:39 -0000	1.12
@@ -54,7 +54,7 @@
 
 static void ssl_input(void *context);
 static void plain_input(void *context);
-static int ssl_proxy_destroy(struct ssl_proxy *proxy);
+static bool ssl_proxy_destroy(struct ssl_proxy *proxy);
 
 static const char *get_alert_text(struct ssl_proxy *proxy)
 {

Index: ssl-proxy-openssl.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy-openssl.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ssl-proxy-openssl.c	1 Oct 2005 10:52:15 -0000	1.30
+++ ssl-proxy-openssl.c	13 Jan 2006 20:26:39 -0000	1.31
@@ -54,7 +54,7 @@
 static void ssl_write(struct ssl_proxy *proxy);
 static void ssl_step(void *context);
 static void ssl_proxy_destroy(struct ssl_proxy *proxy);
-static int ssl_proxy_unref(struct ssl_proxy *proxy);
+static void ssl_proxy_unref(struct ssl_proxy *proxy);
 
 static void ssl_set_io(struct ssl_proxy *proxy, enum ssl_io_action action)
 {
@@ -86,7 +86,7 @@
 	}
 }
 
-static void plain_block_input(struct ssl_proxy *proxy, int block)
+static void plain_block_input(struct ssl_proxy *proxy, bool block)
 {
 	if (block) {
 		if (proxy->io_plain_read != NULL) {
@@ -105,7 +105,7 @@
 {
 	struct ssl_proxy *proxy = context;
 	ssize_t ret;
-	int corked = FALSE;
+	bool corked = FALSE;
 
 	if (proxy->sslout_size == sizeof(proxy->sslout_buf)) {
 		/* buffer full, block input until it's written */
@@ -374,7 +374,7 @@
 	return sfd[1];
 }
 
-int ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy)
+bool ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy)
 {
 	return proxy->cert_received && !proxy->cert_broken;
 }
@@ -404,17 +404,16 @@
 	ssl_proxy_unref(proxy);
 }
 
-static int ssl_proxy_unref(struct ssl_proxy *proxy)
+static void ssl_proxy_unref(struct ssl_proxy *proxy)
 {
 	if (--proxy->refcount > 0)
-		return TRUE;
+		return;
 	i_assert(proxy->refcount == 0);
 
 	SSL_free(proxy->ssl);
 	i_free(proxy);
 
 	main_unref();
-	return FALSE;
 }
 
 static void ssl_proxy_destroy(struct ssl_proxy *proxy)

Index: ssl-proxy.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ssl-proxy.c	1 Oct 2005 10:52:15 -0000	1.6
+++ ssl-proxy.c	13 Jan 2006 20:26:39 -0000	1.7
@@ -3,7 +3,7 @@
 #include "lib.h"
 #include "ssl-proxy.h"
 
-int ssl_initialized = FALSE;
+bool ssl_initialized = FALSE;
 
 #ifndef HAVE_SSL
 
@@ -16,7 +16,7 @@
 	return -1;
 }
 
-int ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy __attr_unused__)
+bool ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy __attr_unused__)
 {
 	return FALSE;
 }

Index: ssl-proxy.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ssl-proxy.h	1 Oct 2005 10:52:15 -0000	1.5
+++ ssl-proxy.h	13 Jan 2006 20:26:39 -0000	1.6
@@ -4,13 +4,13 @@
 struct ip_addr;
 struct ssl_proxy;
 
-extern int ssl_initialized;
+extern bool ssl_initialized;
 
 /* establish SSL connection with the given fd, returns a new fd which you
    must use from now on, or -1 if error occurred. Unless -1 is returned,
    the given fd must be simply forgotten. */
 int ssl_proxy_new(int fd, struct ip_addr *ip, struct ssl_proxy **proxy_r);
-int ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy);
+bool ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy);
 const char *ssl_proxy_get_peer_name(struct ssl_proxy *proxy);
 void ssl_proxy_free(struct ssl_proxy *proxy);
 



More information about the dovecot-cvs mailing list