Make R logging more verbose

diff --git a/request/request.c b/request/request.c
index efe1d0f41dbd469e90d87cc23d41a0fe8e848aec..a8a243a41422cecab49e6b4612e632acf9ce6027 100644 (file)
--- a/request/request.c
+++ b/request/request.c
@@ -356,7 +356,10 @@ int rqcmd_request(void *user, int cargc, char **cargv) {
     now_ts = time(NULL);
     strftime(now, sizeof(now), "%c", localtime(&now_ts));
 
-    fprintf(rq_logfd, "%s: request (%s) for %s from %s: Request was %s.\n", now, RQ_QNICK, cp->index->name->content, np->nick, (retval == RQ_OK) ? "accepted" : "denied");
+    fprintf(rq_logfd, "%s: request (%s) for %s from %s!%s@%s%s%s: Request was %s.\n",
+      now, RQ_QNICK, cp->index->name->content,
+      np->nick, np->ident, np->host->name->content, IsAccount(np)?"/":"", IsAccount(np)?np->authname:"",
+      (retval == RQ_OK) ? "accepted" : "denied");
     fflush(rq_logfd);
   }
 

diff --git a/request/sqrequest.c b/request/sqrequest.c
index d4a76e628a0e3bbdd51ced14bbe8c1ef2f52b6af..9b22bc410671bd1c5b6cda9d3a495bfbf80d47c8 100644 (file)
--- a/request/sqrequest.c
+++ b/request/sqrequest.c
@@ -170,9 +170,10 @@ static void qr_result(requestrec *req, int outcome, char failcode, char *message
 
     strftime(now, sizeof(now), "%c", localtime(&now_ts));
     fprintf(rq_logfd, "%s: request (%s) for %s (%d unique users, "
-            "%d total users) from %s: Request was %s (%c).\n", now,
+            "%d total users) from %s!%s@%s%s%s: Request was %s (%c).\n", now,
             (req->what == QR_CSERVE) ? RQ_QNICK : RQ_SNICK,
-            req->cip->name->content, unique, total, tnp->nick,
+            req->cip->name->content, unique, total,
+            tnp->nick, tnp->ident, tnp->host->name->content, IsAccount(tnp)?"/":"", IsAccount(tnp)?tnp->authname:"",
             (outcome == QR_OK) ? "accepted" : "denied", failcode);
     fflush(rq_logfd);
   }