nix/nixosTest: fix

.zed/settings.json

@@ -0,0 +1,8 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "tab_size": 8,
+  "hard_tabs": false
+}

configure.ac

@@ -196,22 +196,6 @@ AM_CONDITIONAL([HAVE_CAPNG], [test "$with_capng" != "no"])
 AC_SUBST([CAPNG_CFLAGS])
 AC_SUBST([CAPNG_LIBS])
 
-dnl libsystemd
-AC_ARG_WITH([systemd],
-  AC_HELP_STRING([--with-systemd], [use libsystemd for sd_notify service notifications @<:@default=check@:>@]),
-  [],
-  [with_systemd=check])
-if test "$with_systemd" != "no"; then
-  PKG_CHECK_MODULES([SYSTEMD], [libsystemd],
-		    [with_systemd=yes],[with_systemd=no])
-fi
-if test "$with_systemd" = "yes"; then
-  AC_DEFINE_UNQUOTED([HAVE_SYSTEMD], 1, [whether libsystemd is available for sd_notify])
-fi
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "$with_systemd" != "no"])
-AC_SUBST([SYSTEMD_CFLAGS])
-AC_SUBST([SYSTEMD_LIBS])
-
 dnl mitdb
 AC_ARG_WITH([mitdb],
   AC_HELP_STRING([--with-mitdb], [Path to MIT Kerberos DB include header and shared object]),

flake.nix

@@ -28,6 +28,7 @@
         fileset = lib.fileset.difference ./. (lib.fileset.unions [
           ./.github
           ./.gitignore
+          ./.zed
           ./flake.nix
           ./flake.lock
           ./nix

kadmin/Makefile.am

@@ -72,10 +72,7 @@ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
 	../lib/gssapi/libgssapi.la \
 	$(LDADD_common) \
 	$(LIB_pidfile) \
-	$(LIB_dlopen) \
-	$(SYSTEMD_LIBS)
-
-kadmind_CFLAGS = $(SYSTEMD_CFLAGS)
+	$(LIB_dlopen)
 
 kadmin_LDADD = \
 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \

kadmin/kadm_conn.c

@@ -35,11 +35,6 @@
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-daemon.h>
-/* how often (seconds) to refresh the sd_notify STATUS line while idle */
-#define STATUS_INTERVAL 30
-#endif
 
 extern int daemon_child;
 
@@ -208,52 +203,22 @@ wait_for_connection(krb5_context contextp,
     signal(SIGINT, terminate);
     signal(SIGCHLD, sigchld);
 
-    {
-    struct timeval *tmoutp = NULL;
-#ifdef HAVE_SYSTEMD
-    unsigned long nconns = 0;
-    struct timeval tmout;
-
-    tmoutp = &tmout;
-    sd_notify(0, "READY=1");
-    sd_notifyf(0, "STATUS=Serving; %lu connection(s) accepted", nconns);
-#endif
-
     while (term_flag == 0) {
 	read_set = orig_read_set;
-#ifdef HAVE_SYSTEMD
-	tmout.tv_sec = STATUS_INTERVAL;
-	tmout.tv_usec = 0;
-#endif
-	e = select(max_fd + 1, &read_set, NULL, NULL, tmoutp);
+	e = select(max_fd + 1, &read_set, NULL, NULL, NULL);
 	if(rk_IS_SOCKET_ERROR(e)) {
 	    if(rk_SOCK_ERRNO != EINTR)
 		krb5_warn(contextp, rk_SOCK_ERRNO, "select");
-	} else if(e == 0) {
-#ifdef HAVE_SYSTEMD
-	    /* select timed out: refresh our systemd status line */
-	    sd_notifyf(0, "STATUS=Serving; %lu connection(s) accepted", nconns);
-#else
+	} else if(e == 0)
 	    krb5_warnx(contextp, "select returned 0");
-#endif
-	} else {
+	else {
 	    for(i = 0; i < num_socks; i++) {
-		if(FD_ISSET(socks[i], &read_set)) {
+		if(FD_ISSET(socks[i], &read_set))
 		    if(spawn_child(contextp, socks, num_socks, i) == 0)
 			return;
-#ifdef HAVE_SYSTEMD
-		    nconns++;
-#endif
-		}
 	    }
 	}
     }
-    }
-
-#ifdef HAVE_SYSTEMD
-    sd_notify(0, "STOPPING=1");
-#endif
-
     signal(SIGCHLD, SIG_IGN);
 
     while ((waitpid(-1, &status, WNOHANG)) > 0)
@@ -273,37 +238,12 @@ start_server(krb5_context contextp, const char *port_str)
     unsigned int num_socks = 0;
     int i;
 
-#ifdef HAVE_SYSTEMD
-    {
-	char **names = NULL;
-	int sd_n, j;
+    if (port_str == NULL)
+	port_str = "+";
 
-	sd_n = sd_listen_fds_with_names(0, &names);
-	if (sd_n < 0)
-	    krb5_err(contextp, 1, -sd_n, "sd_listen_fds_with_names");
-	if (sd_n > 0) {
-	    socks = malloc(sd_n * sizeof(*socks));
-	    if (socks == NULL)
-		krb5_err(contextp, 1, errno, "malloc");
-	    for (j = 0; j < sd_n; j++) {
-		if (names != NULL && names[j] != NULL &&
-		    strncmp(names[j], "kadmind", 7) == 0)
-		    socks[num_socks++] = SD_LISTEN_FDS_START + j;
-	    }
-	}
-	for (j = 0; names != NULL && names[j] != NULL; j++)
-	    free(names[j]);
-	free(names);
-    }
-#endif /* HAVE_SYSTEMD */
+    parse_ports(contextp, port_str);
 
-    if (num_socks == 0) {
-	if (port_str == NULL)
-	    port_str = "+";
-
-	parse_ports(contextp, port_str);
-
-	for(p = kadm_ports; p; p = p->next) {
+    for(p = kadm_ports; p; p = p->next) {
 	struct addrinfo hints, *ai, *ap;
 	char portstr[32];
 	memset (&hints, 0, sizeof(hints));
@@ -359,7 +299,6 @@ start_server(krb5_context contextp, const char *port_str)
 	    socks[num_socks++] = s;
 	}
 	freeaddrinfo (ai);
-	}
     }
     if(num_socks == 0)
 	krb5_errx(contextp, 1, "no sockets to listen to - exiting");

kdc/Makefile.am

@@ -198,12 +198,12 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_roken) \
 	$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB)
 
-kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS) $(SYSTEMD_LIBS)
+kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS)
 
 if FRAMEWORK_SECURITY
 kdc_LDFLAGS = -framework SystemConfiguration -framework CoreFoundation
 endif
