diff --git a/.mailmap b/.mailmap index 0c7637e7..2865bf9e 100644 --- a/.mailmap +++ b/.mailmap @@ -1,5 +1,8 @@ Aaron Sethman androsyn Alexander Færøy Alexander F?r?y +Ariadne Conill +Ariadne Conill +Ariadne Conill nenolod Brett Greenham B.Greenham Chris Mills TheChrisAM Chris Mills freenode!ChrisAM @@ -15,7 +18,5 @@ Valeriy Yatsko Valeriy Yatsko Valeriy Yatsko Valeriy Yatsko -William Pitcock -William Pitcock nenolod Christine Dodrill Christine Dodrill diff --git a/CREDITS b/CREDITS index 00ba7d18..5176dc1e 100644 --- a/CREDITS +++ b/CREDITS @@ -10,10 +10,10 @@ tomaw, Tom Wesley The Charybdis team was: amdj, Aaron Jones +Ariadne, Ariadne Conill Elizafox, Elizabeth Myers jdhore, JD Horelick jilles, Jilles Tjoelker -kaniini, William Pitcock mr_flea, Keith Buck viatsko, Valerii Iatsko diff --git a/authd/authd.c b/authd/authd.c index 974b6a02..34815441 100644 --- a/authd/authd.c +++ b/authd/authd.c @@ -1,5 +1,5 @@ /* authd/authd.c - main code for authd - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/authd/authd.h b/authd/authd.h index f9e7e2f2..a13b3af5 100644 --- a/authd/authd.h +++ b/authd/authd.h @@ -1,5 +1,5 @@ /* authd/dns.h - header for authd DNS functions - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/authd/dns.c b/authd/dns.c index 909c42a9..8b8a2d27 100644 --- a/authd/dns.c +++ b/authd/dns.c @@ -1,5 +1,5 @@ /* authd/dns.c - authd DNS functions - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/authd/dns.h b/authd/dns.h index 7383ab69..3b2b08f8 100644 --- a/authd/dns.h +++ b/authd/dns.h @@ -1,5 +1,5 @@ /* authd/dns.h - header for authd DNS functions - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/doc/credits-past.txt b/doc/credits-past.txt index 77805ab3..2a33d7e5 100644 --- a/doc/credits-past.txt +++ b/doc/credits-past.txt @@ -174,6 +174,7 @@ recent releases of Hybrid, in nick alphabetical order: A1kmm, Andrew Miller AndroSyn, Aaron Sethman +Ariadne, Ariadne Conill bane, Dragan Dosen bysin, Ben Kittridge cosine, Patrick Alken @@ -187,7 +188,6 @@ jv, Jakub Vlasek k9, Jeremy Chadwick kre, Dinko Korunic madmax, Paul Lomax -nenolod, William Pitcock Riedel, Dennis Vink, scuzzy, David Todd spookey, David Colburn @@ -239,9 +239,9 @@ network configurations. The Charybdis core team, listed in nick-alphabetical order: amdj, Aaron Jones +Ariadne, Ariadne Conill Elizafox, Elizabeth Myers jilles, Jilles Tjoelker -kaniini, William Pitcock mr_flea, Keith Buck The following people are also project members, listed in nick-alphabetical diff --git a/doc/features/account-notify.txt b/doc/features/account-notify.txt index 3a3648c4..a4b5a6d2 100644 --- a/doc/features/account-notify.txt +++ b/doc/features/account-notify.txt @@ -1,7 +1,7 @@ account-notify client capability specification ---------------------------------------------- -Copyright (c) 2010 William Pitcock . +Copyright (c) 2010 Ariadne Conill . Unlimited redistribution and modification of this document is allowed provided that the above copyright notice and this permission notice diff --git a/doc/technical/capab.txt b/doc/technical/capab.txt index bfe52acb..ecfd1fb5 100644 --- a/doc/technical/capab.txt +++ b/doc/technical/capab.txt @@ -1,5 +1,5 @@ Server capabilities -William Pitcock +Ariadne Conill ------------------- Not all TSora IRCd's support these. diff --git a/extensions/chm_nonotice.c b/extensions/chm_nonotice.c index 63295de4..91691865 100644 --- a/extensions/chm_nonotice.c +++ b/extensions/chm_nonotice.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * chm_nonotice: block NOTICEs (+T mode). * - * Copyright (c) 2012 William Pitcock + * Copyright (c) 2012 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/include/authproc.h b/include/authproc.h index c062b6ff..311cf948 100644 --- a/include/authproc.h +++ b/include/authproc.h @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2012 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/include/capability.h b/include/capability.h index 76e58c97..5c455ae4 100644 --- a/include/capability.h +++ b/include/capability.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 William Pitcock . + * Copyright (c) 2012 Ariadne Conill . * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/include/client.h b/include/client.h index 5a86061c..9bc443f7 100644 --- a/include/client.h +++ b/include/client.h @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2004 ircd-ratbox development team - * Copyright (C) 2005 William Pitcock and Jilles Tjoelker + * Copyright (C) 2005 Ariadne Conill and Jilles Tjoelker * * 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 diff --git a/include/dns.h b/include/dns.h index 72d84077..e35b91bc 100644 --- a/include/dns.h +++ b/include/dns.h @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2012 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/include/ircd_linker.h b/include/ircd_linker.h index ad7c9c89..598c970f 100644 --- a/include/ircd_linker.h +++ b/include/ircd_linker.h @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * ircd_linker.h: IRCd symbol table linking and maintainance * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/include/msgbuf.h b/include/msgbuf.h index e553253e..27e6d75d 100644 --- a/include/msgbuf.h +++ b/include/msgbuf.h @@ -1,6 +1,6 @@ /* * solanum - an advanced ircd. - * Copyright (c) 2016 William Pitcock . + * Copyright (c) 2016 Ariadne Conill . * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/include/privilege.h b/include/privilege.h index 54143c60..f6c78db9 100644 --- a/include/privilege.h +++ b/include/privilege.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * Copyright (c) 2008 William Pitcock + * Copyright (c) 2008 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/include/snomask.h b/include/snomask.h index d46608aa..49a84ff3 100644 --- a/include/snomask.h +++ b/include/snomask.h @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * snomask.h: Management for user server-notice masks. * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/include/substitution.h b/include/substitution.h index 8ab9006e..2f93477b 100644 --- a/include/substitution.h +++ b/include/substitution.h @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * markup.h: parses markup into human-readable strings * - * Copyright (c) 2006-2007 William Pitcock + * Copyright (c) 2006-2007 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/include/wsproc.h b/include/wsproc.h index 771e4b69..08b58bb8 100644 --- a/include/wsproc.h +++ b/include/wsproc.h @@ -2,7 +2,7 @@ * wsproc.h: An interface to the solanum websocket helper daemon * Copyright (C) 2007 Aaron Sethman * Copyright (C) 2007 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/ircd/authproc.c b/ircd/authproc.c index 4d2b98e3..0b4f50d4 100644 --- a/ircd/authproc.c +++ b/ircd/authproc.c @@ -4,7 +4,7 @@ * * Copyright (C) 2005 Aaron Sethman * Copyright (C) 2005-2012 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/ircd/capability.c b/ircd/capability.c index e82143e5..710bce10 100644 --- a/ircd/capability.c +++ b/ircd/capability.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 William Pitcock . + * Copyright (c) 2012 Ariadne Conill . * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/ircd/client.c b/ircd/client.c index 136c30a4..8430525c 100644 --- a/ircd/client.c +++ b/ircd/client.c @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2005 ircd-ratbox development team - * Copyright (C) 2007 William Pitcock + * Copyright (C) 2007 Ariadne Conill * * 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 diff --git a/ircd/dns.c b/ircd/dns.c index 92cca073..20ce1480 100644 --- a/ircd/dns.c +++ b/ircd/dns.c @@ -4,7 +4,7 @@ * * Copyright (C) 2005 Aaron Sethman * Copyright (C) 2005-2012 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/ircd/logger.c b/ircd/logger.c index b2e8cad3..44294b19 100644 --- a/ircd/logger.c +++ b/ircd/logger.c @@ -3,7 +3,7 @@ * * Copyright (C) 2003 Lee H * Copyright (C) 2003-2005 ircd-ratbox development team - * Copyright (C) 2008 William Pitcock + * Copyright (C) 2008 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/ircd/msgbuf.c b/ircd/msgbuf.c index 0d134e67..46bf88af 100644 --- a/ircd/msgbuf.c +++ b/ircd/msgbuf.c @@ -1,6 +1,6 @@ /* * solanum - an advanced ircd. - * Copyright (c) 2016 William Pitcock . + * Copyright (c) 2016 Ariadne Conill . * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/ircd/operhash.c b/ircd/operhash.c index d1df2252..a19ce45e 100644 --- a/ircd/operhash.c +++ b/ircd/operhash.c @@ -3,7 +3,7 @@ * * Copyright (C) 2005 Lee Hardy * Copyright (C) 2005-2016 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/ircd/parse.c b/ircd/parse.c index 115ef826..bef6be15 100644 --- a/ircd/parse.c +++ b/ircd/parse.c @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2005 ircd-ratbox development team - * Copyright (C) 2007-2016 William Pitcock + * Copyright (C) 2007-2016 Ariadne Conill * * 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 diff --git a/ircd/privilege.c b/ircd/privilege.c index 6ac27ada..743d8f64 100644 --- a/ircd/privilege.c +++ b/ircd/privilege.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * Copyright (c) 2008 William Pitcock + * Copyright (c) 2008 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/ircd/snomask.c b/ircd/snomask.c index bf453542..c4d34ce8 100644 --- a/ircd/snomask.c +++ b/ircd/snomask.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * snomask.c: Management for user server-notice masks. * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/ircd/substitution.c b/ircd/substitution.c index 3301fd26..65b89de9 100644 --- a/ircd/substitution.c +++ b/ircd/substitution.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * substitution.c: parses substitution-keyword expansions * - * Copyright (c) 2006-2007 William Pitcock + * Copyright (c) 2006-2007 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/ircd/whowas.c b/ircd/whowas.c index 62419535..26146145 100644 --- a/ircd/whowas.c +++ b/ircd/whowas.c @@ -5,7 +5,7 @@ * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1996-2002 Hybrid Development Team * Copyright (C) 2002-2012 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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 diff --git a/librb/include/rb_dictionary.h b/librb/include/rb_dictionary.h index fdedd246..0d9c5dd0 100644 --- a/librb/include/rb_dictionary.h +++ b/librb/include/rb_dictionary.h @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * rb_dictionary.h: Dictionary-based storage. * - * Copyright (c) 2007 William Pitcock + * Copyright (c) 2007 Ariadne Conill * Copyright (c) 2007 Jilles Tjoelker * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/librb/include/rb_radixtree.h b/librb/include/rb_radixtree.h index bbccbd1c..4888e5ec 100644 --- a/librb/include/rb_radixtree.h +++ b/librb/include/rb_radixtree.h @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * rb_radixtree.h: Dictionary-based storage. * - * Copyright (c) 2007-2016 William Pitcock + * Copyright (c) 2007-2016 Ariadne Conill * Copyright (c) 2007-2016 Jilles Tjoelker * * Redistribution and use in source and binary forms, with or without diff --git a/librb/src/dictionary.c b/librb/src/dictionary.c index 1d7b1ef0..7cbc45bd 100644 --- a/librb/src/dictionary.c +++ b/librb/src/dictionary.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * rb_dictionary.c: Dictionary-based information storage. * - * Copyright (c) 2007 William Pitcock + * Copyright (c) 2007 Ariadne Conill * Copyright (c) 2007 Jilles Tjoelker * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/librb/src/mbedtls.c b/librb/src/mbedtls.c index b7460e0c..116127a7 100644 --- a/librb/src/mbedtls.c +++ b/librb/src/mbedtls.c @@ -4,7 +4,7 @@ * * Copyright (C) 2007-2008 ircd-ratbox development team * Copyright (C) 2007-2008 Aaron Sethman - * Copyright (C) 2015 William Pitcock + * Copyright (C) 2015 Ariadne Conill * Copyright (C) 2016 Aaron Jones * * This program is free software; you can redistribute it and/or modify diff --git a/librb/src/radixtree.c b/librb/src/radixtree.c index 89ed0006..15478635 100644 --- a/librb/src/radixtree.c +++ b/librb/src/radixtree.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * rb_radixtree.c: Dictionary-based information storage. * - * Copyright (c) 2007-2016 William Pitcock + * Copyright (c) 2007-2016 Ariadne Conill * Copyright (c) 2007-2016 Jilles Tjoelker * * Redistribution and use in source and binary forms, with or without diff --git a/modules/cap_account_tag.c b/modules/cap_account_tag.c index 3e4edab9..2ea5fa69 100644 --- a/modules/cap_account_tag.c +++ b/modules/cap_account_tag.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * cap_account_tag.c: implement the account-tag IRCv3.2 capability * - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c index 1fd383fd..5a8f1289 100644 --- a/modules/cap_server_time.c +++ b/modules/cap_server_time.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * cap_server_time.c: implement the server-time IRCv3.2 capability * - * Copyright (c) 2016 William Pitcock + * Copyright (c) 2016 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/modules/chm_nocolour.c b/modules/chm_nocolour.c index 265c7855..003788cd 100644 --- a/modules/chm_nocolour.c +++ b/modules/chm_nocolour.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * chm_nocolour: strip colours (+c mode). * - * Copyright (c) 2012 William Pitcock + * Copyright (c) 2012 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/modules/chm_noctcp.c b/modules/chm_noctcp.c index 43ad602d..b0f46916 100644 --- a/modules/chm_noctcp.c +++ b/modules/chm_noctcp.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * chm_noctcp: block non-action CTCP (+C mode). * - * Copyright (c) 2012 William Pitcock + * Copyright (c) 2012 Ariadne Conill * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/modules/m_cap.c b/modules/m_cap.c index 5bdbf52f..3d6355bf 100644 --- a/modules/m_cap.c +++ b/modules/m_cap.c @@ -2,7 +2,7 @@ * * Copyright (C) 2005 Lee Hardy * Copyright (C) 2005 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/modules/m_chghost.c b/modules/m_chghost.c index a402367a..e493278e 100644 --- a/modules/m_chghost.c +++ b/modules/m_chghost.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 William Pitcock + * Copyright (c) 2005 Ariadne Conill * and Jilles Tjoelker * All rights reserved. * diff --git a/modules/m_list.c b/modules/m_list.c index 29204c64..1b3c07ff 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * m_list_safelist.c: Version of /list that uses the safelist code. * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/modules/m_scan.c b/modules/m_scan.c index 25dd2215..c47a58ed 100644 --- a/modules/m_scan.c +++ b/modules/m_scan.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * m_scan.c: Provides information about various targets on various topics * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/modules/m_snote.c b/modules/m_snote.c index 37f5624b..b8086f1b 100644 --- a/modules/m_snote.c +++ b/modules/m_snote.c @@ -2,7 +2,7 @@ * Solanum: a slightly advanced ircd * m_snote.c: Server notice listener * - * Copyright (c) 2006 William Pitcock + * Copyright (c) 2006 Ariadne Conill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/modules/m_starttls.c b/modules/m_starttls.c index 7968836a..bc25e9cc 100644 --- a/modules/m_starttls.c +++ b/modules/m_starttls.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 William Pitcock . + * Copyright (c) 2012 Ariadne Conill . * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/wsockd/wsockd.c b/wsockd/wsockd.c index 82f2f89f..f3231c00 100644 --- a/wsockd/wsockd.c +++ b/wsockd/wsockd.c @@ -2,7 +2,7 @@ * wsockd.c: solanum websockets helper * Copyright (C) 2007 Aaron Sethman * Copyright (C) 2007 ircd-ratbox development team - * Copyright (C) 2016 William Pitcock + * Copyright (C) 2016 Ariadne Conill * * 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