DEB_DESTDIR = $(CURDIR)/debian/tmp
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -Werror=format-security
EXTRA_ARGS=
va_start(ap, format);
- snprintf (StaticBuf, SIZ, format, ap);
- syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
+ vsyslog(LOG_CRIT|LOG_NDELAY|LOG_MAIL, format, ap);
} // outputPrintf
size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
for (NThread = 0; NThread < size; NThread++)
{
- snprintf (StaticBuf, SIZ, "RAW: %p ", stack_frames[NThread]);
- syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
+ syslog(LOG_CRIT|LOG_NDELAY|LOG_MAIL, "RAW: %p ", stack_frames[NThread]);
}
-
strings = backtrace_symbols(stack_frames, size);
for (NThread = 0; NThread < size; NThread++) {
if (strings != NULL) {
- // vsyslogs printf compliance sucks.
- snprintf (StaticBuf, SIZ, "RAW: %p ", strings[NThread]);
- syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
+ syslog(LOG_CRIT|LOG_NDELAY|LOG_MAIL, "RAW: %p ", strings[NThread]);
}
}
} /* createGlobalBacktrace */
size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
for (NThread = 0; NThread < size; NThread++)
{
- snprintf (StaticBuf, SIZ, "RAW: %p ", stack_frames[NThread]);
- syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
+ syslog(LOG_CRIT|LOG_NDELAY|LOG_MAIL, "RAW: %p ", stack_frames[NThread]);
}
} /* createGlobalBacktrace */
snprintf(buf, SIZ,
"Cannot load template file %s [%s]won't send notification\r\n",
file_funambol_msg, strerror(errno));
- syslog(LOG_ERR, buf);
+ syslog(LOG_ERR, "%s", buf);
CtdlAideMessage(buf, "External notifier unable to find message template!");
goto free;
snprintf(buf, SIZ,
"Cannot load template file %s; won't send notification\r\n",
file_funambol_msg);
- syslog(LOG_ERR, buf);
+ syslog(LOG_ERR, "%s", buf);
CtdlAideMessage(buf, "External notifier unable to load message template!");
goto free;
slen = strlen(script_content);
outbuf = malloc (slen + 64);
snprintf(outbuf, slen + 64, "{%ld+}\r\n%s\r\nOK\r\n",slen, script_content);
- cprintf(outbuf);
+ cprintf("%s", outbuf);
}
else
cprintf("No \"there is no script by that name %s \"\r\n", parms[1]);
"An unknown Citadel server called \"%s\" attempted to connect from %s [%s].\n",
node, CC->cs_host, CC->cs_addr
);
- syslog(LOG_WARNING, err_buf);
+ syslog(LOG_WARNING, "%s", err_buf);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
CtdlAideMessage(err_buf, "IGNet Networking.");
return;
"A Citadel server at %s [%s] failed to authenticate as network node \"%s\".\n",
CC->cs_host, CC->cs_addr, node
);
- syslog(LOG_WARNING, err_buf);
+ syslog(LOG_WARNING, "%s", err_buf);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
CtdlAideMessage(err_buf, "IGNet Networking.");
return;
snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
- syslog(LOG_EMERG,Message);
- syslog(LOG_EMERG,ErrSubject);
+ syslog(LOG_EMERG, "%s", Message);
+ syslog(LOG_EMERG, "%s", ErrSubject);
quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
if (errormessages!=NULL) free (errormessages);
errormessages = NULL;
/* If we're using a unix domain socket we can do a bunch of stuff */
if (!strcmp(cithost, UDS)) {
if (!strcasecmp(citport, DEFAULT_PORT)) {
- snprintf(sockpath, sizeof sockpath, file_citadel_socket);
+ snprintf(sockpath, sizeof sockpath, "%s", file_citadel_socket);
}
else {
snprintf(sockpath, sizeof sockpath, "%s/%s", citport, "citadel.socket");
n = read(ipc->sock, rbuf, SIZ);
if (n>0) {
rbuf[n]='\0';
- fprintf(stderr, rbuf);
+ fprintf(stderr, "%s", rbuf);
fflush (stdout);
}
}
}
}
+
+
+#define GetDefaultVALINT(CFGNAME, DEFL) GetDefaultValInt(&config.CFGNAME, "CITADEL_"#CFGNAME, DEFL)
+void GetDefaultValInt(int *WhereTo, const char *VarName, int DefVal)
+{
+ const char *ch;
+ if (*WhereTo == 0) *WhereTo = DefVal;
+
+ if ((setup_type == UI_SILENT) &&
+ (ch = getenv(VarName), ch != NULL))
+ {
+ *WhereTo = atoi(ch);
+ }
+}
+#define GetDefaultVALCHAR(CFGNAME, DEFL) GetDefaultValChar(&config.CFGNAME, "CITADEL_"#CFGNAME, DEFL)
+void GetDefaultValChar(char *WhereTo, const char *VarName, char DefVal)
+{
+ const char *ch;
+ if (*WhereTo == 0) *WhereTo = DefVal;
+
+ if ((setup_type == UI_SILENT) &&
+ (ch = getenv(VarName), ch != NULL))
+ {
+ *WhereTo = atoi(ch);
+ }
+}
+#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr((char**)&config.CFGNAME, sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
+void GetDefaultValStr(char **WhereTo, size_t nMax, const char *VarName, const char *DefVal)
+{
+ const char *ch;
+ if (**WhereTo == '\0')
+ safestrncpy(*WhereTo, DefVal, nMax);
+
+ if ((setup_type == UI_SILENT) &&
+ (ch = getenv(VarName), ch != NULL))
+ {
+ safestrncpy(*WhereTo, ch, nMax);
+ }
+}
+
+
void set_default_values(void)
{
struct passwd *pw;
uname(&my_utsname);
/* set some sample/default values in place of blanks... */
- if (IsEmptyStr(config.c_nodename))
- safestrncpy(config.c_nodename, my_utsname.nodename,
- sizeof config.c_nodename);
+ GetDefaultVALSTR(c_nodename, my_utsname.nodename);
strtok(config.c_nodename, ".");
if (IsEmptyStr(config.c_fqdn) ) {
if ((he = gethostbyname(my_utsname.nodename)) != NULL) {
safestrncpy(config.c_fqdn, my_utsname.nodename, sizeof config.c_fqdn);
}
}
- if (IsEmptyStr(config.c_humannode)) {
- strcpy(config.c_humannode, _("My System"));
- }
- if (IsEmptyStr(config.c_phonenum)) {
- strcpy(config.c_phonenum, _("US 800 555 1212"));
- }
- if (config.c_initax == 0) {
- config.c_initax = 4;
- }
- if (IsEmptyStr(config.c_moreprompt)) strcpy(config.c_moreprompt, "<more>");
- if (IsEmptyStr(config.c_twitroom)) strcpy(config.c_twitroom, "Trashcan");
- if (IsEmptyStr(config.c_baseroom)) strcpy(config.c_baseroom, BASEROOM);
- if (IsEmptyStr(config.c_aideroom)) strcpy(config.c_aideroom, "Aide");
- if (config.c_port_number == 0) {
- config.c_port_number = 504;
- }
- if (config.c_sleeping == 0) {
- config.c_sleeping = 900;
- }
+ GetDefaultVALSTR(c_humannode, _("My System"));
+ GetDefaultVALSTR(c_phonenum, _("US 800 555 1212"));
+
+ GetDefaultVALCHAR(c_initax, 4);
+
+ GetDefaultVALSTR(c_moreprompt, "<more>");
+ GetDefaultVALSTR(c_twitroom, "Trashcan");
+ GetDefaultVALSTR(c_baseroom, BASEROOM);
+ GetDefaultVALSTR(c_aideroom, "Aide");
+ GetDefaultVALINT(c_port_number, 504);
+
+ GetDefaultVALINT(c_sleeping, 900);
+
if (config.c_ctdluid == 0) {
pw = getpwnam("citadel");
if (pw != NULL) {
/*
* Default port numbers for various services
*/
- if (config.c_smtp_port == 0) config.c_smtp_port = 25;
- if (config.c_pop3_port == 0) config.c_pop3_port = 110;
- if (config.c_imap_port == 0) config.c_imap_port = 143;
- if (config.c_msa_port == 0) config.c_msa_port = 587;
- if (config.c_smtps_port == 0) config.c_smtps_port = 465;
- if (config.c_pop3s_port == 0) config.c_pop3s_port = 995;
- if (config.c_imaps_port == 0) config.c_imaps_port = 993;
- if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
- if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
- if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
- if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
+ GetDefaultVALINT(c_smtp_port, 25);
+ GetDefaultVALINT(c_pop3_port, 110);
+ GetDefaultVALINT(c_imap_port, 143);
+ GetDefaultVALINT(c_msa_port, 587);
+ GetDefaultVALINT(c_smtps_port, 465);
+ GetDefaultVALINT(c_pop3s_port, 995);
+ GetDefaultVALINT(c_imaps_port, 993);
+ GetDefaultVALINT(c_pftcpdict_port, -1);
+ GetDefaultVALINT(c_managesieve_port, 2020);
+ GetDefaultVALINT(c_xmpp_c2s_port, 5222);
+ GetDefaultVALINT(c_xmpp_s2s_port, 5269);
}
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -Wformat -Werror=format-security
#-finline-functions
LDFALGS =
# -finline-functions
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: webcit@packages.debian.org\n"
-"POT-Creation-Date: 2009-02-28 11:20+0100\n"
+"POT-Creation-Date: 2011-05-12 20:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. Description
#: ../citadel-webcit.templates:3001
msgid ""
-"Select the port which the SSL HTTP Webcit server should listen on or enter -"
-"1 to disable it."
+"Select the port which the SSL HTTP Webcit server should listen on or enter "
+"-1 to disable it."
msgstr ""
#. Type: select
EXTRA_ARGS=
PROFILE_ARGS=
COMPILER=
+CFLAGS=
#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling compression urldebug iodbg clang"
ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- CC=$(COMPILER) CFLAGS="$(CFLAGS)" ./configure \
+ CC=$(COMPILER) CFLAGS=" -Wformat -Werror=format-security $(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr/sbin/ \
StrBufVAppendPrintf(Error, Format, arg_ptr);
va_end(arg_ptr);
- syslog(1, ChrPtr(Error));
+ syslog(1, "%s", ChrPtr(Error));
WCC = WC;
if (WCC->WFBuf == NULL) WCC->WFBuf = NewStrBuf();
StrBufAppendPrintf(Buf, "%d: %ld]\n", i, LongVector[i]);
}
- syslog(1, ChrPtr(Buf));
+ syslog(1, "%s", ChrPtr(Buf));
FreeStrBuf(&Buf);
}