-kdc_CFLAGS = $(CAPNG_CFLAGS) $(SYSTEMD_CFLAGS)
+kdc_CFLAGS = $(CAPNG_CFLAGS)
 
 kdc_replay_LDADD = libkdc.la $(LDADD) $(LIB_pidfile)
 kdc_tester_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase)

kdc/connect.c

@@ -33,10 +33,6 @@
 
 #include "kdc_locl.h"
 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-daemon.h>
-#endif
-
 /*
  * a tuple describing on what to listen
  */
@@ -299,69 +295,6 @@ init_socket(krb5_context context,
     socket_set_keepalive(d->s, 1);
 }
 
-#ifdef HAVE_SYSTEMD
-/*
- * Allocate descriptors for the sockets handed to us via systemd socket
- * activation whose FileDescriptorName is "kdc", and return then number of
- * them (0 if we were not socket-activated).
- */
-
-static int
-init_sockets_sd(krb5_context context,
-		krb5_kdc_configuration *config,
-		struct descr **desc)
-{
-    char **names = NULL;
-    struct descr *d;
-    int n, i, num = 0;
-
-    n = sd_listen_fds_with_names(0, &names);
-    if (n < 0)
-	krb5_err(context, 1, -n, "sd_listen_fds_with_names");
-    if (n == 0)
-	return 0;
-
-    d = malloc(n * sizeof(*d));
-    if (d == NULL)
-	krb5_errx(context, 1, "malloc(%lu) failed",
-		  (unsigned long)n * sizeof(*d));
-
-    for (i = 0; i < n; i++) {
-	int fd = SD_LISTEN_FDS_START + i;
-	int type;
-	socklen_t tlen = sizeof(type);
-
-	if (names == NULL || names[i] == NULL ||
-	    strncmp(names[i], "kdc", 3) != 0)
-	    continue;
-	if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &tlen) < 0) {
-	    krb5_warn(context, errno,
-		      "getsockopt(SO_TYPE) on socket-activated fd %d", fd);
-	    continue;
-	}
-	init_descr(&d[num]);
-	d[num].s = fd;
-	d[num].type = type;
-	socket_set_nonblocking(fd, 1);
-	kdc_log(context, config, 3, "listening on socket-activated fd %d (%s)",
-		fd, (type == SOCK_STREAM) ? "tcp" : "udp");
-	num++;
-    }
-
-    for (i = 0; names != NULL && names[i] != NULL; i++)
-	free(names[i]);
-    free(names);
-
-    if (num == 0) {
-	free(d);
-	return 0;
-    }
-    reinit_descrs(d, num);
-    *desc = d;
-    return num;
-}
-#endif /* HAVE_SYSTEMD */
-
 /*
  * Allocate descriptors for all the sockets that we should listen on
  * and return the number of them.
@@ -1258,12 +1191,7 @@ start_kdc(krb5_context context,
     socket_set_nonblocking(islive[1], 1);
 #endif
 
-    ndescr = 0;
-#ifdef HAVE_SYSTEMD
-    ndescr = init_sockets_sd(context, config, &d);
-#endif
-    if (ndescr <= 0)
-	ndescr = init_sockets(context, config, &d);
+    ndescr = init_sockets(context, config, &d);
     if(ndescr <= 0)
 	krb5_errx(context, 1, "No sockets!");
 
@@ -1281,11 +1209,6 @@ start_kdc(krb5_context context,
 
     roken_detach_finish(NULL, daemon_child);
 
-#ifdef HAVE_SYSTEMD
-    sd_notify(0, "READY=1");
-    sd_notify(0, "STATUS=Serving requests");
-#endif
-
 #ifdef HAVE_FORK
     if (!testing_flag) {
         /* Note that we might never execute the body of this loop */
