From df5ea090925983a1bbd7fa6c533cb8f2a9ae5bc7 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 11 Mar 2000 21:29:40 +0000 Subject: [PATCH] * SM_ flags for CtdlSaveMsgPointerInRoom() need to be a bit bucket, not an enum, since more than one can be passed. Changed SM_DONT_BUMP_REF_COUNT from 3 to 4. This also fixes bug #33. --- citadel/ChangeLog | 6 +++++- citadel/copyright.txt | 29 ++++++++++++----------------- citadel/msgbase.h | 2 +- citadel/sysdep.c | 6 +++--- citadel/techdoc/session.txt | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index aa6b3746f..5bdd516f5 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,9 @@ $Log$ +Revision 1.486 2000/03/11 21:29:37 ajc +* SM_ flags for CtdlSaveMsgPointerInRoom() need to be a bit bucket, not an + enum, since more than one can be passed. Changed SM_DONT_BUMP_REF_COUNT + from 3 to 4. This also fixes bug #33. + Revision 1.485 2000/03/11 20:26:03 ajc * Reworked the eply logic in messages.c - fixes bug #34 @@ -1724,4 +1729,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/copyright.txt b/citadel/copyright.txt index 1c93749df..634b70990 100644 --- a/citadel/copyright.txt +++ b/citadel/copyright.txt @@ -1,22 +1,17 @@ - Citadel/UX release 5.60 - -Copyright (c) 1987-1999 by: - Art Cancro - -Portions (c) 1998-1999 by: - Brian Costello - Nathan Bryant - Ben Mehlman - -base64 encoding/decoding for MIME parser, public domain by: - John Walker - -ICQ client code derived from ICQLIB written by: - Denis V. Dmitrienko + ----------------------- + Citadel/UX version 5.70 + ----------------------- + +Copyright (c) 1987-2000 by Art Cancro. -'parsedate' function, public domain by: - Steven M. Bellovin, et. al. (see parsedate.y for full credits) +Portions (c) 1998-2000 by Nathan Bryant, Brian Costello, and Ben Mehlman. + +base64 encoding/decoding for MIME parser, public domain by John Walker. +ICQ client code derived from ICQLIB written by Denis V. Dmitrienko. + +'parsedate' function, public domain by Steven M. Bellovin, et. al. + ------------------------------------------------------------------------------ The entire package is free software; you can redistribute diff --git a/citadel/msgbase.h b/citadel/msgbase.h index 5db18749a..a87c01a4d 100644 --- a/citadel/msgbase.h +++ b/citadel/msgbase.h @@ -14,7 +14,7 @@ */ #define SM_VERIFY_GOODNESS 1 /* Verify this is a real msg number */ #define SM_DO_REPL_CHECK 2 /* Perform replication checks */ -#define SM_DONT_BUMP_REF 3 /* Don't bump reference count +#define SM_DONT_BUMP_REF 4 /* Don't bump reference count (use with extreme care!!!!!!) */ diff --git a/citadel/sysdep.c b/citadel/sysdep.c index b258c03b2..c3fde152e 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -849,7 +849,7 @@ int main(int argc, char **argv) /* Tell 'em who's in da house */ lprintf(1, "\nMultithreaded message server for Citadel/UX\n" -"Copyright (C) 1987-1999 by the Citadel/UX development team.\n" +"Copyright (C) 1987-2000 by the Citadel/UX development team.\n" "Citadel/UX is free software, covered by the GNU General Public License, and\n" "you are welcome to change it and/or distribute copies of it under certain\n" "conditions. There is absolutely no warranty for this software. Please\n" @@ -857,7 +857,7 @@ int main(int argc, char **argv) /* Initialize... */ init_sysdep(); - openlog("citserver",LOG_PID,LOG_USER); + openlog("citserver", LOG_PID, LOG_USER); /* Load site-specific parameters */ lprintf(7, "Loading citadel.config\n"); @@ -875,7 +875,7 @@ int main(int argc, char **argv) NULL, citproto_begin_session, do_command_loop); - CtdlRegisterServiceHook(0, /* TCP */ + CtdlRegisterServiceHook(0, /* Unix */ "citadel.socket", citproto_begin_session, do_command_loop); diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt index 1c0b0e0fe..8b5845d3b 100644 --- a/citadel/techdoc/session.txt +++ b/citadel/techdoc/session.txt @@ -1,5 +1,5 @@ SESSION LAYER PROTOCOL FOR CITADEL/UX - (c) 1995-1999 by Art Cancro et. al. All Rights Reserved + (c) 1995-2000 by Art Cancro et. al. All Rights Reserved INTRODUCTION -- 2.30.2