summaryrefslogtreecommitdiff
path: root/hesiod
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-05-02 12:10:48 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-05-02 15:11:02 +0200
commit46cb402c6d621ef89b23fa61247faf623e8fb306 (patch)
tree244f0c55e625837b974f898b9064fd0451068cd3 /hesiod
parentdbdc657dc0b962ef3ac61585c81e0828d8da42ee (diff)
hesiod: Remove DEF_RHS
No functional change because DEF_RHS was already disabled before.
Diffstat (limited to 'hesiod')
-rw-r--r--hesiod/hesiod.c13
-rw-r--r--hesiod/hesiod_p.h1
2 files changed, 0 insertions, 14 deletions
diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c
index 76b9befde2..1869e528af 100644
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -42,7 +42,6 @@
#include "hesiod.h"
#include "hesiod_p.h"
-#undef DEF_RHS
#define _PATH_HESIOD_CONF "/etc/hesiod.conf"
@@ -87,19 +86,7 @@ hesiod_init(void **context) {
if (!configname)
configname = _PATH_HESIOD_CONF;
if (parse_config_file(ctx, configname) < 0) {
-#ifdef DEF_RHS
- /*
- * Use compiled in defaults.
- */
- ctx->LHS = malloc(strlen(DEF_LHS)+1);
- ctx->RHS = malloc(strlen(DEF_RHS)+1);
- if (ctx->LHS == 0 || ctx->RHS == 0)
- goto cleanup;
- strcpy(ctx->LHS, DEF_LHS);
- strcpy(ctx->RHS, DEF_RHS);
-#else
goto cleanup;
-#endif
}
/*
* The default RHS can be overridden by an environment
diff --git a/hesiod/hesiod_p.h b/hesiod/hesiod_p.h
index 7bd291997f..0c00c58538 100644
--- a/hesiod/hesiod_p.h
+++ b/hesiod/hesiod_p.h
@@ -26,7 +26,6 @@
#ifndef _HESIOD_P_H_INCLUDED
#define _HESIOD_P_H_INCLUDED
-#define DEF_RHS ".Athena.MIT.EDU" /* Defaults if HESIOD_CONF */
#define DEF_LHS ".ns" /* file is not */
/* present. */
struct hesiod_p {