Hi,
could someone please apply the attached patch? It removes the ^M from
trace line ends in syslog. Thanks!
Thomas
--
http://www.tmueller.com for pgp key (95702B3B)
--- imapcommands.c.orig 2004-04-27 07:16:49.000000000 +0000
+++ imapcommands.c 2004-05-11 20:31:45.000000000 +0000
@@ -148,7 +148,7 @@
ud->state = IMAPCS_LOGOUT;
trace(TRACE_MESSAGE,
- "_ic_logout(): user (id:%llu) logging out @ [%s]\r\n",
+ "_ic_logout(): user (id:%llu) logging out @ [%s]\n",
ud->userid, timestring);
ci_write(ci->tx, "* BYE dbmail imap server kisses you goodbye\r\n");
@@ -181,7 +181,7 @@
trace(TRACE_DEBUG, "_ic_login(): trying to validate user");
validate_result = auth_validate(args[0], args[1], &userid);
trace(TRACE_MESSAGE,
- "_ic_login(): user (id:%llu, name %s) tries login\r\n",
+ "_ic_login(): user (id:%llu, name %s) tries login\n",
userid, args[0]);
if (validate_result == -1) {
@@ -199,7 +199,7 @@
/* validation failed: invalid user/pass combination */
trace(TRACE_MESSAGE,
- "IMAPD [PID %d]: user (name %s) login rejected @ %s\r\n",
+ "IMAPD [PID %d]: user (name %s) login rejected @ %s\n",
(int) getpid(), args[0], timestring);
ci_write(ci->tx, "%s NO login rejected\r\n", tag);
@@ -208,7 +208,7 @@
/* login ok */
trace(TRACE_MESSAGE,
- "_ic_login(): user (id %llu, name %s) login accepted @ %s\r\n",
+ "_ic_login(): user (id:%llu, name %s) login accepted @ %s\n",
userid, args[0], timestring);
#ifdef PROC_TITLES
set_proc_title("USER %s [%s]", args[0], ci->ip);
@@ -310,7 +310,7 @@
/* validation failed: invalid user/pass combination */
trace(TRACE_MESSAGE,
- "IMAPD [PID %d]: user (name %s) login rejected @ %s\r\n",
+ "IMAPD [PID %d]: user (name %s) login rejected @ %s\n",
(int) getpid(), username, timestring);
return 1;
@@ -325,7 +325,7 @@
db_log_ip(ci->ip);
trace(TRACE_MESSAGE,
- "IMAPD [PID %d]: user (id %llu, name %s) login accepted @ %s\r\n",
+ "IMAPD [PID %d]: user (id %llu, name %s) login accepted @ %s\n",
(int) getpid(), userid, username, timestring);
#ifdef PROC_TITLES
set_proc_title("USER %s [%s]", args[0], ci->ip);