@@ -1327,20 +1250,12 @@ start_kdc(krb5_context context,
                 kdc_log(context, config, 3, "KDC worker process started: %d",
                         pid);
                 num_kdcs++;
-#ifdef HAVE_SYSTEMD
-                sd_notifyf(0, "STATUS=Serving requests; %d of %d KDC worker "
-                           "process(es) running", num_kdcs, max_kdcs);
-#endif
                 /* Slow down the creation of KDCs... */
                 select_sleep(12500);
                 break;
             }
         }
 
-#ifdef HAVE_SYSTEMD
-        sd_notify(0, "STOPPING=1");
-#endif
-
         /* Closing these sockets should cause the kids to die... */
 
         close(islive[0]);
@@ -1392,17 +1307,11 @@ start_kdc(krb5_context context,
         kdc_log(context, config, 3, "KDC master process exiting");
     } else {
         loop(context, config, &d, &ndescr, -1);
-#ifdef HAVE_SYSTEMD
-        sd_notify(0, "STOPPING=1");
-#endif
         kdc_log(context, config, 3, "KDC exiting");
     }
     free(pids);
 #else
     loop(context, config, &d, &ndescr, -1);
-#ifdef HAVE_SYSTEMD
-    sd_notify(0, "STOPPING=1");
-#endif
     kdc_log(context, config, 3, "KDC exiting");
 #endif
 

kpasswd/Makefile.am

@@ -24,10 +24,7 @@ kpasswdd_LDADD = \
 	$(LDADD) \
 	$(LIB_pidfile) \
 	$(LIB_dlopen) \
