Innovation by sed

diff --git a/.appveyor-build.sh b/.appveyor-build.sh
index 8ea6283e9660b361848739837a636e878d7c93c6..0b7f31edcb1b88841d1e23954159d77b5372fa27 100644 (file)
--- a/.appveyor-build.sh
+++ b/.appveyor-build.sh
@@ -4,6 +4,6 @@ export MSYSTEM=MINGW64
 export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
 
 sh ./autogen.sh
-./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
+./configure --prefix=c:/projects/solanum/build --enable-openssl=/mingw64
 make -j2
 make install

diff --git a/.appveyor.yml b/.appveyor.yml
index 59ae886be583a410dc54bae87033342fdbd5a01e..85c86f56d7ed268730816ebeff924c2233d2ecaf 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,7 @@ install:
   - ps: Push-AppveyorArtifact cygcheck.log
 build_script:
   - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh"
-#  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version"
+#  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./solanum -version"
 on_failure:
   - ps: Push-AppveyorArtifact config.log
   - ps: Push-AppveyorArtifact librb\include\librb-config.h

diff --git a/.gitignore b/.gitignore
index cfeceb181674bb2068b7f4991591bb23fca99f03..c1043028bb7c8510e0e8dd62ac3102bdc057f43d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,7 @@ scripts/*.tar.bz2
 scripts/*.tar.gz
 include/setup.h
 include/setup.h.in
-ircd/charybdis
+ircd/solanum
 ircd/ircd_parser.c
 ircd/ircd_parser.h
 ircd/ircd_lexer.c
@@ -74,13 +74,13 @@ tests/*.c.pid
 !tests/runtime/modules/*.so
 !tests/runtime/modules/autoload/*.so
 testsuite/ircd.pid.*
-tools/charybdis-mkpasswd
-tools/charybdis-mkfingerprint
+tools/solanum-mkpasswd
+tools/solanum-mkfingerprint
 tools/genssl
 tools/mkpasswd
 tools/viconf
 include/serno.h
-ircd/charybdis
+ircd/solanum
 ircd/version.c
 ircd/version.c.last
 /libtool

diff --git a/.travis.yml b/.travis.yml
index df5cfa315b32b6ac6486ea6099093e3fe4d94cd4..231616e5da65db381d88f2b0554890ab2a96c573 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Travis-CI Build for charybdis
+# Travis-CI Build for solanum
 # see travis-ci.org for details
 
 language: c
@@ -10,7 +10,7 @@ sudo: false
 notifications:
   irc:
     channels:
-    - "chat.freenode.net#charybdis"
+    - "chat.freenode.net#solanum"
 
 matrix:
   include:

diff --git a/README.md b/README.md
index 962f85269e59b609094c242dd0bcb76a7aebf77b..3d821743c69df63ea72100d18e6f8ba22835ca8c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# charybdis [![POSIX Build Status](https://travis-ci.org/charybdis-ircd/charybdis.svg?branch=master)](https://travis-ci.org/charybdis-ircd/charybdis) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/charybdis/branch/master)
+# solanum [![POSIX Build Status](https://travis-ci.org/solanum-ircd/solanum.svg?branch=master)](https://travis-ci.org/solanum-ircd/solanum) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/solanum/branch/master)
 
-Charybdis is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.
+Solanum is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.
 
 It is meant to be used with an IRCv3-capable services implementation such as [Atheme][atheme] or [Anope][anope].
 
@@ -15,7 +15,7 @@ It is meant to be used with an IRCv3-capable services implementation such as [At
 
 # platforms
 
-Charybdis is designed with portability in mind, but does not target older systems nor those of solely academic
+Solanum is designed with portability in mind, but does not target older systems nor those of solely academic
 interest.
 
 Do note that operating systems are only supported if they are supported by their vendor.
@@ -44,7 +44,7 @@ resolution may not be possible.
 
 ## Tier 3
 
-Anything else that hasn't been tested. Charybdis may or may not work on it; patches welcome if they don't.
+Anything else that hasn't been tested. Solanum may or may not work on it; patches welcome if they don't.
 
 # platform specific errata
 
@@ -68,7 +68,7 @@ These are known issues and workarounds for supported platforms.
 # building from git
 
 We no longer supply a prebuilt configure script in git, due to use of automake and libtool causing problems.
-You will need to run `autogen.sh` to build the autotools files prior to building charybdis.
+You will need to run `autogen.sh` to build the autotools files prior to building solanum.
 
 # feature specific requirements
 
@@ -89,7 +89,7 @@ You will need to run `autogen.sh` to build the autotools files prior to building
 
 # tips
 
- * To report bugs in charybdis, visit us at irc.charybdis.io #charybdis
+ * To report bugs in solanum, visit us at chat.freenode.net #solanum
 
  * Please read doc/index.txt to get an overview of the current documentation.
 
@@ -97,13 +97,13 @@ You will need to run `autogen.sh` to build the autotools files prior to building
 
  * The files, /etc/services, /etc/protocols, and /etc/resolv.conf, SHOULD be
    readable by the user running the server in order for ircd to start with
-   the correct settings.  If these files are wrong, charybdis will try to use
+   the correct settings.  If these files are wrong, solanum will try to use
    127.0.0.1 for a resolver as a last-ditch effort.
 
 # git access
 
- * The Charybdis GIT repository can be checked out using the following command:
-       `git clone https://github.com/charybdis-ircd/charybdis`
+ * The Solanum GIT repository can be checked out using the following command:
+       `git clone https://github.com/solanum-ircd/solanum`
 
- * Charybdis's GIT repository depot can be browsed over the Internet at the following address:
-       https://github.com/charybdis-ircd/charybdis
+ * Solanum's GIT repository depot can be browsed over the Internet at the following address:
+       https://github.com/solanum-ircd/solanum

diff --git a/authd/notice.h b/authd/notice.h
index 5a4349ab769fd99c2914d7530117ee25df225306..a58c4e4d6ad666e5b49ddf5dc996dd09518ca972 100644 (file)
--- a/authd/notice.h
+++ b/authd/notice.h
@@ -18,8 +18,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_AUTHD_NOTICE_H__
-#define __CHARYBDIS_AUTHD_NOTICE_H__
+#ifndef __SOLANUM_AUTHD_NOTICE_H__
+#define __SOLANUM_AUTHD_NOTICE_H__
 
 typedef enum
 {
@@ -35,4 +35,4 @@ void stats_result(uint32_t cid, char letter, const char *fmt, ...);
 void stats_error(uint32_t cid, char letter, const char *fmt, ...);
 void stats_done(uint32_t cid, char letter);
 
-#endif /* __CHARYBDIS_AUTHD_NOTICE_H__ */
+#endif /* __SOLANUM_AUTHD_NOTICE_H__ */

diff --git a/authd/provider.h b/authd/provider.h
index 9f8ae6f65c93c062b5df6343dc132ab0b94d0d71..4000c5d804213c9096383609a2aca06a06ce1814 100644 (file)
--- a/authd/provider.h
+++ b/authd/provider.h
@@ -18,8 +18,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_AUTHD_PROVIDER_H__
-#define __CHARYBDIS_AUTHD_PROVIDER_H__
+#ifndef __SOLANUM_AUTHD_PROVIDER_H__
+#define __SOLANUM_AUTHD_PROVIDER_H__
 
 #include "stdinc.h"
 #include "authd.h"
@@ -243,4 +243,4 @@ get_provider_timeout(struct auth_client *auth, uint32_t id)
        return auth->data[id].timeout;
 }
 
-#endif /* __CHARYBDIS_AUTHD_PROVIDER_H__ */
+#endif /* __SOLANUM_AUTHD_PROVIDER_H__ */

