X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdrbd.c;h=d46bb020ed5cc89d821c1ea5caa71d665f169ec8;hb=17940d824d432c8f67706591d1188d69b07e93b6;hp=f4105579efa5321aca7f226abb69b8871aa826dc;hpb=f07ff737cc6cf9c01673546f5f20226d98e8d688;p=collectd.git

diff --git a/src/drbd.c b/src/drbd.c
index f4105579..d46bb020 100644
--- a/src/drbd.c
+++ b/src/drbd.c
@@ -2,18 +2,23 @@
  * collectd - src/drbd.c
  * Copyright (C) 2014  Tim Laszlo
  *
- * 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; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Tim Laszlo <tim.laszlo at gmail.com>
@@ -127,7 +132,7 @@ static int drbd_read (void)
 	fh = fopen (drbd_stats, "r");
 	if (fh == NULL)
 	{
-		WARNING ("Unable to open%s", drbd_stats);
+		WARNING ("drbd plugin: Unable to open %s", drbd_stats);
 		return (EINVAL);
 	}
 
@@ -137,8 +142,12 @@ static int drbd_read (void)
 				fields, STATIC_ARRAY_SIZE (fields));
 
 		/* ignore headers (first two iterations) */
-		if (fields_num < 4)
+		if ((strcmp(fields[0], "version:") == 0) ||
+				(strcmp(fields[0], "srcversion:") == 0) ||
+				(strcmp(fields[0], "GIT-hash:") == 0))
+		{
 			continue;
+		}
 
 		if (isdigit(fields[0][0]))
 		{