[dovecot-cvs] dovecot/src/master auth-process.c,1.21,1.22 auth-process.h,1.5,1.6 common.h,1.8,1.9 imap-process.c,1.22,1.23 login-process.c,1.24,1.25 main.c,1.23,1.24 master-interface.h,1.3,1.4 settings.c,1.39,1.40 settings.h,1.20,1.21 ssl-init.c,1.6,1.7

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv25916/src/master

Modified Files:
	auth-process.c auth-process.h common.h imap-process.c 
	login-process.c main.c master-interface.h settings.c 
	settings.h ssl-init.c 
Log Message:
Naming style changes, finally got tired of most of the typedefs. Also the
previous enum -> macro change reverted so that we don't use the highest bit
anymore, that's incompatible with old indexes so they will be rebuilt.



Index: auth-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- auth-process.c	19 Dec 2002 23:56:24 -0000	1.21
+++ auth-process.c	5 Jan 2003 13:09:53 -0000	1.22
@@ -16,42 +16,40 @@
 #include <syslog.h>
 #include <sys/stat.h>
 
-typedef struct _WaitingRequest WaitingRequest;
-
-struct _AuthProcess {
-	AuthProcess *next;
+struct auth_process {
+	struct auth_process *next;
 
 	char *name;
 	pid_t pid;
 	int fd;
-	IO io;
-	OStream *output;
+	struct io *io;
+	struct ostream *output;
 
 	unsigned int reply_pos;
-	char reply_buf[sizeof(AuthCookieReplyData)];
+	char reply_buf[sizeof(struct auth_cookie_reply_data)];
 
-	WaitingRequest *requests, **next_request;
+	struct waiting_request *requests, **next_request;
 };
 
-struct _WaitingRequest {
-        WaitingRequest *next;
+struct waiting_request {
+        struct waiting_request *next;
 	unsigned int id;
 
 	AuthCallback callback;
 	void *context;
 };
 
-static Timeout to;
-static AuthProcess *processes;
+static struct timeout *to;
+static struct auth_process *processes;
 
-static void auth_process_destroy(AuthProcess *p);
+static void auth_process_destroy(struct auth_process *p);
 
-static void push_request(AuthProcess *process, unsigned int id,
+static void push_request(struct auth_process *process, unsigned int id,
 			 AuthCallback callback, void *context)
 {
-	WaitingRequest *req;
+	struct waiting_request *req;
 
-	req = i_new(WaitingRequest, 1);
+	req = i_new(struct waiting_request, 1);
 	req->id = id;
 	req->callback = callback;
 	req->context = context;
@@ -60,9 +58,10 @@
 	process->next_request = &req->next;
 }
 
-static void pop_request(AuthProcess *process, AuthCookieReplyData *reply)
+static void pop_request(struct auth_process *process,
+			struct auth_cookie_reply_data *reply)
 {
-	WaitingRequest *req;
+	struct waiting_request *req;
 
 	req = process->requests;
 	if (req == NULL) {
@@ -96,9 +95,10 @@
 	i_free(req);
 }
 
-static void auth_process_input(void *context, int fd, IO io __attr_unused__)
+static void auth_process_input(void *context, int fd,
+			       struct io *io __attr_unused__)
 {
-	AuthProcess *p = context;
+	struct auth_process *p = context;
 	int ret;
 
 	ret = net_receive(fd, p->reply_buf + p->reply_pos,
@@ -114,24 +114,25 @@
 		return;
 
 	/* reply is now read */
-	pop_request(p, (AuthCookieReplyData *) p->reply_buf);
+	pop_request(p, (struct auth_cookie_reply_data *) p->reply_buf);
 	p->reply_pos = 0;
 }
 
-static AuthProcess *auth_process_new(pid_t pid, int fd, const char *name)
+static struct auth_process *
+auth_process_new(pid_t pid, int fd, const char *name)
 {
-	AuthProcess *p;
+	struct auth_process *p;
 
 	PID_ADD_PROCESS_TYPE(pid, PROCESS_TYPE_AUTH);
 
-	p = i_new(AuthProcess, 1);
+	p = i_new(struct auth_process, 1);
 	p->name = i_strdup(name);
 	p->pid = pid;
 	p->fd = fd;
 	p->io = io_add(fd, IO_READ, auth_process_input, p);
 	p->output = o_stream_create_file(fd, default_pool,
-					 sizeof(AuthCookieRequestData)*100,
-					 IO_PRIORITY_DEFAULT, FALSE);
+				sizeof(struct auth_cookie_request_data)*100,
+				IO_PRIORITY_DEFAULT, FALSE);
 
 	p->next_request = &p->requests;
 
@@ -140,10 +141,10 @@
 	return p;
 }
 
-static void auth_process_destroy(AuthProcess *p)
+static void auth_process_destroy(struct auth_process *p)
 {
-	AuthProcess **pos;
-	WaitingRequest *next;
+	struct auth_process **pos;
+	struct waiting_request *next;
 
 	for (pos = &processes; *pos != NULL; pos = &(*pos)->next) {
 		if (*pos == p) {
@@ -169,7 +170,7 @@
 	i_free(p);
 }
 
-static pid_t create_auth_process(AuthConfig *config)
+static pid_t create_auth_process(struct auth_config *config)
 {
 	static char *argv[] = { NULL, NULL };
 	const char *path;
@@ -275,9 +276,9 @@
 	return -1;
 }
 
-AuthProcess *auth_process_find(unsigned int id)
+struct auth_process *auth_process_find(unsigned int id)
 {
-	AuthProcess *p;
+	struct auth_process *p;
 
 	for (p = processes; p != NULL; p = p->next) {
 		if ((unsigned int)p->pid == id)
@@ -288,11 +289,11 @@
 }
 
 void auth_process_request(unsigned int login_pid,
-			  AuthProcess *process, unsigned int id,
+			  struct auth_process *process, unsigned int id,
 			  unsigned char cookie[AUTH_COOKIE_SIZE],
 			  AuthCallback callback, void *context)
 {
-	AuthCookieRequestData req;
+	struct auth_cookie_request_data req;
 
 	req.id = id;
 	req.login_pid = login_pid;
@@ -306,7 +307,7 @@
 
 static unsigned int auth_process_get_count(const char *name)
 {
-	AuthProcess *p;
+	struct auth_process *p;
 	unsigned int count = 0;
 
 	for (p = processes; p != NULL; p = p->next) {
@@ -319,7 +320,7 @@
 
 void auth_processes_destroy_all(void)
 {
-	AuthProcess *next;
+	struct auth_process *next;
 
 	while (processes != NULL) {
 		next = processes->next;
@@ -328,10 +329,11 @@
 	}
 }
 
-static void auth_processes_start_missing(void *context __attr_unused__,
-					 Timeout timeout __attr_unused__)
+static void
+auth_processes_start_missing(void *context __attr_unused__,
+			     struct timeout *timeout __attr_unused__)
 {
-	AuthConfig *config;
+	struct auth_config *config;
 	unsigned int count;
 
         config = auth_processes_config;

Index: auth-process.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/auth-process.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- auth-process.h	19 Dec 2002 23:56:24 -0000	1.5
+++ auth-process.h	5 Jan 2003 13:09:53 -0000	1.6
@@ -2,17 +2,15 @@
 #define __AUTH_PROCESS_H
 
 /* cookie_reply is NULL if some error occured */
-typedef void (*AuthCallback)(AuthCookieReplyData *cookie_reply,
+typedef void (*AuthCallback)(struct auth_cookie_reply_data *cookie_reply,
 			     void *context);
 
-typedef struct _AuthProcess AuthProcess;
-
 /* Find process for given id */
-AuthProcess *auth_process_find(unsigned int id);
+struct auth_process *auth_process_find(unsigned int id);
 
 /* Request information about given cookie */
 void auth_process_request(unsigned int login_pid,
-			  AuthProcess *process, unsigned int id,
+			  struct auth_process *process, unsigned int id,
 			  unsigned char cookie[AUTH_COOKIE_SIZE],
 			  AuthCallback callback, void *context);
 

Index: common.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- common.h	19 Dec 2002 23:56:24 -0000	1.8
+++ common.h	5 Jan 2003 13:09:53 -0000	1.9
@@ -18,7 +18,7 @@
 	PROCESS_TYPE_MAX
 };
 
-extern HashTable *pids;
+extern struct hash_table *pids;
 extern int null_fd, imap_fd, imaps_fd;
 
 /* processes */
@@ -33,12 +33,11 @@
 
 void clean_child_process(void);
 
-MasterReplyResult create_imap_process(int socket, IPADDR *ip,
-				      const char *system_user,
-				      const char *virtual_user,
-				      uid_t uid, gid_t gid, const char *home,
-				      int chroot, const char *mail,
-				      const char *login_tag);
+enum master_reply_result
+create_imap_process(int socket, struct ip_addr *ip,
+		    const char *system_user, const char *virtual_user,
+		    uid_t uid, gid_t gid, const char *home, int chroot,
+		    const char *mail, const char *login_tag);
 void imap_process_destroyed(pid_t pid);
 
 /* misc */

Index: imap-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/imap-process.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- imap-process.c	28 Dec 2002 09:49:16 -0000	1.22
+++ imap-process.c	5 Jan 2003 13:09:53 -0000	1.23
@@ -67,7 +67,7 @@
 static const char *expand_mail_env(const char *env, const char *user,
 				   const char *home)
 {
-	String *str;
+	string_t *str;
 	const char *p, *var;
 	unsigned int width;
 
@@ -139,12 +139,11 @@
 	return str_c(str);
 }
 
-MasterReplyResult create_imap_process(int socket, IPADDR *ip,
-				      const char *system_user,
-				      const char *virtual_user,
-				      uid_t uid, gid_t gid, const char *home,
-				      int chroot, const char *mail,
-				      const char *login_tag)
+enum master_reply_result
+create_imap_process(int socket, struct ip_addr *ip,
+		    const char *system_user, const char *virtual_user,
+		    uid_t uid, gid_t gid, const char *home, int chroot,
+		    const char *mail, const char *login_tag)
 {
 	static char *argv[] = { NULL, NULL, NULL };
 	const char *host;

Index: login-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- login-process.c	29 Dec 2002 19:44:37 -0000	1.24
+++ login-process.c	5 Jan 2003 13:09:53 -0000	1.25
@@ -16,46 +16,46 @@
 #include <unistd.h>
 #include <syslog.h>
 
-typedef struct _LoginProcess LoginProcess;
-
-struct _LoginProcess {
-	LoginProcess *prev_nonlisten, *next_nonlisten;
+struct login_process {
+	struct login_process *prev_nonlisten, *next_nonlisten;
 	int refcount;
 
 	pid_t pid;
 	int fd;
-	IO io;
-	OStream *output;
+	struct io *io;
+	struct ostream *output;
 	unsigned int listening:1;
 	unsigned int destroyed:1;
 };
 
-typedef struct {
-	LoginProcess *process;
+struct login_auth_request {
+	struct login_process *process;
 	unsigned int login_id;
 	unsigned int auth_id;
 	int fd;
 
-	IPADDR ip;
+	struct ip_addr ip;
 	char login_tag[LOGIN_TAG_SIZE];
-} LoginAuthRequest;
+};
 
 static unsigned int auth_id_counter;
-static Timeout to;
+static struct timeout *to;
 
-static HashTable *processes;
-static LoginProcess *oldest_nonlisten_process, *newest_nonlisten_process;
+static struct hash_table *processes;
+static struct login_process *oldest_nonlisten_process;
+static struct login_process *newest_nonlisten_process;
 static unsigned int listening_processes;
 static unsigned int wanted_processes_count;
 
-static void login_process_destroy(LoginProcess *p);
-static void login_process_unref(LoginProcess *p);
+static void login_process_destroy(struct login_process *p);
+static void login_process_unref(struct login_process *p);
 
-static void auth_callback(AuthCookieReplyData *cookie_reply, void *context)
+static void auth_callback(struct auth_cookie_reply_data *cookie_reply,
+			  void *context)
 {
-	LoginAuthRequest *request = context;
-        LoginProcess *process;
-	MasterReply reply;
+	struct login_auth_request *request = context;
+        struct login_process *process;
+	struct master_reply reply;
 
 	if (cookie_reply == NULL || !cookie_reply->success)
 		reply.result = MASTER_RESULT_FAILURE;
@@ -85,7 +85,7 @@
 	i_free(request);
 }
 
-static void login_process_mark_nonlistening(LoginProcess *p)
+static void login_process_mark_nonlistening(struct login_process *p)
 {
 	if (!p->listening) {
 		i_error("login: received another \"not listening\" "
@@ -107,12 +107,12 @@
 }
 
 static void login_process_input(void *context, int fd __attr_unused__,
-				IO io __attr_unused__)
+				struct io *io __attr_unused__)
 {
-	LoginProcess *p = context;
-	AuthProcess *auth_process;
-	LoginAuthRequest *authreq;
-	MasterRequest req;
+	struct login_process *p = context;
+	struct auth_process *auth_process;
+	struct login_auth_request *authreq;
+	struct master_request req;
 	int client_fd, ret;
 
 	ret = fd_read(p->fd, &req, sizeof(req), &client_fd);
@@ -146,13 +146,13 @@
 	}
 
 	/* ask the cookie from the auth process */
-	authreq = i_new(LoginAuthRequest, 1);
+	authreq = i_new(struct login_auth_request, 1);
 	p->refcount++;
 	authreq->process = p;
 	authreq->login_id = req.id;
 	authreq->auth_id = ++auth_id_counter;
 	authreq->fd = client_fd;
-	memcpy(&authreq->ip, &req.ip, sizeof(IPADDR));
+	memcpy(&authreq->ip, &req.ip, sizeof(struct ip_addr));
 	if (strocpy(authreq->login_tag, req.login_tag,
 		    sizeof(authreq->login_tag)) < 0)
 		i_panic("login_tag overflow");
@@ -168,20 +168,20 @@
 	}
 }
 
-static LoginProcess *login_process_new(pid_t pid, int fd)
+static struct login_process *login_process_new(pid_t pid, int fd)
 {
-	LoginProcess *p;
+	struct login_process *p;
 
 	PID_ADD_PROCESS_TYPE(pid, PROCESS_TYPE_LOGIN);
 
-	p = i_new(LoginProcess, 1);
+	p = i_new(struct login_process, 1);
 	p->refcount = 1;
 	p->pid = pid;
 	p->fd = fd;
 	p->listening = TRUE;
 	p->io = io_add(fd, IO_READ, login_process_input, p);
 	p->output = o_stream_create_file(fd, default_pool,
-					 sizeof(MasterReply)*10,
+					 sizeof(struct master_reply)*10,
 					 IO_PRIORITY_DEFAULT, FALSE);
 
 	hash_insert(processes, POINTER_CAST(pid), p);
@@ -189,7 +189,7 @@
 	return p;
 }
 
-static void login_process_remove_from_lists(LoginProcess *p)
+static void login_process_remove_from_lists(struct login_process *p)
 {
 	if (p == oldest_nonlisten_process)
 		oldest_nonlisten_process = p->next_nonlisten;
@@ -204,7 +204,7 @@
 	p->next_nonlisten = p->prev_nonlisten = NULL;
 }
 
-static void login_process_destroy(LoginProcess *p)
+static void login_process_destroy(struct login_process *p)
 {
 	if (p->destroyed)
 		return;
@@ -226,7 +226,7 @@
 	login_process_unref(p);
 }
 
-static void login_process_unref(LoginProcess *p)
+static void login_process_unref(struct login_process *p)
 {
 	if (--p->refcount > 0)
 		return;
@@ -369,8 +369,9 @@
 	wanted_processes_count = 0;
 }
 
-static void login_processes_start_missing(void *context __attr_unused__,
-					  Timeout timeout __attr_unused__)
+static void
+login_processes_start_missing(void *context __attr_unused__,
+			      struct timeout *timeout __attr_unused__)
 {
 	if (!set_login_process_per_connection) {
 		/* create max. one process every second, that way if it keeps

Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- main.c	28 Dec 2002 09:04:01 -0000	1.23
+++ main.c	5 Jan 2003 13:09:53 -0000	1.24
@@ -28,10 +28,10 @@
 };
 
 static const char *configfile = SYSCONFDIR "/" PACKAGE ".conf";
-static IOLoop ioloop;
-static Timeout to;
+static struct ioloop *ioloop;
+static struct timeout *to;
 
-HashTable *pids;
+struct hash_table *pids;
 int null_fd, imap_fd, imaps_fd;
 
 int validate_str(const char *str, size_t max_len)
@@ -82,7 +82,7 @@
         auth_processes_destroy_all();
 }
 
-static const char *get_exit_status_message(FatalExitStatus status)
+static const char *get_exit_status_message(enum fatal_exit_status status)
 {
 	switch (status) {
 	case FATAL_LOGOPEN:
@@ -104,7 +104,7 @@
 }
 
 static void timeout_handler(void *context __attr_unused__,
-			    Timeout timeout __attr_unused__)
+			    struct timeout *timeout __attr_unused__)
 {
 	const char *process_type_name, *msg;
 	pid_t pid;
@@ -150,9 +150,9 @@
 		i_warning("waitpid() failed: %m");
 }
 
-static IPADDR *resolve_ip(const char *name)
+static struct ip_addr *resolve_ip(const char *name)
 {
-	IPADDR *ip;
+	struct ip_addr *ip;
 	int ret, ips_count;
 
 	if (name == NULL)
@@ -160,14 +160,14 @@
 
 	if (strcmp(name, "*") == 0) {
 		/* IPv4 any */
-		ip = t_new(IPADDR, 1);
+		ip = t_new(struct ip_addr, 1);
 		net_get_ip_any4(ip);
 		return ip;
 	}
 
 	if (strcmp(name, "::") == 0) {
 		/* IPv6 any */
-		ip = t_new(IPADDR, 1);
+		ip = t_new(struct ip_addr, 1);
 		net_get_ip_any6(ip);
 		return ip;
 	}
@@ -187,7 +187,7 @@
 
 static void open_fds(void)
 {
-	IPADDR *imap_ip, *imaps_ip;
+	struct ip_addr *imap_ip, *imaps_ip;
 
 	imap_ip = resolve_ip(set_imap_listen);
 	imaps_ip = resolve_ip(set_imaps_listen);

Index: master-interface.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-interface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- master-interface.h	19 Dec 2002 23:56:24 -0000	1.3
+++ master-interface.h	5 Jan 2003 13:09:53 -0000	1.4
@@ -10,25 +10,25 @@
 #define LOGIN_IMAP_LISTEN_FD 1
 #define LOGIN_IMAPS_LISTEN_FD 2
 
-typedef enum {
+enum master_reply_result {
 	MASTER_RESULT_INTERNAL_FAILURE,
 	MASTER_RESULT_SUCCESS,
 	MASTER_RESULT_FAILURE
-} MasterReplyResult;
+};
 
-typedef struct {
+struct master_request {
 	unsigned int id;
 
 	unsigned int auth_process;
 	unsigned char cookie[AUTH_COOKIE_SIZE];
 
-	IPADDR ip;
+	struct ip_addr ip;
 	char login_tag[LOGIN_TAG_SIZE];
-} MasterRequest;
+};
 
-typedef struct {
+struct master_reply {
 	unsigned int id;
-        MasterReplyResult result;
-} MasterReply;
+	enum master_reply_result result;
+};
 
 #endif

Index: settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- settings.c	29 Dec 2002 19:36:41 -0000	1.39
+++ settings.c	5 Jan 2003 13:09:53 -0000	1.40
@@ -11,19 +11,19 @@
 #include <fcntl.h>
 #include <pwd.h>
 
-typedef enum {
+enum setting_type {
 	SET_STR,
 	SET_INT,
 	SET_BOOL
-} SettingType;
+};
 
-typedef struct {
+struct setting {
 	const char *name;
-	SettingType type;
+	enum setting_type type;
 	void *ptr;
-} Setting;
+};
 
-static Setting settings[] = {
+static struct setting settings[] = {
 	{ "base_dir",		SET_STR, &set_base_dir },
 	{ "log_path",		SET_STR, &set_log_path },
 	{ "info_log_path",	SET_STR, &set_info_log_path },
@@ -146,7 +146,7 @@
 unsigned int set_umask = 0077;
 
 /* auth */
-AuthConfig *auth_processes_config = NULL;
+struct auth_config *auth_processes_config = NULL;
 
 static void fix_base_path(char **str)
 {
@@ -172,7 +172,7 @@
 
 static void auth_settings_verify(void)
 {
-	AuthConfig *auth;
+	struct auth_config *auth;
 
 	for (auth = auth_processes_config; auth != NULL; auth = auth->next) {
 		if (access(auth->executable, X_OK) < 0) {
@@ -311,11 +311,11 @@
 	auth_settings_verify();
 }
 
-static AuthConfig *auth_config_new(const char *name)
+static struct auth_config *auth_config_new(const char *name)
 {
-	AuthConfig *auth;
+	struct auth_config *auth;
 
-	auth = i_new(AuthConfig, 1);
+	auth = i_new(struct auth_config, 1);
 	auth->name = i_strdup(name);
 	auth->executable = i_strdup(PKG_LIBEXECDIR"/imap-auth");
 	auth->count = 1;
@@ -325,7 +325,7 @@
 	return auth;
 }
 
-static void auth_config_free(AuthConfig *auth)
+static void auth_config_free(struct auth_config *auth)
 {
 	i_free(auth->name);
 	i_free(auth->methods);
@@ -340,7 +340,7 @@
 
 static const char *parse_new_auth(const char *name)
 {
-	AuthConfig *auth;
+	struct auth_config *auth;
 
 	if (strchr(name, '/') != NULL)
 		return "Authentication process name must not contain '/'";
@@ -358,7 +358,7 @@
 
 static const char *parse_auth(const char *key, const char *value)
 {
-	AuthConfig *auth = auth_processes_config;
+	struct auth_config *auth = auth_processes_config;
 	const char *p;
 	char **ptr;
 
@@ -423,7 +423,7 @@
 
 static const char *parse_setting(const char *key, const char *value)
 {
-	Setting *set;
+	struct setting *set;
 
 	if (strcmp(key, "auth") == 0)
 		return parse_new_auth(value);
@@ -464,7 +464,7 @@
 static void settings_free(void)
 {
 	while (auth_processes_config != NULL) {
-		AuthConfig *auth = auth_processes_config;
+		struct auth_config *auth = auth_processes_config;
 
 		auth_processes_config = auth->next;
                 auth_config_free(auth);
@@ -475,7 +475,7 @@
 
 void settings_read(const char *path)
 {
-	IStream *input;
+	struct istream *input;
 	const char *errormsg;
 	char *line, *key, *p;
 	int fd, linenum;
@@ -545,7 +545,7 @@
 
 void settings_init(void)
 {
-	Setting *set;
+	struct setting *set;
 
 	/* strdup() all default settings */
 	for (set = settings; set->name != NULL; set++) {

Index: settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- settings.h	29 Dec 2002 19:25:48 -0000	1.20
+++ settings.h	5 Jan 2003 13:09:53 -0000	1.21
@@ -60,10 +60,8 @@
 extern unsigned int set_umask;
 
 /* auth */
-typedef struct _AuthConfig AuthConfig;
-
-struct _AuthConfig {
-	AuthConfig *next;
+struct auth_config {
+	struct auth_config *next;
 
 	char *name;
 	char *methods;
@@ -77,7 +75,7 @@
 	unsigned int process_size;
 };
 
-extern AuthConfig *auth_processes_config;
+extern struct auth_config *auth_processes_config;
 
 void settings_read(const char *path);
 

Index: ssl-init.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/ssl-init.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ssl-init.c	21 Dec 2002 12:42:36 -0000	1.6
+++ ssl-init.c	5 Jan 2003 13:09:53 -0000	1.7
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-static Timeout to;
+static struct timeout *to;
 static int generating;
 
 static void generate_parameters_file(const char *fname)