From dfdf0c6bc52d833f7fb0daaf9e33e4dab43ab8da Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 6 Jul 2022 11:51:18 -0400 Subject: [PATCH] Define the citserver BUILD_ID as a five digit number consisting of the two digit year and a zero-padded three digit julian date. No, this is not Year 2100 compliant. I will be delighted if Citadel is still in use half a century after I'm dead and this will be a small problem for someone to solve. --- citadel/Makefile | 5 ----- citadel/configure | 7 +------ citadel/server/citadel_dirs.c | 1 - citadel/server/citserver.c | 1 - citadel/server/clientsocket.c | 1 - citadel/server/config.c | 1 - citadel/server/context.c | 1 - citadel/server/control.c | 1 - citadel/server/database.c | 1 - citadel/server/default_timezone.c | 1 - citadel/server/domain.c | 1 - citadel/server/euidindex.c | 1 - citadel/server/genstamp.c | 13 ++++--------- citadel/server/housekeeping.c | 1 - citadel/server/internet_addressing.c | 1 - citadel/server/journaling.c | 5 ++--- citadel/server/ldap.c | 1 - citadel/server/locate_host.c | 19 ++++++------------- citadel/server/modules_init.c | 1 - citadel/server/msgbase.c | 6 ------ citadel/server/netconfig.c | 5 ----- citadel/server/room_ops.c | 5 ----- citadel/server/serv_extensions.c | 22 ++++++++-------------- citadel/server/server_main.c | 5 ----- citadel/server/support.c | 3 +++ citadel/server/sysdep.c | 5 ----- citadel/server/threads.c | 5 ----- citadel/server/user_ops.c | 5 ----- 28 files changed, 24 insertions(+), 100 deletions(-) diff --git a/citadel/Makefile b/citadel/Makefile index d26bbdf1b..726a39d6f 100644 --- a/citadel/Makefile +++ b/citadel/Makefile @@ -7,11 +7,6 @@ # # This program is open source software. Use, duplication, and/or # disclosure are subject to the GNU General Purpose License version 3. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # config.mk is generated by ./configure diff --git a/citadel/configure b/citadel/configure index 2edeab990..2bb14259d 100755 --- a/citadel/configure +++ b/citadel/configure @@ -6,11 +6,6 @@ # # This program is open source software. Use, duplication, and/or # disclosure are subject to the GNU General Purpose License version 3. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. echo echo Running the configure script to create config.mk @@ -117,7 +112,7 @@ cc $tempcc -o $tempfile && { ######################################################################## # FIXME do a real build id here ######################################################################## -CFLAGS=${CFLAGS}' -DBUILD_ID=\"unknown\"' +CFLAGS=${CFLAGS}' -DBUILD_ID=\"'$( date +%y%03j)'\"' CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"' diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c index 056047718..2312b0e31 100644 --- a/citadel/server/citadel_dirs.c +++ b/citadel/server/citadel_dirs.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include #include diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c index ec2a1bb82..0361ffac4 100644 --- a/citadel/server/citserver.c +++ b/citadel/server/citserver.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include #include diff --git a/citadel/server/clientsocket.c b/citadel/server/clientsocket.c index a88c614d9..78e5be9c1 100644 --- a/citadel/server/clientsocket.c +++ b/citadel/server/clientsocket.c @@ -7,7 +7,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include #include diff --git a/citadel/server/config.c b/citadel/server/config.c index 86077a0c6..670e6e224 100644 --- a/citadel/server/config.c +++ b/citadel/server/config.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include diff --git a/citadel/server/context.c b/citadel/server/context.c index bca317d23..9121a783b 100644 --- a/citadel/server/context.c +++ b/citadel/server/context.c @@ -6,7 +6,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "ctdl_module.h" #include "serv_extensions.h" diff --git a/citadel/server/control.c b/citadel/server/control.c index 4efe823fc..5bd526882 100644 --- a/citadel/server/control.c +++ b/citadel/server/control.c @@ -5,7 +5,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include #include diff --git a/citadel/server/database.c b/citadel/server/database.c index fd88ffd5e..97c014188 100644 --- a/citadel/server/database.c +++ b/citadel/server/database.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. /***************************************************************************** Tunable configuration parameters for the Berkeley DB back end diff --git a/citadel/server/default_timezone.c b/citadel/server/default_timezone.c index 383a3364d..b7090d966 100644 --- a/citadel/server/default_timezone.c +++ b/citadel/server/default_timezone.c @@ -3,7 +3,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include diff --git a/citadel/server/domain.c b/citadel/server/domain.c index 3e0f74e31..460c3937b 100644 --- a/citadel/server/domain.c +++ b/citadel/server/domain.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include diff --git a/citadel/server/euidindex.c b/citadel/server/euidindex.c index 6db2b4251..cf26193b6 100644 --- a/citadel/server/euidindex.c +++ b/citadel/server/euidindex.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include diff --git a/citadel/server/genstamp.c b/citadel/server/genstamp.c index 1a3dc1e95..fdb46c9eb 100644 --- a/citadel/server/genstamp.c +++ b/citadel/server/genstamp.c @@ -1,11 +1,8 @@ // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. -/* - * Function to generate RFC822-compliant textual time/date stamp - */ +// Function to generate RFC822-compliant textual time/date stamp #include "sysdep.h" #include @@ -24,10 +21,8 @@ static char *weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; -/* - * Supplied with a unix timestamp, generate an RFC822-compliant textual - * time and date stamp. - */ +// Supplied with a unix timestamp, generate an RFC822-compliant textual +// time and date stamp. long datestring(char *buf, size_t n, time_t xtime, int which_format) { struct tm t; @@ -36,7 +31,7 @@ long datestring(char *buf, size_t n, time_t xtime, int which_format) { localtime_r(&xtime, &t); - /* Convert "seconds west of GMT" to "hours/minutes offset" */ + // Convert "seconds west of GMT" to "hours/minutes offset" #ifdef HAVE_STRUCT_TM_TM_GMTOFF offset = t.tm_gmtoff; #else diff --git a/citadel/server/housekeeping.c b/citadel/server/housekeeping.c index 4f8b1a9d9..6532e092a 100644 --- a/citadel/server/housekeeping.c +++ b/citadel/server/housekeeping.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c index 7b8c2963a..fa550d75f 100644 --- a/citadel/server/internet_addressing.c +++ b/citadel/server/internet_addressing.c @@ -5,7 +5,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include diff --git a/citadel/server/journaling.c b/citadel/server/journaling.c index 931169efb..17127222f 100644 --- a/citadel/server/journaling.c +++ b/citadel/server/journaling.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. #include #include @@ -12,11 +11,11 @@ #include "citserver.h" #include "config.h" #include "user_ops.h" -#include "serv_vcard.h" /* Needed for vcard_getuser and extract_inet_email_addrs */ +#include "serv_vcard.h" // Needed for vcard_getuser and extract_inet_email_addrs #include "internet_addressing.h" #include "journaling.h" -struct jnlq *jnlq = NULL; /* journal queue */ +struct jnlq *jnlq = NULL; // journal queue /* * Hand off a copy of a message to be journalized. diff --git a/citadel/server/ldap.c b/citadel/server/ldap.c index 1807fcf0a..87e6c1574 100644 --- a/citadel/server/ldap.c +++ b/citadel/server/ldap.c @@ -5,7 +5,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. // ldapsearch -D uid=admin,cn=users,cn=compat,dc=demo1,dc=freeipa,dc=org -w Secret123 -h ipa.demo1.freeipa.org diff --git a/citadel/server/locate_host.c b/citadel/server/locate_host.c index 64879eefb..98cfc9c95 100644 --- a/citadel/server/locate_host.c +++ b/citadel/server/locate_host.c @@ -1,16 +1,9 @@ -/* - * Functions which handle hostname/address lookups and resolution - * - * Copyright (c) 1987-2019 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// Functions which handle hostname/address lookups and resolution +// +// Copyright (c) 1987-2019 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. #include "sysdep.h" #include diff --git a/citadel/server/modules_init.c b/citadel/server/modules_init.c index 9fdb98c59..bd0393010 100644 --- a/citadel/server/modules_init.c +++ b/citadel/server/modules_init.c @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. // // To add new modules to the server: // 1. Write the module and place it in a server/modules/[module_name]/ directory diff --git a/citadel/server/msgbase.c b/citadel/server/msgbase.c index 0cde681fc..0da39fc87 100644 --- a/citadel/server/msgbase.c +++ b/citadel/server/msgbase.c @@ -4,12 +4,6 @@ // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - #include #include diff --git a/citadel/server/netconfig.c b/citadel/server/netconfig.c index 0969c6769..5be018371 100644 --- a/citadel/server/netconfig.c +++ b/citadel/server/netconfig.c @@ -4,11 +4,6 @@ // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License, version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. #include "sysdep.h" #include diff --git a/citadel/server/room_ops.c b/citadel/server/room_ops.c index cc77735a2..53090b66c 100644 --- a/citadel/server/room_ops.c +++ b/citadel/server/room_ops.c @@ -4,11 +4,6 @@ // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License, version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. #include #include diff --git a/citadel/server/serv_extensions.c b/citadel/server/serv_extensions.c index dc6806396..e92f7f931 100644 --- a/citadel/server/serv_extensions.c +++ b/citadel/server/serv_extensions.c @@ -1,17 +1,11 @@ -/* - * Citadel Extension Loader - * Originally written by Brian Costello - * - * Copyright (c) 1987-2021 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// This began as a framework written by Brian Costello (btx) that loaded server extensions as dynamic modules. +// We don't do it that way anymore but the concept lives on as a high degree of modularity in the server. +// The functions in this file handle registration and execution of the server hooks used by static linked modules. +// +// Copyright (c) 1987-2021 by the citadel.org team +// +// This program is open source software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License, version 3. #include #include diff --git a/citadel/server/server_main.c b/citadel/server/server_main.c index 150e31313..a48a4c689 100644 --- a/citadel/server/server_main.c +++ b/citadel/server/server_main.c @@ -4,11 +4,6 @@ // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. #include #include diff --git a/citadel/server/support.c b/citadel/server/support.c index 20937f2b8..7410e7cc2 100644 --- a/citadel/server/support.c +++ b/citadel/server/support.c @@ -1,4 +1,7 @@ // Server-side utility functions +// Copyright (c) 1987-2022 by the citadel.org team +// This program is open source software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License, version 3. #include "sysdep.h" #include diff --git a/citadel/server/sysdep.c b/citadel/server/sysdep.c index 06a8b40ed..9f1193a5f 100644 --- a/citadel/server/sysdep.c +++ b/citadel/server/sysdep.c @@ -7,11 +7,6 @@ // // This program is open source software; you can redistribute it and/or modify // it under the terms of the GNU General Public License, version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. #include "sysdep.h" #include diff --git a/citadel/server/threads.c b/citadel/server/threads.c index 7b404b043..e21d83e4a 100644 --- a/citadel/server/threads.c +++ b/citadel/server/threads.c @@ -5,11 +5,6 @@ * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include diff --git a/citadel/server/user_ops.c b/citadel/server/user_ops.c index 7032821e0..6617fabe9 100644 --- a/citadel/server/user_ops.c +++ b/citadel/server/user_ops.c @@ -4,11 +4,6 @@ // // This program is open source software; you can redistribute it and/or // modify it under the terms of the GNU General Public License, version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. #include #include -- 2.39.2