X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=1231075a324803bd3fa866396c62563763496e67;hb=92445ff3363441d0f515de4a3ab92a504cfc0366;hp=03d6148c04453e6855f5e4b892e230efa7dde5bc;hpb=b41e61688c372024abeab0882252b25ff68624d6;p=collectd.git

diff --git a/src/users.c b/src/users.c
index 03d6148c..1231075a 100644
--- a/src/users.c
+++ b/src/users.c
@@ -4,8 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the license is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,33 +23,22 @@
 #include "common.h"
 #include "plugin.h"
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif /* HAVE_STATGRAB_H */
+
 #if HAVE_UTMPX_H
 # include <utmpx.h>
-#else /* !HAVE_UTMPX_H */
-# if HAVE_UTMP_H
-#  include <utmp.h>
-# endif /* HAVE_UTMP_H */
-#endif /* HAVE_UTMPX_H */
+/* #endif HAVE_UTMPX_H */
 
-#define MODULE_NAME "users"
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
-#if HAVE_GETUTXENT || HAVE_GETUTENT
-# define USERS_HAVE_READ 1
 #else
-# define USERS_HAVE_READ 0
+# error "No applicable input method."
 #endif
 
-static data_source_t dsrc[1] =
-{
-	{"users",  DS_TYPE_GAUGE, 0.0, 65535.0}
-};
-
-static data_set_t ds =
-{
-	"users", 1, dsrc
-};
-
-#if USERS_HAVE_READ
 static void users_submit (gauge_t value)
 {
 	value_t values[1];
@@ -61,10 +49,11 @@ static void users_submit (gauge_t value)
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "users");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "users", sizeof (vl.plugin));
+	sstrncpy (vl.type, "users", sizeof (vl.plugin));
 
-	plugin_dispatch_values ("users", &vl);
+	plugin_dispatch_values (&vl);
 } /* void users_submit */
 
 static int users_read (void)
@@ -103,15 +92,26 @@ static int users_read (void)
 	endutent();
 
 	users_submit (users);
-#endif /* HAVE_GETUTENT */
+/* #endif HAVE_GETUTENT */
+
+#elif HAVE_LIBSTATGRAB
+	sg_user_stats *us;
+
+	us = sg_get_user_stats ();
+	if (us == NULL)
+		return (-1);   
+
+	users_submit ((gauge_t) us->num_entries);
+/* #endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
 
 	return (0);
 } /* int users_read */
-#endif /* USERS_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds);
 	plugin_register_read ("users", users_read);
-	return;
 } /* void module_register(void) */