Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / jupe.c

diff --git a/ircd/jupe.c b/ircd/jupe.c
index 2a58812a07a1de13e8875dea9da73c59a990baf9..b406f54509cbc5c3f40e276fba09c6c87a9d0545 100644 (file)
--- a/ircd/jupe.c
+++ b/ircd/jupe.c
@@ -28,6 +28,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_log.h"
+#include "ircd_policy.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -122,8 +123,13 @@ jupe_add(struct Client *cptr, struct Client *sptr, char *server, char *reason,
 
   /* Inform ops and log it */
   sendto_opmask_butone(0, SNO_NETWORK, "%s adding %sJUPE for %s, expiring at "
-                      "%Tu: %s", IsServer(sptr) ? cli_name(sptr) :
+                      "%Tu: %s",
+#ifdef HEAD_IN_SAND_SNOTICES
+                      cli_name(sptr),
+#else
+                      IsServer(sptr) ? cli_name(sptr) :
                       cli_name(cli_user(sptr)->server),
+#endif
                       flags & JUPE_LOCAL ? "local " : "", server,
                       expire + TSoffset, reason);
 
@@ -168,7 +174,12 @@ jupe_activate(struct Client *cptr, struct Client *sptr, struct Jupe *jupe,
   /* Inform ops and log it */
   sendto_opmask_butone(0, SNO_NETWORK, "%s activating JUPE for %s, expiring "
                       "at %Tu: %s",
-                      IsServer(sptr) ? cli_name(sptr) : cli_name(cli_user(sptr)->server),
+#ifdef HEAD_IN_SAND_SNOTICES
+                      cli_name(sptr),
+#else
+                      IsServer(sptr) ? cli_name(sptr) :
+                      cli_name(cli_user(sptr)->server),
+#endif
                       jupe->ju_server, jupe->ju_expire + TSoffset,
                       jupe->ju_reason);
 
@@ -211,7 +222,12 @@ jupe_deactivate(struct Client *cptr, struct Client *sptr, struct Jupe *jupe,
   /* Inform ops and log it */
   sendto_opmask_butone(0, SNO_NETWORK, "%s %s JUPE for %s, expiring at %Tu: "
                       "%s",
-                      IsServer(sptr) ? cli_name(sptr) : cli_name(cli_user(sptr)->server),
+#ifdef HEAD_IN_SAND_SNOTICES
+                      cli_name(sptr),
+#else
+                      IsServer(sptr) ? cli_name(sptr) :
+                      cli_name(cli_user(sptr)->server),
+#endif
                       JupeIsLocal(jupe) ? "removing local" : "deactivating",
                       jupe->ju_server, jupe->ju_expire + TSoffset,
                       jupe->ju_reason);