Define the citserver BUILD_ID as a five digit number consisting of the two digit...

diff --git a/citadel/Makefile b/citadel/Makefile
index d26bbdf1b23587b9b73c43901a47649169823b61..726a39d6f4e5de5808b00baa859d3208b667bb30 100644 (file)
--- 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 2edeab990767cffd599c859ea6ca81ca6fffa9c7..2bb14259df1fe640da7c69aa7612934c7dd39161 100755 (executable)
--- 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 056047718089c1842c5c6c5e0052d868c70e542e..2312b0e3195a78f154f7d55913267d623bfd70fb 100644 (file)
--- 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 <unistd.h>
 #include <stdio.h>

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index ec2a1bb82333d47fc060f55670d10add358966e8..0361ffac42a66bdd17ad800bf8fe2039e84930ab 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/clientsocket.c b/citadel/server/clientsocket.c
index a88c614d91240409266e9d461b69f58450cf17f6..78e5be9c11a3ead18b490caea136672c4ab43e50 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/config.c b/citadel/server/config.c
index 86077a0c634c3fa7d79947d68ee6b53a905f4dc6..670e6e224b30a73a72fa82eac83b9d9fcd40dcf7 100644 (file)
--- 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 <stdlib.h>

diff --git a/citadel/server/context.c b/citadel/server/context.c
index bca317d238c78d8509ccc3b86ddc0bbadfdec263..9121a783b0609ae5f286012d24c6fdaa5109b1ee 100644 (file)
--- 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 4efe823fcbb8c4c22c25a92e69ddd9d656a2f991..5bd526882fd5a81253d489abe2ff92456d49505c 100644 (file)
--- 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 <stdio.h>
 #include <sys/file.h>

diff --git a/citadel/server/database.c b/citadel/server/database.c
index fd88ffd5eee6adb4d08d3a397e1c56868f4c89d1..97c014188c14c8f3376ef734d6001079e1e9d337 100644 (file)
--- 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 383a3364d37d2da785efb955e896ce4da8a6ded3..b7090d966f1e0fefa0fc3c73b9c35456f4590758 100644 (file)
--- 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 <stdlib.h>

diff --git a/citadel/server/domain.c b/citadel/server/domain.c
index 3e0f74e31d94a7c4b059ad4a09cde48fcb0136d5..460c3937bba87c05448260ef8a5646a379c9a0d7 100644 (file)
--- 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 <stdio.h>

diff --git a/citadel/server/euidindex.c b/citadel/server/euidindex.c
index 6db2b4251a52cf6d3c27109411009e58178b21bd..cf26193b626c0f92de5f937dd88ee5b7dae441df 100644 (file)
--- 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 <stdio.h>

diff --git a/citadel/server/genstamp.c b/citadel/server/genstamp.c
index 1a3dc1e950159be66ef7226db266b5661a1b98ee..fdb46c9eb1aa51c915e5300d7d689b8378545fde 100644 (file)
--- 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 <stdio.h>
@@ -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 4f8b1a9d99596304e758f3436e685f9701ad4bce..6532e092a7972fa98bba37114402142c709b8d83 100644 (file)
--- 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 <stdio.h>

diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c
index 7b8c2963aead5099e1f95127e6cc0a83b2d02956..fa550d75fa4952edfa142f04dd7363249ac0e773 100644 (file)
--- 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 <stdlib.h>

diff --git a/citadel/server/journaling.c b/citadel/server/journaling.c
index 931169efb5c981e04874e181719413eefeea808f..17127222f43bf2828e12c607078e787536fd1533 100644 (file)
--- 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 <stdio.h>
 #include <libcitadel.h>
@@ -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 1807fcf0aa4b80c7484aac136714c52f33d00b35..87e6c15746431cc65a5ae97a0b5532773fd53727 100644 (file)
--- 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 64879eefbb797115d5037b89572205a702977611..98cfc9c953a6c7c7b8502d9b14d694605149f84f 100644 (file)
--- 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 <string.h>

diff --git a/citadel/server/modules_init.c b/citadel/server/modules_init.c
index 9fdb98c59becb4780d13dd7d646e270abc86f4ca..bd03930105822205ffaca2a625ef18d66756c69f 100644 (file)
--- 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 0cde681fc302c04456001cc700a83050c0937532..0da39fc875e87db8a0541258210c2cf0f7e1022d 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/netconfig.c b/citadel/server/netconfig.c
index 0969c6769d118d1e007a4555fce4a345bf160edd..5be018371bee1bc8c6adba70987ffbb661437cdd 100644 (file)
--- 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 <stdio.h>

diff --git a/citadel/server/room_ops.c b/citadel/server/room_ops.c
index cc77735a2628f1f276dbb484082c9b5370b2c515..53090b66c53ad0d88d4b2a0198aa91c98c4e6653 100644 (file)
--- 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 <stdio.h>
 #include <libcitadel.h>

diff --git a/citadel/server/serv_extensions.c b/citadel/server/serv_extensions.c
index dc680639605f4982ce99f2c95e252d9941568c7e..e92f7f931172a70481f1fd5d7eca2acb71756e6e 100644 (file)
--- a/citadel/server/serv_extensions.c
+++ b/citadel/server/serv_extensions.c
@@ -1,17 +1,11 @@
-/*
- * Citadel Extension Loader
- * Originally written by Brian Costello <btx@calyx.net>
- *
- * 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 <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/server_main.c b/citadel/server/server_main.c
index 150e313135e9d0d22e54038d20dd2589abfc8a4e..a48a4c689efd4747dcd40b94cb59ecd4dca63924 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/support.c b/citadel/server/support.c
index 20937f2b82305ad936c77e7722aac73639457631..7410e7cc23f9179c8c9693c35b36e2e914590f09 100644 (file)
--- 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 <stdio.h>

diff --git a/citadel/server/sysdep.c b/citadel/server/sysdep.c
index 06a8b40ed7455fcda8f25e51445cfeb951691e5f..9f1193a5f15c4f30ce7a4d81a761169b4166f285 100644 (file)
--- 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 <stdlib.h>

diff --git a/citadel/server/threads.c b/citadel/server/threads.c
index 7b404b0439a67475fe5809443e56559d9c6f5b81..e21d83e4a882499e29e04ab2003660a0f07c17a8 100644 (file)
--- 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 <errno.h>

diff --git a/citadel/server/user_ops.c b/citadel/server/user_ops.c
index 7032821e018470355474bfca9ad7a8c69ca29a60..6617fabe9d9184243a97b06d5386e738403c08a2 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>