Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
From:   =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
To:     libtirpc-devel@lists.sourceforge.net
Cc:     linux-nfs@vger.kernel.org,
        =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
Date:   Thu, 12 Oct 2023 16:28:29 +0200
Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120909.git.joerg.sommer@navimatix.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T0ozblBHQStTd2kzU1Q0NklXMnc2eHdFM0lBYnFYdW1hQ2w3QVNWeU9HZjBS?=
 =?utf-8?B?N3VDOFNWMlVpbmVNb3Q2M2lacWZRbENqa2Nxd1U5WW9PQjQ2RWNHKzgvejJB?=
 =?utf-8?B?OUw1NE5jRktVNFpFNDhPeTRsQUh2eTRnVG9mYjJsQzFHYVk5RHVyZllLYi9H?=
 =?utf-8?B?NzVhT09uK0JtNnlIQmhEdkhCZ3NYUyt6a1VVQVVjaU1GWXBpcSs1NVlVN1gx?=
 =?utf-8?B?cmVqRlVRKzlkNDJGNWppYkNVeHlFYStvQzIzNmxneEZBcUp4ZDJ0ZnAvSXhp?=
 =?utf-8?B?MGR3WEZsbVZPZ1FPYzl5TVJjczFuYlE2YzlTZXF3QnZjem02ekk5bHNhck5J?=
 =?utf-8?B?MEo5NDJWcm1NWC9DaGJLa1pIWEVhdEZmU2duSXlnSThnbElHclFITHpTbEFM?=
 =?utf-8?B?emNPaXQwamVTNFVuOFdzMnlxYnlTQnlTMTlqZnNUVEpBSjlpN1JDKzd5WnlR?=
 =?utf-8?B?bWNVejlsTG1CWHFJNnE3WStIS2t6b1p2ajY2c0E4ZlhBWDZHSndvQkMyVGdC?=
 =?utf-8?B?Y0dTbC9qZmUyTTQ0WGxxakt3T2NVVDhkb0dCWHZKTHNvNnhuMEpZalp3cnBs?=
 =?utf-8?B?UmVQUno4WW0vNnZJaU1CWVh6aVBzdk1LTzRSWDEveGRwRmcxd2J2SXJBSS9K?=
 =?utf-8?B?Sk9FZWdpTWxnUkJuQU05MVd1aU9sNTd1RXd0cGZNdDRNUkFCUmZUY3Yvem1u?=
 =?utf-8?B?NFJVaGVESEJqeUppek1IYzArc2NkUmtmeEFWYTM1NEVwMmE4bk9LRDRjZzVO?=
 =?utf-8?B?bWlBOWlqVVdKcjk3QzlDejVWTkNDeC9Pek42V2pCVFZVZ05qc1prNVZHUU1L?=
 =?utf-8?B?OGpMMGVhUGZuOGlneHhrNUdxaDBwa2o3bFFlWkk5bWFjaXB0NGYzbEFhS0l2?=
 =?utf-8?B?Ykdxd0ZwZkpPSXVQcEdUQTljdkd1YnhKZWZOR1lqUUN4Q2M1ZFBHNUZnSm9z?=
 =?utf-8?B?ZnFhamRVYk1RU3kvdkFtNEJvK2ZUYlBpbFFzN0VkRklRTDlRYkJ2WjYxZkJO?=
 =?utf-8?B?bC9UYXpvVlVCblN4WWxybkMwNE1QMHp5SnFUeEltNjdvb1hGclZFRlErK3pL?=
 =?utf-8?B?UElSVTZ4MkczN2kzWHlNK2NzcmkyUHNldXFDbHRpTk1KdmczcWJNTXNsU0pt?=
 =?utf-8?B?UkNnU0d2dHQ2WkpudktLZ3F0elNTa0ZEVSs1cVFEZEZZa2NDcmU3UkhzNU1H?=
 =?utf-8?B?dXFmUVB2Y25RWDFzSlkrQnpuL0FnRXQwN1VHT2NtdjhYdnFPUU9oM1NwWkhT?=
 =?utf-8?B?TFlzQ2NqY1VVcmR4M0dDN2tVR29GcEREVk40MHlBMEduRTErTHRLTVNSaWlT?=
 =?utf-8?B?YkpMMVdPNDFlSitTalZtZFBnOXEzbGtoYUo0d0Vic2RxVFNERTlvUStJUlQx?=
 =?utf-8?B?eUhEUFd2aDBNL1h4aE1NT2lrUzhDZElkaEdtSUIwbk9JYzJaZ0ZtSHpzZXo2?=
 =?utf-8?B?d2xPSW1BQ2xqWi9Wb3RqNHlzWlZHaHZoSjVBTndjdG85RG5DWGVUYVlLeHBK?=
 =?utf-8?B?R09ZWCtidlRFNVlsUDIxeVVVV2wwTW5WZWxOeHJKK1phZzBIRVVuTHU3R3k4?=
 =?utf-8?B?SHNpL1ZucVRPSFVGZ0JNNFNlMDdWcFNjWVJFdm5aNVFsMm1WWjhBcWJlbUJG?=
 =?utf-8?B?cTFhYXN4MWtCRFVaci9pdXRraUNvelExWlR0RDFLaXEwaGloMjNRSFBrb3FR?=
 =?utf-8?B?QXdOelZ0Wlh2ZGx4TnBlQ1E3S0t2NUlBT2RVeWJFNHBYTDI0cmNXd2VZZVpX?=
 =?utf-8?B?WDlHalJNTEwxcStJcytKdElPT0hxRWlVWENNNGY1K3hzalkzMVJzMmZ0Qnpk?=
 =?utf-8?B?Y080VVlLcTlRUnYzTi9vM1lSVnBDVWM3OElpWWdZaGJ1dTgxdFM4YlloRmlq?=
 =?utf-8?B?d3ErYVBDTFRwWTVYVjg2SVRJUmVaMmxINGFZanlMdmFhZnRKRWlhODBxWEpV?=
 =?utf-8?B?VUxtdEZEY2ZtU3RqcU1HVHlRWmptY2ZNVFYza3NQb0Ivd1lJQ0FobFlZZlI5?=
 =?utf-8?B?U2JGZzJyWFArZXV4dW0yYm5wZHIzTlJxcGtWc09jbE5rVG5UQVYrWkdwTXFq?=
 =?utf-8?B?RkhDc2dZdzJKWFpCRGd4MnB1SUY0M2VKMlJ4aHRmb0NNZGNjUk8yZXI1OTRS?=
 =?utf-8?B?Um8yZDVwUndDa0E5K1FQUHB5VjI5MlRsN0N4NG9KL3VTcm1RWWhaWjBsbGxX?=
 =?utf-8?B?TWc9PQ==?=