diff --git a/authd/providers/dnsbl.c b/authd/providers/dnsbl.c
index db0a94403866390a4af6c4b3c996a0bee9f8ba95..f4f5d1dbd780ddde622cdec5ddc2740f77ace693 100644 (file)
--- a/authd/providers/dnsbl.c
+++ b/authd/providers/dnsbl.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: A slightly useful ircd.
+ * Solanum: a slightly advanced ircd
  * dnsbl.c: Manages DNSBL entries and lookups
  *
  * Copyright (C) 2006-2011 charybdis development team
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* Originally written for charybdis circa 2006 (by nenolod?).
+/* Originally written for solanum circa 2006 (by nenolod?).
  * Tweaked for authd. Some functions and structs renamed. Public/private
  * interfaces have been shifted around. Some code has been cleaned up too.
  * -- Elizafox 24 March 2016

diff --git a/authd/res.c b/authd/res.c
index 0336b46242734adb126e2ceadcdfaeb9bd32de05..71f0f74286231c00e2506a56230ac37355900b79 100644 (file)
--- a/authd/res.c
+++ b/authd/res.c
@@ -105,7 +105,7 @@ static uint16_t generate_random_id(void);
  * author:
  *      paul vixie, 29may94
  *      revised for ircd, cryogen(stu) may03
- *      slightly modified for charybdis, mr_flea oct12
+ *      slightly modified for solanum, mr_flea oct12
  */
 static int
 res_ourserver(const struct rb_sockaddr_storage *inp)

diff --git a/authd/res.h b/authd/res.h
index 1fabe0b22e2123244dbb10926367270fee118c97..a68010689481dd04621c9c14d41e3031a41a1ba3 100644 (file)
--- a/authd/res.h
+++ b/authd/res.h
@@ -3,11 +3,11 @@
  *
  */
 
-#ifndef _CHARYBDIS_RES_H
-#define _CHARYBDIS_RES_H
+#ifndef _SOLANUM_RES_H
+#define _SOLANUM_RES_H
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about
- * In hybrid, this was 2 -- but in Charybdis, we want to track
+ * In hybrid, this was 2 -- but in Solanum, we want to track
  * a few more than that ;) --nenolod
  */
 #define IRCD_MAXNS 10

diff --git a/authd/reslib.h b/authd/reslib.h
index e8917130ce553ca8cd7c456c17bcfa2f07f60b51..c2d7fc978251d463f38146fd8f92d83ea592f2c7 100644 (file)
--- a/authd/reslib.h
+++ b/authd/reslib.h
@@ -3,8 +3,8 @@
  *
  */
 
