X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-metadata.c;h=efb2201773686c7475af2e5c930aaa0fd69dc621;hb=7d7eb735f0c8b541e7809a68cb49174605147904;hp=3c8a4a85623bc9c6ccaf53180e49a2170a38fa0f;hpb=e03d8eb7284147f7d44ff192cec18ad9716fedff;p=ngircd-alex.git

diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c
index 3c8a4a85..efb22017 100644
--- a/src/ngircd/irc-metadata.c
+++ b/src/ngircd/irc-metadata.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,21 +18,17 @@
  * IRC metadata commands
  */
 
-#include "imp.h"
 #include <assert.h>
-#include <string.h>
+#include <strings.h>
 #include <stdio.h>
 
 #include "conn-func.h"
 #include "channel.h"
-#include "conn-encoding.h"
 #include "irc-write.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
-#include "tool.h"
 
-#include "exp.h"
 #include "irc-metadata.h"
 
 /**
@@ -51,25 +47,21 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	if (Req->argc != 3)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
 	prefix = Client_Search(Req->prefix);
 	if (!prefix)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+		return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
 					  Client_ID(Client), Req->prefix);
 
 	target = Client_Search(Req->argv[0]);
 	if (!target)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+		return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
 					  Client_ID(Client), Req->argv[0]);
 
 	LogDebug("Got \"METADATA\" command from \"%s\" for client \"%s\": \"%s=%s\".",
 		 Client_ID(prefix), Client_ID(target),
 		 Req->argv[1], Req->argv[2]);
 
-	/* Mark client: it has receiveda a METADATA command */
+	/* Mark client: it has received a METADATA command */
 	if (!Client_HasFlag(target, 'M')) {
 		snprintf(new_flags, sizeof new_flags, "%sM",
 			 Client_Flags(target));
@@ -96,6 +88,8 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req)
 		Client_SetInfo(target, Req->argv[2]);
 	else if (*Req->argv[2] && strcasecmp(Req->argv[1], "user") == 0)
 		Client_SetUser(target, Req->argv[2], true);
+	else if (strcasecmp(Req->argv[1], "accountname") == 0)
+		Client_SetAccountName(target, Req->argv[2]);
 	else if (*Req->argv[2] && strcasecmp(Req->argv[1], "certfp") == 0)
 		Conn_SetCertFp(Client_Conn(target), Req->argv[2]);
 	else