-	$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) \
-	$(SYSTEMD_LIBS)
-
-kpasswdd_CFLAGS = $(SYSTEMD_CFLAGS)
+	$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB)
 
 LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \

kpasswd/kpasswdd.c

@@ -41,11 +41,6 @@ RCSID("$Id$");
 #include <hdb.h>
 #include <kadm5/private.h>
 #include <kadm5/kadm5_err.h>
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-daemon.h>
-/* how often (seconds) to refresh the sd_notify STATUS line while idle */
-#define STATUS_INTERVAL 30
-#endif
 
 static krb5_context context;
 static krb5_log_facility *log_facility;
@@ -706,166 +701,81 @@ doit(krb5_keytab keytab, int port)
     fd_set real_fdset;
     struct sockaddr_storage __ss;
     struct sockaddr *sa = (struct sockaddr *)&__ss;
-    int sd_activated = 0;
 
-#ifdef HAVE_SYSTEMD
-    {
-	char **names = NULL;
-	int sd_n, j;
-
-	sd_n = sd_listen_fds_with_names(0, &names);
-	if (sd_n < 0)
-	    krb5_err(context, 1, -sd_n, "sd_listen_fds_with_names");
-	if (sd_n > 0) {
-	    sd_activated = 1;
-	    sockets = malloc(sd_n * sizeof(*sockets));
-	    if (sockets == NULL)
-		krb5_errx(context, 1, "out of memory");
-	    memset(&addrs, 0, sizeof(addrs));
-	    addrs.val = malloc(sd_n * sizeof(*addrs.val));
-	    if (addrs.val == NULL)
-		krb5_errx(context, 1, "out of memory");
-	    n = 0;
-	    maxfd = -1;
-	    FD_ZERO(&real_fdset);
-	    for (j = 0; j < sd_n; j++) {
-		int fd = SD_LISTEN_FDS_START + j;
-		krb5_socklen_t sa_size = sizeof(__ss);
-
-		if (names == NULL || names[j] == NULL ||
-		    strncmp(names[j], "kpasswdd", 8) != 0)
-		    continue;
-		if (getsockname(fd, sa, &sa_size) < 0) {
-		    krb5_warn(context, errno,
-			      "getsockname on socket-activated fd %d", fd);
-		    continue;
-		}
-		if (krb5_sockaddr2address(context, sa, &addrs.val[n]) != 0)
-		    continue;
-		sockets[n] = fd;
-		maxfd = max(maxfd, fd);
-		if (maxfd >= FD_SETSIZE)
-		    krb5_errx(context, 1, "fd too large");
-		FD_SET(fd, &real_fdset);
-		n++;
-	    }
-	    addrs.len = n;
-	}
-	for (j = 0; names != NULL && names[j] != NULL; j++)
-	    free(names[j]);
-	free(names);
+    if (explicit_addresses.len) {
+	addrs = explicit_addresses;
+    } else {
+	ret = krb5_get_all_server_addrs(context, &addrs);
+	if (ret)
+	    krb5_err(context, 1, ret, "krb5_get_all_server_addrs");
     }
-#endif /* HAVE_SYSTEMD */
+    n = addrs.len;
 
-    if (!sd_activated) {
-	if (explicit_addresses.len) {
-	    addrs = explicit_addresses;
-	} else {
-	    ret = krb5_get_all_server_addrs(context, &addrs);
+    sockets = malloc(n * sizeof(*sockets));
+    if (sockets == NULL)
+	krb5_errx(context, 1, "out of memory");
+    maxfd = -1;
+    FD_ZERO(&real_fdset);
+    for (i = 0; i < n; ++i) {
+	krb5_socklen_t sa_size = sizeof(__ss);
+
+	krb5_addr2sockaddr(context, &addrs.val[i], sa, &sa_size, port);
+
+	sockets[i] = socket(__ss.ss_family, SOCK_DGRAM, 0);
+	if (sockets[i] < 0)
+	    krb5_err(context, 1, errno, "socket");
+	if (bind(sockets[i], sa, sa_size) < 0) {
+	    char str[128];
+	    size_t len;
+	    int save_errno = errno;
+
+	    ret = krb5_print_address(&addrs.val[i], str, sizeof(str), &len);
 	    if (ret)
-		krb5_err(context, 1, ret, "krb5_get_all_server_addrs");
-	}
-	n = addrs.len;
-
-	sockets = malloc(n * sizeof(*sockets));
-	if (sockets == NULL)
-	    krb5_errx(context, 1, "out of memory");
-	maxfd = -1;
-	FD_ZERO(&real_fdset);
-	for (i = 0; i < n; ++i) {
-	    krb5_socklen_t sa_size = sizeof(__ss);
-
-	    krb5_addr2sockaddr(context, &addrs.val[i], sa, &sa_size, port);
-
-	    sockets[i] = socket(__ss.ss_family, SOCK_DGRAM, 0);
-	    if (sockets[i] < 0)
-		krb5_err(context, 1, errno, "socket");
-	    if (bind(sockets[i], sa, sa_size) < 0) {
-		char str[128];
-		size_t len;
-		int save_errno = errno;
-
-		ret = krb5_print_address(&addrs.val[i], str, sizeof(str), &len);
-		if (ret)
-		    strlcpy(str, "unknown address", sizeof(str));
-		krb5_warn(context, save_errno, "bind(%s)", str);
-		continue;
-	    }
-	    maxfd = max(maxfd, sockets[i]);
-	    if (maxfd >= FD_SETSIZE)
-		krb5_errx(context, 1, "fd too large");
-	    FD_SET(sockets[i], &real_fdset);
+		strlcpy(str, "unknown address", sizeof(str));
+	    krb5_warn(context, save_errno, "bind(%s)", str);
+	    continue;
 	}
+	maxfd = max(maxfd, sockets[i]);
+	if (maxfd >= FD_SETSIZE)
+	    krb5_errx(context, 1, "fd too large");
+	FD_SET(sockets[i], &real_fdset);
     }
-
     if (maxfd == -1)
 	krb5_errx(context, 1, "No sockets!");
 
     roken_detach_finish(NULL, daemon_child);
 
-    {
-	struct timeval *tmoutp = NULL;
-#ifdef HAVE_SYSTEMD
-	unsigned long nrequests = 0;
-	struct timeval tmout;
+    while (exit_flag == 0) {
+	krb5_ssize_t retx;
+	fd_set fdset = real_fdset;
 
-	tmoutp = &tmout;
-	sd_notify(0, "READY=1");
-	sd_notifyf(0, "STATUS=Serving; %lu password change request(s) processed",
-		   nrequests);
-#endif
-
-	while (exit_flag == 0) {
-	    krb5_ssize_t retx;
-	    fd_set fdset = real_fdset;
-
-#ifdef HAVE_SYSTEMD
-	    tmout.tv_sec = STATUS_INTERVAL;
-	    tmout.tv_usec = 0;
-#endif
-	    retx = select(maxfd + 1, &fdset, NULL, NULL, tmoutp);
-	    if (retx < 0) {
-		if (errno == EINTR)
-		    continue;
-		else
-		    krb5_err(context, 1, errno, "select");
-	    }
-#ifdef HAVE_SYSTEMD
-	    if (retx == 0) {
-		/* select timed out: refresh our systemd status line */
-		sd_notifyf(0, "STATUS=Serving; %lu password change request(s) "
-			   "processed", nrequests);
+	retx = select(maxfd + 1, &fdset, NULL, NULL, NULL);
+	if (retx < 0) {
+	    if (errno == EINTR)
 		continue;
-	    }
-#endif
-	    for (i = 0; i < n; ++i)
-		if (FD_ISSET(sockets[i], &fdset)) {
-		    u_char buf[BUFSIZ];
-		    socklen_t addrlen = sizeof(__ss);
-
-		    retx = recvfrom(sockets[i], buf, sizeof(buf), 0,
-				    sa, &addrlen);
-		    if (retx < 0) {
-			if (errno == EINTR)
-			    break;
-			else
-			    krb5_err(context, 1, errno, "recvfrom");
-		    }
-
-		    process(keytab, sockets[i],
-			     &addrs.val[i],
-			     sa, addrlen,
-			     buf, retx);
-#ifdef HAVE_SYSTEMD
-		    nrequests++;
-#endif
-		}
+	    else
+		krb5_err(context, 1, errno, "select");
 	}
-    }
+	for (i = 0; i < n; ++i)
+	    if (FD_ISSET(sockets[i], &fdset)) {
+		u_char buf[BUFSIZ];
+		socklen_t addrlen = sizeof(__ss);
 
-#ifdef HAVE_SYSTEMD
-    sd_notify(0, "STOPPING=1");
-#endif
+		retx = recvfrom(sockets[i], buf, sizeof(buf), 0,
+				sa, &addrlen);
+		if (retx < 0) {
+		    if (errno == EINTR)
+			break;
+		    else
+			krb5_err(context, 1, errno, "recvfrom");
+		}
+
+		process(keytab, sockets[i],
+			 &addrs.val[i],
+			 sa, addrlen,
+			 buf, retx);
+	    }
+    }
 
     for (i = 0; i < n; ++i)
 	close(sockets[i]);

nix/heimdal/0001-Define-HAVE_DB_185_H.patch

@@ -0,0 +1,26 @@
+From 08d719e96214f648ae95043acc308deca36e1f7a Mon Sep 17 00:00:00 2001
+From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
+Date: Tue, 15 Oct 2024 13:52:39 -0400
+Subject: [PATCH] Define HAVE_DB_185_H
+
+---
+ cf/db.m4 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cf/db.m4 b/cf/db.m4
+index c0b4510b6..c95a9dee9 100644
+--- a/cf/db.m4
++++ b/cf/db.m4
+@@ -57,6 +57,9 @@ AS_IF([test "x$with_berkeley_db" != xno],
+ 	           db.h					\
+     ])])
+ 
++dnl detect if compat db_185.h is present
++AC_CHECK_HEADERS([db_185.h])
++
+ dnl db_create is used by db3 and db4 and db5 and db6
+ 
+   AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6 db-5 db4 db3 db, [
+-- 
+2.46.0
+

nix/heimdal/package.nix

@@ -22,7 +22,6 @@
   pam,
   libmicrohttpd,
   cjson,
-  systemdLibs,
 
   CoreFoundation,
   Security,
@@ -44,7 +43,6 @@
   withOpenLDAPAsHDBModule ? false,
   withOpenSSL ? true,
   withSQLite3 ? true,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
 }:
 
 assert lib.assertMsg (withOpenLDAPAsHDBModule -> withOpenLDAP) ''
@@ -91,8 +89,7 @@ stdenv.mkDerivation {
     ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ]
     ++ lib.optionals (withOpenLDAP) [ openldap ]
     ++ lib.optionals (withOpenSSL) [ openssl ]
-    ++ lib.optionals (withSQLite3) [ sqlite ]
-    ++ lib.optionals (withSystemd) [ systemdLibs ];
+    ++ lib.optionals (withSQLite3) [ sqlite ];
 
   doCheck = true;
   nativeCheckInputs = [
@@ -128,11 +125,13 @@ stdenv.mkDerivation {
     ]
     ++ lib.optionals (withSQLite3) [
       "--with-sqlite3=${sqlite.dev}"
-    ]
-    ++ lib.optionals (withSystemd) [
-      "--with-systemd"
     ];
 
+  patches = [
+    # Proposed @ https://github.com/heimdal/heimdal/pull/1264
+    ./0001-Define-HAVE_DB_185_H.patch
+  ];
+
   # (check-ldap) slapd resides within ${openldap}/libexec,
   #              which is not part of $PATH by default.
   # (check-ldap) prepending ${openldap}/bin to the path to avoid

nix/module/default.nix

@@ -30,10 +30,6 @@ in
     services.kerberos_server = {
       enable = lib.mkEnableOption "the kerberos authentication server";
 
-      enableSocketActivation = lib.mkEnableOption ''
-        Systemd socket activation for the kerberos daemons.
-      '';
-
       settings = mkOption {
         type = format.type;
         description = ''
@@ -63,7 +59,7 @@ in
 
     systemd.slices.system-kerberos-server = { };
     systemd.targets.kerberos-server = {
-      wantedBy = lib.mkIf (!cfg.enableSocketActivation) [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" ];
     };
   };
 

nix/module/heimdal.nix

@@ -10,10 +10,6 @@ let
   cfg = config.services.kerberos_server;
   package = config.security.krb5.package;
 
-  socketActivation = cfg.enableSocketActivation;
-
-  serviceWantedBy = [ "kerberos-server.target" ];
-
   aclConfigs = lib.pipe cfg.settings.realms [
     (mapAttrs (
       name:
@@ -73,14 +69,11 @@ in
     systemd.services.kadmind = {
       description = "Kerberos Administration Daemon";
       partOf = [ "kerberos-server.target" ];
-      wantedBy = serviceWantedBy;
+      wantedBy = [ "kerberos-server.target" ];
       serviceConfig = {
-        Type = "notify";
         ExecStart = "${package}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf";
         Slice = "system-kerberos-server.slice";
         StateDirectory = "heimdal";
-
-        PrivateNetwork = socketActivation;
       };
       restartTriggers = [ kdcConfFile ];
     };
@@ -88,13 +81,11 @@ in
     systemd.services.kdc = {
       description = "Key Distribution Center daemon";
       partOf = [ "kerberos-server.target" ];
-      wantedBy = serviceWantedBy;
+      wantedBy = [ "kerberos-server.target" ];
       serviceConfig = {
-        Type = "notify";
         ExecStart = "${package}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf";
         Slice = "system-kerberos-server.slice";
         StateDirectory = "heimdal";
-        PrivateNetwork = socketActivation;
       };
       restartTriggers = [ kdcConfFile ];
     };
@@ -102,63 +93,13 @@ in
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       partOf = [ "kerberos-server.target" ];
-      wantedBy = serviceWantedBy;
+      wantedBy = [ "kerberos-server.target" ];
       serviceConfig = {
-        Type = "notify";
         ExecStart = "${package}/libexec/kpasswdd";
         Slice = "system-kerberos-server.slice";
         StateDirectory = "heimdal";
-        PrivateNetwork = socketActivation;
       };
       restartTriggers = [ kdcConfFile ];
     };
-
-    systemd.sockets = lib.mkIf socketActivation {
-      kadmind = {
-        description = "Kerberos Administration Daemon socket";
-        partOf = [ "kerberos-server.target" ];
-        wantedBy = [
-          "sockets.target"
-          "kerberos-server.target"
-        ];
-        socketConfig = {
-          ListenStream = 749;
-          FileDescriptorName = "kadmind";
-          Accept = false;
-          Slice = "system-kerberos-server.slice";
-        };
-      };
-
-      kdc = {
-        description = "Key Distribution Center daemon socket";
-        partOf = [ "kerberos-server.target" ];
-        wantedBy = [
-          "sockets.target"
-          "kerberos-server.target"
-        ];
-        socketConfig = {
-          ListenStream = 88;
-          ListenDatagram = 88;
-          FileDescriptorName = "kdc";
-          Accept = false;
-          Slice = "system-kerberos-server.slice";
-        };
-      };
-
-      kpasswdd = {
-        description = "Kerberos Password Changing daemon socket";
-        partOf = [ "kerberos-server.target" ];
-        wantedBy = [
-          "sockets.target"
-          "kerberos-server.target"
-        ];
-        socketConfig = {
-          ListenDatagram = 464;
-          FileDescriptorName = "kpasswdd";
-          Accept = false;
-          Slice = "system-kerberos-server.slice";
-        };
-      };
-    };
   };
 }

nix/nixosTest.nix

@@ -84,10 +84,6 @@
               };
             };
           };
-
-          specialisation.socketActivation.configuration = {
-            services.kerberos_server.enableSocketActivation = true;
-          };
         };
 
       client =
