[IRC-Dev CVS] SF.net SVN: irc-dev:[208] ircd/trunk/ircd

[<zo...@us...>]

Revision: 208
          http://irc-dev.svn.sourceforge.net/irc-dev/?rev=208&view=rev
Author:   zolty
Date:     2008-09-11 23:21:45 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
Correcciones menores

Modified Paths:
--------------
    ircd/trunk/ircd/m_ghost.c
    ircd/trunk/ircd/s_user.c

Modified: ircd/trunk/ircd/m_ghost.c
===================================================================
--- ircd/trunk/ircd/m_ghost.c	2008-08-24 19:44:36 UTC (rev 207)
+++ ircd/trunk/ircd/m_ghost.c	2008-09-11 23:21:45 UTC (rev 208)
@@ -117,7 +117,7 @@
                   acptr, cptr);
   }
   sendcmdbotto_one(botname, CMD_NOTICE, cptr, "%C :*** %C GHOST session has been "
-                   "released", acptr, cptr);
+                   "released", cptr, acptr);
   exit_client_msg(cptr, acptr, &me, "Killed (GHOST session released by %C)",
                   cptr);
   return 0;

Modified: ircd/trunk/ircd/s_user.c
===================================================================
--- ircd/trunk/ircd/s_user.c	2008-08-24 19:44:36 UTC (rev 207)
+++ ircd/trunk/ircd/s_user.c	2008-09-11 23:21:45 UTC (rev 208)
@@ -486,8 +486,8 @@
   /* Send user mode to client */
   if (MyUser(sptr))
   {
+  #if defined(UNDERNET)
     static struct Flags flags; /* automatically initialized to zeros */
-#if defined(UNDERNET)
     /* To avoid sending +r to the client due to auth-on-connect, set
      * the "old" FLAG_ACCOUNT bit to match the client's value.
      */
@@ -496,8 +496,8 @@
     else
       FlagClr(&flags, FLAG_ACCOUNT);
     client_set_privs(sptr, NULL);
-#endif
     send_umode(cptr, sptr, &flags, ALL_UMODES);
+#endif    
     if ((cli_snomask(sptr) != SNO_DEFAULT) && HasFlag(sptr, FLAG_SERVNOTICE))
       send_reply(sptr, RPL_SNOMASK, cli_snomask(sptr), cli_snomask(sptr));
   }
@@ -832,6 +832,9 @@
 #if defined(DDB)
     if (IsIdentify(flags) && !IsNickEquivalent(flags))
     {
+      if (!botname)
+        botname = ddb_get_botname(DDB_NICKSERV);
+        
       sendcmdbotto_one(botname, CMD_NOTICE, cptr,
                        "%C :*** Password accepted. Welcome to %s",
                        cptr, feature_str(FEAT_NETWORK));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.