}
else if (!strcasecmp(t[1], "time-range")) { // RFC4791 9.9
- syslog(LOG_DEBUG, "time range filter at level %d FIXME add recurrence", this_rule_level);
+ syslog(LOG_DEBUG, "time range filter at level %d", this_rule_level);
+ char *tr_start = (char *)the_beginning_of_time; // default if not specified
+ char *tr_end = (char *)the_end_of_time; // default if not specified
for (int i=2; (i+1)<num_tokens; i+=2) {
- char *tr_start = (char *)the_beginning_of_time; // default if not specified
- char *tr_end = (char *)the_end_of_time; // default if not specified
if (!strcasecmp(t[i], "start")) {
tr_start = t[i+1];
}
else if (!strcasecmp(t[i], "end")) {
tr_end = t[i+1];
}
- if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
- syslog(LOG_DEBUG, "time range matches");
- }
- else {
- syslog(LOG_DEBUG, "time range does not match -- rejecting");
- qual = 0;
- }
+ }
+ if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
+ syslog(LOG_DEBUG, "time range matches");
+ }
+ else {
+ syslog(LOG_DEBUG, "time range does not match -- rejecting");
+ qual = 0;
}
}
strcpy(buf, "DELE ");
do {
sprintf(&buf[strlen(buf)], "%ld", msgnums[i]);
- if ((((i + 1) % 50) == 0) || (i == num_msgs - 1)) // delete up to 50 messages with one server command
- {
+ if ((((i + 1) % 50) == 0) || (i == num_msgs - 1)) { // delete up to 50 messages with one server command
syslog(LOG_DEBUG, "%s", buf);
ctdl_printf(c, "%s", buf);
ctdl_readline(c, buf, sizeof(buf));
if (!strcmp(buf, "text")) {
while ((ctdl_readline(c, buf, sizeof(buf)) >= 0) && (strcmp(buf, "")) && (strcmp(buf, "000"))) {
- // rfc822 header parsing here
+ // RFC822 header parsing here
if (!strncasecmp(buf, "Content-transfer-encoding:", 26)) {
strcpy(content_transfer_encoding, &buf[26]);
string_trim(content_transfer_encoding);
// Output our big pile of markup
StrBufAppendBuf(Target, converted_msg, 0);
- BAIL: // A little trailing vertical whitespace...
+BAIL: // A little trailing vertical whitespace...
StrBufAppendPrintf(Target, "<br>\n");
// Now give back the memory
openlog("webcit", (running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR)), LOG_DAEMON);
// Tell 'em who's in da house
- syslog(LOG_NOTICE, "MAKE WEBCIT GREAT AGAIN!");
+ syslog(LOG_NOTICE, "WEBCIT-NG DEVELOPER BUILD");
syslog(LOG_NOTICE, "Copyright (C) 1996-2024 by the citadel.org team");
syslog(LOG_NOTICE, " ");
syslog(LOG_NOTICE, "This program is open source software. Use, duplication, or");
// TCP sockets layer
//
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2024 by the citadel.org team
//
// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3.
else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) { // specific IPv4
ip_version = 4;
if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
- syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr);
return (-1);
}
}
ip_version = 6;
if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
- syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr);
return (-1);
}
}
if (port_number == 0) {
- syslog(LOG_WARNING, "Cannot start: no port number specified.\n");
+ syslog(LOG_WARNING, "tcp_sockets: cannot start: no port number specified");
return (-1);
}
sin6.sin6_port = htons((u_short) port_number);
ip_addr = ipv4broadcast;
goto retry;
}
- syslog(LOG_WARNING, "Can't create a listening socket: %s\n", strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: can't create a listening socket: %m");
return (-1);
}
}
if (b < 0) {
- syslog(LOG_ERR, "Can't bind: %s\n", strerror(errno));
+ syslog(LOG_ERR, "tcp_sockets: can't bind: %m");
close(s);
return (-1);
}
if (listen(s, queue_len) < 0) {
- syslog(LOG_ERR, "Can't listen: %s\n", strerror(errno));
+ syslog(LOG_ERR, "tcp_sockets: can't listen: %m");
close(s);
return (-1);
}
i = unlink(sockpath);
if ((i != 0) && (errno != ENOENT)) {
- syslog(LOG_WARNING, "webcit: can't unlink %s: %s", sockpath, strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: can't unlink %s: %m", sockpath);
return (-1);
}
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- syslog(LOG_WARNING, "webcit: Can't create a unix domain socket: %s", strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: can't create a unix domain socket: %m");
return (-1);
}
if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- syslog(LOG_WARNING, "webcit: Can't bind: %s", strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: Can't bind: %m");
close(s);
return (-1);
}
if (listen(s, actual_queue_len) < 0) {
- syslog(LOG_WARNING, "webcit: Can't listen: %s", strerror(errno));
+ syslog(LOG_WARNING, "tcp_sockets: Can't listen: %m");
close(s);
return (-1);
}