@@ -293,58 +289,32 @@
           if not "host/client.foo.bar" in ktutil_list:
             exit(1)
 
-        def kerberos_auth_flow(mode):
-          global alice_krb_pw, alice_old_krb_pw
+        with subtest("Client: kinit alice"):
+          kinit(client, "alice", alice_krb_pw)
 
-          with subtest(f"[{mode}] Client: kinit alice"):
-            kinit(client, "alice", alice_krb_pw)
+        with subtest("Client: kpasswd alice"):
+          alice_old_krb_pw = alice_krb_pw
+          alice_krb_pw = random_password()
+          output = client.succeed(f"${lib.getExe kpasswd} {alice_old_krb_pw} {alice_krb_pw}")
+          assert "Success : Password changed" in output
 
-          with subtest(f"[{mode}] Client: kpasswd alice"):
-            alice_old_krb_pw = alice_krb_pw
-            alice_krb_pw = random_password()
-            output = client.succeed(f"${lib.getExe kpasswd} {alice_old_krb_pw} {alice_krb_pw}")
-            assert "Success : Password changed" in output
+        with subtest("Client: kadmin get bob"):
+          output = kadmin(client, "get bob")
+          print(output)
+          assert "Principal: bob@FOO.BAR" in output
 
-          with subtest(f"[{mode}] Client: kadmin get bob"):
-            output = kadmin(client, "get bob")
-            assert "Principal: bob@FOO.BAR" in output
+        with subtest("Server: kinit alice"):
+          kinit(server, "alice", alice_krb_pw)
 
