Completed the removal of $Id$ tags in the Citadel server. Also, since the strings...

module init functions are now short names rather than entire Id tags, the phrase "Loaded module:" has
been prepended to the log messages which display them.

diff --git a/citadel/modules/pop3/serv_pop3.h b/citadel/modules/pop3/serv_pop3.h
index 4f0fa6bcef7a95f0f6bd4a2418df03723fbd3509..dee594cf4a4bb96451eec7df9fbb15002a35a9d9 100644 (file)
--- a/citadel/modules/pop3/serv_pop3.h
+++ b/citadel/modules/pop3/serv_pop3.h
@@ -1,22 +1,19 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 1998-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  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 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 struct pop3msg {

diff --git a/citadel/modules/roomchat/serv_roomchat.c b/citadel/modules/roomchat/serv_roomchat.c
index 63feceb51e82246158ab433acddf087e3a39ed2c..225f0861c237b17bb8f05e6a00bece7c93d338aa 100644 (file)
--- a/citadel/modules/roomchat/serv_roomchat.c
+++ b/citadel/modules/roomchat/serv_roomchat.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module handles instant messaging between users.
  * 
  * Copyright (c) 2010 by the citadel.org team
@@ -274,5 +272,5 @@ CTDL_MODULE_INIT(roomchat)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "roomchat";
 }

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 7f8e9f383dd704d287de0023d2cd03bf864d13c9..404d879e7cefbbed44c444d796a55b9686b59e16 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Bring external RSS feeds into rooms.
  *
  * Copyright (c) 2007-2010 by the citadel.org team
@@ -955,5 +953,5 @@ CTDL_MODULE_INIT(rssclient)
                CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, 0);
        }
        /* return our Subversion id for the Log */
-        return "$Id$";
+        return "rssclient";
 }

diff --git a/citadel/modules/rwho/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c
index 225f003766c254dbfbc6f1dc95df85c58c4171e4..86d2cd44946c692dec1e5360b2066f401f3f8403 100644 (file)
--- a/citadel/modules/rwho/serv_rwho.c
+++ b/citadel/modules/rwho/serv_rwho.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module implements server commands related to the display and
  * manipulation of the "Who's online" list.
  *
@@ -293,5 +291,5 @@ CTDL_MODULE_INIT(rwho)
        }
        
        /* return our Subversion id for the Log */
-        return "$Id$";
+        return "rwho";
 }

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index f8c6e8c3589ac9336788f8d4cb00fa8a33a6c30a..b25b1f70953e714f3560a4d00526652988055ac2 100644 (file)
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module glues libSieve to the Citadel server in order to implement
  * the Sieve mailbox filtering language (RFC 3028).
  *
@@ -1306,6 +1304,6 @@ CTDL_MODULE_INIT(sieve)
        }
        
         /* return our Subversion id for the Log */
-       return "$Id$";
+       return "sieve";
 }
 

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index b6ae6d044f9e0b6f358263aa4dde9046053b7d18..69f12fb037bc110485524be5d8039cc3b03e5855 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module is an SMTP and ESMTP implementation for the Citadel system.
  * It is compliant with all of the following:
  *
@@ -1934,5 +1932,5 @@ CTDL_MODULE_INIT(smtp)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "smtp";
 }

diff --git a/citadel/modules/spam/serv_spam.c b/citadel/modules/spam/serv_spam.c
index 3473a82d2a36f032e144d7da001b06abd42190d9..be829829856e658dce582638243d9b8e7ac1921d 100644 (file)
--- a/citadel/modules/spam/serv_spam.c
+++ b/citadel/modules/spam/serv_spam.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module allows Citadel to use SpamAssassin to filter incoming messages
  * arriving via SMTP.  For more information on SpamAssassin, visit
  * http://www.spamassassin.org (the SpamAssassin project is not in any way
@@ -8,19 +6,19 @@
  *
  * Copyright (c) 1998-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  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 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define SPAMASSASSIN_PORT       "783"
@@ -205,5 +203,5 @@ CTDL_MODULE_INIT(spam)
        }
        
        /* return our Subversion id for the Log */
-        return "$Id$";
+        return "spam";
 }

diff --git a/citadel/modules/test/serv_test.c b/citadel/modules/test/serv_test.c
index 19c3a4f88f66bc551be473dfceb70d47dcede038..7538b401a321fc116401440b57c2ca9663c91062 100644 (file)
--- a/citadel/modules/test/serv_test.c
+++ b/citadel/modules/test/serv_test.c
@@ -1,24 +1,21 @@
 /*
- * $Id$
- *
  * A skeleton module to test the dynamic loader.
  *
- *
  * Copyright (c) 1998-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  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 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -85,5 +82,5 @@ CTDL_MODULE_INIT(test)
 #endif
 
    /* return our Subversion id for the Log */
-   return "$Id$";
+   return "test";
 }

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 20497ded7e97eaa86ef0a91b88cb1334d1407834..317023ae7a5558ce412d1a52a196f30e516f1505 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Transparently handle the upgrading of server data formats.
  *
  * Copyright (c) 1987-2010 by the citadel.org team
@@ -326,5 +324,5 @@ CTDL_MODULE_UPGRADE(upgrade)
        check_server_upgrades();
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "upgrade";
 }

