X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_gline.c;h=549ae140db667df9ebac742cc6efb0ec0ec25635;hb=79f4396535284e060d4a4ada4a4cc897cd5f69d3;hp=c099a631e9fcea82cbe4ea09d22c0235f0466301;hpb=2575d32764863d3d571794f433e407d21a06032a;p=ircu2.10.12-pk.git

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index c099a63..549ae14 100644
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -1,4 +1,4 @@
-/*
+\/*
  * IRC - Internet Relay Chat, ircd/m_gline.c
  * Copyright (C) 1990 Jarkko Oikarinen and
  *                    University of Oulu, Computing Center
@@ -308,7 +308,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 	if (!agline || /* gline creation, has to be the reason */
 	    /* trial-convert as lifetime, and if it doesn't fully convert,
 	     * it must be the reason */
-	    ((lifetime = strtoul(parv[5], &tmp, 10)) && !*tmp)) {
+	    (!(lifetime = strtoul(parv[5], &tmp, 10)) && !*tmp)) {
 	  lifetime = 0;
 	  reason = parv[5];
 
@@ -610,12 +610,6 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       return send_reply(sptr, ERR_NOPRIVILEGES);
   }
 
-  /* If globally disabling a G-line that we do not already have, avoid
-   * creating a temporary one. */
-  if (!agline && action == GLINE_DEACTIVATE) {
-    return gline_forward_deactivation(cptr, sptr, mask, expire, CurrentTime, 0, flags);
-  }
-
   Debug((DEBUG_DEBUG, "I have a global G-line I am acting upon now; "
 	 "target %s, mask %s, operforce %s, action %s, expire %Tu, "
 	 "reason: %s; gline %s!  (fields present: %s %s)", target,