X-OriginatorOrg: navimatix.de
X-MS-Exchange-CrossTenant-Network-Message-Id: 61dd0a91-91e4-4409-a4b8-08dbcb2fa24e
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0102MB3136.eurprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 14:29:25.1907
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: c87b4f54-b992-4813-8f3f-4a876324197f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /joPtzxlYW5lEstley2IhTuREhXqwuXj8ZggUg79DGdPH3SSrPVITFLs4nkDnT+r005vL5nz7o4b0pyUoVimBmkAbXD7x8XSNnJVhbArX/Q=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR01MB7736
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 12 Oct 2023 07:29:34 -0700 (PDT)

If the configuration for IPv6 is disabled, the netconfig should not contain
settings for tcp6 and udp6.

The test for the configure option didn't work, because it check the wrong
variable.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 configure.ac    | 2 +-
 doc/Makefile.am | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fe6c517..b687f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ fi
 AC_ARG_ENABLE(ipv6,
 	[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
 	[],[enable_ipv6=yes])
-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
 if test "x$enable_ipv6" != xno; then
 	AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
 fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d42ab90..b9678f6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,3 +2,8 @@ dist_sysconf_DATA	= netconfig bindresvport.blacklist
 
 CLEANFILES	       = cscope.* *~
 DISTCLEANFILES	       = Makefile.in
+
+if ! INET6
+install-exec-hook:
+	$(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
+endif
-- 
2.34.1