Update behavior of "order" attribute for command arguments

fixes #6718

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>

diff --git a/AUTHORS b/AUTHORS
index 9b52eb4b0b01fe6234bf2ec5273cb7e0b61359f2..475f903b5bba325e104d5a0330957bc3d9b47080 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Carlos Cesario <carloscesario@gmail.com>
 Gerd von Egidy <gerd@egidy.de>
 Gunnar Beutner <gunnar.beutner@netways.de>
 Jan Wagner <waja@cyconet.org>
+Jason Young <jyoung15@gmail.com>
 Johannes Meyer <johannes.meyer@netways.de>
 Marcus van Dam <marcus@marcusvandam.nl>
 Markus Frosch <markus@lazyfrosch.de>

diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp
index c651b60bdc42a0c37f16444bb303eb201a204df0..77f7cc7a7a22eee9594c1979c472ca81ddcfa68d 100644 (file)
--- a/lib/icinga/pluginutility.cpp
+++ b/lib/icinga/pluginutility.cpp
@@ -46,16 +46,7 @@ struct CommandArgument
 
        bool operator<(const CommandArgument& rhs) const
        {
-               return GetNormalizedOrder() < rhs.GetNormalizedOrder();
-       }
-
-private:
-       int GetNormalizedOrder(void) const
-       {
-               if (Order == 0)
-                       return 0;
-               else
-                       return -(1 / Order);
+               return Order < rhs.Order;
        }
 };