summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/conf.c11
-rw-r--r--sbin/isakmpd/sa.c4
2 files changed, 8 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index 43cea3f9107..aed4ea6acf5 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.59 2003/09/02 18:15:55 ho Exp $ */
+/* $OpenBSD: conf.c,v 1.60 2004/01/06 00:22:48 hshoexer Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -190,15 +190,16 @@ conf_set_now (char *section, char *tag, char *value, int override,
else if (conf_get_str (section, tag))
{
if (!is_default)
- log_print ("conf_set: duplicate tag [%s]:%s, ignoring...\n", section,
- tag);
+ log_print ("conf_set_now: duplicate tag [%s]:%s, ignoring...\n",
+ section, tag);
return 1;
}
node = calloc (1, sizeof *node);
if (!node)
{
- log_error ("conf_set: calloc (1, %lu) failed", (unsigned long)sizeof *node);
+ log_error ("conf_set_now: calloc (1, %lu) failed", (unsigned long)sizeof
+ * node);
return 1;
}
node->section = strdup (section);
@@ -207,7 +208,7 @@ conf_set_now (char *section, char *tag, char *value, int override,
node->is_default = is_default;
LIST_INSERT_HEAD (&conf_bindings[conf_hash (section)], node, link);
- LOG_DBG ((LOG_MISC, 95, "conf_set: [%s]:%s->%s", node->section, node->tag,
+ LOG_DBG ((LOG_MISC, 95, "conf_set_now: [%s]:%s->%s", node->section, node->tag,
node->value));
return 0;
}
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index f556243b1f5..a0817c7b5ea 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sa.c,v 1.73 2003/07/25 08:31:16 markus Exp $ */
+/* $OpenBSD: sa.c,v 1.74 2004/01/06 00:22:48 hshoexer Exp $ */
/* $EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $ */
/*
@@ -947,7 +947,7 @@ sa_teardown_all (void)
int i;
struct sa *sa;
- LOG_DBG((LOG_MISC, 70, "sa_teardown_all.a"));
+ LOG_DBG((LOG_MISC, 70, "sa_teardown_all:"));
/* Get Phase 2 SAs. */
for (i = 0; i <= bucket_mask; i++)
for (sa = LIST_FIRST (&sa_tab[i]); sa; sa = LIST_NEXT (sa, link))