From: Wilfried Goesgens Date: Mon, 2 Jul 2012 23:00:53 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.13~26 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cd367fad021ddbae6f6977a4eb80e426da39248d;hp=50a7f9b7c2183eb912b5c22d8f70b82a8310a6c6 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- diff --git a/citadel/COPYING b/citadel/COPYING index 042bd7127..6b5859481 100644 --- a/citadel/COPYING +++ b/citadel/COPYING @@ -34,14 +34,13 @@ Copyright for RFC 2739 openldap schema: GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (C) 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies of this +license document. Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU General Public License is an open source license for software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, diff --git a/citadel/auth.c b/citadel/auth.c index ae09354f2..07f4e9fa7 100644 --- a/citadel/auth.c +++ b/citadel/auth.c @@ -6,18 +6,12 @@ * Copyright (c) 1999-2009 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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 */ #if defined(__linux) || defined(__sun) /* needed for crypt(): */ diff --git a/citadel/citserver.c b/citadel/citserver.c index 088b584e1..7e5538b51 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c index a4b521864..1f163c222 100644 --- a/citadel/clientsocket.c +++ b/citadel/clientsocket.c @@ -7,18 +7,12 @@ * Copyright (c) 1987-2011 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 as published - * by the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/context.c b/citadel/context.c index d08c74d62..953d1d6ae 100644 --- a/citadel/context.c +++ b/citadel/context.c @@ -5,18 +5,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/domain.c b/citadel/domain.c index a1049537c..0e6bb7dab 100644 --- a/citadel/domain.c +++ b/citadel/domain.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/ecrash.c b/citadel/ecrash.c index efe071ca5..b9decd1bf 100644 --- a/citadel/ecrash.c +++ b/citadel/ecrash.c @@ -12,18 +12,12 @@ * vim: ts=4 * * This program is open source 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. + * 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. - * - * 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" diff --git a/citadel/event_client.c b/citadel/event_client.c index 383668c45..79a2f0f9c 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -1,20 +1,13 @@ /* - * * Copyright (c) 1998-2012 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 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 open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. * - * 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 + * 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" diff --git a/citadel/event_client.h b/citadel/event_client.h index 320beb746..9c1303991 100644 --- a/citadel/event_client.h +++ b/citadel/event_client.h @@ -3,18 +3,12 @@ * Copyright (c) 1998-2012 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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 */ #ifndef __EVENT_CLIENT_H__ diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index 6eb6440b7..108410af2 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/ldap.c b/citadel/ldap.c index 9d2801864..385498443 100644 --- a/citadel/ldap.c +++ b/citadel/ldap.c @@ -5,18 +5,12 @@ * Copyright (c) 2011 by Art Cancro and 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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 */ int ctdl_require_ldap_version = 3; diff --git a/citadel/locate_host.c b/citadel/locate_host.c index 39309e943..d964bc72e 100644 --- a/citadel/locate_host.c +++ b/citadel/locate_host.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/room_ops.c b/citadel/room_ops.c index aee5c05a1..4fb1501cd 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -1,21 +1,15 @@ /* * Server functions which perform operations on room objects. * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2012 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" @@ -261,6 +255,7 @@ SKIP_EVERYTHING: if (view != NULL) *view = vbuf.v_view; } + /* * Self-checking stuff for a room record read into memory */ @@ -362,13 +357,10 @@ void b_putroom(struct ctdlroom *qrbuf, char *room_name) len = bptr - lowercase_name; if (qrbuf == NULL) { - cdb_delete(CDB_ROOMS, - lowercase_name, len); + cdb_delete(CDB_ROOMS, lowercase_name, len); } else { time(&qrbuf->QRmtime); - cdb_store(CDB_ROOMS, - lowercase_name, len, - qrbuf, sizeof(struct ctdlroom)); + cdb_store(CDB_ROOMS, lowercase_name, len, qrbuf, sizeof(struct ctdlroom)); } } @@ -389,7 +381,6 @@ void b_deleteroom(char *room_name) { } - /* * CtdlPutRoomLock() - same as CtdlPutRoom() but unlocks the record (if supported) */ @@ -401,8 +392,6 @@ void CtdlPutRoomLock(struct ctdlroom *qrbuf) } -/****************************************************************************/ - /* * CtdlGetFloorByName() - retrieve the number of the named floor @@ -426,7 +415,6 @@ int CtdlGetFloorByName(const char *floor_name) } - /* * CtdlGetFloorByNameLock() - retrieve floor number for given floor and lock the floor list. */ @@ -484,6 +472,7 @@ void CtdlGetFloor(struct floor *flbuf, int floor_num) } + /* * lgetfloor() - same as CtdlGetFloor() but locks the record (if supported) */ @@ -533,7 +522,6 @@ struct floor *CtdlGetCachedFloor(int floor_num) { } - /* * CtdlPutFloor() - store floor data on disk */ @@ -553,7 +541,6 @@ void CtdlPutFloor(struct floor *flbuf, int floor_num) } - /* * CtdlPutFloorLock() - same as CtdlPutFloor() but unlocks the record (if supported) */ @@ -566,7 +553,6 @@ void CtdlPutFloorLock(struct floor *flbuf, int floor_num) } - /* * lputfloor() - same as CtdlPutFloor() but unlocks the record (if supported) */ @@ -591,11 +577,13 @@ void CtdlForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data memset(&qrbuf, 0, sizeof(struct ctdlroom)); memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ? - sizeof(struct ctdlroom) : cdbqr->len)); + sizeof(struct ctdlroom) : cdbqr->len) + ); cdb_free(cdbqr); room_sanity_check(&qrbuf); - if (qrbuf.QRflags & QR_INUSE) + if (qrbuf.QRflags & QR_INUSE) { (*CallBack)(&qrbuf, in_data); + } } } @@ -608,7 +596,7 @@ void delete_msglist(struct ctdlroom *whichroom) struct cdbdata *cdbml; /* Make sure the msglist we're deleting actually exists, otherwise - * gdbm will complain when we try to delete an invalid record + * libdb will complain when we try to delete an invalid record */ cdbml = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long)); if (cdbml != NULL) { @@ -620,7 +608,6 @@ void delete_msglist(struct ctdlroom *whichroom) } - /* * Message pointer compare function for sort_msglist() */ @@ -649,8 +636,7 @@ int sort_msglist(long listptrs[], int oldcount) /* and yank any nulls */ while ((numitems > 0) && (listptrs[0] == 0L)) { - memmove(&listptrs[0], &listptrs[1], - (sizeof(long) * (numitems - 1))); + memmove(&listptrs[0], &listptrs[1], (sizeof(long) * (numitems - 1))); --numitems; } @@ -674,7 +660,6 @@ int CtdlIsNonEditable(struct ctdlroom *qrbuf) } - /* * Back-back-end for all room listing commands */ @@ -1054,7 +1039,7 @@ void CtdlUserGoto(char *where, int display_result, int transiently, CCC->curr_view = (int)vbuf.v_view; if (display_result) { - cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|%d|\n", + cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|%d|%ld|\n", CIT_OK, CtdlCheckExpress(), truncated_roomname, (int)new_messages, @@ -1070,7 +1055,8 @@ void CtdlUserGoto(char *where, int display_result, int transiently, (int)vbuf.v_view, (int)CCC->room.QRdefaultview, (int)is_trash, - (int)CCC->room.QRflags2 + (int)CCC->room.QRflags2, + (long)CCC->room.QRmtime ); } } diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index b03741e7a..861ecb849 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -5,18 +5,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 25499da30..b59445a85 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -10,18 +10,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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" diff --git a/citadel/threads.c b/citadel/threads.c index 062d19911..ec8fc3feb 100644 --- a/citadel/threads.c +++ b/citadel/threads.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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 diff --git a/citadel/user_ops.c b/citadel/user_ops.c index c29a5613b..f7cb74938 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published - * by the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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"