-#ifndef _CHARYBDIS_RESLIB_H
-#define _CHARYBDIS_RESLIB_H
+#ifndef _SOLANUM_RESLIB_H
+#define _SOLANUM_RESLIB_H
 
 /* Longest hostname we're willing to work with.
  * Due to DNSBLs this is more than HOSTLEN.

diff --git a/bandb/bandb.c b/bandb/bandb.c
index 769f6fe437b6b6430dbf20f20830368f537b128f..44f19e6967ed792b97571c09c8438ee4450ad7cf 100644 (file)
--- a/bandb/bandb.c
+++ b/bandb/bandb.c
@@ -306,7 +306,7 @@ main(int argc, char *argv[])
        if(bandb_helper == NULL)
        {
                fprintf(stderr,
-                       "This is the charybdis bandb for internal ircd use.\n");
+                       "This is the solanum bandb for internal ircd use.\n");
                fprintf(stderr,
                        "You aren't supposed to run me directly (did you want bantool?). Exiting.\n");
                exit(1);

diff --git a/bandb/bantool.c b/bandb/bantool.c
index caadd920f980084642e339dd76e132cae8188258..5563a4a921af2ef2b97cbf73da72c524c291f0cb 100644 (file)
--- a/bandb/bantool.c
+++ b/bandb/bantool.c
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
                rb_strlcpy(etc, ETCPATH, sizeof(ETCPATH));
 
        fprintf(stdout,
-               "* charybdis bantool v.%s\n", BT_VERSION);
+               "* solanum bantool v.%s\n", BT_VERSION);
 
        if(flag.pretend == false)
        {
@@ -864,7 +864,7 @@ bt_smalldate(const char *string)
 void
 print_help(int i_exit)
 {
-       fprintf(stderr, "bantool v.%s - the charybdis database tool.\n", BT_VERSION);
+       fprintf(stderr, "bantool v.%s - the solanum database tool.\n", BT_VERSION);
        fprintf(stderr, "Copyright (C) 2008 Daniel J Reidy <dubkat@gmail.com>\n");
        fprintf(stderr, "This program is distributed in the hope that it will be useful,\n"
                "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"

diff --git a/configure.ac b/configure.ac
index e03c71575ab8fd5ab7adc4e5f913daf5040749bb..dcb3365942704835a8c1b57adbd1557f82422db9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl said functions need to be just about as complex as they already are.
 
 AC_PREREQ(2.60)
 
-AC_INIT([charybdis], [4.1.3-dev])
+AC_INIT([solanum], [1.0-dev])
 
 AC_LANG(C)
 AC_USE_SYSTEM_EXTENSIONS
@@ -13,7 +13,7 @@ AC_GNU_SOURCE
 AC_PROG_CC_C99
 
 if test x"$ac_cv_prog_cc_c99" = "xno"; then
-       AC_ERROR([charybdis requires a C99 capable compiler])
+       AC_ERROR([solanum requires a C99 capable compiler])
 fi
 
 AC_PREFIX_DEFAULT($HOME/ircd)
@@ -183,7 +183,7 @@ AC_SUBST(CRYPT_LIB)
 AC_C_BIGENDIAN
 
 dnl Check for stdarg.h - if we can't find it, halt configure
-AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - charybdis will not compile without it **])])
+AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - solanum will not compile without it **])])
 AC_CHECK_FUNCS([strlcat strlcpy])
 
 AC_TYPE_INT16_T
@@ -561,7 +561,7 @@ if test "$profile" = yes; then
        if test "$ac_cv_c_compiler_gnu" = yes; then
                IRC_CFLAGS="$IRC_CFLAGS -pg"
                AC_MSG_RESULT([yes, adding -pg])
-               AC_DEFINE(CHARYBDIS_PROFILE, 1, [Define this if you are profiling.])
+               AC_DEFINE(SOLANUM_PROFILE, 1, [Define this if you are profiling.])
        else
                AC_MSG_RESULT([no, profile builds only work with gcc])
        fi
@@ -646,26 +646,26 @@ AC_HELP_STRING([--enable-warnings],[Enable all sorts of warnings for debugging.]
 IRC_CFLAGS="$IRC_CFLAGS -O0"
 CFLAGS="$IRC_CFLAGS"
 
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wall], charybdis_cv_c_gcc_w_all)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wpointer-arith], charybdis_cv_c_gcc_w_pointer_arith)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], charybdis_cv_c_gcc_w_implicit)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-align], charybdis_cv_c_gcc_w_cast_align)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wcast-qual], charybdis_cv_c_gcc_w_cast_qual)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wwrite-strings], charybdis_cv_c_gcc_w_write_strings)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], charybdis_cv_c_gcc_w_error_implicit_function_declaration)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], charybdis_cv_c_gcc_prototypes)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wparentheses], charybdis_cv_c_gcc_parentheses)
-CHARYBDIS_C_GCC_TRY_FLAGS([-W -Wno-unused], charybdis_cv_c_gcc_w)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wextra], charybdis_cv_c_gcc_w_extra)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wshadow], charybdis_cv_c_gcc_w_shadow)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wmissing-noreturn], charybdis_cv_c_gcc_w_missing_noreturn)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wundef], charybdis_cv_c_gcc_w_undef)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wpacked], charybdis_cv_c_gcc_w_packed)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wnested-externs], charybdis_cv_c_gcc_w_nested_externs)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], charybdis_cv_c_gcc_w_unused)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wredundant-decls], charybdis_cv_c_gcc_w_redundant_decls)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wfloat-equal], charybdis_cv_c_gcc_w_float_equal)
-CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], charybdis_cv_c_gcc_w_format)
+SOLANUM_C_GCC_TRY_FLAGS([-Wall], solanum_cv_c_gcc_w_all)
+SOLANUM_C_GCC_TRY_FLAGS([-Wpointer-arith], solanum_cv_c_gcc_w_pointer_arith)
+SOLANUM_C_GCC_TRY_FLAGS([-Wimplicit -Wnested-externs], solanum_cv_c_gcc_w_implicit)
+SOLANUM_C_GCC_TRY_FLAGS([-Wcast-align], solanum_cv_c_gcc_w_cast_align)
+SOLANUM_C_GCC_TRY_FLAGS([-Wcast-qual], solanum_cv_c_gcc_w_cast_qual)
+SOLANUM_C_GCC_TRY_FLAGS([-Wwrite-strings], solanum_cv_c_gcc_w_write_strings)
+SOLANUM_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], solanum_cv_c_gcc_w_error_implicit_function_declaration)
+SOLANUM_C_GCC_TRY_FLAGS([-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations], solanum_cv_c_gcc_prototypes)
+SOLANUM_C_GCC_TRY_FLAGS([-Wparentheses], solanum_cv_c_gcc_parentheses)
+SOLANUM_C_GCC_TRY_FLAGS([-W -Wno-unused], solanum_cv_c_gcc_w)
+SOLANUM_C_GCC_TRY_FLAGS([-Wextra], solanum_cv_c_gcc_w_extra)
+SOLANUM_C_GCC_TRY_FLAGS([-Wshadow], solanum_cv_c_gcc_w_shadow)
+SOLANUM_C_GCC_TRY_FLAGS([-Wmissing-noreturn], solanum_cv_c_gcc_w_missing_noreturn)
+SOLANUM_C_GCC_TRY_FLAGS([-Wundef], solanum_cv_c_gcc_w_undef)
+SOLANUM_C_GCC_TRY_FLAGS([-Wpacked], solanum_cv_c_gcc_w_packed)
+SOLANUM_C_GCC_TRY_FLAGS([-Wnested-externs], solanum_cv_c_gcc_w_nested_externs)
+SOLANUM_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], solanum_cv_c_gcc_w_unused)
+SOLANUM_C_GCC_TRY_FLAGS([-Wredundant-decls], solanum_cv_c_gcc_w_redundant_decls)
+SOLANUM_C_GCC_TRY_FLAGS([-Wfloat-equal], solanum_cv_c_gcc_w_float_equal)
+SOLANUM_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], solanum_cv_c_gcc_w_format)
 
 IRC_CFLAGS="$CFLAGS"
 ],[])

diff --git a/doc/ircd.motd b/doc/ircd.motd
index 343031a0afe753fd91823fb4ca81639d2bc74884..29202cd87b38f98bb2272d9972fb2db507699f5c 100644 (file)
--- a/doc/ircd.motd
+++ b/doc/ircd.motd
@@ -1,2 +1,2 @@
-This is charybdis MOTD you might replace it, but if not your friends will
+This is solanum MOTD you might replace it, but if not your friends will
 laugh at you.

diff --git a/doc/reference.conf b/doc/reference.conf
index c489d5b599378d11e8f2fe4c2ab48ec205065346..91bbe1137c085809c71a05be5fd4d28802d103d4 100644 (file)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1,4 +1,4 @@
-/* doc/reference.conf - charybdis Example configuration file
+/* doc/reference.conf - solanum example configuration file
  *
  * Copyright (C) 2000-2002 Hybrid Development Team
  * Copyright (C) 2002-2005 ircd-ratbox development team

diff --git a/extensions/README b/extensions/README
index 9361bb78dfa22306902d5457dddf9199ab111236..0c21f54db627f38503d0edf78d8d88b3931402ec 100644 (file)
--- a/extensions/README
+++ b/extensions/README
@@ -1,4 +1,4 @@
-This directory contains extensions (modules) to charybdis ircd that
+This directory contains extensions (modules) to solanum ircd that
 have been contributed by other people, or written by our development
 team.  Unsupported extensions live under unsupported/.
 

diff --git a/extensions/chm_nonotice.c b/extensions/chm_nonotice.c
index c2dcb6b2e66f88e715932abfa68a28e300b3fd59..63295de4acd917b29dda6042b62cf3c1fd17a9d3 100644 (file)
--- a/extensions/chm_nonotice.c
+++ b/extensions/chm_nonotice.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_nonotice: block NOTICEs (+T mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>

diff --git a/extensions/example_module.c b/extensions/example_module.c
index a0b501f5394f98985659bec5de23c852c9b75af4..bc277316f40c0fb1004d2b408eddbf398d44216a 100644 (file)
--- a/extensions/example_module.c
+++ b/extensions/example_module.c
@@ -30,7 +30,7 @@
  *
  * Make it short, sweet, and to the point.
  */
-static const char example_desc[] = "This is an example Charybdis module.";
+static const char example_desc[] = "This is an example Solanum module.";
 
 /* Declare the void's initially up here, as modules dont have an
  * include file, we will normally have client_p, source_p, parc

diff --git a/extensions/hurt.c b/extensions/hurt.c
index 2baf3c58c4adbaa0fc171a87e568006c346c6bf6..c04c09c882a19e4175c000acfbaf2afd46a9ac2b 100644 (file)
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2006 charybdis development team
  * All rights reserved

diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index a650c8abda7d673b5e9a67c8f5eea66431bfc24a..4ae0ca92fa56ab0e9844e7656a923bb6ba20ea76 100644 (file)
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -1,5 +1,5 @@
 /*
- * Charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ip_cloaking.c: provide user hostname cloaking
  *
  * Written originally by nenolod, altered to use FNV by Elizabeth in 2008

diff --git a/extensions/ip_cloaking_4.0.c b/extensions/ip_cloaking_4.0.c
index 011fcc699c9c82b404fffe817d60294fc135171e..e298651cd0f33819fa9ce823775cc2b14f760c2d 100644 (file)
--- a/extensions/ip_cloaking_4.0.c
+++ b/extensions/ip_cloaking_4.0.c
@@ -1,5 +1,5 @@
 /*
- * Charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ip_cloaking.c: provide user hostname cloaking
  *
  * Written originally by nenolod, altered to use FNV by Elizabeth in 2008

diff --git a/extensions/m_extendchans.c b/extensions/m_extendchans.c
index d9e887ee617d4bbb2a4280f725a6e68c6ae96e8e..6f2682a461ee48f293a95268af28704abb9b985f 100644 (file)
--- a/extensions/m_extendchans.c
+++ b/extensions/m_extendchans.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  m_extendchans.c: Allow an oper or service to let a given user join more channels.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index 571868f749e68374e643ed75ba0075f226e1366e..045248982f02fffbe182519a75a21647ee123937 100644 (file)
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -1,5 +1,5 @@
 /*
- *  Charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_omode.c: allows oper mode hacking
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 0f26942ccd37b4fe193aa7a8e1b0668f6e8baf4c..bb6f010a0c29ab009154b6b8a81526be44700512 100644 (file)
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -1,5 +1,5 @@
 /*
- * roleplay commands for charybdis.
+ * roleplay commands for solanum.
  *
  * adds NPC, NPCA, and SCENE which allow users to send messages from 'fake'
  * nicknames. in the case of NPC and NPCA, the nickname will be underlined

diff --git a/extensions/override.c b/extensions/override.c
index 91b3d6eb38e9e2c5fdafbabff6cff031823922b9..50dae5791ae196fcfe585851228746759d6bedd5 100644 (file)
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -1,5 +1,5 @@
 /*
- * oper-override for charybdis.
+ * oper-override for solanum.
  *
  * adds usermode +p and has a timer event that is iterated over to disable
  * usermode +p after a while...

diff --git a/include/authproc.h b/include/authproc.h
index 571253f850a94d726063de2fa7d0c577801db1d6..c062b6ffdc4d0b559779bd16fbf2332f34b10739 100644 (file)
--- a/include/authproc.h
+++ b/include/authproc.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  authproc.h: A header with the authd functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -23,8 +23,8 @@
  *  USA
  */
 
