AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

hesiod: Remove DEF_RHS

Browse Source 
No functional change because DEF_RHS was already disabled before.
This commit is contained in:
Florian Weimer 2016-05-02 12:10:48 +02:00
parent dbdc657dc0
commit 46cb402c6d
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,7 +1,13 @@
2016-05-02 Florian Weimer <fweimer@redhat.com>
* hesiod/hesiod_p.h (DEF_RHS): Remove.
* hesiod/hesiod.c (hesiod_init): Remove code for handling DEF_RHS.
2016-05-02 Florian Weimer <fweimer@redhat.com>
* hesiod/hesiod.h: Remove RCS keyword.
* hesiod/hesiod_p.h: Likewise.
* hesiod/hesiod.c: Likewise.
2016-05-01 Arnas Udovičius <arnas.udovicius@gmail.com>

13
hesiod/hesiod.c
View File

@ -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

1
hesiod/hesiod_p.h
View File

@ -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 {