- new gcc doesn't like more things

[packages/cyrus-sasl.git] / cyrus-sasl-nagios-plugin.patch

--- cyrus-sasl-2.1.22-nagios/saslauthd/Makefile.am	2009-01-30 18:09:01.984198032 +0200
+++ cyrus-sasl-2.1.22/saslauthd/Makefile.am	2009-01-30 18:43:20.796560455 +0200
@@ -1,5 +1,7 @@
 AUTOMAKE_OPTIONS = 1.7
 sbin_PROGRAMS	= saslauthd testsaslauthd
+nagios_PROGRAMS	= check_saslauthd
+nagiosdir	= @libexecdir@/nagios/plugins
 EXTRA_PROGRAMS  = saslcache
 
 saslauthd_SOURCES = mechanisms.c globals.h \
@@ -21,6 +23,10 @@
 testsaslauthd_SOURCES = testsaslauthd.c utils.c
 testsaslauthd_LDADD = @LIB_SOCKET@
 
+check_saslauthd_SOURCES = testsaslauthd.c utils.c
+check_saslauthd_LDADD = @LIB_SOCKET@
+check_saslauthd_CFLAGS = -DNAGIOS_PLUGIN
+
 saslcache_SOURCES = saslcache.c
 
 EXTRA_DIST	= saslauthd.8 saslauthd.mdoc config include \
--- cyrus-sasl-2.1.22/saslauthd/testsaslauthd.c	2004-01-21 21:54:53.000000000 +0200
+++ cyrus-sasl-2.1.22-nagios/saslauthd/testsaslauthd.c	2009-01-30 18:36:26.070737112 +0200
@@ -57,6 +57,13 @@
 #endif
 #include <assert.h>
 
+#ifdef NAGIOS_PLUGIN
+#define STATE_OK    0
+#define STATE_WARNING   1
+#define STATE_CRITICAL  2
+#define STATE_UNKNOWN   3
+#endif
+
 #include "globals.h"
 #include "utils.h"
 
@@ -243,7 +250,11 @@
     }
   
     printf("NO \"authentication failed\"\n");
+#ifdef NAGIOS_PLUGIN
+    return 1;
+#else
     return -1;
+#endif
 }
 
 int
@@ -293,7 +304,11 @@
 		  "              [-r realm] [-s servicename]\n"
 		  "              [-f socket path] [-R repeatnum]\n",
 		  argv[0], argv[0]);
+#ifdef NAGIOS_PLUGIN
+    exit(STATE_UNKNOWN);
+#else
     exit(1);
+#endif
   }
 
   if (!repeat) repeat = 1;
@@ -302,7 +317,23 @@
       printf("%d: ", c);
       result = saslauthd_verify_password(path, user, password, service, realm);
   }
+#ifdef NAGIOS_PLUGIN
+  switch (result) {
+  case -1:
+      return STATE_CRITICAL;
+
+  case 0: // auth ok
+      return STATE_OK;
+
+  case 1: // auth fail
+      return STATE_WARNING;
+
+  default:
+      return STATE_UNKNOWN;
+  }
+#else
   return result;
+#endif
 }