From patchwork Mon Apr 16 17:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero Gonzalez X-Patchwork-Id: 898793 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netfilter.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40PvqW6tbNz9s0t for ; Tue, 17 Apr 2018 03:04:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752783AbeDPREH (ORCPT ); Mon, 16 Apr 2018 13:04:07 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33053 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752387AbeDPREG (ORCPT ); Mon, 16 Apr 2018 13:04:06 -0400 Received: by mail-wr0-f196.google.com with SMTP id z73so28049037wrb.0 for ; Mon, 16 Apr 2018 10:04:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=IZeHYwKQKaiE07G676+HeRloBr2rJyYzrd0EdHp5wP4=; b=b4EgAA4yQcwFBWiT3Ca9SUdz8VY5F88Q83+AshVdTY1YWcWKRe23vdkck7XYEMicsJ x2Pp4ZLBZgWjkZdeBjQcODxswNvr9ud98ycRI7k8/dipl+zVp95tdVnvmGNGkZyDoy2d Y4Ih3QzNOx7o/BTj1R0vmWt84P/WnZBj/dazzAEuu4A1iIPY4cHPAH0qV2LpT1DsKba9 4aBOP5eR4W7KvohiZggH0/iOlMuHHgrwb26rf4uWdZBBcZZZLxpqxFWe+uj2c6MLYrIU Ri+KZ5cBPxOmcoCLhpR93oZ3B+IMYOwpzbpmteZDYT5S6GwVyxjXRwZBHvRtlcXO0Rfc xIKw== X-Gm-Message-State: ALQs6tC/V0f8LZCWp5SsRpoCvfz2ShYhUyKIPixnhJm8bhfHi7Nv/3iE 8j64BnVV6dHSLKeqmdAipvYkchtR X-Google-Smtp-Source: AIpwx4+UAfOVkNDR13SWcdZ1fdEGL8cJv9OjNy+zFkR4+szCftxZQ0vw4J2cXohB1CZxbEL8vs3Jqg== X-Received: by 10.223.135.156 with SMTP id b28mr1039844wrb.119.1523898245071; Mon, 16 Apr 2018 10:04:05 -0700 (PDT) Received: from endurance (44.red-88-15-116.dynamicip.rima-tde.net. [88.15.116.44]) by smtp.gmail.com with ESMTPSA id 80sm11315411wmk.46.2018.04.16.10.04.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Apr 2018 10:04:04 -0700 (PDT) Received: by endurance (sSMTP sendmail emulation); Mon, 16 Apr 2018 19:04:02 +0200 Subject: [conntrack-tools PATCH] systemd: default to use libsystemd if build with support for it From: Arturo Borrero Gonzalez To: netfilter-devel@vger.kernel.org Date: Mon, 16 Apr 2018 19:04:02 +0200 Message-ID: <152389824276.32583.7500446628583980403.stgit@endurance> User-Agent: StGit/0.18 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org We may assume that if an user does build conntrackd with such feature, is with the intention to use it. So, if that's the case, default to use it. This eases some downstream use cases when dealing with default configs to be shipped to final users. This could be a mid-point solution, given some users are asking for a full revert of commit c01d0d9138112ec95ee316385ea2687dd94fa4e3. Signed-off-by: Arturo Borrero Gonzalez --- src/read_config_yy.y | 4 ++++ 1 file changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/read_config_yy.y b/src/read_config_yy.y index 32cca3c..6de8c6c 100644 --- a/src/read_config_yy.y +++ b/src/read_config_yy.y @@ -1626,6 +1626,10 @@ init_config(char *filename) CONFIG(stats).syslog_facility = -1; CONFIG(netlink).subsys_id = -1; +#ifdef BUILD_SYSTEMD + CONFIG(systemd) = 1; +#endif /* BUILD_SYSTEMD */ + /* Initialize list of user-space helpers */ INIT_LIST_HEAD(&CONFIG(cthelper).list);