- Allow IRCItem.oper and IRCItem.mode to be empty

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.1.x@9516 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/config.c b/src/config.c
index 70129b03c04d535dec5097f6edc25f5d24b6281c..40b8a45d6386c299f3f2f61b31a2e0216bec5ec0 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -52,14 +52,12 @@ static void
 config_setup(void)
 {
   /* Setup irc {} block defaults */
-  IRCItem.mode = xstrdup("+c");
   IRCItem.nick = xstrdup("hopm");
   IRCItem.port = 6667;
   IRCItem.tls = 0;
   IRCItem.tls_hostname_verification = 1;
   IRCItem.readtimeout = 900;
   IRCItem.reconnectinterval = 30;
-  IRCItem.oper = xstrdup("undefined");
   IRCItem.username = xstrdup("hopm");
   IRCItem.realname = xstrdup("Hybrid Open Proxy Monitor");
   IRCItem.server = xstrdup("irc.example.org");

diff --git a/src/irc.c b/src/irc.c
index b212d576c9528793c681f9787eee7ac10c50127e..b7ea0e7d277f70484cbd2a420bab28bb856efeae 100644 (file)
--- a/src/irc.c
+++ b/src/irc.c
@@ -120,17 +120,19 @@ m_perform(char *parv[], unsigned int parc, const char *msg, const char *source_p
 {
   node_t *node;
 
-  log_printf("IRC -> Connected to %s/%d", IRCItem.server, IRCItem.port);
+  log_printf("IRC -> Connected to %s[%s]:%i", IRC_SVR_STR, IRCItem.server, IRCItem.port);
 
   /* Identify to nickserv if needed */
   if (!EmptyString(IRCItem.nickserv))
     irc_send("%s", IRCItem.nickserv);
 
   /* Oper */
-  irc_send("OPER %s", IRCItem.oper);
+  if (!EmptyString(IRCItem.oper))
+    irc_send("OPER %s", IRCItem.oper);
 
   /* Set modes */
-  irc_send("MODE %s %s", IRCItem.nick, IRCItem.mode);
+  if (!EmptyString(IRCItem.mode))
+    irc_send("MODE %s %s", IRCItem.nick, IRCItem.mode);
 
   /* Set Away */
   if (!EmptyString(IRCItem.away))