Mercurial > dovecot > core-2.2

annotate src/pop3/main.c @ 12782:447bce266022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated copyright notices to include year 2011.
author Timo Sirainen <tss@iki.fi>
date Fri, 04 Mar 2011 20:54:29 +0200
parents 0d455d1a9ea6
children ac006833cd66
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12782
447bce266022 Updated copyright notices to include year 2011.
Timo Sirainen <tss@iki.fi>
parents: 12450
diff changeset
1 /* Copyright (c) 2002-2011 Dovecot authors, see the included COPYING file */
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
9219
97cdfeb57129 Renamed headers to prevent collision if they were flattened on an install.
Mark Washenberger
parents: 9177
diff changeset
3 #include "pop3-common.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "ioloop.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
5 #include "buffer.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
6 #include "istream.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
7 #include "ostream.h"
10459
e9cbc461c525 imap, pop3: Added back ability to run post-login scripts.
Timo Sirainen <tss@iki.fi>
parents: 10456
diff changeset
8 #include "abspath.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
9 #include "base64.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
10 #include "str.h"
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
11 #include "process-title.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 #include "restrict-access.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
13 #include "master-service.h"
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
14 #include "master-login.h"
9661
1780d56a9160 imap/pop3: Compiling fix.
Timo Sirainen <tss@iki.fi>
parents: 9653
diff changeset
15 #include "master-interface.h"
2976
96a4ab34c8f1 Added pop3_uidl_format setting.
Timo Sirainen <tss@iki.fi>
parents: 2952
diff changeset
16 #include "var-expand.h"
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
17 #include "mail-user.h"
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
18 #include "mail-storage-service.h"
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
19
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
20 #include <stdio.h>
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
21 #include <stdlib.h>
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
22 #include <unistd.h>
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
24 #define IS_STANDALONE() \
12425
10c163bb5e22 "Running standalone?" check now uses a new DOVECOT_CHILD_PROCESS environment rather than GENERATION.
Timo Sirainen <tss@iki.fi>
parents: 12366
diff changeset
25 (getenv(MASTER_IS_PARENT_ENV) == NULL)
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
26
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
27 static bool verbose_proctitle = FALSE;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
28 static struct mail_storage_service_ctx *storage_service;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
29 static struct master_login *master_login = NULL;
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
30
1646
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
31 void (*hook_client_created)(struct client **client) = NULL;
a7c742b940e5 Added pop3 hooks
Timo Sirainen <tss@iki.fi>
parents: 1620
diff changeset
32
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
33 void pop3_refresh_proctitle(void)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
34 {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
35 struct client *client;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
36 string_t *title = t_str_new(128);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
37
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
38 if (!verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
39 return;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
40
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
41 str_append_c(title, '[');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
42 switch (pop3_client_count) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
43 case 0:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
44 str_append(title, "idling");
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
45 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
46 case 1:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
47 client = pop3_clients;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
48 str_append(title, client->user->username);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
49 if (client->user->remote_ip != NULL) {
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
50 str_append_c(title, ' ');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
51 str_append(title, net_ip2addr(client->user->remote_ip));
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
52 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
53 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
54 default:
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
55 str_printfa(title, "%u connections", pop3_client_count);
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
56 break;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
57 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
58 str_append_c(title, ']');
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
59 process_title_set(str_c(title));
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
60 }
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
61
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
62 static void pop3_die(void)
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
63 {
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
64 /* do nothing. pop3 connections typically die pretty quick anyway. */
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
65 }
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
66
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
67 static void client_add_input(struct client *client, const buffer_t *buf)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
68 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
69 struct ostream *output;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
70
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
71 if (buf != NULL && buf->used > 0) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
72 if (!i_stream_add_data(client->input, buf->data, buf->used))
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
73 i_panic("Couldn't add client input to stream");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
74 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
75
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
76 output = client->output;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
77 o_stream_ref(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
78 o_stream_cork(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
79 if (!IS_STANDALONE())
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
80 client_send_line(client, "+OK Logged in.");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
81 (void)client_handle_input(client);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
82 o_stream_uncork(output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
83 o_stream_unref(&output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
84 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
85
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
86 static int
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
87 client_create_from_input(const struct mail_storage_service_input *input,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
88 int fd_in, int fd_out, const buffer_t *input_buf,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
89 const char **error_r)
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
90 {
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
91 struct mail_storage_service_user *user;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
92 struct mail_user *mail_user;
7927
2351a81ce699 If commands are pipelined after the login command, pass them to the
Timo Sirainen <tss@iki.fi>
parents: 7109
diff changeset
93 struct client *client;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
94 const struct pop3_settings *set;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
95
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
96 if (mail_storage_service_lookup_next(storage_service, input,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
97 &user, &mail_user, error_r) <= 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
98 return -1;
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
99 restrict_access_allow_coredumps(TRUE);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
100
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
101 set = mail_storage_service_user_get_set(user)[1];
10193
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
102 if (set->verbose_proctitle)
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
103 verbose_proctitle = TRUE;
02e852b2c2c3 pop3: Added support for verbose_proctitle=yes
Timo Sirainen <tss@iki.fi>
parents: 10171
diff changeset
104
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
105 client = client_create(fd_in, fd_out, mail_user, user, set);
11011
110ef59372cd pop3: Don't crash if INBOX can't be opened.
Timo Sirainen <tss@iki.fi>
parents: 10985
diff changeset
106 if (client != NULL) T_BEGIN {
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
107 client_add_input(client, input_buf);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
108 } T_END;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
109 return 0;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
110 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
111
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
112 static void main_stdio_run(const char *username)
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
113 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
114 struct mail_storage_service_input input;
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
115 buffer_t *input_buf;
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
116 const char *value, *error, *input_base64;
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
117
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
118 memset(&input, 0, sizeof(input));
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
119 input.module = input.service = "pop3";
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
120 input.username = username != NULL ? username : getenv("USER");
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
121 if (input.username == NULL && IS_STANDALONE())
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
122 input.username = getlogin();
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
123 if (input.username == NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
124 i_fatal("USER environment missing");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
125 if ((value = getenv("IP")) != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
126 net_addr2ip(value, &input.remote_ip);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
127 if ((value = getenv("LOCAL_IP")) != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
128 net_addr2ip(value, &input.local_ip);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
129
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
130 input_base64 = getenv("CLIENT_INPUT");
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
131 input_buf = input_base64 == NULL ? NULL :
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
132 t_base64_decode_str(input_base64);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
133
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
134 if (client_create_from_input(&input, STDIN_FILENO, STDOUT_FILENO,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
135 input_buf, &error) < 0)
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
136 i_fatal("%s", error);
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
137 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
139 static void
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
140 login_client_connected(const struct master_login_client *client,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
141 const char *username, const char *const *extra_fields)
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142 {
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
143 struct mail_storage_service_input input;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
144 const char *error;
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
145 buffer_t input_buf;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
146
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
147 memset(&input, 0, sizeof(input));
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
148 input.module = input.service = "pop3";
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
149 input.local_ip = client->auth_req.local_ip;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
150 input.remote_ip = client->auth_req.remote_ip;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
151 input.username = username;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
152 input.userdb_fields = extra_fields;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
153
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
154 buffer_create_const_data(&input_buf, client->data,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
155 client->auth_req.data_size);
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
156 if (client_create_from_input(&input, client->fd, client->fd,
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
157 &input_buf, &error) < 0) {
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
158 i_error("%s", error);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
159 (void)close(client->fd);
10456
f0fd3bd7c122 imap, pop3: If client creation fails, update lib-master connection count.
Timo Sirainen <tss@iki.fi>
parents: 10455
diff changeset
160 master_service_client_connection_destroyed(master_service);
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
161 }
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
162 }
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163
11018
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
164 static void login_client_failed(const struct master_login_client *client,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
165 const char *errormsg)
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
166 {
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
167 const char *msg;
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
168
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
169 msg = t_strdup_printf("-ERR [IN-USE] %s\r\n", errormsg);
11212
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
170 if (write(client->fd, msg, strlen(msg)) < 0) {
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
171 /* ignored */
6d9265a3a620 Compiler warning fix.
Timo Sirainen <tss@iki.fi>
parents: 11018
diff changeset
172 }
11018
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
173 }
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
174
11388
b8d3c96e61a7 lib-master API changed to avoid accidentally leaking client connections.
Timo Sirainen <tss@iki.fi>
parents: 11212
diff changeset
175 static void client_connected(struct master_service_connection *conn)
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
176 {
11661
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
177 /* when running standalone, we shouldn't even get here */
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
178 i_assert(master_login != NULL);
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
179
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
180 master_service_client_connection_accept(conn);
1799fbbd104b imap, pop3: Added an assert to client_connected().
Pascal Volk <user@localhost.localdomain.org>
parents: 11388
diff changeset
181 master_login_add(master_login, conn->fd);
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
182 }
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9147
diff changeset
183
10120
b584904d3bc7 Moved process title init to lib-master. With Linux-hack enabled it now preserves command args.
Timo Sirainen <tss@iki.fi>
parents: 10119
diff changeset
184 int main(int argc, char *argv[])
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185 {
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
186 static const struct setting_parser_info *set_roots[] = {
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
187 &pop3_setting_parser_info,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
188 NULL
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
189 };
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
190 enum master_service_flags service_flags = 0;
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
191 enum mail_storage_service_flags storage_service_flags = 0;
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
192 const char *postlogin_socket_path, *username = NULL;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
193 int c;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents: 8590
diff changeset
194
2873
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
195 if (IS_STANDALONE() && getuid() == 0 &&
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
196 net_getpeername(1, NULL, NULL) == 0) {
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
197 printf("-ERR pop3 binary must not be started from "
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
198 "inetd, use pop3-login instead.\n");
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
199 return 1;
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
200 }
72f28a4b964d Make sure imap or pop3 processes cannot be started from inetd.
Timo Sirainen <tss@iki.fi>
parents: 2719
diff changeset
201
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
202 if (IS_STANDALONE()) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
203 service_flags |= MASTER_SERVICE_FLAG_STANDALONE |
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
204 MASTER_SERVICE_FLAG_STD_CLIENT;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
205 } else {
10194
40d8df2b4111 imap, pop3: Connection counting fixes.
Timo Sirainen <tss@iki.fi>
parents: 10193
diff changeset
206 service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
9970
4b28edba5ff9 imap, pop3: Process permissions weren't properly dropped.
Timo Sirainen <tss@iki.fi>
parents: 9969
diff changeset
207 storage_service_flags |=
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
208 MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
9970
4b28edba5ff9 imap, pop3: Process permissions weren't properly dropped.
Timo Sirainen <tss@iki.fi>
parents: 9969
diff changeset
209 }
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
210
10119
1e63221f5c83 Moved most of getopt() handling to lib-master.
Timo Sirainen <tss@iki.fi>
parents: 10101
diff changeset
211 master_service = master_service_init("pop3", service_flags,
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
212 &argc, &argv, "u:");
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
213 while ((c = master_getopt(master_service)) > 0) {
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
214 switch (c) {
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
215 case 'u':
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
216 storage_service_flags |=
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
217 MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
218 username = optarg;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
219 break;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
220 default:
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
221 return FATAL_DEFAULT;
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
222 }
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
223 }
12450
0d455d1a9ea6 imap, pop3: Fixed giving any -parameters.
Timo Sirainen <tss@iki.fi>
parents: 12425
diff changeset
224 postlogin_socket_path = argv[optind] == NULL ? NULL :
0d455d1a9ea6 imap, pop3: Fixed giving any -parameters.
Timo Sirainen <tss@iki.fi>
parents: 12425
diff changeset
225 t_abspath(argv[optind]);
10459
e9cbc461c525 imap, pop3: Added back ability to run post-login scripts.
Timo Sirainen <tss@iki.fi>
parents: 10456
diff changeset
226
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
227 master_service_init_finish(master_service);
10171
7f0ccd367351 Handle shutdown_clients globally for all services.
Timo Sirainen <tss@iki.fi>
parents: 10136
diff changeset
228 master_service_set_die_callback(master_service, pop3_die);
9147
bf448752f6c4 Pass remote/local IPs to mail_users. Standalone mail programs now log with mail_log_prefix.
Timo Sirainen <tss@iki.fi>
parents: 9106
diff changeset
229
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
230 storage_service =
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
231 mail_storage_service_init(master_service,
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
232 set_roots, storage_service_flags);
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
233
10136
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
234 /* fake that we're running, so we know if client was destroyed
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
235 while handling its initial input */
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
236 io_loop_set_running(current_ioloop);
ff200b8e4929 imap/pop3: Cleaned up initialization code.
Timo Sirainen <tss@iki.fi>
parents: 10135
diff changeset
237
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
238 if (IS_STANDALONE()) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
239 T_BEGIN {
10985
93be85bb9db8 imap, pop3: Added -u <username> parameter to do userdb lookup.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
240 main_stdio_run(username);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
241 } T_END;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
242 } else {
12366
0b77044fbdd4 imap, pop3: Use absolute path to auth-master socket.
Timo Sirainen <tss@iki.fi>
parents: 11661
diff changeset
243 master_login = master_login_init(master_service,
0b77044fbdd4 imap, pop3: Use absolute path to auth-master socket.
Timo Sirainen <tss@iki.fi>
parents: 11661
diff changeset
244 t_abspath("auth-master"),
10459
e9cbc461c525 imap, pop3: Added back ability to run post-login scripts.
Timo Sirainen <tss@iki.fi>
parents: 10456
diff changeset
245 postlogin_socket_path,
11018
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
246 login_client_connected,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes).
Timo Sirainen <tss@iki.fi>
parents: 11011
diff changeset
247 login_client_failed);
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
248 io_loop_set_running(current_ioloop);
9080
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
249 }
e560b92ed763 imap and pop3 now use mail-storage-service API.
Timo Sirainen <tss@iki.fi>
parents: 9059
diff changeset
250
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
251 if (io_loop_is_running(current_ioloop))
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
252 master_service_run(master_service, client_connected);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
253 clients_destroy_all();
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
254
10101
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
255 if (master_login != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs.
Timo Sirainen <tss@iki.fi>
parents: 9970
diff changeset
256 master_login_deinit(&master_login);
10130
d1384c2b08e5 Merged single and multi mail_storage_service_*() functions.
Timo Sirainen <tss@iki.fi>
parents: 10120
diff changeset
257 mail_storage_service_deinit(&storage_service);
9348
0c587f108916 lib-master has now a global master_service variable that all binaries use.
Timo Sirainen <tss@iki.fi>
parents: 9263
diff changeset
258 master_service_deinit(&master_service);
1043
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259 return 0;
cacabd33c68a Initial code for POP3 server. RETR isn't working right yet, there's some
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
260 }