From d56a1a82b06ed401324fc252dcd5f29e0c8b3ae5 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 9 Dec 2017 15:18:14 -0500 Subject: [PATCH] removed some old cruft --- citadel/COPYING | 7 +- citadel/Makefile.in | 2 +- citadel/euidindex.c | 22 +++-- citadel/internet_addressing.c | 1 - citadel/loginwrapper.sh | 3 - citadel/notify_about_newmail.js | 7 -- citadel/openldap/citadel.schema | 68 --------------- citadel/openldap/rfc2739.schema | 147 -------------------------------- citadel/sendwelcomemail.sh | 15 ---- citadel/serv_sieve.h | 7 +- 10 files changed, 18 insertions(+), 261 deletions(-) delete mode 100755 citadel/loginwrapper.sh delete mode 100644 citadel/notify_about_newmail.js delete mode 100644 citadel/openldap/citadel.schema delete mode 100644 citadel/openldap/rfc2739.schema delete mode 100644 citadel/sendwelcomemail.sh diff --git a/citadel/COPYING b/citadel/COPYING index 0587b6c23..44b6007e8 100644 --- a/citadel/COPYING +++ b/citadel/COPYING @@ -1,16 +1,11 @@ -Copyright: (C) 1987-2016 Citadel development team; GPL V3 +Copyright: (C) 1987-2017 Citadel development team; GPL V3 Copyright for CRC16: (C) 2002-2003 Indigo Systems Corporation; Artistic license + Non advertising clause Copyright for MD5 implementation: (C) 1993 Colin Plumb; Public Domain -Copyright for RFC 2739 openldap schema: - (C) 2000 The Internet Society - (C) 2004 Martin Konold - (C) 2006 Art Cancro - * In addition, as a special exception, we hereby declare that our favorite type of software is called "open source" -- NOT "free software" -- and that our favorite operating system is called diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 34458a61c..83b079d0f 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -214,7 +214,7 @@ install-data: network/systems; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done - @for i in notify_about_newmail.js public_clients citadel_urlshorteners.rc \ + @for i in public_clients citadel_urlshorteners.rc \ `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ diff --git a/citadel/euidindex.c b/citadel/euidindex.c index 95c7c77a7..edff5d7c6 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -1,5 +1,15 @@ -/* +/* * Index messages by EUID per room. + * + * Copyright (c) 1987-2017 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. */ #include "sysdep.h" @@ -23,8 +33,6 @@ * */ - - /* * Return nonzero if the supplied room is one which should have * an EUID index. @@ -48,10 +56,6 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) { } - - - - /* * Locate a message in a given room with a given euid, and return * its message number. @@ -60,6 +64,7 @@ long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) { return CtdlLocateMessageByEuid (euid, qrbuf); } + long CtdlLocateMessageByEuid(char *euid, struct ctdlroom *qrbuf) { char *key; int key_len; @@ -120,7 +125,6 @@ void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum) { } - /* * Called by rebuild_euid_index_for_room() to index one message. */ @@ -184,7 +188,6 @@ void rebuild_euid_index(void) { } - /* * Server command to fetch a message number given an euid. */ @@ -222,6 +225,7 @@ void cmd_euid(char *cmdbuf) { cprintf("%d not found\n", ERROR + MESSAGE_NOT_FOUND); } + CTDL_MODULE_INIT(euidindex) { if (!threading) { diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 9cc6a7dbe..ed160fae7 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ - #include "sysdep.h" #include #include diff --git a/citadel/loginwrapper.sh b/citadel/loginwrapper.sh deleted file mode 100755 index b72298b69..000000000 --- a/citadel/loginwrapper.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# This file is obsolete. See docs/install.txt -#exec /bin/login $* bbs diff --git a/citadel/notify_about_newmail.js b/citadel/notify_about_newmail.js deleted file mode 100644 index 51c77ee69..000000000 --- a/citadel/notify_about_newmail.js +++ /dev/null @@ -1,7 +0,0 @@ -{ "message_notification" : { - "to" : "^notifyuser", - "syncsource" : "^syncsource", - "msgid" : "^msgid", - "msgnum" : "^msgnum" - } -} diff --git a/citadel/openldap/citadel.schema b/citadel/openldap/citadel.schema deleted file mode 100644 index 682ff2cdf..000000000 --- a/citadel/openldap/citadel.schema +++ /dev/null @@ -1,68 +0,0 @@ -# $Id$ - -# (c) 2006 Art Cancro - -# This file is distributed under the terms of the GNU General Public License v3. - -# This schema depends on the core.schema, cosine.schema and the inetorgperson.schema -# as provided by third parties such as OpenLDAP. It also depends on rfc2739 schema, -# which is included in the Citadel distribution. -# -# If you are using OpenLDAP, slapd.conf should declare schemas like this: -# -# include /etc/openldap/schema/core.schema -# include /etc/openldap/schema/cosine.schema -# include /etc/openldap/schema/inetorgperson.schema -# include /etc/openldap/schema/rfc2739.schema -# include /etc/openldap/schema/citadel.schema - - -############################################################################## -# -# Our OID tree so far looks like this: -# -# 1.3.6.1.4.1.25404 citadel.org -# 1.3.6.1.4.1.25404.1 Citadel server project - LDAP schema -# 1.3.6.1.4.1.25404.1.1 Custom attributes -# 1.3.6.1.4.1.25404.1.2 Custom object classes -# -############################################################################## - -###################### -# citadel attributes # -###################### - -# alias used to provide alternative rfc822 email addresses for citadel users -attributetype ( 1.3.6.1.4.1.25404.1.1.1 - NAME 'alias' - DESC 'RFC1274: RFC822 Mailbox' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) - -# euid used to provide unique identifier for GAB entries -attributetype ( 1.3.6.1.4.1.25404.1.1.2 - NAME 'euid' - DESC 'unique GAB entry' - EQUALITY caseExactMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{256} ) - -########################## -# citadel object classes # -########################## - -# citadel account -# we use a STRUCTURAL in order to ease integration -# with existing inetOrgPerson objects - -objectclass ( 1.3.6.1.4.1.25404.1.2.1 - NAME 'citadelInetOrgPerson' - DESC 'Citadel Internet Organizational Person' - SUP inetOrgPerson - STRUCTURAL - MUST ( euid ) - MAY ( c $ - alias $ - calFBURL ) - ) - ) diff --git a/citadel/openldap/rfc2739.schema b/citadel/openldap/rfc2739.schema deleted file mode 100644 index 4232302af..000000000 --- a/citadel/openldap/rfc2739.schema +++ /dev/null @@ -1,147 +0,0 @@ -# (c) 2004 Martin Konold -# (c) 2006 Art Cancro - -# This schema is derived from RFC 2739 and may act as a substitute -# when used with OpenLDAP as the original schema from RFC 2739 -# is syntactically not accepted by OpenLDAP 2.2.14 - -# The version of this file as distributed in the Citadel upstream packages -# contains text claiming copyright by the Internet Society and including -# the IETF RFC license, which does not meet Debian's Free Software -# Guidelines. However, apart from short and obvious comments, the text of -# this file is purely a functional interface specification, which is not -# subject to that license and is not copyrightable under US law. -# -# The license statement is retained below so as not to remove credit, but -# as best as we can determine, it is not applicable to the contents of -# this file. - -# Copyright (C) The Internet Society (2000). All Rights Reserved. -# -# This document and translations of it may be copied and furnished to -# others, and derivative works that comment on or otherwise explain it -# or assist in its implementation may be prepared, copied, published -# and distributed, in whole or in part, without restriction of any -# kind, provided that the above copyright notice and this paragraph are -# included on all such copies and derivative works. However, this -# document itself may not be modified in any way, such as by removing -# the copyright notice or references to the Internet Society or other -# Internet organizations, except as needed for the purpose of -# developing Internet standards in which case the procedures for -# copyrights defined in the Internet Standards process must be -# followed, or as required to translate it into languages other than -# English. -# -# The limited permissions granted above are perpetual and will not be -# revoked by the Internet Society or its successors or assigns. -# -# This document and the information contained herein is provided on an -# "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING -# TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING -# BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION -# HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF -# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - - -# If you are using OpenLDAP, slapd.conf should declare schemas like this: -# -# include /etc/openldap/schema/core.schema -# include /etc/openldap/schema/cosine.schema -# include /etc/openldap/schema/inetorgperson.schema -# include /etc/openldap/schema/rfc2739.schema -# include /etc/openldap/schema/citadel.schema - -################################ -# rfc 2739 calendar attributes # -################################ - -# contains the URI to a snapshot of the user's entire -# default calendar -attributetype ( 1.2.840.113556.1.4.478 - NAME 'calCalURI' - DESC 'RFC2739: URI of entire default calendar' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# contains the URI to the user's default -# busy time data -attributetype (1.2.840.113556.1.4.479 - NAME 'calFBURL' - DESC 'RFC2739: URI to the users default freebusy data' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# contains a URI that can be used to communicate with -# the user's calendar -attributetype (1.2.840.113556.1.4.480 - NAME 'calCAPURI' - DESC 'RFC2739: URI used to communicate with the users calendar' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# contains a URI that points to the location to which event -# requests should be sent for that user -attributetype (1.2.840.113556.1.4.481 - NAME 'calCalAdrURI' - DESC 'RFC2739: URI for event equests destination' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# multi-valued property containing URIs to snapshots of -# other calendars that the user may have -attributetype (1.2.840.113556.1.4.482 - NAME 'calOtherCalURIs' - DESC 'RFC2739: multi-value URI for snapshots of other calendars' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# multi-valued property containing URIs to snapshots of other -# free/busy data that the user may have -attributetype (1.2.840.113556.1.4.483 - NAME 'calOtherFBURLs' - DESC 'RFC2739: multi-value URI for other free/busy data' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# multi-valued property containing URI to other calendars that -# the user may have -attributetype (1.2.840.113556.1.4.484 - NAME 'calOtherCAPURIs' - DESC 'RFC2739: multi-value URI to other calendars' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -# URIs to other locations that a user may want -# event requests sent to -attributetype (1.2.840.113556.1.4.485 - NAME 'calOtherCalAdrURIs' - DESC 'RFC2739: multi-value URI to other request destinations' - EQUALITY caseIgnoreIA5Match - SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - USAGE userApplications ) - -objectclass (1.2.840.113556.1.5.87 - NAME 'calEntry' - DESC 'RFC2739: Calendar Entry' - SUP top AUXILIARY - MAY ( calCalURI $ - calFBURL $ - calOtherCalURIs $ - calOtherFBURLs $ - calCAPURI $ - calOtherCAPURIs ) ) diff --git a/citadel/sendwelcomemail.sh b/citadel/sendwelcomemail.sh deleted file mode 100644 index 432b13135..000000000 --- a/citadel/sendwelcomemail.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - - -export FOO=2600908b3f21ae7f692b973ed26e212d -export WELCOMEHTML=welcomemail.html -export WELCOMETXT=welcomemail.txt -export FROM=nobody@example.com -export TO=room_lobby -( - printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$FOO\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$FOO\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; - cat $WELCOMETXT - printf "\r\n\r\n--$FOO\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n" - cat $WELCOMEHTML; - printf "\r\n\r\n--$FOO--\r\n\r\n") | \ - citmail -bm -r "$FROM" "$TO" diff --git a/citadel/serv_sieve.h b/citadel/serv_sieve.h index 2a203cda7..5b98b662e 100644 --- a/citadel/serv_sieve.h +++ b/citadel/serv_sieve.h @@ -1,5 +1,4 @@ - #include #include @@ -17,10 +16,10 @@ struct sdm_vacation { }; struct sdm_userdata { - sieve2_context_t *sieve2_context; /**< for libsieve's use */ - long config_msgnum; /**< confirms that a sieve config was located */ + sieve2_context_t *sieve2_context; /* for libsieve's use */ + long config_msgnum; /* confirms that a sieve config was located */ char config_roomname[ROOMNAMELEN]; - long lastproc; /**< last message processed */ + long lastproc; /* last message processed */ struct sdm_script *first_script; struct sdm_vacation *first_vacation; }; -- 2.30.2