fix patch 998291

[nagiosplug.git] / plugins / check_users.c

diff --git a/plugins/check_users.c b/plugins/check_users.c
index e0a71845fec857f585d5f85c1b7962243b6c786c..d1b4f01898e5a8130871ef55387c86c5da112c35 100644 (file)
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -14,11 +14,13 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 *****************************************************************************/
 
 const char *progname = "check_users";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -38,7 +40,7 @@ int
 main (int argc, char **argv)
 {
        int users = -1;
-       int result = STATE_OK;
+       int result = STATE_UNKNOWN;
        char input_buffer[MAX_INPUT_BUFFER];
        char *perf;
 
@@ -49,7 +51,7 @@ main (int argc, char **argv)
        perf = strdup("");
 
        if (process_arguments (argc, argv) == ERROR)
-               usage (_("Could not parse arguments\n"));
+               usage4 (_("Could not parse arguments"));
 
        /* run the command */
        child_process = spopen (WHO_COMMAND);
@@ -112,8 +114,6 @@ main (int argc, char **argv)
 
 
 
-
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -151,13 +151,13 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                case 'c':                                                                       /* critical */
                        if (!is_intnonneg (optarg))
-                               usage (_("Critical threshold must be a nonnegative integer\n"));
+                               usage (_("Critical threshold must be a positive integer\n"));
                        else
                                cusers = atoi (optarg);
                        break;
                case 'w':                                                                       /* warning */
                        if (!is_intnonneg (optarg))
-                               usage (_("Warning threshold must be a nonnegative integer\n"));
+                               usage (_("Warning threshold must be a positive integer\n"));
                        else
                                wusers = atoi (optarg);
                        break;
@@ -167,14 +167,14 @@ process_arguments (int argc, char **argv)
        c = optind;
        if (wusers == -1 && argc > c) {
                if (is_intnonneg (argv[c]) == FALSE)
-                       usage (_("Warning threshold must be a nonnegative integer\n"));
+                       usage (_("Warning threshold must be a positive integer\n"));
                else
                        wusers = atoi (argv[c++]);
        }
 
        if (cusers == -1 && argc > c) {
                if (is_intnonneg (argv[c]) == FALSE)
-                       usage (_("Warning threshold must be a nonnegative integer\n"));
+                       usage (_("Warning threshold must be a positive integer\n"));
                else
                        cusers = atoi (argv[c]);
        }
@@ -184,16 +184,13 @@ process_arguments (int argc, char **argv)
 
 
 
-
-
-\f
 void
 print_help (void)
 {
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad\n");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("\
 This plugin checks the number of users currently logged in on the local\n\
@@ -214,10 +211,8 @@ system and generates an error if the number exceeds the thresholds specified.\n"
 
 
 
-
 void
 print_usage (void)
 {
        printf ("Usage: %s -w <users> -c <users>\n", progname);
-       printf (_(UT_HLP_VRS), progname, progname);
 }