summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--init.c2
-rw-r--r--operserv.c16
-rw-r--r--version.log6
4 files changed, 15 insertions, 10 deletions
diff --git a/Changes b/Changes
index 0e83debf1..ceebfdc48 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
Anope Version 1.7.x (will be renamed when next release is produced)
-------------------
Provided by Anope Dev. <dev@anope.org>
+2004/05/14 Fixed a bug with globals containing format characters ( #52 )
2004/05/14 Fixed a tiny type in HostServ help ( #51 )
2004/05/12 Fixed missing RANDOMNEWS entry on /OS HELP ( #40 )
2004/05/12 Fixed xOP management inconsistency ( #38 )
diff --git a/init.c b/init.c
index 87e5005de..1a9006712 100644
--- a/init.c
+++ b/init.c
@@ -891,7 +891,7 @@ int init(int ac, char **av)
/* Write the StartGlobal */
if (GlobalOnCycle) {
if (GlobalOnCycleUP)
- oper_global(NULL, GlobalOnCycleUP);
+ oper_global(NULL, "%s", GlobalOnCycleUP);
}
/* Success! */
diff --git a/operserv.c b/operserv.c
index b4d84f959..d050ec089 100644
--- a/operserv.c
+++ b/operserv.c
@@ -1025,7 +1025,7 @@ static int do_global(User * u)
}
if (WallOSGlobal)
wallops(s_OperServ, "\2%s\2 just used GLOBAL command.", u->nick);
- oper_global(u->nick, msg);
+ oper_global(u->nick, "%s", msg);
return MOD_CONT;
}
@@ -4577,7 +4577,7 @@ static int do_os_quit(User * u)
sprintf(quitmsg, "QUIT command received from %s", u->nick);
if (GlobalOnCycle) {
- oper_global(NULL, GlobalOnCycleMessage);
+ oper_global(NULL, "%s", GlobalOnCycleMessage);
}
quitting = 1;
return MOD_CONT;
@@ -4594,7 +4594,7 @@ static int do_shutdown(User * u)
sprintf(quitmsg, "SHUTDOWN command received from %s", u->nick);
if (GlobalOnCycle) {
- oper_global(NULL, GlobalOnCycleMessage);
+ oper_global(NULL, "%s", GlobalOnCycleMessage);
}
save_data = 1;
delayed_quit = 1;
@@ -4613,7 +4613,7 @@ static int do_restart(User * u)
sprintf(quitmsg, "RESTART command received from %s", u->nick);
if (GlobalOnCycle) {
- oper_global(NULL, GlobalOnCycleMessage);
+ oper_global(NULL, "%s", GlobalOnCycleMessage);
}
/* raise(SIGHUP); */
do_restart_services();
@@ -4749,7 +4749,7 @@ static int do_defcon(User * u)
the Admin would like to add. Set in config file. */
if (GlobalOnDefcon) {
if ((DefConLevel == 5) && (DefConOffMessage)) {
- oper_global(NULL, DefConOffMessage);
+ oper_global(NULL, "%s", DefConOffMessage);
} else {
oper_global(NULL, langglobal, DefConLevel);
}
@@ -4757,7 +4757,7 @@ static int do_defcon(User * u)
if (GlobalOnDefconMore) {
if ((DefConOffMessage) && DefConLevel == 5) {
} else {
- oper_global(NULL, DefconMessage);
+ oper_global(NULL, "%s", DefconMessage);
}
}
/* Run any defcon functions, e.g. FORCE CHAN MODE */
@@ -4839,14 +4839,14 @@ void resetDefCon(int level)
s_OperServ, level);
if (GlobalOnDefcon) {
if (DefConOffMessage) {
- oper_global(NULL, DefConOffMessage);
+ oper_global(NULL, "%s", DefConOffMessage);
} else {
oper_global(NULL, getstring(NULL, DEFCON_GLOBAL),
DefConLevel);
}
}
if (GlobalOnDefconMore && !DefConOffMessage) {
- oper_global(NULL, DefconMessage);
+ oper_global(NULL, "%s", DefconMessage);
}
runDefCon();
}
diff --git a/version.log b/version.log
index a63ad98d1..234622712 100644
--- a/version.log
+++ b/version.log
@@ -8,11 +8,15 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="2"
-VERSION_BUILD="99"
+VERSION_BUILD="100"
VERSION_EXTRA=""
# $Log$
#
+# BUILD : 1.7.2 (100)
+# BUGS : 52
+# NOTES : Fixed a bug with globals containing format characters
+#
# BUILD : 1.7.2 (99)
# BUGS : none
# NOTES : Removed lang/index since it is auto-generated upon compilation.