-#ifndef CHARYBDIS_AUTHD_H
-#define CHARYBDIS_AUTHD_H
+#ifndef SOLANUM_AUTHD_H
+#define SOLANUM_AUTHD_H
 
 #include "stdinc.h"
 #include "rb_dictionary.h"

diff --git a/include/certfp.h b/include/certfp.h
index 0913cade41ade48fc263286cf13304f7bc681176..16b71cd0b3ecc1d4f7252021c30ff73f0a89a182 100644 (file)
--- a/include/certfp.h
+++ b/include/certfp.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  certpf.h: Fingerprint method strings
  *
  *  Copyright 2016 Simon Arlott

diff --git a/include/chmode.h b/include/chmode.h
index 54010dadd2287a0221bd762958db8fa34be52ca7..2b2eb33c760b47f863cd46def5ceeaa1b31cc0c2 100644 (file)
--- a/include/chmode.h
+++ b/include/chmode.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  chmode.h: The ircd channel header.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/client.h b/include/client.h
index f1285b18561f0ebfd745ec0db9b27ff3d1f9440b..894d82fd7e288b3ef15d03b9f4f9d7369710f860 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  client.h: The ircd client header.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/dns.h b/include/dns.h
index 3a13c3f7dec087258a130323c5dae4e03eaecbb0..72d8407713a9889905d561ca6596ed1efadcf429 100644 (file)
--- a/include/dns.h
+++ b/include/dns.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  dns.h: A header with the DNS functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -23,8 +23,8 @@
  *  USA
  */
 
-#ifndef CHARYBDIS_DNS_H
-#define CHARYBDIS_DNS_H
+#ifndef SOLANUM_DNS_H
+#define SOLANUM_DNS_H
 
 #include "stdinc.h"
 #include "authproc.h"

diff --git a/include/hostmask.h b/include/hostmask.h
index 7b2ce4354685bdc670750a39298132e9bb69b944..2eb2a16d405e9351f588ced6e79d2fb35d883d37 100644 (file)
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  hostmask.h: A header for the hostmask code.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/inline/stringops.h b/include/inline/stringops.h
index b5616081242f18f419cca93a6bf2fd7a19066562..6959a1a72f6320a9fd39d2a9bc96c867ef10000a 100644 (file)
--- a/include/inline/stringops.h
+++ b/include/inline/stringops.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  inline/stringops.h: inlined string operations used in a few places
  *
  *  Copyright (c) 2005-2008 charybdis development team

diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index cea850cede7bc2cdad3b5241e380d0ef16b6b2c4..b89d7f8506da8a00b782e151b9292f7f6cdd384d 100644 (file)
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced IRCd.
+ *  solanum: An advanced IRCd.
  *  ircd_defs.h: A header for ircd global definitions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/ircd_linker.h b/include/ircd_linker.h
index 7d40b513fb39fd8ac045a83cecefa4e3e64fd2bf..ad7c9c89399f86c8998c9f8162c5ae7d40007521 100644 (file)
--- a/include/ircd_linker.h
+++ b/include/ircd_linker.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * ircd_linker.h: IRCd symbol table linking and maintainance
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _CHARYBDIS_IRCD_LINKER_H
-#define _CHARYBDIS_IRCD_LINKER_H
+#ifndef _SOLANUM_IRCD_LINKER_H
+#define _SOLANUM_IRCD_LINKER_H
 
 #include <dlfcn.h>
 

