X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Frouteros.c;h=4ca9d5b2e77e6b3d059aee2e1d656b0d62cbf292;hp=d61ffe984d36cfa2eaa3b74efce9872abdc9d648;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=50c6b81549e3239034f71f00ff7dde4c6a8767e5 diff --git a/src/routeros.c b/src/routeros.c index d61ffe98..4ca9d5b2 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -2,18 +2,23 @@ * collectd - src/routeros.c * Copyright (C) 2009,2010 Florian octo Forster * - * 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: * Florian octo Forster @@ -341,7 +346,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */ if (strcasecmp ("Host", child->key) == 0) status = cf_util_get_string (child, &router_data->node); else if (strcasecmp ("Port", child->key) == 0) - status = cf_util_get_string (child, &router_data->service); + status = cf_util_get_service (child, &router_data->service); else if (strcasecmp ("User", child->key) == 0) status = cf_util_get_string (child, &router_data->username); else if (strcasecmp ("Password", child->key) == 0)