Merge - fixed conflicts in chanserv/authcmds/authhistory.c.

diff --cc chanserv/authcmds/authhistory.c
index ac3f8fd9b459b81392ae99331f932c978e8d1458,1816a0376acbf455cea15c987a21dfdd08821a39..44f32a278a105cfb68edd88462ba789744828697
--- 1/chanserv/authcmds/authhistory.c
--- 2/chanserv/authcmds/authhistory.c
+++ b/chanserv/authcmds/authhistory.c
@@@ -110,33 -119,29 +119,42 @@@ int csa_doauthhistory(void *source, in
    if (!(rup=getreguserfromnick(sender)))
      return CMD_ERROR;
  
-   if (cargc >= 1) {
-     if (!(trup=findreguser(sender, cargv[0])))
+   if (cargc) {
+     if (!ircd_strcmp(cargv[0], "-a")) {
+       if (UHasOperPriv(rup))
+         limit=0;
+       
+       arg++;
+     }
+   }
+ 
+   if (cargc > arg) {
+     if (!(trup=findreguser(sender, cargv[arg])))
        return CMD_ERROR;
  
 -    /* don't allow non-opers to view oper auth history, but allow helpers to view non-oper history */
 -    if ((trup != rup) && ((UHasOperPriv(trup) && !UHasOperPriv(rup)) || !UHasHelperPriv(rup))) {
 -      chanservstdmessage(sender, QM_NOACCESSONUSER, "authhistory", cargv[arg]);
 -      return CMD_ERROR;
 +    /* if target != command issuer */
 +    if (trup != rup) {
 +      /* only opers and helpers can view authhistory of other users */
 +      if (!UHasHelperPriv(rup)) {
-         chanservstdmessage(sender, QM_NOACCESSONUSER, "authhistory", cargv[0]);
++        chanservstdmessage(sender, QM_NOACCESSONUSER, "authhistory", cargv[arg]);
 +        return CMD_ERROR;
 +      }
 +
 +      /* and only opers can view opers history */
 +      if (UHasOperPriv(trup) && !UHasOperPriv(rup)) {
 +        chanservwallmessage("%s (%s) just FAILED using AUTHHISTORY on %s", sender->nick, rup->username, trup->username);
-         chanservstdmessage(sender, QM_NOACCESSONUSER, "authhistory", cargv[0]);
++        chanservstdmessage(sender, QM_NOACCESSONUSER, "authhistory", cargv[arg]);
 +        return CMD_ERROR;
 +      }
 +
 +      /* checks passed */
- 
 +      chanservwallmessage("%s (%s) used AUTHHISTORY on %s", sender->nick, rup->username, trup->username);
      }
    } else {
      trup=rup;
    }
-   csdb_retreiveauthhistory(sender, trup, 10);
 -  
++
+   csdb_retreiveauthhistory(sender, trup, limit);
  
    return CMD_OK;
  }