From 511f1e262b9f335faf1ca219ec6f72ab0a1f168b Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 9 Jun 2022 16:21:20 -0400 Subject: [PATCH] Modified some of the server source files to carry the new and improved version of the GPL declaration that disrespects Richard Stallman. --- citadel/server/database.c | 10 ++--- citadel/server/default_timezone.c | 24 ++++------- citadel/server/domain.c | 57 ++++++++++--------------- citadel/server/euidindex.c | 13 ++---- citadel/server/genstamp.c | 5 +++ citadel/server/housekeeping.c | 63 ++++++++++------------------ citadel/server/internet_addressing.c | 10 ++--- citadel/server/journaling.c | 22 ++++------ citadel/server/ldap.c | 10 ++--- 9 files changed, 78 insertions(+), 136 deletions(-) diff --git a/citadel/server/database.c b/citadel/server/database.c index eb4dae515..fd88ffd5e 100644 --- a/citadel/server/database.c +++ b/citadel/server/database.c @@ -2,13 +2,9 @@ // // 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. -// -// 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 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 6ce5c107e..383a3364d 100644 --- a/citadel/server/default_timezone.c +++ b/citadel/server/default_timezone.c @@ -1,15 +1,9 @@ -/* - * Copyright (c) 1987-2018 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. - */ - +// +// Copyright (c) 1987-2022 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. +// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include @@ -32,10 +26,8 @@ #include "ctdl_module.h" -/* - * Figure out which time zone needs to be used for timestamps that are - * not UTC and do not have a time zone specified. - */ +// Figure out which time zone needs to be used for timestamps that are +// not UTC and do not have a time zone specified. icaltimezone *get_default_icaltimezone(void) { icaltimezone *zone = NULL; diff --git a/citadel/server/domain.c b/citadel/server/domain.c index 79461f55a..3e0f74e31 100644 --- a/citadel/server/domain.c +++ b/citadel/server/domain.c @@ -1,16 +1,10 @@ -/* - * DNS lookup for SMTP sender - * - * 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. - */ +// DNS lookup for SMTP sender +// +// Copyright (c) 1987-2022 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. +// The program is distributed without any warranty, expressed or implied. #include "sysdep.h" #include @@ -32,13 +26,11 @@ #include "internet_addressing.h" -/* - * get_hosts() checks the Internet configuration for various types of - * entries and returns them in the same format as getmx() does -- fill the - * buffer with a delimited list of hosts and return the number of hosts. - * - * This is used to fetch MX smarthosts, SpamAssassin hosts, etc. - */ +// get_hosts() checks the Internet configuration for various types of +// entries and returns them in the same format as getmx() does -- fill the +// buffer with a delimited list of hosts and return the number of hosts. +// +// This is used to fetch MX smarthosts, SpamAssassin hosts, etc. int get_hosts(char *mxbuf, char *rectype) { int config_lines; int i; @@ -66,11 +58,9 @@ int get_hosts(char *mxbuf, char *rectype) { } -/* - * Compare the preference of two MX records. First check by the actual - * number listed in the MX record. If they're identical, randomize the - * result. - */ +// Compare the preference of two MX records. First check by the actual +// number listed in the MX record. If they're identical, randomize the +// result. int mx_compare_pref(const void *mx1, const void *mx2) { int pref1; int pref2; @@ -90,16 +80,13 @@ int mx_compare_pref(const void *mx1, const void *mx2) { } -/* - * getmx() - * - * Return one or more MX's for a mail destination. - * - * Upon success, it fills 'mxbuf' with one or more MX hosts, separated by - * vertical bar characters, and returns the number of hosts as its return - * value. If no MX's are found, it returns 0. - * - */ +// getmx() +// +// Return one or more MX's for a mail destination. +// +// Upon success, it fills 'mxbuf' with one or more MX hosts, separated by +// vertical bar characters, and returns the number of hosts as its return +// value. If no MX's are found, it returns 0. int getmx(char *mxbuf, char *dest) { #ifdef HAVE_RESOLV_H diff --git a/citadel/server/euidindex.c b/citadel/server/euidindex.c index 0e8daf9ce..6db2b4251 100644 --- a/citadel/server/euidindex.c +++ b/citadel/server/euidindex.c @@ -2,18 +2,13 @@ // // 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. -// -// 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 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 #include - #include "citserver.h" #include "room_ops.h" @@ -208,6 +203,6 @@ char *ctdl_module_init_euidindex(void) { if (!threading) { CtdlRegisterProtoHook(cmd_euid, "EUID", "Perform operations on Extended IDs for messages"); } - /* return our id for the log */ + // return our id for the log return "euidindex"; } diff --git a/citadel/server/genstamp.c b/citadel/server/genstamp.c index e8d5dd86b..1a3dc1e95 100644 --- a/citadel/server/genstamp.c +++ b/citadel/server/genstamp.c @@ -1,3 +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 */ diff --git a/citadel/server/housekeeping.c b/citadel/server/housekeeping.c index 54cfe11b8..4f8b1a9d9 100644 --- a/citadel/server/housekeeping.c +++ b/citadel/server/housekeeping.c @@ -1,16 +1,11 @@ -/* - * This file contains miscellaneous housekeeping tasks. - * - * 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 file contains miscellaneous housekeeping tasks. +// +// Copyright (c) 1987-2021 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. +// The program is distributed without any warranty, expressed or implied. + #include #include @@ -31,10 +26,8 @@ void check_sched_shutdown(void) { } -/* - * Check (and fix) floor reference counts. This doesn't need to be done - * very often, since the counts should remain correct during normal operation. - */ +// Check (and fix) floor reference counts. This doesn't need to be done +// very often, since the counts should remain correct during normal operation. void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) { int *new_refcounts; @@ -75,9 +68,7 @@ void check_ref_counts(void) { } -/* - * Provide hints as to whether we have any memory leaks - */ +// Provide hints as to whether we have any memory leaks void keep_an_eye_on_memory_usage(void) { static void *original_brk = NULL; if (!original_brk) original_brk = sbrk(0); // Remember the original program break so we can test for leaks @@ -85,12 +76,10 @@ void keep_an_eye_on_memory_usage(void) { } -/* - * This is the housekeeping loop. Worker threads come through here after - * processing client requests but before jumping back into the pool. We - * only allow housekeeping to execute once per minute, and we only allow one - * instance to run at a time. - */ +// This is the housekeeping loop. Worker threads come through here after +// processing client requests but before jumping back into the pool. We +// only allow housekeeping to execute once per minute, and we only allow one +// instance to run at a time. static int housekeeping_in_progress = 0; static int housekeeping_disabled = 0; static time_t last_timer = 0L; @@ -104,11 +93,9 @@ void do_housekeeping(void) { return; } - /* - * We do it this way instead of wrapping the whole loop in an - * S_HOUSEKEEPING critical section because it eliminates the need to - * potentially have multiple concurrent mutexes in progress. - */ + // We do it this way instead of wrapping the whole loop in an + // S_HOUSEKEEPING critical section because it eliminates the need to + // potentially have multiple concurrent mutexes in progress. begin_critical_section(S_HOUSEKEEPING); if (housekeeping_in_progress == 0) { do_housekeeping_now = 1; @@ -127,21 +114,19 @@ void do_housekeeping(void) { return; } - /* - * Ok, at this point we've made the decision to run the housekeeping - * loop. Everything below this point is real work. - */ + // Ok, at this point we've made the decision to run the housekeeping + // loop. Everything below this point is real work. if ( (now - last_timer) > (time_t)60 ) { do_perminute_housekeeping_now = 1; last_timer = time(NULL); } - /* First, do the "as often as needed" stuff... */ + // First, do the "as often as needed" stuff... JournalRunQueue(); PerformSessionHooks(EVT_HOUSE); - /* Then, do the "once per minute" stuff... */ + // Then, do the "once per minute" stuff... if (do_perminute_housekeeping_now) { cdb_check_handles(); PerformSessionHooks(EVT_TIMER); // Run all registered TIMER hooks @@ -156,9 +141,7 @@ void do_housekeeping(void) { keep_an_eye_on_memory_usage(); } - /* - * All done. - */ + // All done. begin_critical_section(S_HOUSEKEEPING); housekeeping_in_progress = 0; end_critical_section(S_HOUSEKEEPING); diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c index 59e078f9c..7b8c2963a 100644 --- a/citadel/server/internet_addressing.c +++ b/citadel/server/internet_addressing.c @@ -3,13 +3,9 @@ // // 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. -// -// 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 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 939ec3b7d..931169efb 100644 --- a/citadel/server/journaling.c +++ b/citadel/server/journaling.c @@ -1,16 +1,10 @@ -/* - * Message journaling functions. - * - * Copyright (c) 1987-2020 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. - */ +// Message journaling functions. +// +// Copyright (c) 1987-2022 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. +// The program is distributed without any warranty, expressed or implied. #include #include @@ -251,5 +245,3 @@ void JournalRunQueue(void) { JournalRunQueueMsg(jptr); } } - - diff --git a/citadel/server/ldap.c b/citadel/server/ldap.c index 3a16117cd..1807fcf0a 100644 --- a/citadel/server/ldap.c +++ b/citadel/server/ldap.c @@ -3,13 +3,9 @@ // // Copyright (c) 2011-2022 by the citadel.org development 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 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 -- 2.39.2