Moved from citadel.h to server.h

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
index db8552d630d7d043e947b1d9e4ae0d0b8a9319f1..b96435c9e4cf876efaa18080443a1e4e9866bde6 100644 (file)
--- a/citadel/server/citadel.h
+++ b/citadel/server/citadel.h
@@ -67,31 +67,6 @@ struct ExpirePolicy {
 // Bits which may appear in MMflags.
 #define MM_VALID       4               // New users need validating
 
-// Room records.
-struct ctdlroom {
-       char QRname[ROOMNAMELEN];       // Name of room
-       char QRpasswd[10];              // Only valid if it's a private rm
-       long QRroomaide;                // User number of room aide
-       long QRhighest;                 // Highest message NUMBER in room
-       time_t QRgen;                   // Generation number of room
-       unsigned QRflags;               // See flag values below
-       char QRdirname[15];             // Directory name, if applicable
-       long msgnum_info;               // msgnum of room banner (info file)
-       char QRfloor;                   // Which floor this room is on
-       time_t QRmtime;                 // Date/time of last post
-       struct ExpirePolicy QRep;       // Message expiration policy
-       long QRnumber;                  // Globally unique room number
-       char QRorder;                   // Sort key for room listing order
-       unsigned QRflags2;              // Additional flags
-       int QRdefaultview;              // How to display the contents
-       long msgnum_pic;                // msgnum of room picture or icon
-};
-
-// Private rooms are always flagged with QR_PRIVATE.  If neither QR_PASSWORDED
-// or QR_GUESSNAME is set, then it is invitation-only.  Passworded rooms are
-// flagged with both QR_PRIVATE and QR_PASSWORDED while guess-name rooms are
-// flagged with both QR_PRIVATE and QR_GUESSNAME.  NEVER set all three flags.
-
 // Miscellaneous
 #define MES_NORMAL     65              // Normal message
 #define MES_ANONONLY   66              // "****" header

diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c
index 2312b0e3195a78f154f7d55913267d623bfd70fb..bad200ef3e8373109d891538c07f490cca1a3ce8 100644 (file)
--- a/citadel/server/citadel_dirs.c
+++ b/citadel/server/citadel_dirs.c
@@ -16,6 +16,7 @@
 #include <syslog.h>
 #include <libcitadel.h>
 #include "citadel.h"
+#include "server.h"
 #include "citadel_dirs.h"
 
 // Generate an associated file name for a room

diff --git a/citadel/server/server.h b/citadel/server/server.h
index 645568466e98ca0498bc83bee4e69a2ebd216e0e..64797f80f3ab7aae1b23625e7eb67f04a1519560 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -319,4 +319,30 @@ struct ctdluser {                  // User record
 };
 
 
+// Room records.
+struct ctdlroom {
+       char QRname[ROOMNAMELEN];       // Name of room
+       char QRpasswd[10];              // Only valid if it's a private rm
+       long QRroomaide;                // User number of room aide
+       long QRhighest;                 // Highest message NUMBER in room
+       time_t QRgen;                   // Generation number of room
+       unsigned QRflags;               // See flag values below
+       char QRdirname[15];             // Directory name, if applicable
+       long msgnum_info;               // msgnum of room banner (info file)
+       char QRfloor;                   // Which floor this room is on
+       time_t QRmtime;                 // Date/time of last post
+       struct ExpirePolicy QRep;       // Message expiration policy
+       long QRnumber;                  // Globally unique room number
+       char QRorder;                   // Sort key for room listing order
+       unsigned QRflags2;              // Additional flags
+       int QRdefaultview;              // How to display the contents
+       long msgnum_pic;                // msgnum of room picture or icon
+};
+
+// Private rooms are always flagged with QR_PRIVATE.  If neither QR_PASSWORDED
+// or QR_GUESSNAME is set, then it is invitation-only.  Passworded rooms are
+// flagged with both QR_PRIVATE and QR_PASSWORDED while guess-name rooms are
+// flagged with both QR_PRIVATE and QR_GUESSNAME.  NEVER set all three flags.
+
+
 #endif // SERVER_H

diff --git a/citadel/utils/chkpw.c b/citadel/utils/chkpw.c
index 620613b2309065770aa1d494d96513ebe4521649..8c9dcb395efce64ebc14e925066e35e9f163a851 100644 (file)
--- a/citadel/utils/chkpw.c
+++ b/citadel/utils/chkpw.c
@@ -19,6 +19,7 @@
 #include <limits.h>
 #include <dirent.h>
 #include "../server/citadel.h"
+#include "../server/server.h"
 #include "../server/sysdep.h"
 #include "../server/citadel_dirs.h"
 

diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index 6686507ec0e88f55a77e845d34620855cb209739..cff216f3e59a745d6890fdefbc9eb9171ffc2129 100644 (file)
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -25,6 +25,7 @@
 #include <libcitadel.h>
 #include "../server/sysdep.h"
 #include "../server/citadel.h"
+#include "../server/server.h"
 #include "../server/citadel_dirs.h"
 
 int serv_sock;

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index e38b9db2c43c9c62d71f092f55d6fcc2c6b16e94..6380f4eecb3a8d7ab8485bd5f7b6220716ee72f2 100644 (file)
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -1,6 +1,6 @@
 // Command-line utility to transmit a server command.
 //
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
@@ -20,6 +20,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "../server/citadel.h"
+#include "../server/server.h"
 #include "../server/citadel_dirs.h"
 #include <libcitadel.h>
 

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index b36da8979ba8f11dc50571822b00c2ccafeaf080..2acbc6ab5fa962d567149e466536476113159aec 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1,6 +1,6 @@
 // Citadel setup utility
 //
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <libcitadel.h>
 #include "../server/citadel.h"
+#include "../server/server.h"
 #include "axdefs.h"
 #include "../server/sysdep.h"
 #include "../server/citadel_dirs.h"