tlshd: Relocate /etc/tlshd.conf

To support TLS session tags, additional configuration files,
outside of /etc/tlshd.conf, will be needed. So create a tlshd
configuration directory:

   /etc/tlshd/

And move /etc/tlshd.conf into that directory as:

   /etc/tlshd/config

For now, tlshd will look for /etc/tlshd.conf first, and warn
that the new file name should be used instead.

XXX: I'm not sure what to rename tlshd.conf.man to.

Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

configure.ac

@@ -81,5 +81,5 @@ AC_CHECK_LIB([gnutls], [gnutls_psk_allocate_client_credentials2],
                         [Define to 1 if you have the gnutls_psk_allocate_client_credentials2 function.])])
 AC_SUBST([AM_CPPFLAGS])
 
-AC_CONFIG_FILES([Makefile src/Makefile src/tlshd/Makefile systemd/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/tlshd/Makefile src/tlshd/etc/Makefile systemd/Makefile])
 AC_OUTPUT

src/tlshd/Makefile.am

@@ -16,11 +16,8 @@
 # 02110-1301, USA.
 #
 
-dist_sysconf_DATA	= tlshd.conf
-
-man5_MANS		= tlshd.conf.man
 man8_MANS		= tlshd.man
-EXTRA_DIST		= $(man5_MANS) $(man8_MANS)
+EXTRA_DIST		= $(man8_MANS)
 
 sbin_PROGRAMS		= tlshd
 tlshd_CFLAGS		= -Werror -Wall -Wextra $(LIBGNUTLS_CFLAGS) \
@@ -31,4 +28,5 @@ tlshd_SOURCES		= client.c config.c handshake.c keyring.c ktls.c log.c \
 tlshd_LDADD		= $(LIBGNUTLS_LIBS) $(LIBKEYUTILS_LIBS) $(GLIB_LIBS) \
 			  $(LIBNL3_LIBS) $(LIBNL_GENL3_LIBS)
 
+SUBDIRS			= etc
 MAINTAINERCLEANFILES	= Makefile.in cscope.out

src/tlshd/etc/Makefile.am

@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2025 Oracle and/or its affiliates.
+#
+# ktls-utils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+tlshdconfigdir		= $(sysconfdir)/tlshd
+
+dist_tlshdconfig_DATA	= config
+
+man5_MANS		= tlshd.conf.man
+EXTRA_DIST		= $(man5_MANS)
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+install-exec-hook:
+	mkdir -p $(DESTDIR)$(tlshdconfigdir)

src/tlshd/tlshd.conf renamed to src/tlshd/etc/config

@@ -22,7 +22,7 @@
 .SH NAME
 tlshd.conf \- tlshd configuration file
 .SH SYNOPSIS
-.B /etc/tlshd.conf
+.B /etc/tlshd/config
 .SH DESCRIPTION
 The
 .B tlshd

src/tlshd/tlshd.conf.man renamed to src/tlshd/etc/tlshd.conf.man

@@ -63,13 +63,14 @@ static void usage(char *progname)
 
 int main(int argc, char **argv)
 {
-	static gchar config_file[PATH_MAX + 1] = "/etc/tlshd.conf";
+	static gchar config_file[PATH_MAX + 1];
 	char *progname;
 	int c;
 	size_t len;
 
 	tlshd_tls_debug = 0;
 	progname = basename(argv[0]);
+	config_file[0] = '\0';
 	while ((c = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) {
 		switch (c) {
 		case 'c':
@@ -100,10 +101,20 @@ int main(int argc, char **argv)
 
 	tlshd_log_init(progname);
 
-	if (!tlshd_config_init(config_file)) {
-		tlshd_log_shutdown();
-		tlshd_log_close();
-		return EXIT_FAILURE;
+	if (config_file[0] != '\0') {
+		if (!tlshd_config_init(config_file)) {
+			tlshd_log_shutdown();
+			tlshd_log_close();
+			return EXIT_FAILURE;
+		}
+	} else {
+		if (tlshd_config_init("/etc/tlshd.conf")) {
+			tlshd_log_notice("Please relocate /etc/tlshd.conf to /etc/tlshd/config");
+		} else if (!tlshd_config_init("/etc/tlshd/config")) {
+			tlshd_log_shutdown();
+			tlshd_log_close();
+			return EXIT_FAILURE;
+		}
 	}
 
 	if (tlshd_gnutls_priority_init()) {