diff --git a/citadel/modules/upgrade/serv_upgrade.h b/citadel/modules/upgrade/serv_upgrade.h
index 09b5555d4465f135ea131ce9420aa823fc94903a..3256140d355948647a43acc4cf269715fbb6a4dc 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.h
+++ b/citadel/modules/upgrade/serv_upgrade.h
@@ -1,21 +1,18 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 1987-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  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 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 71525578bdc04d90aea235ca78ffad74eb30bbec..2a2ffb4b3b3b329b3ea18bf21df9113998242ae8 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -1,24 +1,22 @@
 /*
- * $Id$
- * 
  * A server-side module for Citadel which supports address book information
  * using the standard vCard format.
  * 
  * Copyright (c) 1999-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  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 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -1473,5 +1471,5 @@ CTDL_MODULE_INIT(vcard)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "vcard";
 }

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 624138b1cc936845742a711452494312b5a6d075..e005e8609f071efb2184b769555a0ca3b9bcbd6c 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Server-side module for Wiki rooms.  This handles things like version control. 
  * 
  * Copyright (c) 2009 by the citadel.org team
@@ -662,5 +660,5 @@ CTDL_MODULE_INIT(wiki)
        }
 
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "wiki";
 }

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 835b30195bd1230760468a277e1a73ab575e64d0..5015c3184267b70a26f98364bbaf013efefc8195 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * XMPP (Jabber) service for the Citadel system
  * Copyright (c) 2007-2010 by Art Cancro
  *
@@ -601,5 +599,5 @@ CTDL_MODULE_INIT(xmpp)
        }
 
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "xmpp";
 }

diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index 989ec798d0d3ca608309ffad31d907c39d912b92..e2dafe736cfdf810ef1c281b7d4f8f9a4534dff7 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007-2009 by Art Cancro
  *
  *  This program is free software; you can redistribute it and/or modify

diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c
index d989beb686c74d42381f72bf887883524d3deefc..0deb0199a6f880ff542074619e58f2c331285759 100644 (file)
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Handle messages sent and received using XMPP (Jabber) protocol
  *
  * Copyright (c) 2007-2010 by Art Cancro

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 2866daa97c1a432440dd0c31eb18e17abf26c614..cef4661f5083302309402c63ba03974bf7a3f402 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Handle XMPP presence exchanges
  *
  * Copyright (c) 2007-2010 by Art Cancro

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 9a6826a7681923501a2c22cc0ee9360db34443dd..ee83d98eca0a8ddcf2b8b627a285f89088bd6c71 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Handle <iq> <get> <query> type situations (namespace queries)
  *
  * Copyright (c) 2007-2009 by Art Cancro

diff --git a/citadel/modules/xmpp/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c
index 24e474aa4cbac21842056149fe25b3c361d212d9..811f2645230ea37b3f1af3359aa321b362c0c0fd 100644 (file)
--- a/citadel/modules/xmpp/xmpp_queue.c
+++ b/citadel/modules/xmpp/xmpp_queue.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * XMPP event queue
  *
  * Copyright (c) 2007-2009 by Art Cancro

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index aee8bb7576457f7d793c7b67e1f7c885177622ba..f53ae1ea5940afab2ced09023d2adfe5e0650aee 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Barebones SASL authentication service for XMPP (Jabber) clients.
  *
  * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.

diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index 2d0dc3c03ce6753f808fbb10e194f5ca3dd46131..cd89694d14ca20bc90db68fc999b24aa98c08621 100755 (executable)
--- a/citadel/scripts/mk_module_init.sh
+++ b/citadel/scripts/mk_module_init.sh
@@ -118,17 +118,17 @@ void initialise_modules (int threading)
     nSizErrmsg = 0;
 
     if (threading)
-        CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads enabled.\n");
+        CtdlLogPrintf (CTDL_INFO, "Initialize modules, CtdlThreads enabled.\n");
     else
-        CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads not yet enabled.\n");
+        CtdlLogPrintf (CTDL_INFO, "Initialize modules, CtdlThreads not yet enabled.\n");
 /* static server initialization: */
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(citserver));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(control));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(euidindex));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(file_ops));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(msgbase));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(room_ops));
-        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(user_ops));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(citserver));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(control));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(euidindex));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(file_ops));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(msgbase));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(room_ops));
+        CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL(user_ops));
 /* dynamic modules: */
 
 EOF
@@ -165,7 +165,7 @@ do
                RES_OUT=`echo $RES | cut -b2-`
                /usr/bin/printf "Found entry point in file $i\n"
 cat <<EOF  >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL($RES_OUT));
 
 EOF
 cat <<EOF >>$H_FILE
@@ -215,7 +215,7 @@ EOF
                                                /usr/bin/printf "Found entry point in file modules/$j/$k\n"
 # Add this entry point to the .c file
 cat <<EOF >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL($RES_OUT));
 EOF
 # Add this entry point to the .h file
 cat <<EOF >> $H_FILE
@@ -271,7 +271,7 @@ EOF
                                                RES_OUT=`echo $RES | cut -b2-`
                                                /usr/bin/printf "Found entry point in file user_modules/$j/$k\n"
 cat <<EOF >> $C_FILE
-       CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL($RES_OUT));
+       CtdlLogPrintf(CTDL_INFO, "Loaded module: %s\n", CTDL_INIT_CALL($RES_OUT));
 EOF
 cat <<EOF >> $H_FILE
 CTDL_MODULE_INIT($RES_OUT);