-          with subtest(f"[{mode}] Server: kinit alice"):
-            kinit(server, "alice", alice_krb_pw)
+        with subtest("Server: kpasswd alice"):
+          alice_old_krb_pw = alice_krb_pw
+          alice_krb_pw = random_password()
+          output = server.succeed(f"${lib.getExe kpasswd} {alice_old_krb_pw} {alice_krb_pw}")
+          assert "Success : Password changed" in output
 
-          with subtest(f"[{mode}] Server: kpasswd alice"):
-            alice_old_krb_pw = alice_krb_pw
-            alice_krb_pw = random_password()
-            output = server.succeed(f"${lib.getExe kpasswd} {alice_old_krb_pw} {alice_krb_pw}")
-            assert "Success : Password changed" in output
-
-          with subtest(f"[{mode}] Server: kadmin get bob"):
-            output = kadmin(server, "get bob")
-            assert "Principal: bob@FOO.BAR" in output
-
-        # First run against the default, self-binding daemons.
-        kerberos_auth_flow("bind")
-
-        with subtest("Server: daemons publish an sd_notify status line"):
-          for svc in ["kdc", "kadmind", "kpasswdd"]:
-              status = server.succeed(f"systemctl show {svc}.service -p StatusText")
-              assert "Serving" in status, \
-                  f"{svc}.service has no sd_notify status: {status}"
-
-        server.succeed("systemctl stop kadmind.service kdc.service kpasswdd.service")
-        server.succeed(
-          "/run/current-system/specialisation/socketActivation/bin/switch-to-configuration test"
-        )
-        for unit in ["kadmind.socket", "kdc.socket", "kpasswdd.socket"]:
-            server.wait_for_unit(unit)
-
-        kerberos_auth_flow("socket-activation")
-
-        with subtest("Server: daemons are wired to their activation sockets"):
-          for svc in ["kdc", "kadmind", "kpasswdd"]:
-              triggered = server.succeed(f"systemctl show {svc}.service -p TriggeredBy")
-              assert f"{svc}.socket" in triggered, \
-                  f"{svc}.service not triggered by {svc}.socket: {triggered}"
+        with subtest("Server: kadmin get bob"):
+          output = kadmin(server, "get bob")
+          assert "Principal: bob@FOO.BAR" in output
       '';
 
     meta.maintainers = pkgs.heimdal.meta.maintainers;

nix/shell.nix

@@ -31,7 +31,6 @@ pkgs.mkShell {
     openldap
     openssl
     sqlite
-    systemd
   ];
 
   env = {