--- lbbs/src/net_server.c	2025/11/18 12:12:52	1.92
+++ lbbs/src/net_server.c	2025/12/02 08:48:05	1.101
@@ -40,6 +40,7 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -114,6 +115,11 @@ static int auth_password(ssh_session ses
 	else
 	{
 		ret = check_user(user, password);
+		if (ret == 2) // Enforce update user agreement
+		{
+			BBS_update_eula = 1;
+			ret = 0;
+		}
 	}
 
 	if (ret == 0)
@@ -422,6 +428,8 @@ static int fork_server(void)
 			log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session));
 			goto cleanup;
 		}
+
+		ssh_set_blocking(SSH_session, 0);
 	}
 
 	// Redirect Input
@@ -446,6 +454,13 @@ static int fork_server(void)
 
 	SYS_child_process_count = 0;
 
+	// BWF compile
+	if (bwf_compile() < 0)
+	{
+		log_error("bwf_compile() error\n");
+		goto cleanup;
+	}
+
 	bbs_main();
 
 cleanup:
@@ -482,6 +497,9 @@ cleanup:
 	ssh_free(SSH_session);
 	ssh_finalize();
 
+	// BWF cleanup
+	bwf_cleanup();
+
 	// Close Input and Output for client
 	io_cleanup();
 	close(STDIN_FILENO);
@@ -497,6 +515,7 @@ cleanup:
 
 int net_server(const char *hostaddr, in_port_t port[])
 {
+	struct stat file_stat;
 	unsigned int addrlen;
 	int ret;
 	int flags_server[2];
@@ -511,10 +530,9 @@ int net_server(const char *hostaddr, in_
 	int nfds;
 	int notify_child_exit = 0;
 	time_t tm_notify_child_exit = time(NULL);
-	MENU_SET bbs_menu_new;
-	MENU_SET top10_menu_new;
 	int i, j;
 	pid_t pid;
+	int ssh_key_valid = 0;
 	int ssh_log_level = SSH_LOG_NOLOG;
 
 #ifdef HAVE_SYSTEMD_SD_DAEMON_H
@@ -525,10 +543,41 @@ int net_server(const char *hostaddr, in_
 
 	sshbind = ssh_bind_new();
 
+	if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEY_FILE) < 0)
+	{
+		log_error("Error loading SSH RSA key: %s\n", SSH_HOST_RSA_KEY_FILE);
+	}
+	else
+	{
+		ssh_key_valid = 1;
+	}
+	if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ED25519_KEY_FILE) < 0)
+	{
+		log_error("Error loading SSH ED25519 key: %s\n", SSH_HOST_ED25519_KEY_FILE);
+	}
+	else
+	{
+		ssh_key_valid = 1;
+	}
+	if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ECDSA_KEY_FILE) < 0)
+	{
+		log_error("Error loading SSH ECDSA key: %s\n", SSH_HOST_ECDSA_KEY_FILE);
+	}
+	else
+	{
+		ssh_key_valid = 1;
+	}
+
+	if (!ssh_key_valid)
+	{
+		log_error("Error: no valid SSH host key\n");
+		ssh_bind_free(sshbind);
+		return -1;
+	}
+
 	if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||
-		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_KEYFILE) < 0 ||
-		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256") < 0 ||
+		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "+ssh-rsa") < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0)
 	{
 		log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind));
@@ -606,6 +655,8 @@ int net_server(const char *hostaddr, in_
 		fcntl(socket_server[i], F_SETFL, flags_server[i] | O_NONBLOCK);
 	}
 
+	ssh_bind_set_blocking(sshbind, 0);
+
 	hash_dict_pid_sockaddr = hash_dict_create(MAX_CLIENT_LIMIT);
 	if (hash_dict_pid_sockaddr == NULL)
 	{
@@ -704,7 +755,7 @@ int net_server(const char *hostaddr, in_
 				log_common("Notify %d child process to exit\n", SYS_child_process_count);
 #endif
 
-				if (kill(-getpid(), SIGTERM) < 0)
+				if (kill(0, SIGTERM) < 0)
 				{
 					log_error("Send SIGTERM signal failed (%d)\n", errno);
 				}
@@ -718,7 +769,7 @@ int net_server(const char *hostaddr, in_
 				sd_notifyf(0, "STATUS=Kill %d child process", SYS_child_process_count);
 #endif
 
-				if (kill(-getpid(), SIGKILL) < 0)
+				if (kill(0, SIGKILL) < 0)
 				{
 					log_error("Send SIGKILL signal failed (%d)\n", errno);
 				}
@@ -759,29 +810,34 @@ int net_server(const char *hostaddr, in_
 				log_error("Reload BWF conf failed\n");
 			}
 
-			if (load_menu(&bbs_menu_new, CONF_MENU) < 0)
+			// Get EULA modification tm
+			if (stat(DATA_EULA, &file_stat) == -1)
 			{
-				unload_menu(&bbs_menu_new);
-				log_error("Reload bbs menu failed\n");
+				log_error("stat(%s) error\n", DATA_EULA, errno);
 			}
 			else
 			{
+				BBS_eula_tm = file_stat.st_mtim.tv_sec;
+			}
+
+			if (detach_menu_shm(&bbs_menu) < 0)
+			{
+				log_error("detach_menu_shm(bbs_menu) error\n");
+			}
+			if (load_menu(&bbs_menu, CONF_MENU) < 0)
+			{
+				log_error("load_menu(bbs_menu) error\n");
 				unload_menu(&bbs_menu);
-				memcpy(&bbs_menu, &bbs_menu_new, sizeof(bbs_menu_new));
-				log_common("Reload bbs menu successfully\n");
 			}
 
-			if (load_menu(&top10_menu_new, CONF_TOP10_MENU) < 0)
+			if (detach_menu_shm(&top10_menu) < 0)
 			{
-				unload_menu(&top10_menu_new);
-				log_error("Reload top10 menu failed\n");
+				log_error("detach_menu_shm(top10_menu) error\n");
 			}
-			else
+			if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0)
 			{
+				log_error("load_menu(top10_menu) error\n");
 				unload_menu(&top10_menu);
-				top10_menu_new.allow_exit = 1;
-				memcpy(&top10_menu, &top10_menu_new, sizeof(top10_menu_new));
-				log_common("Reload top10 menu successfully\n");
 			}
 
 			for (int i = 0; i < data_files_load_startup_count; i++)
@@ -791,20 +847,15 @@ int net_server(const char *hostaddr, in_
 					log_error("load_file(%s) error\n", data_files_load_startup[i]);
 				}
 			}
-			log_common("Reload data files successfully\n");
 
 			// Load section config and gen_ex
 			if (load_section_config_from_db(1) < 0)
 			{
 				log_error("load_section_config_from_db(1) error\n");
 			}
-			else
-			{
-				log_common("Reload section config and gen_ex successfully\n");
-			}
 
 			// Notify child processes to reload configuration
-			if (kill(-getpid(), SIGUSR1) < 0)
+			if (kill(0, SIGUSR1) < 0)
 			{
 				log_error("Send SIGUSR1 signal failed (%d)\n", errno);
 			}