summaryrefslogtreecommitdiff
path: root/src/mhd
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-03-01 13:44:13 +0100
committerChristian Grothoff <christian@grothoff.org>2020-03-01 13:44:13 +0100
commit440c3dc1f008a012edb57e49c37af4327ac69536 (patch)
treefcfe50e0893bcdf83e05c7a79a71d409d54f4ec9 /src/mhd
parentf457e1332d5963b661741cff8ce2068fa83f5224 (diff)
downloadexchange-440c3dc1f008a012edb57e49c37af4327ac69536.tar.gz
exchange-440c3dc1f008a012edb57e49c37af4327ac69536.tar.bz2
exchange-440c3dc1f008a012edb57e49c37af4327ac69536.zip
fix missing NULL termination on array
Diffstat (limited to 'src/mhd')
-rw-r--r--src/mhd/mhd_config.c39
-rw-r--r--src/mhd/mhd_legal.c11
2 files changed, 27 insertions, 23 deletions
diff --git a/src/mhd/mhd_config.c b/src/mhd/mhd_config.c
index 128e1c27..8ee29ed0 100644
--- a/src/mhd/mhd_config.c
+++ b/src/mhd/mhd_config.c
@@ -49,25 +49,30 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
char **unix_path,
mode_t *unix_mode)
{
- const char *choices[] = {"tcp", "unix"};
+ const char *choices[] = {
+ "tcp",
+ "unix",
+ NULL
+ };
const char *serve_type;
unsigned long long port;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_choice (cfg,
section,
- "serve",
+ "SERVE",
choices,
&serve_type))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
section,
- "serve",
- "serve type required");
+ "SERVE",
+ "serve type (tcp or unix) required");
return GNUNET_SYSERR;
}
- if (0 == strcasecmp (serve_type, "tcp"))
+ if (0 == strcasecmp (serve_type,
+ "tcp"))
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg,
@@ -77,7 +82,7 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
section,
- "port",
+ "PORT",
"port number required");
return GNUNET_SYSERR;
}
@@ -87,15 +92,16 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
section,
- "port",
- "value not in [1,65535]");
+ "PORT",
+ "port number not in [1,65535]");
return GNUNET_SYSERR;
}
*rport = (uint16_t) port;
*unix_path = NULL;
return GNUNET_OK;
}
- if (0 == strcmp (serve_type, "unix"))
+ if (0 == strcmp (serve_type,
+ "unix"))
{
struct sockaddr_un s_un;
char *modestring;
@@ -103,13 +109,13 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
section,
- "unixpath",
+ "UNIXPATH",
unix_path))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
section,
- "unixpath",
- "unixpath required");
+ "UNIXPATH",
+ "UNIXPATH value required");
return GNUNET_SYSERR;
}
if (strlen (*unix_path) >= sizeof (s_un.sun_path))
@@ -291,11 +297,10 @@ TALER_MHD_open_unix_path (const char *unix_path,
/**
- * Bind a listen socket to the UNIX domain path
- * or the TCP port and IP address as specified
- * in @a cfg in section @a section. IF only a
- * port was specified, set @a port and return -1.
- * Otherwise, return the bound file descriptor.
+ * Bind a listen socket to the UNIX domain path or the TCP port and IP address
+ * as specified in @a cfg in section @a section. IF only a port was
+ * specified, set @a port and return -1. Otherwise, return the bound file
+ * descriptor.
*
* @param cfg configuration to parse
* @param section configuration section to use
diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c
index 2ad1497c..f99289a2 100644
--- a/src/mhd/mhd_legal.c
+++ b/src/mhd/mhd_legal.c
@@ -148,8 +148,8 @@ language_matches (const char *language_pattern,
/**
- * Generate a response with a legal document in
- * the format and language of the user's choosing.
+ * Generate a response with a legal document in the format and language of the
+ * user's choosing.
*
* @param conn HTTP connection to handle
* @param legal legal document to serve
@@ -507,10 +507,9 @@ load_language (struct TALER_MHD_Legal *legal,
/**
- * Load set of legal documents as specified in
- * @a cfg in section @a section where the Etag
- * is given under the @param tagoption and the
- * directory under the @a diroption.
+ * Load set of legal documents as specified in @a cfg in section @a section
+ * where the Etag is given under the @param tagoption and the directory under
+ * the @a diroption.
*
* @param cfg configuration to use
* @param section section to load values from