irc: pass username option

3 files changed, 6 insertions, 7 deletions

diff --git a/irc.c b/irc.c
index f4ec697..9fe4ec6 100644
--- a/irc.c
+++ b/irc.c
@@ -35,7 +35,7 @@ static int tcp_connect(const char *host, int port)
 }
 
 struct irc_session *irc_connect(const char* server, int port, const char *nick,
-				const char *pass)
+				const char *username, const char *pass)
 {
 	char buf[256];
 	struct irc_session *sess;
@@ -54,7 +54,7 @@ struct irc_session *irc_connect(const char* server, int port, const char *nick,
 	if (pass)
 		irc_send(sess, "PASS", pass);
 	irc_send(sess, "NICK", nick);
-	snprintf(buf, sizeof(buf), "%s localhost %s :%s", nick, server, nick);
+	snprintf(buf, sizeof(buf), "%s 0 * :%s", username, username);
 	irc_send(sess, "USER", buf);
 	return sess;
 }
diff --git a/irc.h b/irc.h
index e5dd2c8..f886836 100644
--- a/irc.h
+++ b/irc.h
@@ -15,7 +15,7 @@ struct irc_session {
 };
 
 struct irc_session *irc_connect(const char* server, int port, const char *nick,
-				const char *pass);
+				const char *username, const char *pass);
 int irc_send(struct irc_session *s, const char *command, const char *args);
 int irc_send_chan(struct irc_session *s, const char *chan, const char *msg);
 int irc_send_ping(struct irc_session *s);
diff --git a/sircbot.c b/sircbot.c
index 6ac9122..1f3e04f 100644
--- a/sircbot.c
+++ b/sircbot.c
@@ -584,8 +584,7 @@ int main(int argc, char *argv[])
 	static char pidfile[PATH_MAX] = "";
 	const char *server = "irc.freenode.org";
 	const char *nick = "sircbot";
-	const char *user = "sircbot";
-	const char *group = "sircbot";
+	const char *username = "sircbot";
 	const char *pass = NULL;
 	const char *logfile = "/dev/null";
 	struct sircbot_session sb;
@@ -622,7 +621,7 @@ int main(int argc, char *argv[])
 			server = optarg;
 			break;
 		case 'u':
-			user = optarg;
+			username = optarg;
 			break;
 		default:
 			usage_exit(1);
@@ -670,7 +669,7 @@ int main(int argc, char *argv[])
 	openlog("sircbot",0, LOG_DAEMON);
 
 	while (1) {
-		sb.sess = irc_connect(server, port, nick, pass);
+		sb.sess = irc_connect(server, port, nick, username, pass);
 
 		if (sb.sess == NULL) {
 			log_err(server);