From 506ac42b503539ee8262fb5507d0648f4ce12015 Mon Sep 17 00:00:00 2001 From: Joseph Bongaarts Date: Thu, 7 Mar 2002 22:52:57 +0000 Subject: [PATCH] Author: Reed Loden By way of Ghostwolf Log message: Various trival changes to tools/* git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@667 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 37 +++++++++++++++++++++++++++++++++++++ acconfig.h | 2 +- config.h.in | 4 ++-- tools/Bounce/Bounce.cpp | 4 ++-- tools/Bounce/Bounce.h | 2 +- tools/Bounce/bounce.conf | 1 + tools/README | 28 +++++++++++++++------------- tools/crypter | 10 +++++++--- tools/hashtoy | 2 ++ tools/mkpasswd.c | 1 + tools/ringlog.c | 1 + tools/ringlog.pl | 1 + tools/untabify | 3 ++- tools/wrapper.c | 1 + 14 files changed, 74 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac8b88d..65e4ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2002-02-27 Reed Loden + + * tools/crypter: Updated some variables, added another notice, + added CVS Id tag, and updated Perl location. + + * tools/ringlog.c: Added IRC - Internet Relay Chat, + tools/ringlog.c + + * tools/ringlog.pl: Added IRC - Internet Relay Chat, + tools/ringlog.pl + + * tools/wrapper.c: Added IRC - Internet Relay Chat, + tools/wrapper.c + + * tools/mkpasswd.c: Added CVS Id tag + + * tools/sums: Updated to comply with sums being moved to tools/ + and added CVS Id tag + + * tools/README: Updated location of file and partly rewrote to fit + u2.10.11's Features + + * tools/Makefile.crypt: Updated location of file and added CVS Id + tag + + * acconfig.h: Updated location of file + + * config.h.in: Updated location of file + + * tools/Bounce/bounce.conf: Added CVS Id tag + + * tools/Bounce/Bounce.cpp: Updated location of file + + * tools/Bounce/Bounce.h: Updated location of file + + * tools/hashtoy: Added CVS Id Tag + 2002-02-27 Carlo Wood * /ircd/ircd.c: check_pings: First check if a PING was sent at all. diff --git a/acconfig.h b/acconfig.h index 5b6d248..3ad4e1f 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,7 @@ #ifndef INCLUDED_config_h #define INCLUDED_config_h /* - * IRC - Internet Relay Chat, include/config.h + * IRC - Internet Relay Chat, acconfig.h * Copyright (C) 2000 Kevin L. Mitchell * * This program is free software; you can redistribute it and/or modify diff --git a/config.h.in b/config.h.in index 3880424..390526f 100644 --- a/config.h.in +++ b/config.h.in @@ -2,7 +2,7 @@ #ifndef INCLUDED_config_h #define INCLUDED_config_h /* - * IRC - Internet Relay Chat, include/config.h + * IRC - Internet Relay Chat, config.h.in * Copyright (C) 2000 Kevin L. Mitchell * * This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: config.h.in,v 1.2 2001-06-07 00:29:46 kev Exp $ + * $Id: config.h.in,v 1.3 2002-03-07 22:52:56 ghostwolf Exp $ */ /* Define to `int' if doesn't define. */ diff --git a/tools/Bounce/Bounce.cpp b/tools/Bounce/Bounce.cpp index 4ea729f..df79a17 100755 --- a/tools/Bounce/Bounce.cpp +++ b/tools/Bounce/Bounce.cpp @@ -1,5 +1,5 @@ /* - * IRC - Internet Relay Chat, tools/Bouncer/Bouncer.cpp + * IRC - Internet Relay Chat, tools/Bounce/Bounce.cpp * Copyright (C) 1990 Jarkko Oikarinen and * University of Oulu, Computing Center * @@ -27,7 +27,7 @@ * Each listening port can bounce to a different host/port defined in the * config file. --Gte * - * $Id: Bounce.cpp,v 1.2 2000-04-13 05:53:48 gte Exp $ + * $Id: Bounce.cpp,v 1.3 2002-03-07 22:52:57 ghostwolf Exp $ * */ diff --git a/tools/Bounce/Bounce.h b/tools/Bounce/Bounce.h index c0e466b..b35d471 100755 --- a/tools/Bounce/Bounce.h +++ b/tools/Bounce/Bounce.h @@ -1,5 +1,5 @@ /* - * IRC - Internet Relay Chat, tools/Bouncer/Bouncer.h + * IRC - Internet Relay Chat, tools/Bounce/Bounce.h * Copyright (C) 1990 Jarkko Oikarinen and * University of Oulu, Computing Center * diff --git a/tools/Bounce/bounce.conf b/tools/Bounce/bounce.conf index 6b2fbdb..c8bf979 100644 --- a/tools/Bounce/bounce.conf +++ b/tools/Bounce/bounce.conf @@ -1,5 +1,6 @@ # Format: P:::: # IP's only for now :) +# $Id: bounce.conf,v 1.2 2002-03-07 22:52:57 ghostwolf Exp $ P:192.168.10.5:2000:192.168.10.1:80 P:192.168.10.5:3000:4.33.94.3:80 diff --git a/tools/README b/tools/README index 9d5f79c..8547bd5 100644 --- a/tools/README +++ b/tools/README @@ -1,5 +1,5 @@ /************************************************************************ - * IRC - Internet Relay Chat, ircd/crypt/README + * IRC - Internet Relay Chat, tools/README * Copyright (C) 1991 Nelson Minar * * This program is free software; you can redistribute it and/or modify @@ -29,22 +29,24 @@ in your ircd.conf file, you have O:*:sCnvYRmbFJ7oI:Nelson You still type "/oper Nelson goodboy" to become operator. However, if -someone gets ahold of your irc.conf file, they can no longer figure +someone gets ahold of your ircd.conf file, they can no longer figure out what the password is from reading it. There are still other security holes, namely server-server passwords, but this closes one obvious problem. -So how do you generate these icky looking strings for passwords? -There's a simple program called mkpasswd to do that for you. Just run -mkpasswd, and at the prompt type in your plaintext password. It will -spit out the encrypted password, which you should then just copy into -the irc.conf file. This should be done only when adding new passwords -to your irc.conf file. To change over your irc.conf file to use -encrypted passwords, define CRYPT_OPER_PASSWORD in config.h. You will -need to recompile your server if you already compiled it with this -feature disabled. Once compiled, edit the Makefile in this directory -and chang "IRCDCONF" to your irc.conf file. Then "make install" in this -directory to replace all the operator passwords in your irc.conf file +So, how do you generate these icky looking strings for passwords? +There's a simple program called mkpasswd to do that for you. To +compile mkpasswd, just "make -f Makefile.crypt" in this directory. After it +compiles, just run mkpasswd, and at the prompt type in your plaintext passwor\ +d. +It will spit out the encrypted password, which you should then just copy +into your ircd.conf file. This should be done only when adding new passwords +to your ircd.conf file. Crypting of oper passwords is automatically done +with the new F:lines so there is nothing to enable to be able to use +crypted oper passwords. All you have to do is edit the Makefile.crypt in this +directory and change "IRCDCONF = /usr/local/lib/irc/ircd.conf" to the full +path to your ircd.conf file. Then "make -f Makefile.crypt install" in this +directory to replace all the operator passwords in your ircd.conf file with the encrypted format. Choose your passwords carefully. Do not choose something in a diff --git a/tools/crypter b/tools/crypter index 1bf5ebb..7feb6c2 100755 --- a/tools/crypter +++ b/tools/crypter @@ -1,6 +1,7 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl + #************************************************************************ -#* IRC - Internet Relay Chat, ircd/crypt/crypter +#* IRC - Internet Relay Chat, tools/crypter #* Copyright (C) 1991 Sean Batt #* #* This program is free software; you can redistribute it and/or modify @@ -16,6 +17,8 @@ #* You should have received a copy of the GNU General Public License #* along with this program; if not, write to the Free Software #* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#* +#* $Id: crypter,v 1.2 2002-03-07 22:52:57 ghostwolf Exp $ #*/ #From Sean Batt sean@coombs.anu.edu.au @@ -33,7 +36,7 @@ print "crypting ",$ircdconf,"\n"; @saltset = ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '.', '/'); umask(0077); -open ($ircdout, ">/tmp/ircd.conf.tmp") || die "open $!"; +open ($ircdout, ">$tmpfile") || die "open $!"; while ($text = <>) { #if its not an "O" line we can ignore it @@ -48,5 +51,6 @@ close ($ircdout); close ($ircdin); print "/bin/cp ",$tmpfile," ",$ircdconf,"\n"; (fork()==0) ? exec("/bin/cp", $tmpfile, $ircdconf) : wait; +print "",$ircdconf," has been crypted successfully!\n"; #unlink($tmpfile); diff --git a/tools/hashtoy b/tools/hashtoy index 4c767ab..9469913 100644 --- a/tools/hashtoy +++ b/tools/hashtoy @@ -10,6 +10,8 @@ # details of the encoding. # # --Liandrin +# +# $Id: hashtoy,v 1.2 2002-03-07 22:52:57 ghostwolf Exp $ @convert2n = ( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c index dfe6305..a36493a 100644 --- a/tools/mkpasswd.c +++ b/tools/mkpasswd.c @@ -1,6 +1,7 @@ /* simple password generator by Nelson Minar (minar@reed.edu) * copyright 1991, all rights reserved. * You can use this code as long as my name stays with it. + * $Id$ */ #define _XOPEN_SOURCE #define _XOPEN_VERSION 4 diff --git a/tools/ringlog.c b/tools/ringlog.c index 920ab5f..f8a4c12 100644 --- a/tools/ringlog.c +++ b/tools/ringlog.c @@ -1,4 +1,5 @@ /* +** IRC - Internet Relay Chat, tools/ringlog.c ** Copyright (C) 2002 by Kevin L. Mitchell ** ** This program is free software; you can redistribute it and/or modify diff --git a/tools/ringlog.pl b/tools/ringlog.pl index 346b05f..6442434 100755 --- a/tools/ringlog.pl +++ b/tools/ringlog.pl @@ -1,5 +1,6 @@ #! /usr/bin/perl -w # +# IRC - Internet Relay Chat, tools/ringlog.pl # Copyright (C) 2002 by Kevin L. Mitchell # # This program is free software; you can redistribute it and/or modify diff --git a/tools/untabify b/tools/untabify index 6a48b63..048603e 100644 --- a/tools/untabify +++ b/tools/untabify @@ -2,7 +2,8 @@ # # untabify - convert tabs to spaces # -# $Id: untabify,v 1.1 2000-03-18 05:20:30 bleep Exp $ +# $Id: untabify,v 1.2 2002-03-07 22:52:57 ghostwolf Exp $ + use Text::Tabs; $tabstop = 8; while (<>) { print expand($_) } diff --git a/tools/wrapper.c b/tools/wrapper.c index 5431c19..cd26ae1 100644 --- a/tools/wrapper.c +++ b/tools/wrapper.c @@ -1,4 +1,5 @@ /* +** IRC - Internet Relay Chat, tools/wrapper.c ** Copyright (C) 2000 by Kevin L. Mitchell ** ** This program is free software; you can redistribute it and/or modify -- 2.20.1