diff --git a/include/m_info.h b/include/m_info.h
index 94a870c3355680e5eed201413e40878f157a0f4c..98eeafbb079762decb3b898b01406f61694b6f8e 100644 (file)
--- a/include/m_info.h
+++ b/include/m_info.h
@@ -63,10 +63,10 @@ Info MyInformation[] = {
 #endif /* UH PATH */
 
 #ifdef SOMAXCONN
-       {"CHARYBDIS_SOMAXCONN", "", SOMAXCONN,
+       {"SOLANUM_SOMAXCONN", "", SOMAXCONN,
         "Maximum Queue Length of Pending Connections"},
 #else
-       {"CHARYBDIS_SOMAXCONN", "", CHARYBDIS_SOMAXCONN,
+       {"SOLANUM_SOMAXCONN", "", SOLANUM_SOMAXCONN,
         "Maximum Queue Length of Pending Connections"},
 #endif /* SOMAXCONN */
 

diff --git a/include/modules.h b/include/modules.h
index 0c74672894d9ce9fa10c1911a45116658e341dec..41d0f65835ff561f6398a4dd34ddd3d3935567a1 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -30,7 +30,7 @@
 #include "parse.h"
 #include "client.h" /* for IDLEN */
 
-#define MAPI_CHARYBDIS 2
+#define MAPI_SOLANUM 2
 
 #include <ltdl.h>
 
@@ -97,8 +97,8 @@ struct mapi_mheader_av1
 };
 
 #define MAPI_ORIGIN_UNKNOWN    0               /* Unknown provenance (AV1 etc.) */
-#define MAPI_ORIGIN_EXTENSION  1               /* Charybdis extension */
-#define MAPI_ORIGIN_CORE       2               /* Charybdis core module */
+#define MAPI_ORIGIN_EXTENSION  1               /* Solanum extension */
+#define MAPI_ORIGIN_CORE       2               /* Solanum core module */
 
 struct mapi_mheader_av2
 {

diff --git a/include/msgbuf.h b/include/msgbuf.h
index 085569ab3188a8472314897c491f41f3151f87a4..e553253eb0363fd5822ffcf8809befc7600ca565 100644 (file)
--- a/include/msgbuf.h
+++ b/include/msgbuf.h
@@ -1,5 +1,5 @@
 /*
- * charybdis - an advanced ircd.
+ * solanum - an advanced ircd.
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,8 +19,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CHARYBDIS__MSGBUF_H
-#define CHARYBDIS__MSGBUF_H
+#ifndef SOLANUM__MSGBUF_H
+#define SOLANUM__MSGBUF_H
 
 #define MAXPARA                (15)
 

diff --git a/include/privilege.h b/include/privilege.h
index a3e5bffb4dccf883bcdfda72cf3791e0ccc5ac24..1176f2bb5336c767e142206229dd7ca33a24fc76 100644 (file)
--- a/include/privilege.h
+++ b/include/privilege.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * privilege.h: Dynamic privileges API.
  *
  * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
@@ -21,8 +21,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CHARYBDIS_PRIVILEGE_H
-#define __CHARYBDIS_PRIVILEGE_H
+#ifndef __SOLANUM_PRIVILEGE_H
+#define __SOLANUM_PRIVILEGE_H
 
 #include "stdinc.h"
 

diff --git a/include/ratelimit.h b/include/ratelimit.h
index 8e39493e97d4aa13ae205cdbe79294c9acb774cf..a990f7e366b418638a5b88f16eed0de2961cf3fd 100644 (file)
--- a/include/ratelimit.h
+++ b/include/ratelimit.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2012 Keith Buck <mr_flea@esper.net>
  *

diff --git a/include/s_assert.h b/include/s_assert.h
index d64834135c220911a48cd4b041ff1886625c8c4a..913ec1a9cb601fd794a9f674b727ede716d7af72 100644 (file)
--- a/include/s_assert.h
+++ b/include/s_assert.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: An advanced IRCd.
+ *  solanum: An advanced IRCd.
  *  s_assert.h: Definition of the soft assert (s_assert) macro.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/s_conf.h b/include/s_conf.h
index da6797b52d5eb5fed7686658d46d7d53d67b41cd..c804dd40c5cd7c3b108f454d2cee21034db0503f 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: Advanced, scalable Internet Relay Chat.
+ *  solanum: Advanced, scalable Internet Relay Chat.
  *  s_conf.h: A header for the configuration functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/include/snomask.h b/include/snomask.h
index 2044ffcef7719aac7048bcff3702081dd02692a0..d46608aa3635baecb711eaa1ac812f97b29e99dd 100644 (file)
--- a/include/snomask.h
+++ b/include/snomask.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * snomask.h: Management for user server-notice masks.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>

diff --git a/include/substitution.h b/include/substitution.h
index 1242d58032ac8e75e4a763e9732345eed9f0aa1e..8ab9006ec512e9f479e7bf9d75cb19e5c4eb19bb 100644 (file)
--- a/include/substitution.h
+++ b/include/substitution.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * markup.h: parses markup into human-readable strings
  *
  * Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>

diff --git a/include/supported.h b/include/supported.h
index 2a77f0954d119638c863605d39d433ff7d414e1b..06370a003dd71546b431fb23dd61a80f2243783c 100644 (file)
--- a/include/supported.h
+++ b/include/supported.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  supported.h: isupport (005) numeric
  *
  *  Entirely rewritten, August 2006 by Jilles Tjoelker

diff --git a/include/tgchange.h b/include/tgchange.h
index 7e9bd052cb3dac30b7959cd3673dd3eb78cc43d9..9504c96390bc7d58a32115c3a075abf6ccdc53c4 100644 (file)
--- a/include/tgchange.h
+++ b/include/tgchange.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>
  * Copyright (C) 2005-2010 Jilles Tjoelker <jilles@stack.nl>

diff --git a/include/wsproc.h b/include/wsproc.h
index 3d818146815d3d3c38e98b7eda1ec718bdf96ae6..771e4b69d2cadb83a46d92d93b0807673c19d736 100644 (file)
--- a/include/wsproc.h
+++ b/include/wsproc.h
@@ -1,5 +1,5 @@
 /*
- *  wsproc.h: An interface to the charybdis websocket helper daemon
+ *  wsproc.h: An interface to the solanum websocket helper daemon
  *  Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2007 ircd-ratbox development team
  *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>

diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index d4b1e31b7f24c6980b428f2c283cc88d0160c4b4..a157ea4f1cea660ae1afeaca31a7f06ac42aa303 100644 (file)
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -69,10 +69,10 @@ libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -no-undefined
 libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lrb
 libircd_LTLIBRARIES = libircd.la
 
-bin_PROGRAMS = charybdis
-charybdis_SOURCES = main.c
-charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
-charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
+bin_PROGRAMS = solanum
+solanum_SOURCES = main.c
+solanum_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
+solanum_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
 
 install-exec-hook: install-libircdLTLIBRARIES
        $(RM) -f version.c

diff --git a/ircd/chmode.c b/ircd/chmode.c
index 8da13bf32ce433d5156fa33d783e1f621aedb8b6..6416a8c9107476c068b853e4e3eec0543081cae0 100644 (file)
--- a/ircd/chmode.c
+++ b/ircd/chmode.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  chmode.c: channel mode management
  *
  * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/ircd/client.c b/ircd/client.c
index 259b4a78c4eb5676ba01db418fed38e7b6198155..a11873991a2f40d98b043b7a71a67429f2e49aac 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  client.c: Controls clients.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -1147,7 +1147,7 @@ free_exited_clients(void *unused)
                                                target_p->name, (unsigned int) target_p->status,
                                                (unsigned long long)target_p->flags,  target_p->handler);
                                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                               "Please report this to the charybdis developers!");
+                                               "Please report this to the solanum developers!");
                                        found++;
                                }
                        }
@@ -1291,7 +1291,7 @@ exit_aborted_clients(void *unused)
                                        abt->client->name, (unsigned int) abt->client->status,
                                        (unsigned long long)abt->client->flags, abt->client->handler);
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "Please report this to the charybdis developers!");
+                                       "Please report this to the solanum developers!");
                                continue;
                        }
                }

diff --git a/ircd/extban.c b/ircd/extban.c
index 69603f1404ad20b3df7bf98339f940c31520dff8..f99d3fcaedc035d26ae8e924797f0d704c004639 100644 (file)
--- a/ircd/extban.c
+++ b/ircd/extban.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  extban.c: extended ban types ($type:data)
  *
  * Copyright (C) 2006 charybdis development team

diff --git a/ircd/hostmask.c b/ircd/hostmask.c
index 5266ba2d938b6d0c4cf68d42f3a0e1cf8cd8a897..cfbab79cb8d053a8bb0709ca4f4c0bac36068ccd 100644 (file)
--- a/ircd/hostmask.c
+++ b/ircd/hostmask.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced internet relay chat daemon (ircd).
+ *  Solanum: a slightly advanced ircd
  *  hostmask.c: Code to efficiently find IP & hostmask based configs.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 64292609d21b51137837dfaf034dc1934f2f822e..935aa4e9671fa067ba2d6101be9db175618df058 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  ircd.c: Starts up and runs the ircd.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -206,7 +206,7 @@ init_sys(void)
                if(maxconnections <= MAX_BUFFER)
                {
                        fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
-                       fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
+                       fprintf(stderr, "ERROR: solanum reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
                        exit(EXIT_FAILURE);
                }
                return;
@@ -553,7 +553,7 @@ ircd_restart_cb(const char *str)
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
- * error inside libcharybdis, and we don't know how to handle the
+ * error inside libsolanum, and we don't know how to handle the
  * exception, so it is logical to return a FAILURE exit code here.
  *    --nenolod
  */
@@ -627,7 +627,7 @@ seed_random(void *unused)
  * Side Effects - this is where the ircd gets going right now
  */
 int
-charybdis_main(int argc, char * const argv[])
+solanum_main(int argc, char * const argv[])
 {
        int fd;
 

diff --git a/ircd/logger.c b/ircd/logger.c
index 71c45e7178471ccaf732c205e11ee9dec3346cb8..b2e8cad377f8a2997ba7829c82015e8836c892fa 100644 (file)
--- a/ircd/logger.c
+++ b/ircd/logger.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  *
  * Copyright (C) 2003 Lee H <lee@leeh.co.uk>
  * Copyright (C) 2003-2005 ircd-ratbox development team

diff --git a/ircd/main.c b/ircd/main.c
index 16771ed487f8809a3b1687d9c80866a4e05cf353..4d7092e9ca48941140255e94d7286f0b4b7e1f38 100644 (file)
--- a/ircd/main.c
+++ b/ircd/main.c
@@ -1,9 +1,9 @@
 /* This file is in the public domain. */
 
-extern int charybdis_main(int argc, const char *argv[]);
+extern int solanum_main(int argc, const char *argv[]);
 
 int
 main(int argc, const char *argv[])
 {
-       return charybdis_main(argc, argv);
+       return solanum_main(argc, argv);
 }

diff --git a/ircd/modules.c b/ircd/modules.c
index 54acf80f286fbc9b76ec9ed73b5cfaf7d70b1216..7e466d654a26bd13203c1718a1910acdf84697b1 100644 (file)
--- a/ircd/modules.c
+++ b/ircd/modules.c
@@ -41,7 +41,7 @@
 #include <ltdl.h>
 
 #ifndef LT_MODULE_EXT
-#      error "Charybdis requires loadable module support."
+#      error "Solanum requires loadable module support."
 #endif
 
 rb_dlink_list module_list;

diff --git a/ircd/msgbuf.c b/ircd/msgbuf.c
index fe4e8e25a4651ff13530381c17b571c8b09b2381..0d134e678eba24586b1707f02857d3170a8baca6 100644 (file)
--- a/ircd/msgbuf.c
+++ b/ircd/msgbuf.c
@@ -1,5 +1,5 @@
 /*
- * charybdis - an advanced ircd.
+ * solanum - an advanced ircd.
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/ircd/operhash.c b/ircd/operhash.c
index 6d1948e6e0889ff93c4ed99eb825eea1178fa863..d1df22521203e356629ffbb5202deabc30ca7b52 100644 (file)
--- a/ircd/operhash.c
+++ b/ircd/operhash.c
@@ -1,4 +1,4 @@
-/* charybdis
+/* solanum
  * operhash.c - Hashes nick!user@host{oper}
  *
  * Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>

diff --git a/ircd/parse.c b/ircd/parse.c
index 250424bfbfa21f835b46104eecf21368264469b2..c6155b6c1e2ae1fde67abb3e0a0e5950344d3444 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced ircd.
+ *  Solanum: a slightly advanced ircd
  *  parse.c: The message parser.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/ircd/privilege.c b/ircd/privilege.c
index d81bf8f3a58d6975d1a7c902c950f6fc7b679b6d..18785db1b96e8570e738569c0c1de97ec4e1feb3 100644 (file)
--- a/ircd/privilege.c
+++ b/ircd/privilege.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * privilege.c: Dynamic privileges API.
  *
  * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>

diff --git a/ircd/ratelimit.c b/ircd/ratelimit.c
index 80a3701c96c0f90e4602ddb5d8ade3cb6c6728b7..c924008be6a5c7e2ee7f5fae7a6fc03a7a05326d 100644 (file)
--- a/ircd/ratelimit.c
+++ b/ircd/ratelimit.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * ratelimit.c: Per-client ratelimiting for high-bandwidth commands.
  *
  * Copyright (c) 2012 Keith Buck <mr_flea -at- esper.net>

diff --git a/ircd/scache.c b/ircd/scache.c
index 93f5acdc7ddceb9c397dab82bc698c12297e587c..43c055d1704bffcc6dcc6d1c5f6f812acf1e34d9 100644 (file)
--- a/ircd/scache.c
+++ b/ircd/scache.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis
+ *  solanum
  *  scache.c: Server names cache.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center

diff --git a/ircd/snomask.c b/ircd/snomask.c
index d3986c2b6816672e99e422f46bb9e7a050cd4489..bf45354210acdd87d404146dbbce1e11f31cd54d 100644 (file)
--- a/ircd/snomask.c
+++ b/ircd/snomask.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * snomask.c: Management for user server-notice masks.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>

diff --git a/ircd/substitution.c b/ircd/substitution.c
index 24672c7b5ba9cbdbbb3c3310f3b4d8a99b8c3e9b..3301fd26459ad258f3624340c6a590359548a299 100644 (file)
--- a/ircd/substitution.c
+++ b/ircd/substitution.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * substitution.c: parses substitution-keyword expansions
  *
  * Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>

diff --git a/ircd/supported.c b/ircd/supported.c
index 35c6ea931bb2cc9df0d07c681340f88cdda742eb..b04b815b056c1f27476eb391b29da11f913b9e7f 100644 (file)
--- a/ircd/supported.c
+++ b/ircd/supported.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  supported.c: isupport (005) numeric
  *
  * Copyright (C) 2006 Jilles Tjoelker

diff --git a/ircd/tgchange.c b/ircd/tgchange.c
index 0db3a1948910c27dfc84bb173fb92faf6e330f6f..b9f427bd5d65cdb8c645a0ba80a2f6cea007131b 100644 (file)
--- a/ircd/tgchange.c
+++ b/ircd/tgchange.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ * Solanum: a slightly advanced ircd
  * tgchange.c - code for restricting private messages
  *
  * Copyright (C) 2004-2005 Lee Hardy <lee@leeh.co.uk>

diff --git a/ircd/version.c.SH b/ircd/version.c.SH
index 35818842e7b7824c74ae3d0d36040e30cdada811..80cda0ffc209d1df97f38d9ac558ce50a8eb53e7 100644 (file)
--- a/ircd/version.c.SH
+++ b/ircd/version.c.SH
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 spitshell=cat
-package=charybdis
+package=solanum
 
 echo "Extracting $package/src/version.c..."
 

diff --git a/librb/CREDITS b/librb/CREDITS
index e9715a5176219b69b539d861044661db279e74fc..aa9d2c8b55db9ddc9da04530423cee87acfe5b94 100644 (file)
--- a/librb/CREDITS
+++ b/librb/CREDITS
@@ -1,2 +1,2 @@
 librb was based on ircd-ratbox's libratbox. This contains various utility
-functions. See the CREDITS in Charybdis for more information.
+functions. See the CREDITS in Solanum for more information.

diff --git a/librb/configure.ac b/librb/configure.ac
index 8c0cb29abc8712ee93f90ad5a29da5cd96738d21..f44d8443c8f1384b27aab66c1a46891dd9a6ebe1 100644 (file)
--- a/librb/configure.ac
+++ b/librb/configure.ac
@@ -20,7 +20,7 @@ dnl Checks for programs.
 AC_PROG_CC_C99
 
 if test x"$ac_cv_prog_cc_c99" = "xno"; then
-       AC_ERROR([charybdis requires a C99 capable compiler])
+       AC_ERROR([solanum requires a C99 capable compiler])
 fi
 
 

diff --git a/librb/include/rb_dictionary.h b/librb/include/rb_dictionary.h
index 2baf027d4601f899d5d66e914e12a59248658103..fdedd24683b7cf1d15da6bea0460d64c7fb18721 100644 (file)
--- a/librb/include/rb_dictionary.h
+++ b/librb/include/rb_dictionary.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_dictionary.h: Dictionary-based storage.
  *
  * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>

diff --git a/librb/include/rb_radixtree.h b/librb/include/rb_radixtree.h
index 0b5d1bcc98695bc611278f772e51e732b12b7879..bbccbd1c763a09bf48583ae9730b7e73961f5f26 100644 (file)
--- a/librb/include/rb_radixtree.h
+++ b/librb/include/rb_radixtree.h
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_radixtree.h: Dictionary-based storage.
  *
  * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>

diff --git a/librb/librb.pc.in b/librb/librb.pc.in
index a2fd7da0eb7fc518d1537d71f5a2f691ade17bb7..d9555e49924a012777c5348fadd6972d2d76c69d 100644 (file)
--- a/librb/librb.pc.in
+++ b/librb/librb.pc.in
@@ -8,7 +8,7 @@ include_dir=@includedir@/librb
 lib_dir=@libdir@
 
 Name: librb
-Description: Portable runtime for charybdis and other things, based on libratbox
+Description: Portable runtime for solanum and other things, based on libratbox
 Version: @PACKAGE_VERSION@
 Libs: -L${lib_dir} -lrb
 Cflags: -I${include_dir}

diff --git a/librb/src/dictionary.c b/librb/src/dictionary.c
index f09aebe2c727af88886306ee36ea44a4b2d8d444..1d7b1ef0af5799bac5cabbdacac27cb1e3647343 100644 (file)
--- a/librb/src/dictionary.c
+++ b/librb/src/dictionary.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd
+ * Solanum: a slightly advanced ircd
  * rb_dictionary.c: Dictionary-based information storage.
  *
  * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>

diff --git a/librb/src/mbedtls_ratbox.h b/librb/src/mbedtls_ratbox.h
index 72e92721b2402203f85ee4d5876c89f0c4f8a584..e571deab8616ca2586d07ec9e244eb8a79d73f49 100644 (file)
--- a/librb/src/mbedtls_ratbox.h
+++ b/librb/src/mbedtls_ratbox.h
@@ -40,7 +40,7 @@
 /*
  * Personalization string for CTR-DRBG initialization
  */
-static const char rb_mbedtls_personal_str[] = "charybdis/librb personalization string";
+static const char rb_mbedtls_personal_str[] = "solanum/librb personalization string";
 
 /*
  * Default list of supported ciphersuites

diff --git a/librb/src/radixtree.c b/librb/src/radixtree.c
index 581eba04afdfb1f851ec293f6cbe60ce4b408836..bc2fca5c93cf6525cf41bd4d846c65b43e8a4ccc 100644 (file)
--- a/librb/src/radixtree.c
+++ b/librb/src/radixtree.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * rb_radixtree.c: Dictionary-based information storage.
  *
  * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>

diff --git a/librb/src/version.c.SH b/librb/src/version.c.SH
index 22cb63f210756c0a359afba2e47856f213b69376..e5d0ef36198bca80ee915a2d901279f83d9c5817 100644 (file)
--- a/librb/src/version.c.SH
+++ b/librb/src/version.c.SH
@@ -18,7 +18,7 @@ generation=`expr $generation + 1`
 
 $spitshell >version.c <<!SUB!THIS!
 /*
- *   librb: a library used by charybdis and other things
+ *   librb: a library used by solanum and other things
  *   src/version.c
  *
  *   Copyright (C) 1990 Chelsea Ashley Dyerman

diff --git a/librb/src/win32.c b/librb/src/win32.c
index a321d58f59e62c3a7001de0ac8e3664e826912d1..6120b9069dca2ec83ac5eedc5a2a45cd6d0373f4 100644 (file)
--- a/librb/src/win32.c
+++ b/librb/src/win32.c
@@ -372,7 +372,7 @@ rb_init_netio_win32(void)
 {
        /* this muchly sucks, but i'm too lazy to do overlapped i/o, maybe someday... -androsyn */
        WNDCLASS wc;
-       static const char *classname = "charybdis-class";
+       static const char *classname = "solanum-class";
 
        wc.style = 0;
        wc.lpfnWndProc = (WNDPROC) rb_process_events;

diff --git a/m4/charybdis.m4 b/m4/charybdis.m4
index bc5f6a39182b5e72bd16028db605b3b96a9eb002..75817cd19ab875832de94d45b64a599446118de1 100644 (file)
--- a/m4/charybdis.m4
+++ b/m4/charybdis.m4
@@ -29,8 +29,8 @@ AC_DEFUN([AC_SUBST_DIR], [
         AC_SUBST($1)
 ])
 
-dnl CHARYBDIS_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
-AC_DEFUN([CHARYBDIS_C_GCC_TRY_FLAGS],[
+dnl SOLANUM_C_GCC_TRY_FLAGS(<warnings>,<cachevar>)
+AC_DEFUN([SOLANUM_C_GCC_TRY_FLAGS],[
  AC_MSG_CHECKING([GCC flag(s) $1])
  if test "${GCC-no}" = yes
  then

diff --git a/modules/cap_account_tag.c b/modules/cap_account_tag.c
index 85e8dab2126b1fa317ad949e012f2bece49c215e..3e4edab9749b232059adcd54344cf6495376b63e 100644 (file)
--- a/modules/cap_account_tag.c
+++ b/modules/cap_account_tag.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * cap_account_tag.c: implement the account-tag IRCv3.2 capability
  *
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>

diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c
index 40d75d77b809d33aabcc325e683e651a184e5391..1fd383fd3bd048fad2785730e67e43b6f371922d 100644 (file)
--- a/modules/cap_server_time.c
+++ b/modules/cap_server_time.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * cap_server_time.c: implement the server-time IRCv3.2 capability
  *
  * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>

diff --git a/modules/chm_nocolour.c b/modules/chm_nocolour.c
index 0a39c12f89ccb7e05ff932cc0973215dcdcd04c3..265c7855a64256a755792f8325886718ba247aec 100644 (file)
--- a/modules/chm_nocolour.c
+++ b/modules/chm_nocolour.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_nocolour: strip colours (+c mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>

diff --git a/modules/chm_noctcp.c b/modules/chm_noctcp.c
index 60e4f7d5cc414846c693c5703a60da79e4c063be..43ad602d099b6060a4fc7dee69b0f768fe9b3642 100644 (file)
--- a/modules/chm_noctcp.c
+++ b/modules/chm_noctcp.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: an advanced ircd.
+ * Solanum: a slightly advanced ircd
  * chm_noctcp: block non-action CTCP (+C mode).
  *
  * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>

diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c
index b1e738d3a77eb326f284fc4ee4893560b6cdcead..897a40b02d2babbe469c4486983a2b17db26ece2 100644 (file)
--- a/modules/core/m_ban.c
+++ b/modules/core/m_ban.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * m_ban.c: Propagates network bans across servers.
  *
  *  Copyright (C) 2010 Jilles Tjoelker

diff --git a/modules/m_list.c b/modules/m_list.c
index e8947cf8efb0ffa7234b7db2e0dbb81ed6ab508a..29204c64bdf445d21177bd2e827e5e161660c425 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -1,5 +1,5 @@
 /*
- * charybdis: An advanced ircd.
+ * Solanum: a slightly advanced ircd
  * m_list_safelist.c: Version of /list that uses the safelist code.
  *
  * Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>

diff --git a/modules/m_scan.c b/modules/m_scan.c
index 550717163173079d9a76c140558f501e76027ae8..25dd22154f201d1cecbd94610567416c4db60815 100644 (file)
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_scan.c: Provides information about various targets on various topics
  *
  *  Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>

diff --git a/modules/m_snote.c b/modules/m_snote.c
index b79afbd9456aa445a5d442e2d6698d38394997b5..37f5624b498d0b07aafb9a8eb2eda85c1a600a35 100644 (file)
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  m_snote.c: Server notice listener
  *
  *  Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>

diff --git a/modules/sno_routing.c b/modules/sno_routing.c
index 241ec6f2a6c76d4bcf9cf298692cc1056f3fd8bc..608ef4ffa51c999d0737ac25cadac29d648e898f 100644 (file)
--- a/modules/sno_routing.c
+++ b/modules/sno_routing.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: an advanced Internet Relay Chat Daemon(ircd).
+ *  Solanum: a slightly advanced ircd
  *  sno_routing.c: Shows notices about netjoins and netsplits
  *
  *  Copyright (c) 2005-2006 Jilles Tjoelker <jilles-at-stack.nl>

diff --git a/scripts/application.sh b/scripts/application.sh
index 69b158aba708b12038534fc8a4133503b9d68f51..69287857d97b7f7ba4ea25a702e01ef586dd5ed6 100755 (executable)
--- a/scripts/application.sh
+++ b/scripts/application.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# application.sh: Special package building rules for charybdis.
+# application.sh: Special package building rules for solanum.
 #
 # Copyright (c) 2007-2008 atheme.org
 #
@@ -24,11 +24,11 @@ if [ "x$TIP" = "x" ]; then
        exit
 fi
 
-# Charybdis wants the git head to be in include/serno.h, in its own format.
+# Solanum wants the git head to be in include/serno.h, in its own format.
 SERNO=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`
 DATECODE=`git log -1 --pretty=format:%ct`
 
-echo "[charybdis] Generating include/serno.h for tip $MYTIP."
+echo "[solanum] Generating include/serno.h for tip $MYTIP."
 cat << _EOF_ > include/serno.h
 /* Generated automatically by makepackage. Any changes made here will be lost. */
 #define SERNO "$SERNO"

diff --git a/ssld/ssld.c b/ssld/ssld.c
index db33486be448d2421288b5aa2a35b762ed91f9c1..1939260f984106555bc91cac43a50ca46c3833d8 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -1169,7 +1169,7 @@ main(int argc, char **argv)
        if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
        {
                fprintf(stderr,
-                       "This is the charybdis ssld for internal ircd use.\n");
+                       "This is the solanum ssld for internal ircd use.\n");
                fprintf(stderr,
                        "You aren't supposed to run me directly. Exiting.\n");
                exit(1);

diff --git a/tests/ircd_util.c b/tests/ircd_util.c
index 866969fb55e1502125762fc4cf75e76edb0a4372..36a3d4e6134277d9776f92a6cc589f433e090825 100644 (file)
--- a/tests/ircd_util.c
+++ b/tests/ircd_util.c
@@ -31,7 +31,7 @@
 
 #define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
 
-extern int charybdis_main(int argc, const char *argv[]);
+extern int solanum_main(int argc, const char *argv[]);
 
 static char argv0[BUFSIZE];
 static char configfile[BUFSIZE];
@@ -94,7 +94,7 @@ void ircd_util_init(const char *name)
        ircd_paths[IRCD_PATH_BIN] = rb_strdup(buf);
        ircd_paths[IRCD_PATH_LIBEXEC] = rb_strdup(buf);
 
-       is_int(0, charybdis_main(ARRAY_SIZE(argv) - 1, argv), MSG);
+       is_int(0, solanum_main(ARRAY_SIZE(argv) - 1, argv), MSG);
 }
 
 void ircd_util_reload_module(const char *name)

diff --git a/testsuite/ircd.conf.1 b/testsuite/ircd.conf.1
index 46e71b61c51e74a2065f913109b628b073755d4e..479444509223a2e98e048ab9bd4d474ecc2a51cf 100644 (file)
--- a/testsuite/ircd.conf.1
+++ b/testsuite/ircd.conf.1
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
        name = "Here";
-       description = "Charybdis testsuite server";
+       description = "Solanum testsuite server";
        email = "root@localhost";
 };
 

diff --git a/testsuite/ircd.conf.2 b/testsuite/ircd.conf.2
index a94cc6e085743cd2984e08005d9900ea8aca0f21..23cbfcb9432474199cb686e112111c9f666e8898 100644 (file)
--- a/testsuite/ircd.conf.2
+++ b/testsuite/ircd.conf.2
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
        name = "Here";
-       description = "Charybdis testsuite server";
+       description = "Solanum testsuite server";
        email = "root@localhost";
 };
 

diff --git a/testsuite/ircd.conf.3 b/testsuite/ircd.conf.3
index d93cb320fa59e0bda9bbfc9ce227a0cce65184d2..ebe289864deddb1189201e27c88599668de4521f 100644 (file)
--- a/testsuite/ircd.conf.3
+++ b/testsuite/ircd.conf.3
@@ -19,7 +19,7 @@ serverinfo {
 
 admin {
        name = "Here";
-       description = "Charybdis testsuite server";
+       description = "Solanum testsuite server";
        email = "root@localhost";
 };
 

diff --git a/testsuite/startall.sh b/testsuite/startall.sh
index df1c558e63cf99b4455c3570e725fdb6dc7a1c9c..1b383dda9b453649e99f1fb669d0763c5421eb43 100755 (executable)
--- a/testsuite/startall.sh
+++ b/testsuite/startall.sh
@@ -3,6 +3,6 @@ testdir=`pwd`
 prefix=`sed -n -e 's/^#define IRCD_PREFIX "\(.*\)"/\1/p' "$testdir/../include/setup.h"`
 [ -d $prefix ] || { echo Unable to find installation prefix; exit 1; }
 
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
-$prefix/bin/charybdis -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3
+$prefix/bin/solanum -configfile $testdir/ircd.conf.1 -pidfile $testdir/ircd.pid.1
+$prefix/bin/solanum -configfile $testdir/ircd.conf.2 -pidfile $testdir/ircd.pid.2
+$prefix/bin/solanum -configfile $testdir/ircd.conf.3 -pidfile $testdir/ircd.pid.3

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 607bca31eaddba49208dde4d1ec8b0629d1f903e..c44dee6264a1d4332593a65a5c1717ab147f758c 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,9 +1,9 @@
-bin_PROGRAMS = charybdis-mkpasswd charybdis-mkfingerprint
+bin_PROGRAMS = solanum-mkpasswd solanum-mkfingerprint
 AM_CFLAGS=$(WARNFLAGS)
 AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
 
-charybdis_mkpasswd_SOURCES = mkpasswd.c
-charybdis_mkpasswd_LDADD = ../librb/src/librb.la
+solanum_mkpasswd_SOURCES = mkpasswd.c
+solanum_mkpasswd_LDADD = ../librb/src/librb.la
 
-charybdis_mkfingerprint_SOURCES = mkfingerprint.c
-charybdis_mkfingerprint_LDADD = ../librb/src/librb.la
+solanum_mkfingerprint_SOURCES = mkfingerprint.c
+solanum_mkfingerprint_LDADD = ../librb/src/librb.la

diff --git a/tools/README.mkpasswd b/tools/README.mkpasswd
index 2bae860c15e937357fa85ca96777fe41eba23c15..c09b4ab3fbb3daedfc77afed647700df12318527 100644 (file)
--- a/tools/README.mkpasswd
+++ b/tools/README.mkpasswd
@@ -32,7 +32,7 @@ A Blowfish salt consists of up to 22 alphanumeric characters (plus '.' and
 Blowfish may not always be available, but MD5, SHA256, and SHA512 are
 guaranteed to be.
 
-This program should work anywhere Charybdis does; if you find otherwise, file
+This program should work anywhere Solanum does; if you find otherwise, file
 a bug.
 
  * Blowfish's rounds parameter is a logarithm, not an integer value

diff --git a/wsockd/wsockd.c b/wsockd/wsockd.c
index 2f1310045708cca601db74431ad5f1ed5b170136..82f2f89ff0cd3078688980e196cd0b8666b0f324 100644 (file)
--- a/wsockd/wsockd.c
+++ b/wsockd/wsockd.c
@@ -1,5 +1,5 @@
 /*
- *  wsockd.c: charybdis websockets helper
+ *  wsockd.c: solanum websockets helper
  *  Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2007 ircd-ratbox development team
  *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
@@ -961,7 +961,7 @@ main(int argc, char **argv)
        if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
        {
                fprintf(stderr,
-                       "This is the charybdis wsockd for internal ircd use.\n");
+                       "This is the solanum wsockd for internal ircd use.\n");
                fprintf(stderr,
                        "You aren't supposed to run me directly. Exiting.\n");
                exit(1);