From f4caf74d8b5acbd10546023300973c5686e365bd Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 11 Feb 2023 18:41:55 -0500 Subject: [PATCH] Moved from citadel.h to server.h --- citadel/server/citadel.h | 25 ------------------------- citadel/server/citadel_dirs.c | 1 + citadel/server/server.h | 26 ++++++++++++++++++++++++++ citadel/utils/chkpw.c | 1 + citadel/utils/citmail.c | 1 + citadel/utils/sendcommand.c | 3 ++- citadel/utils/setup.c | 3 ++- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h index db8552d63..b96435c9e 100644 --- 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 2312b0e31..bad200ef3 100644 --- a/citadel/server/citadel_dirs.c +++ b/citadel/server/citadel_dirs.c @@ -16,6 +16,7 @@ #include #include #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 645568466..64797f80f 100644 --- 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 620613b23..8c9dcb395 100644 --- a/citadel/utils/chkpw.c +++ b/citadel/utils/chkpw.c @@ -19,6 +19,7 @@ #include #include #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 6686507ec..cff216f3e 100644 --- a/citadel/utils/citmail.c +++ b/citadel/utils/citmail.c @@ -25,6 +25,7 @@ #include #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 e38b9db2c..6380f4eec 100644 --- 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 #include #include "../server/citadel.h" +#include "../server/server.h" #include "../server/citadel_dirs.h" #include diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index b36da8979..2acbc6ab5 100644 --- 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 #include #include "../server/citadel.h" +#include "../server/server.h" #include "axdefs.h" #include "../server/sysdep.h" #include "../server/citadel_dirs.h" -- 2.30.2