Remove some debug lines

Code doesn't look as horrible as i thought ^_^
It works in a real inspircd net! ( I think i've said that before )
needs testing in unreal but there's probably not that many bugs left to fix now :3

git-svn-id: http://svn.tabris.net/repos/srsv@3554 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.5.0/SrSv/Agent.pm b/branches/0.5.0/SrSv/Agent.pm
index c2ae9d61b5d5f1cbd10f5ca6c58e0a9d98c02822..7c9fcc95c1ed160ac2b2a3e2b6f5a40767ef5ef6 100644 (file)
--- a/branches/0.5.0/SrSv/Agent.pm
+++ b/branches/0.5.0/SrSv/Agent.pm
@@ -63,7 +63,6 @@ sub is_agent_in_chan($$) {
        $agent = lc $agent; $chan = lc $chan;
 
        if($agents{$agent} and $agents{$agent}{CHANS} and $agents{$agent}{CHANS}{$chan}) {
-               print "$agent is in $chan\n";
                return 1;
        } else {
                return 0;
@@ -155,7 +154,6 @@ sub agent_join($$) {
 }
 sub agent_sync() {
        foreach my $j (@defer_join) {
-               print "Processing join: $j\n" if DEBUG;
                my ($agent, $chan) = split(/ /, $j);
                if($agents{lc $agent}) {
                        $agents{lc $agent}{CHANS}{lc $chan} = 1;
@@ -245,6 +243,7 @@ sub kill_callback($$$$) {
                } else {
                        my $rsUser = {NICK=>$main::rsnick,ID=>"123AAAAAA"}; #FIXME - erry
                        ircd::irckill($rsUser, $srcUser, "Do not kill services agents.");
+                       #ftr they can't if the bots have +k in insp.
                }
 
                &agent_connect(@{$agents{lc $dst}{PARMS}}) if synced();

diff --git a/branches/0.5.0/SrSv/Insp/Parse.pm b/branches/0.5.0/SrSv/Insp/Parse.pm
index efd8fd66615544d5523269e0e4f06600400b8d5e..20f9e1b8d9754e395b857ad051ea825e4a3801d0 100644 (file)
--- a/branches/0.5.0/SrSv/Insp/Parse.pm
+++ b/branches/0.5.0/SrSv/Insp/Parse.pm
@@ -230,20 +230,16 @@ sub PING($) {
 }
 sub UID ($) {
        if ($_[0] =~ /^(:\S+) UID (\S+) (\d+) (\S+) (\S+) (\S+) (\S+) (\S+) (\d+) (\S+) :(.*)$/) {
-               print "1111111111111\n";
-                       #:583 UID 583AAAAAJ 1307703236 erry__ localhost localhost errietta 127.0.0.1 1307703241 + :errietta
+               #:583 UID 583AAAAAJ 1307703236 erry__ localhost localhost errietta 127.0.0.1 1307703241 + :errietta
                my ($server, $uid, $stamp, $nick, $host, $vhost, $ident, $IP, $ts, $modes, $gecos) = ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);
-               print "UID $uid " . decodeUUID($uid) . "\n";
                my $user = { NICK => $nick, ID => decodeUUID($uid) };
                return ('NICKCONN', undef, undef, WF_NICK, $user, 0, $ts, $ident, $host, $server, $stamp, $modes, $vhost, $gecos,
                        join('.', unpack('C4', MIME::Base64::decode($IP))));
        }
        elsif ($_[0] =~ /^(:\S+) UID (\S+) (\d+) (\S+) (\S+) (\S+) (\S+) (\S+) (\d+) (\S+) (\S+) :(.*)$/) {
-               print "2222222\n";
                #:965 UID 965AAAAAG 1311863295 erry arceus.pokemonlake.com IceFyre/NetAdmin/erry ~erry 216.14.116.138 1311863255 +IWhiosw   +ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz :erry
                my ($server, $uid, $stamp, $nick, $host, $vhost, $ident, $IP, $ts, $modes, $snomasks, $gecos) = ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);
                $modes .= " " . $snomasks;
-               print "UID $uid " . decodeUUID($uid) . "\n";
                my $user = { NICK => $nick, ID => decodeUUID($uid) };
                return ('NICKCONN', undef, undef, WF_NICK, $user, 0, $ts, $ident, $host, $server, $stamp, $modes, $vhost, $gecos,
                        join('.', unpack('C4', MIME::Base64::decode($IP))));
@@ -268,7 +264,6 @@ sub EOS($) {
                return ($event, undef, undef, WF_ALL, $server);
        }
        else {
-               print "wot\n";
                $_[0] =~ /^:(\S+) ENDBURST/;
                my $server = $1;
                set_server_state($server, 1);
@@ -328,7 +323,6 @@ sub SERVER($) {
        }
        elsif ($_[0] =~ /^SERVER (\S+) (\S+) (\d+) (\S+) :(.*)$/) {
                print "RIGHT ONE WHOO\n";
-               #SERVER inspircd.erry.omg mypass 0 583 :erry World
                #SERVER irc.icefyre.org mypass 0 965 :IceFyre IRC Hub
 
                #SERVER servername password hopcount SID :Server Desc
@@ -381,7 +375,6 @@ sub FJOIN ($) {
        print "FJOIN\n";
        #>> 114 :965 FJOIN #erry 1305486096 +nt :o,00BAAAAAX qo,965AAAAAC
        if ($_[0] =~ m"^:(\S+) FJOIN (\S+) (\d+) (\S+) :(.*)$") {
-               print "?????FJ\n";
                my ($server, $channel, $ts, $modes, $userstring) = ($1, $2, $3, $4, $5);
                print "userstring $userstring";         
                my @users = split (" ", $userstring);
@@ -408,7 +401,6 @@ sub FJOIN ($) {
        #>> 15 :583 FJOIN #opers 1310128904 +Pis :
        #CHANNELS CONFIGURED TO STAY OPEN WITH CHMODE +P (INSP)
        elsif ($_[0] =~ m"^:(\S+) FJOIN (\S+) (\d+) (\S+) :$") {
-               print "WHOOOOOOF";
                #FIXME - Update channel modes.
        }
 }
@@ -458,9 +450,7 @@ sub FMODE($) {
                my $m = $4;
                my $a = $5;
                my $user;               
-               print "FMODE ID $id " . length($id);
                if (length($id) > 3) { #UID
-                       print "FFFFFFFFFFF\n";
                        $user = {ID => decodeUUID($id)};
                        get_user_nick ($user);
                }
@@ -471,9 +461,6 @@ sub FMODE($) {
                my $argz = $5;
                my @args = split(/ /, $argz);
                my $modes = $4;
-               print "============MODES $modes=================\n";
-               print "5: $4\n";
-               print "6: $5\n";
                my @modes = split(//, $modes);
                my @userargs;
                foreach my $mode (@modes) {
@@ -495,9 +482,7 @@ sub FMODE($) {
        elsif($_[0] =~ /^:(\S+) FMODE (#\S+) (\d+) (\S+) :(.*)$/) {
                my $id = $1;
                my $user;               
-               print "FMODE ID $id " . length($id);
                if (length($id) > 3) { #UID
-                       print "FFFFFFFFFFF\n";
                        $user = {ID => decodeUUID($id)};
                        get_user_nick ($user);
                }
@@ -508,9 +493,6 @@ sub FMODE($) {
                my $argz = $5;
                my @args = split(/ /, $argz);
                my $modes = $4;
-               print "============MODES $modes=================\n";
-               print "5: $4\n";
-               print "6: $5\n";
                my @modes = split(//, $modes);
                my @userargs;
                foreach my $mode (@modes) {
@@ -543,9 +525,6 @@ sub MODE($) {
                my $argz = $6;
                my @args = split(/ /, $argz);
                my $modes = $5;
-               print "============MODES $modes=================\n";
-               print "5: $5\n";
-               print "6: $6\n";
                my @modes = split(//, $modes);
                my $newargs = "";
                foreach my $mode (@modes) {
@@ -555,7 +534,6 @@ sub MODE($) {
                        my $id = encodeUUID($arg);
                        my $tuser = {ID=>$id};
                        my $nick = get_user_nick ($tuser);
-                       print "!!!!!!!!!!!1!!!!!$nick\n";
                        $newargs .= ($newargs eq ""?$nick:" $nick"); # what an awful way to do it.
                }
                my $arguements;
@@ -871,8 +849,6 @@ sub CAPAB {
 #---
 #What we care about:  CHANMODES :admin=&a founder=~q Determines if we can set +a and +q on people, halfop %h: likewise... cloak=x determines if we can have cloaks or vhosts. in the modules we care about chghost, chgident, cloaking for vhosts, m_silence and m_watch for silence and watch respectively. Also c_registered, we can _NOT_ continue w/o it.
 #I HAVE NO IDEA where to get the watch/silence list limit!!!
-#let's do this the lame way!
-       #FIXME this is so ugly
        my $capab = $_[0];
        print "CAPAB $_[0]\n";
        $capab =~ /CAPAB (\S+)/;

diff --git a/branches/0.5.0/SrSv/Insp/Send.pm b/branches/0.5.0/SrSv/Insp/Send.pm
index 05ad3c722f8a65168e2cfcb300e25082f4d39ff3..7c0696c8b3bf44bd4f7aab2e70ebeb318a825ac5 100644 (file)
--- a/branches/0.5.0/SrSv/Insp/Send.pm
+++ b/branches/0.5.0/SrSv/Insp/Send.pm
@@ -122,12 +122,6 @@ sub serv_connect() {
        my $remote = $main_conf{remote};
        my $port = $main_conf{port};
        ircd_connect($remote, $port);
-       #ircsendimm('PROTOCTL '.($tkn ? 'TOKEN ' : '').'NICKv2 UMODE2 TKLEXT'.
-               #(CLK ? ' CLK' : ' VHP'). # CLK obsoletes VHP. Plus if you leave VHP on, CLK doesn't work.
-       #       (NOQUIT ? ' NOQUIT' : '').(SJ3 ? ' SJOIN SJOIN2 SJ3' : '').
-       #       (NICKIP ? ' NICKIP' : '').
-       #       (SJB64 ? ' SJB64 NS VL' : ''),
-       #CONNECTCRAP
        ircsendimm(     'PASS :'.$main_conf{pass},
                'SERVER '.$main_conf{local}.' ' . $main_conf{pass} . ' 0 ' .$main_conf{numeric} . ' ' .$main_conf{info} );
        ircsendimm ('BURST ' .time);
@@ -163,7 +157,6 @@ sub pong($$$) {
         }
 }
 sub endburst {
-       print "ENDBURST\n";
         agent_sync();
         flushmodes(\%preconnect_defer_mode);
         ircd_flush_queue();
@@ -174,7 +167,6 @@ sub endburst {
        
 }
 sub eos {
-       print "GOT EOS\n\n";
 
        #foreach my $k (keys %servers) {
        #       print "Server: $k ircline: ",$servers{$k}[0], " state: ", $servers{$k}[1], "\n";
@@ -534,8 +526,8 @@ sub zline ($$$$) {
        my ($setter, $host, $expiry, $reason) = @_;
        $setter=$main_conf{local} unless defined($setter);
        my $setId = getAgentUuid($setter);
-    if ($setId) { $setter = $setId; }
-    #:583AAAAAE ADDLINE Z test.com inspircd.erry.omg 1308216407 0 :go away
+       if ($setId) { $setter = $setId; }
+        #:583AAAAAE ADDLINE Z test.com inspircd.erry.omg 1308216407 0 :go away
        my $line = ":$setter ADDLINE Z $host " . $main_conf{local} . " ". time() . " " . ($expiry)." :$reason";
        ircsend($line);
        callfuncs('TKL', undef, undef, [parse_addline($line)]);
@@ -613,15 +605,10 @@ sub svsnoop($$$) {
     ircsend(":$main_conf{local} SVSNOOP $targetserver $bool");
 }
 
-#START TODO - erry
 
 sub svswatch ($$@) { 
-# Changes the WATCH list of a user.
-# Syntax: SVSWATCH <nick> :<watch parameters>
-# Example: SVSWATCH Blah :+Blih!*@* -Bluh!*@* +Bleh!*@*.com
-# *** We do not track this info nor care.
        my ($src, $target, @watchlist) = @_;
-    my $srcId = ($src->{ID}?$src->{ID}:$src->{NICK});
+       my $srcId = ($src->{ID}?$src->{ID}:$src->{NICK});
        my $targetId = ($target->{ID}?encodeUUID_($target):$target->{NICK});
        my $base_str = ":$srcId SVSWATCH $targetId ";
        my $send_str = $base_str;
@@ -678,7 +665,6 @@ sub swhois($$$) {
     $src = $main_conf{local} unless defined($src);
     ircsend(":$src SWHOIS $target :$swhois");
 }
-#END TODO - erry
 
 sub svsjoin($$@) {
        my ($src, $target, @chans) = @_;
@@ -734,7 +720,6 @@ sub svsunhold($) {
 sub qline($$$) {
        my ($nickmask, $expiry, $reason) = @_;
        #:583AAAAAA ADDLINE Q hell3o inspircd.erry.omg 1308295479 600 :Bye Bye
-
        my $line = ':' . $main_conf{numeric} . ' ADDLINE Q '.$nickmask . ' ' . $main_conf{local} . ' '. time() . ' ' . ($expiry ? $expiry : 0).' :'.$reason;
        ircsend($line);
 
@@ -754,9 +739,8 @@ sub unsqline ($) {
 
 sub unqline($) {
        my ($nickmask) = @_;
-# TKL version
-# TKL - Q * test services.SC.net
-       my $line = 'TKL - Q * '.$nickmask.' '.$main_conf{local};
+       #>> 37 :583AAAAAA DELLINE Q errietta3
+       my $line = ':' . $main_conf{numeric} . ' DELLINE Q '.$nickmask;
        ircsend($line);
        callfuncs('TKL', undef, undef, [parse_tkl($line)]);
 }

diff --git a/branches/0.5.0/modules/serviceslibs/adminserv.pm b/branches/0.5.0/modules/serviceslibs/adminserv.pm
index b2ba094b11b9ec0d490ea9a1c51ab0da27c9587f..5399fbea1eb7c2652bc4ef729222adcfbb7c077b 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/adminserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/adminserv.pm
@@ -41,7 +41,7 @@ use constant {
 
 our (%flags, @levels, @defflags, $allflags);
 
-our $asnick_default = 'AdminServ';
+our $asnick_default = 'AdminServ1';
 our $asnick = $asnick_default;
 our $asuser = { NICK => $asnick, ID => ircd::getAgentUuid($asnick) };
 

diff --git a/branches/0.5.0/modules/serviceslibs/botserv.pm b/branches/0.5.0/modules/serviceslibs/botserv.pm
index 6dd58353db6ba2470f6dd042287ec9561f2544ea..f07dbe32993097e6c0e61ca3b670fbcef53ec69b 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/botserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/botserv.pm
@@ -42,7 +42,7 @@ use constant {
        F_DEAF          => 2
 };
 
-our $bsnick_default = 'BotServ';
+our $bsnick_default = 'BotServ1';
 our $bsnick = $bsnick_default;
 our $botchmode;
 our $bsuser = { NICK => $bsnick, ID => ircd::getAgentUuid($bsnick) };
@@ -880,7 +880,6 @@ sub bot_join($;$) {
        unless(is_agent_in_chan($nick, $cn)) {
                agent_join($bot, $cn);
                my $bot2 = { NICK => $nick, ID => ircd::getAgentUuid($nick), UID=>ircd::getAgentUuid($nick) };
-               print "FOUNDERRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR " . $IRCd_capabilities{"FOUNDER"};   
                if(!ircd::PREFIXAQ_DISABLE() && $IRCd_capabilities{"FOUNDER"} ne "" && $IRCd_capabilities{"ADMIN"} ne "") {
                        $botchmode = '+q';
                } else {
@@ -897,15 +896,12 @@ sub bot_part_if_needed($$$;$) {
        $u = agent($chan) unless $u;
        my $nick = $u->{NICK};
        return if (lc $chanserv::enforcers{lc $cn} eq lc $nick);
-       print "nick $nick $bot $cn $reason $empty\n";
        if(is_agent_in_chan($nick, $cn)) {
                if(lc $bot eq lc $nick) {
                        if(cr_chk_flag($chan, CRF_BOTSTAY(), 1) or ($empty != 1 or chanserv::get_user_count($chan))) {
-                               print "count " . chanserv::get_user_count($chan);
                                return;
                        }
                }
-               print "????\n";
                agent_part($nick, $cn, $reason);
        }
 }

diff --git a/branches/0.5.0/modules/serviceslibs/chanserv.pm b/branches/0.5.0/modules/serviceslibs/chanserv.pm
index ab517a741cb6a186bfdc46dd03b321f1a7d74410..546701cc5e18b76381ec26a13a20a3686d4b096f 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/chanserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/chanserv.pm
@@ -140,7 +140,7 @@ our @override = (
 
 $chanuser_table = 0;
 
-our $csnick_default = 'ChanServ';
+our $csnick_default = 'ChanServ1';
 our $csnick = $csnick_default;
 our $csUser = { NICK => $csnick, ID => ircd::getAgentUuid($csnick) };
 
@@ -2268,7 +2268,6 @@ sub cs_kick($$$;$$) {
 
        my ($nick, $override) = can_do($chan, ($ban ? 'BAN' : 'KICK'), $user, { ACC => $srclevel });
        if (!$nick) {
-               print "NO NICK???\n";
                return;
        }
 
@@ -2321,7 +2320,6 @@ sub cs_kick($$$;$$) {
                if($ban) {
                        kickban($chan, $tuser, undef, $reason, 1);
                } else {
-                       print "is service? " , adminserv::is_service($user);
                        ircd::kick(agent($chan), $cn, $tuser, $reason) unless adminserv::is_service($user);
                }
        }
@@ -3563,7 +3561,6 @@ sub clear_ops($) {
                my $user = { NICK => $nick }; 
                get_user_id ($user);
                my $opmodes = get_op($user, $chan);
-               print "OPMODES $opmodes\n";
                for(my $i; $i < 5; $i++) {
                        if($opmodes & 2**$i) {
                                push @modelist, ['-'.$opmodes[$i], $user];
@@ -4596,14 +4593,11 @@ sub user_join($$) {
 sub handle_sjoin($$$$$$$) {
        my ($server, $cn, $ts, $chmodes, $chmodeparms, $userarray, $banarray, $exceptarray) = @_;
        my $chan = { CHAN => $cn };
-       print "handle_sjoin\n";
-       print "USERS: " . Dumper(@$userarray); 
        if(synced()) {
                chan_mode($server, $cn, $chmodes, $chmodeparms) if $chmodes;
        } else {
                update_modes($cn, "$chmodes $chmodeparms") if $chmodes;
        }
-       print "hm?\n";
        user_join_multi($chan, $userarray) if scalar @$userarray;
 
        foreach my $ban (@$banarray) {
@@ -4615,7 +4609,6 @@ sub handle_sjoin($$$$$$$) {
 }
 
 sub user_join_multi($$) {
-       print "user_join_multi\n";
        my ($chan, $users) = @_;
        my $cn = $chan->{CHAN};
        my $seq = $ircline;
@@ -4754,7 +4747,6 @@ sub user_part_multi($$$) {
        }
 
        my $uid = get_user_id($user);
-       print "part uid $uid\n";
        my $seq = $ircline;
 
        $get_joinpart_lock->execute; $get_joinpart_lock->finish;
@@ -4804,7 +4796,6 @@ sub process_kick($$$$) {
 
 sub chan_mode($$$$@) {
        my ($user, $cn, $modes, $args, @userargs) = @_;
-       print "CHAN_MODE $user $cn $modes $args\n";
        my $src;
        if (ref($user) eq "HASH") {
                $src = $user->{NICK};
@@ -4840,7 +4831,6 @@ sub chan_mode($$$$@) {
                        next if $arg eq '';
                        next if is_agent($arg);
                        my $auser = shift (@userargs);
-                       print "Auser " , Dumper ($auser);
                        $num = 0 if $mode eq 'v';
                        $num = 1 if $mode eq 'h';
                        $num = 2 if $mode eq 'o';

diff --git a/branches/0.5.0/modules/serviceslibs/hostserv.pm b/branches/0.5.0/modules/serviceslibs/hostserv.pm
index 7557c10b7889b25d89450568f8f891e50d7a4329..a6f7431b5817630f83abc80d57d6c7478f7b83c4 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/hostserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/hostserv.pm
@@ -34,7 +34,7 @@ use SrSv::MySQL::Glob;
 require SrSv::DB::StubGen;
 
 
-our $hsnick_default = 'HostServ';
+our $hsnick_default = 'HostServ1';
 our $hsnick = $hsnick_default;
 our $hsuser = { NICK => $hsnick, ID => ircd::getAgentUuid($hsnick) };
 sub init() {

diff --git a/branches/0.5.0/modules/serviceslibs/memoserv.pm b/branches/0.5.0/modules/serviceslibs/memoserv.pm
index d7c4d6cfeb1f3bd6cc3c617c477e9f449904386d..4d07a18c435f7a4a1f4f6c3db858d55e24d625fa 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/memoserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/memoserv.pm
@@ -46,7 +46,7 @@ use constant (
        MAX_MEMO_LEN => 400
 );
 
-our $msnick_default = 'MemoServ';
+our $msnick_default = 'MemoServ1';
 our $msnick = $msnick_default;
 our $msuser = { NICK => $msnick, ID => ircd::getAgentUuid($msnick) };
 our (

diff --git a/branches/0.5.0/modules/serviceslibs/nickserv.pm b/branches/0.5.0/modules/serviceslibs/nickserv.pm
index e5565b5914ab3b2e1508e6f6fa41c5e48a611f2d..003c842fa94416f79d31de99f3459fb42f67bb02 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/nickserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/nickserv.pm
@@ -76,7 +76,7 @@ use constant {
        MAX_PROFILE_LEN => 250,
 };
 
-our $nsnick_default = 'NickServ';
+our $nsnick_default = 'NickServ1';
 our $nsnick = $nsnick_default;
 our $nsuser = { NICK => $nsnick, ID => ircd::getAgentUuid($nsnick) }; #FIXME - erry
 our $cur_lock;
@@ -2707,7 +2707,6 @@ sub get_hostmask($) {
        my ($ident, $host);
        my $src;
        if (ref ($user) eq "HASH") {
-               print "WTF\n"; 
                $src = get_user_nick($user);
        }
        else { $src = $user; }
@@ -2939,11 +2938,10 @@ sub warn_countdown($) {
        my $user = { NICK => $nick, AGENT => $nsuser };
        get_user_id($user);
        if (is_identified($user, $nick)) {
-               print "Line 2778\n";
                $update_nickalias_last->execute($nick); $update_nickalias_last->finish();
                return;
        }
-       elsif(!(is_online($nick)) or !(is_registered($nick))) { print "Line 2782\n"; return; } 
+       elsif(!(is_online($nick)) or !(is_registered($nick))) { return; }
 
        if($rem == 0) {
                notice($user, 'Your nick is now being changed.');
@@ -3034,7 +3032,6 @@ sub get_user_modes($) {
        $get_umodes->execute($uid);
        my ($umodes) = $get_umodes->fetchrow_array;
        $get_umodes->finish();
-       print "UMODES $umodes\n";
        return $umodes;
 };
 
@@ -3376,7 +3373,6 @@ sub nick_delete($$) {
        my $nick = $user->{NICK};
        get_lock($nick);
        my $id = get_user_id($user);
-       print "DELETE: $nick, $id\n";
        $del_nickchg_id->execute($id); $del_nickchg_id->finish();
        $quit_update->execute($quit, $id); $quit_update->finish();
        $update_lastseen->execute($id); $update_lastseen->finish();
@@ -3421,7 +3417,6 @@ sub nick_change($$$) {
        my ($user, $new, $time) = @_;
        my $old = $user->{NICK};
        return if(lc $old eq lc $new);
-       print "NICK CHANGE: $old -> $new ($time)\n";
        get_lock($old);
        nick_cede($new);
        $nick_change->execute($new, $old);
@@ -3507,7 +3502,6 @@ sub killhandle($$$$) {
        my ($srcUser, $dstUser, $path, $reason) = @_;
        my $dst = $dstUser->{NICK};
        my $src = $srcUser->{NICK};
-       print "KILL $src $dst\n";
        unless (is_agent($dst)) {
                nick_delete($dstUser, "Killed ($src ($reason))");
        }

diff --git a/branches/0.5.0/modules/serviceslibs/operserv.pm b/branches/0.5.0/modules/serviceslibs/operserv.pm
index f82fb5ed27ae52b2ce104bde3f20dadd1b3b061e..e8aad5778452bfb58d457ea419853811506e2789 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/operserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/operserv.pm
@@ -45,7 +45,7 @@ use constant {
 
 *kill_user = \&nickserv::kill_user;
 
-our $osnick_default = 'OperServ';
+our $osnick_default = 'OperServ1';
 our $osnick = $osnick_default;
 our $osuser = { NICK => $osnick, ID => ircd::getAgentUuid($osnick) };
 my %newstypes = (
@@ -1317,3 +1317,4 @@ sub get_newusers($) {
 ## IRC EVENTS ##
 
 1;
+