diff --git a/Config b/Config index 9e43b8cf8..3719bacc7 100755 --- a/Config +++ b/Config @@ -206,7 +206,7 @@ while [ -z "$TEST" ] ; do TEST="No" fi echo "" - echo "Should Unreal notify a user when they are no longer shunned?" + echo "Should UnrealIRCd notify a user when they are no longer shunned?" echo $n "[$TEST] -> $c" read cc if [ -z "$cc" ] ; then diff --git a/include/common.h b/include/common.h index dc0bea2ec..a8f78c7db 100644 --- a/include/common.h +++ b/include/common.h @@ -59,7 +59,7 @@ typedef int bool; #define BMAGIC 0x4675636B596F754661736369737473 -#define BASE_VERSION "Unreal" +#define BASE_VERSION "UnrealIRCd" #ifndef _WIN32 #define FDwrite(x,y,z) write(x, y, z) #else diff --git a/include/modversion.h b/include/modversion.h index ce2b5d25b..af3744308 100644 --- a/include/modversion.h +++ b/include/modversion.h @@ -63,12 +63,12 @@ #ifdef UNREALCORE - char our_mod_version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \ + char our_mod_version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \ MYTOKEN_SSL \ MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF; unsigned int our_compiler_version = GCCVER; #else - DLLFUNC char Mod_Version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \ + DLLFUNC char Mod_Version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \ MYTOKEN_SSL \ MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF; DLLFUNC unsigned int compiler_version = GCCVER; diff --git a/makefile.win32 b/makefile.win32 index 4a1e2d629..e347b806e 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -12,7 +12,7 @@ MT=mt # which passes all these arguments to nmake, like: # nmake -f makefile.win32 OPENSSL_INC_DIR="c:\dev\openssl" etc etc... # Both ways will work, but if you use a batch file it's easier with -# upgrading Unreal as you won't have to edit this makefile again. +# upgrading UnrealIRCd as you won't have to edit this makefile again. ### TRE ### #TRE_LIB_DIR="C:\dev\tre\win32\release" diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c index 3d471d089..3e77bfcc5 100644 --- a/src/modules/m_nick.c +++ b/src/modules/m_nick.c @@ -1437,7 +1437,7 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha #ifdef EXPERIMENTAL sendto_one(sptr, - ":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (Unreal%s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/", + ":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (UnrealIRCd %s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/", me.name, sptr->name, VERSIONONLY); #endif #ifdef HOSTILENAME diff --git a/src/s_serv.c b/src/s_serv.c index 738c26513..ef312fbc0 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -226,7 +226,7 @@ char buf[1024]; } #ifndef IRCDTOTALVERSION -#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9 +#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9 #endif int remotecmdfilter(aClient *sptr, int parc, char *parv[]) diff --git a/src/version.c.SH b/src/version.c.SH index ac37ff030..87ef5174b 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -54,7 +54,7 @@ cat >version.c < #include #ifndef IRCDTOTALVERSION -#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9 +#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9 #endif #define BUFFERSIZE 0x200 diff --git a/src/win32/editor.c b/src/win32/editor.c index 7d6f3076a..327d162b2 100644 --- a/src/win32/editor.c +++ b/src/win32/editor.c @@ -314,7 +314,7 @@ LRESULT CALLBACK FromFileDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar ft.chrg.cpMax = -1; } if (SendMessage(hRich, EM_FINDTEXTEX, flags, (LPARAM)&ft) == -1) - MessageBox(NULL, "Unreal has finished searching the document", + MessageBox(NULL, "UnrealIRCd has finished searching the document", "Find", MB_ICONINFORMATION|MB_OK); else { diff --git a/src/win32/gui.c b/src/win32/gui.c index 9908d3c90..9685f6c44 100644 --- a/src/win32/gui.c +++ b/src/win32/gui.c @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define WIN32_VERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 +#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 #include "sys.h" #include "resource.h" #include "version.h" diff --git a/src/win32/service.c b/src/win32/service.c index b52c4d331..bd4db05d1 100644 --- a/src/win32/service.c +++ b/src/win32/service.c @@ -36,7 +36,7 @@ SERVICE_STATUS_HANDLE IRCDStatusHandle; MODVAR BOOL IsService = FALSE; extern OSVERSIONINFO VerInfo; -#define WIN32_VERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 +#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 /* Places the service in the STOPPED state * Parameters: diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 6fe558a1d..97fe728b1 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -32,7 +32,7 @@ Name: "installservice/startdemand"; Description: "Start UnrealIRCd on &request"; Name: "installservice/crashrestart"; Description: "Restart UnrealIRCd if it &crashes"; GroupDescription: "Service support:"; Flags: unchecked; MinVersion: 0,5.0; Name: "makecert"; Description: "&Create certificate"; GroupDescription: "SSL options:"; Name: "enccert"; Description: "&Encrypt certificate"; GroupDescription: "SSL options:"; Flags: unchecked; -Name: "fixperm"; Description: "Make Unreal folder writable by current user"; +Name: "fixperm"; Description: "Make UnrealIRCd folder writable by current user"; [Files] Source: "wircd.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -160,7 +160,7 @@ if CurStep = ssPostInstall then d := ExpandConstant('{app}'); if IsTaskSelected('fixperm') then begin - // This fixes the permissions in the Unreal folder by granting full access to the user + // This fixes the permissions in the UnrealIRCd folder by granting full access to the user // running the install. s := '-on "'+d+'" -ot file -actn ace -ace "n:'+GetUserNameString()+';p:full;m:set'; Exec(d+'\tmp\setacl.exe', s, d, SW_HIDE, ewWaitUntilTerminated, Res); diff --git a/unrealircd.in b/unrealircd.in index 077f7fb62..174b477c4 100644 --- a/unrealircd.in +++ b/unrealircd.in @@ -121,7 +121,7 @@ elif [ "$1" = "backtrace" ] ; then echo 'has permission to dump core (type "ulimit -c unlimited" and see' echo 'if you get permission denied errors). Also verify that you did' echo 'not run out of quota.' - echo 'If all that is ok, then it might be that Unreal did not crash but' + echo 'If all that is ok, then it might be that UnrealIRCd did not crash but' echo 'got killed by the OS (eg: cpu/mem resource limits), the syadmin,' echo 'or an automated process.' exit 1 @@ -182,5 +182,5 @@ __EOF__ echo "" echo "Thanks!" else - echo "Usage: unreal start|stop|rehash|restart|mkpasswd|version|gencloak|upgrade-conf" + echo "Usage: unrealircd start|stop|rehash|restart|mkpasswd|version|gencloak|upgrade-conf" fi