From patchwork Mon May 2 13:53:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 617546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qz5PQ1xjGz9t5P for ; Mon, 2 May 2016 23:53:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=ummUJLOQ; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= LXXoBxoNx63E21smkhPOnPFKWjUbI9qPEUasofq48VzAWEcW0zeb7N72d2EtHJBH lgI7xfhokTsrjLIV3RVj5mrsJiIoNCaHdgHCd0uiPYYucifMdk6sHoGSF3/fLtW3 8fx/d/aD8yha5OGh5KdOIU24ZwwYtUXBr2hJ8fGXCxw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=I3t8FI /SClr7GmjX69nAuOThTgw=; b=ummUJLOQlNT1vMMMjkBB05XcASvmADLGzLu/ZV z7k1oKF8Tz/UPydfauMKFSRQ6O58X9DPE6H4VlsqgSjODbGcstgaQhDzsF7SjKYK /peAzMXIsv+kUxY6cV9hliWhevzC6KE3XOMQRw/HH7TLT8bjAZhGLMW41TSrCwOb /K244= Received: (qmail 1656 invoked by alias); 2 May 2016 13:53:40 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 1627 invoked by uid 89); 2 May 2016 13:53:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=overridden X-HELO: mx1.redhat.com Date: Mon, 02 May 2016 15:53:35 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] hesiod: Remove DEF_RHS User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20160502135335.6ABFB40438A22@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) No functional change because DEF_RHS was already disabled before. 2016-05-02 Florian Weimer * hesiod/hesiod_p.h (DEF_RHS): Remove. * hesiod/hesiod.c (hesiod_init): Remove code for handling DEF_RHS. 2016-05-02 Florian Weimer diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c index 76b9bef..1869e52 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 7bd2919..0c00c58 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 {