From ea60fc2286cdbc98b62055ee2b1c530356c18f8a Mon Sep 17 00:00:00 2001
From: Michael Woods <alienhunter3@gmail.com>
Date: Sat, 27 Dec 2025 12:49:58 -0500
Subject: [PATCH] A few changes to ensure that some default config values
 always exist.

---
 packetserver/server/__init__.py  | 7 ++++++-
 packetserver/server/constants.py | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packetserver/server/__init__.py b/packetserver/server/__init__.py
index 60906ba..a0fbe33 100644
--- a/packetserver/server/__init__.py
+++ b/packetserver/server/__init__.py
@@ -3,7 +3,7 @@ import tempfile
 
 import pe.app
 from packetserver.common import Response, Message, Request, PacketServerConnection, send_response, send_blank_response
-from packetserver.server.constants import default_server_config
+from packetserver.server.constants import default_server_config, default_server_name
 from packetserver.server.users import User
 from copy import deepcopy
 import ax25
@@ -75,6 +75,11 @@ class Server:
                 conn.root.config = PersistentMapping(deepcopy(default_server_config))
                 conn.root.server_callsign = self.callsign
                 conn.root.config['blacklist'] = PersistentList()
+                for key in ['motd', 'operator']:
+                    if key not in conn.root.config:
+                        conn.root.config[key] = ""
+                if 'server_name' not in conn.root.config:
+                    conn.root.config.server_name = default_server_name
             if 'SYSTEM' not in conn.root.config['blacklist']:
                 logging.debug("Adding 'SYSTEM' to blacklist in case someone feels like violating FCC rules.")
                 conn.root.config['blacklist'].append('SYSTEM')
diff --git a/packetserver/server/constants.py b/packetserver/server/constants.py
index ed68c4b..72233fa 100644
--- a/packetserver/server/constants.py
+++ b/packetserver/server/constants.py
@@ -1,9 +1,11 @@
 
+default_server_name = "Packet Server BBS"
+
 default_server_config = {
     "motd": "Welcome to this PacketServer BBS!",
     "operator": "email_callsign_name_whatever",
     "max_message_length": 2000,
-    "server_name": "Packet Server BBS"
+    "server_name": default_server_name
 }
 
 jobs_default = {