changeset 4856:f75041ec22ba HEAD

Changed the service name from uppercase IMAP/POP3 to lowercase imap/pop3 so they're consistent with smtp/deliver.
author Timo Sirainen <tss@iki.fi>
date Sun, 03 Dec 2006 14:13:51 +0200
parents 5bc593f1a8f6
children 32514e2d9670
files src/imap-login/client-authenticate.c src/pop3-login/client-authenticate.c
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client-authenticate.c	Fri Dec 01 23:02:10 2006 +0200
+++ b/src/imap-login/client-authenticate.c	Sun Dec 03 14:13:51 2006 +0200
@@ -17,6 +17,8 @@
 
 #include <stdlib.h>
 
+#define IMAP_SERVICE_NAME "imap"
+
 const char *client_authenticate_get_capabilities(bool secured)
 {
 	const struct auth_mech_desc *mech;
@@ -255,7 +257,7 @@
 		return 0;
 
 	client_ref(client);
-	sasl_server_auth_begin(&client->common, "IMAP", mech_name,
+	sasl_server_auth_begin(&client->common, IMAP_SERVICE_NAME, mech_name,
 			       init_resp, sasl_callback);
 	if (!client->common.authenticating)
 		return 1;
@@ -310,7 +312,7 @@
 	base64_encode(plain_login->data, plain_login->used, base64);
 
 	client_ref(client);
-	sasl_server_auth_begin(&client->common, "IMAP", "PLAIN",
+	sasl_server_auth_begin(&client->common, IMAP_SERVICE_NAME, "PLAIN",
 			       str_c(base64), sasl_callback);
 	if (!client->common.authenticating)
 		return 1;
--- a/src/pop3-login/client-authenticate.c	Fri Dec 01 23:02:10 2006 +0200
+++ b/src/pop3-login/client-authenticate.c	Sun Dec 03 14:13:51 2006 +0200
@@ -19,6 +19,8 @@
 
 #include <stdlib.h>
 
+#define POP3_SERVICE_NAME "pop3"
+
 const char *capability_string = POP3_CAPABILITY_REPLY;
 
 bool cmd_capa(struct pop3_client *client, const char *args __attr_unused__)
@@ -240,7 +242,7 @@
 	}
 
 	client_ref(client);
-	sasl_server_auth_begin(&client->common, "POP3", mech_name,
+	sasl_server_auth_begin(&client->common, POP3_SERVICE_NAME, mech_name,
 			       args, sasl_callback);
 	if (!client->common.authenticating)
 		return TRUE;
@@ -308,7 +310,7 @@
 	base64_encode(plain_login->data, plain_login->used, base64);
 
 	client_ref(client);
-	sasl_server_auth_begin(&client->common, "POP3", "PLAIN",
+	sasl_server_auth_begin(&client->common, POP3_SERVICE_NAME, "PLAIN",
 			       str_c(base64), sasl_callback);
 	if (!client->common.authenticating)
 		return TRUE;
@@ -366,7 +368,7 @@
 	base64_encode(apop_data->data, apop_data->used, base64);
 
 	client_ref(client);
-	sasl_server_auth_begin(&client->common, "POP3", "APOP",
+	sasl_server_auth_begin(&client->common, POP3_SERVICE_NAME, "APOP",
 			       str_c(base64), sasl_callback);
 	if (!client->common.authenticating)
 		return TRUE;