diff --git a/ABOUT-NLS b/ABOUT-NLS index 8ffb467..3575535 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -1,10 +1,11 @@ -Notes on the Free Translation Project -************************************* +1 Notes on the Free Translation Project +*************************************** Free software is going international! The Free Translation Project is a way to get maintainers of free software, translators, and users all -together, so that will gradually become able to speak many languages. -A few packages already provide translations for their messages. +together, so that free software will gradually become able to speak many +languages. A few packages already provide translations for their +messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, @@ -15,15 +16,15 @@ this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and -work at translations should contact the appropriate team. +work on translations can contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -Quick configuration advice -========================== +1.1 Quick configuration advice +============================== If you want to exploit the full power of internationalization, you should configure it using @@ -45,8 +46,8 @@ to change to GNU `gettext' as soon as possible. you have installed a recent copy of the GNU gettext package with the included `libintl'. -INSTALL Matters -=============== +1.2 INSTALL Matters +=================== Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such @@ -55,27 +56,27 @@ internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the GNU `gettext' own -library will be used. This library is wholly contained within this -package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is _not_ required. Installers may use -special options at configuration time for changing the default -behaviour. The commands: +provides the GNU `gettext' functions. If not, the included GNU +`gettext' library will be used. This library is wholly contained +within this package, usually in the `intl/' subdirectory, so prior +installation of the GNU `gettext' package is _not_ required. +Installers may use special options at configuration time for changing +the default behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls -will respectively bypass any pre-existing `gettext' to use the +will, respectively, bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might be not what is desirable. You -should use the more recent version of the GNU `gettext' library. I.e. -if the file `intl/VERSION' shows that the library which comes with this -package is more recent, you should use +will decide to use this. This might not be desirable. You should use +the more recent version of the GNU `gettext' library. I.e. if the file +`intl/VERSION' shows that the library which comes with this package is +more recent, you should use ./configure --with-included-gettext @@ -86,7 +87,7 @@ and therefore it will not be used. The reason is that even an emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. - Internationalized packages have usually many `po/LL.po' files, where + Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed @@ -95,8 +96,8 @@ may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -Using This Package -================== +1.3 Using This Package +====================== As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate @@ -117,8 +118,8 @@ country code serves to distinguish the dialects. language and `CC' denoting the country, is the one use on systems based on GNU libc. On other systems, some variations of this scheme are used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your country by running the command -`locale -a | grep '^LL''. +locales supported by your system for your language by running the +command `locale -a | grep '^LL''. Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you @@ -131,14 +132,21 @@ system libraries. For example, some Swedish users who would rather read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -Translating Teams -================= +1.4 Translating Teams +===================== For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also @@ -167,518 +175,904 @@ coordinator for all translator teams. the terminology in use. Proven linguistic skill are praised more than programming skill, here. -Available Packages -================== +1.5 Available Packages +====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of December -2003. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of July +2006. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files am az be bg ca cs da de el en en_GB eo es - +-------------------------------------------+ - a2ps | [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | | - ap-utils | | - bash | [] [] [] [] | - batchelor | | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - bluez-pin | [] [] | - clisp | | - clisp | [] [] [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - darkstat | [] () [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] () [] [] [] [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] | - flex | [] [] [] [] | - fslint | | - gas | [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] [] [] [] | - gliv | | - glunarclock | [] [] | - gnubiff | [] | - gnucash | [] () [] [] | - gnucash-glossary | [] () [] | - gnupg | [] () [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] [] | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] | - gpsdrive | () () () | - gramadoir | [] | - grep | [] [] [] [] [] [] | - gretl | [] | - gtick | () | - hello | [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - jpilot | [] [] [] | - jtag | | - jwhois | [] | - kbd | [] [] [] [] [] | - latrine | () | - ld | [] [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] | - libiconv | [] [] [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lingoteach_lessons | () () | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] | - man-db | [] () [] [] () | - minicom | [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] | - nano_1_0 | [] () [] [] [] | - opcodes | [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | | - sharutils | [] [] [] [] [] [] | - silky | () | - skencil | [] () [] | - sketch | [] () [] | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] [] | - tin | () () | - tuxpaint | [] [] [] [] [] [] [] | - util-linux | [] [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] | - xchat | [] [] [] [] | - xfree86_xkb_xml | [] | - xpad | [] | - +-------------------------------------------+ - am az be bg ca cs da de el en en_GB eo es - 0 0 8 3 37 38 56 73 15 1 5 12 64 + Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo + +----------------------------------------------------+ + GNUnet | [] | + a2ps | [] [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | [] | + ap-utils | | + aspell | [] [] [] [] | + bash | [] [] [] | + batchelor | [] | + bfd | | + bibshelf | [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | | + cpplib | [] [] [] | + cryptonit | [] | + darkstat | [] () [] | + dialog | [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] | + doodle | [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] | + fetchmail | [] [] () [] | + fileutils | [] [] | + findutils | [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] [] [] | + gip | [] | + gliv | [] | + glunarclock | [] | + gmult | [] [] | + gnubiff | () | + gnucash | () () [] | + gnucash-glossary | [] () | + gnuedu | | + gnulib | [] [] [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | | + gpe-edit | [] | + gpe-filemanager | | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-package | | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | () () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] | + gretl | | + gsasl | | + gss | | + gst-plugins | [] [] [] [] | + gst-plugins-base | [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | [] () | + gtkam | [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] | + id-utils | [] [] | + impost | | + indent | [] [] [] | + iso_3166 | [] [] | + iso_3166_1 | [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] | + iso_639 | [] [] | + jpilot | [] | + jtag | | + jwhois | | + kbd | [] [] [] [] | + keytouch | | + keytouch-editor | | + keytouch-keyboa... | | + latrine | () | + ld | [] | + leafpad | [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] | + libgsasl | | + libiconv | [] [] | + libidn | [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] | + make | [] [] | + man-db | [] () [] [] | + minicom | [] [] [] | + mysecretdiary | [] [] | + nano | [] [] () [] | + nano_1_0 | [] () [] [] | + opcodes | [] | + parted | | + pilot-qof | [] | + psmisc | [] | + pwdutils | | + python | | + qof | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | | + silky | | + skencil | [] () | + sketch | [] () | + solfege | | + soundtracker | [] [] | + sp | [] | + stardict | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] | + texinfo | [] [] [] | + textutils | [] [] [] | + tin | () () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] | + xchat | [] [] [] [] [] | + xkeyboard-config | | + xpad | [] [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs cy da de el en en_GB eo + 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16 - et fa fi fr ga gl he hr hu id is it ja - +----------------------------------------+ - a2ps | [] [] [] () | - aegis | | - ant-phone | | - anubis | [] | - ap-utils | [] | - bash | [] [] | - batchelor | [] | - bfd | [] | - binutils | [] [] | - bison | [] [] [] [] | - bluez-pin | [] [] [] [] [] | - clisp | | - clisp | [] | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - darkstat | () [] [] [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | | - enscript | [] [] | - error | [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] [] [] | - flex | [] [] | - fslint | | - gas | [] | - gawk | [] [] [] | - gbiff | | - gcal | [] | - gcc | [] | - gettext | [] [] | - gettext-examples | [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gliv | () | - glunarclock | [] [] [] [] | - gnubiff | | - gnucash | () [] | - gnucash-glossary | [] | - gnupg | [] [] [] [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] [] [] | - gpe-clock | [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] [] | - gpe-sketchbook | [] | - gpe-su | [] | - gpe-taskmanager | [] | - gpe-timesheet | [] [] [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] | - gprof | [] [] | - gpsdrive | () [] () () | - gramadoir | [] | - grep | [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] | - gtick | [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] | - jpilot | [] () | - jtag | | - jwhois | [] [] [] [] | - kbd | [] | - latrine | | - ld | [] | - libc | [] [] [] [] [] | - libgpewidget | [] [] [] [] | - libiconv | [] [] [] [] [] [] [] [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] | - lingoteach_lessons | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | | - make | [] [] [] [] [] | - man-db | () () | - minicom | [] [] [] [] | - mysecretdiary | [] [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | | - screem | | - scrollkeeper | [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] | - sharutils | [] [] [] [] [] | - silky | [] () | - skencil | [] | - sketch | [] | - soundtracker | [] [] [] [] | - sp | [] () | - tar | [] [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tuxpaint | [] [] [] [] [] [] [] [] | - util-linux | [] [] [] [] () [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] | - xchat | [] [] [] | - xfree86_xkb_xml | | - xpad | [] | - +----------------------------------------+ - et fa fi fr ga gl he hr hu id is it ja - 21 1 25 86 24 24 8 10 38 31 1 23 32 + es et eu fa fi fr ga gl gu he hi hr hu id is it + +--------------------------------------------------+ + GNUnet | | + a2ps | [] [] [] () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] [] | + aspell | [] [] [] | + bash | [] [] [] | + batchelor | [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + cflow | | + clisp | [] [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cpplib | [] [] | + cryptonit | [] | + darkstat | [] () [] [] [] | + dialog | [] [] [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | [] [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] [] | + gcc | [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] | + gip | [] [] [] | + gliv | () | + glunarclock | [] [] [] | + gmult | [] [] [] | + gnubiff | () () | + gnucash | () () () | + gnucash-glossary | [] [] | + gnuedu | [] | + gnulib | [] [] [] [] [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] [] [] | + gpe-filemanager | [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | () () [] () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] [] [] | + gsasl | [] | + gss | [] | + gst-plugins | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gstreamer | [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] [] | + impost | [] [] | + indent | [] [] [] [] [] [] [] [] [] [] | + iso_3166 | [] [] [] | + iso_3166_1 | [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] | + iso_639 | [] [] [] [] [] | + jpilot | [] [] | + jtag | [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | [] [] [] | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] [] [] | + libgpg-error | | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] | + libgsasl | [] [] | + libiconv | [] | + libidn | [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] [] | + lynx | [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | () | + minicom | [] [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] [] | + nano_1_0 | [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pilot-qof | | + psmisc | [] [] [] | + pwdutils | | + python | | + qof | | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + shishi | | + silky | [] | + skencil | [] [] | + sketch | [] [] | + solfege | [] | + soundtracker | [] [] [] | + sp | [] | + stardict | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + tp-robot | [] [] [] [] | + tuxpaint | [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] [] [] [] | + vorbis-tools | [] [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + es et eu fa fi fr ga gl gu he hi hr hu id is it + 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53 - ko lg lt lv ms nb nl nn no pl pt pt_BR ro - +-------------------------------------------+ - a2ps | () [] [] () () [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] [] [] | - ap-utils | [] () [] | - bash | [] [] | - batchelor | [] | - bfd | [] | - binutils | | - bison | [] [] [] [] | - bluez-pin | [] [] [] | - clisp | | - clisp | [] | - coreutils | [] | - cpio | [] [] [] [] [] | - darkstat | [] [] [] [] | - diffutils | [] [] [] [] | - e2fsprogs | [] | - enscript | [] [] [] | - error | [] [] [] | - fetchmail | [] [] () | - fileutils | [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] | - fslint | [] [] | - gas | | - gawk | [] [] [] | - gbiff | [] [] | - gcal | | - gcc | | - gettext | [] [] [] | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] | - gliv | [] [] [] | - glunarclock | [] [] [] | - gnubiff | | - gnucash | [] [] () | - gnucash-glossary | [] [] | - gnupg | [] | - gpe-aerial | [] [] [] | - gpe-beam | [] [] [] | - gpe-calendar | [] [] [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] [] [] | - gpe-edit | [] [] [] | - gpe-go | [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] | - gpe-sketchbook | [] [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] | - gpe-today | [] [] [] | - gpe-todo | [] [] [] | - gphoto2 | [] | - gprof | [] [] | - gpsdrive | () () () [] | - gramadoir | [] | - grep | [] [] [] [] | - gretl | | - gtick | [] [] | - hello | [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] | - jpilot | () () | - jtag | | - jwhois | [] [] [] [] | - kbd | [] [] [] | - latrine | [] | - ld | | - libc | [] [] [] [] [] | - libgpewidget | [] [] [] | - libiconv | [] [] [] [] | - lifelines | | - lilypond | | - lingoteach | | - lingoteach_lessons | | - lynx | [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] | - man-db | [] | - minicom | [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] | - sed | [] [] [] | - sh-utils | [] | - shared-mime-info | [] | - sharutils | [] | - silky | | - skencil | [] [] | - sketch | [] [] | - soundtracker | | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] | - tin | | - tuxpaint | [] [] [] [] [] [] [] [] [] | - util-linux | [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] | - xfree86_xkb_xml | [] | - xpad | [] [] | - +-------------------------------------------+ - ko lg lt lv ms nb nl nn no pl pt pt_BR ro - 12 0 1 2 12 10 60 4 4 38 25 35 76 + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + +--------------------------------------------------+ + GNUnet | | + a2ps | () [] [] () | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + batchelor | [] [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | | + cpplib | [] | + cryptonit | [] | + darkstat | [] [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + error | [] | + fetchmail | [] [] | + fileutils | [] [] | + findutils | [] | + flex | [] [] | + fslint | [] [] | + gas | | + gawk | [] [] | + gbiff | [] | + gcal | | + gcc | | + gettext-examples | [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] | + gnubiff | | + gnucash | () () | + gnucash-glossary | [] | + gnuedu | | + gnulib | [] [] [] [] | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] | + gpe-edit | [] [] | + gpe-filemanager | [] | + gpe-go | [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] | + gpe-package | [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | [] [] | + gprof | | + gpsdrive | () () () | + gramadoir | () | + grep | [] [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins | [] | + gst-plugins-base | | + gst-plugins-good | [] | + gstreamer | [] | + gtick | [] | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | | + hello | [] [] [] [] [] [] [] [] | + id-utils | [] | + impost | | + indent | [] [] | + iso_3166 | [] | + iso_3166_1 | [] [] | + iso_3166_2 | [] | + iso_3166_3 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] | + jpilot | () () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | | + libidn | [] [] | + lifelines | [] | + lilypond | | + lingoteach | [] | + lynx | [] [] | + m4 | [] [] | + mailutils | | + make | [] [] [] | + man-db | () | + minicom | [] | + mysecretdiary | [] | + nano | [] [] [] | + nano_1_0 | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + psmisc | [] [] [] | + pwdutils | | + python | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] [] [] [] | + sharutils | [] [] | + shishi | | + silky | [] | + skencil | | + sketch | | + solfege | | + soundtracker | | + sp | () | + stardict | [] [] | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + vorbis-tools | [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | + +--------------------------------------------------+ + ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3 - ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW - +-------------------------------------------+ - a2ps | [] [] [] [] [] | 16 - aegis | () | 0 - ant-phone | | 2 - anubis | [] [] [] | 9 - ap-utils | () | 3 - bash | [] | 9 - batchelor | | 2 - bfd | [] [] | 6 - binutils | [] [] [] | 7 - bison | [] [] [] | 14 - bluez-pin | [] [] [] | 13 - clisp | | 0 - clisp | | 5 - coreutils | [] [] [] [] [] | 16 - cpio | [] [] [] | 14 - darkstat | [] [] [] () () | 12 - diffutils | [] [] [] [] | 22 - e2fsprogs | [] [] | 5 - enscript | [] [] [] | 12 - error | [] [] [] | 15 - fetchmail | [] [] [] | 11 - fileutils | [] [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] [] | 29 - flex | [] [] [] | 13 - fslint | | 2 - gas | [] | 3 - gawk | [] [] | 12 - gbiff | | 3 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] [] | 16 - gettext-examples | [] [] [] [] | 11 - gettext-runtime | [] [] [] [] [] [] [] [] [] | 21 - gettext-tools | [] [] [] [] [] [] | 14 - gimp-print | [] [] | 10 - gliv | | 3 - glunarclock | [] [] [] [] | 13 - gnubiff | | 1 - gnucash | [] [] [] | 9 - gnucash-glossary | [] [] [] | 8 - gnupg | [] [] [] [] | 17 - gpe-aerial | [] [] | 7 - gpe-beam | [] [] | 8 - gpe-calendar | [] [] [] [] [] | 13 - gpe-clock | [] [] [] [] | 10 - gpe-conf | [] [] [] | 9 - gpe-contacts | [] [] [] [] | 11 - gpe-edit | [] [] [] [] [] [] | 12 - gpe-go | [] | 5 - gpe-login | [] [] [] [] [] [] | 13 - gpe-ownerinfo | [] [] [] [] [] | 13 - gpe-sketchbook | [] [] [] | 9 - gpe-su | [] [] [] [] | 10 - gpe-taskmanager | [] [] [] [] | 10 - gpe-timesheet | [] [] [] [] [] | 12 - gpe-today | [] [] [] [] [] [] | 13 - gpe-todo | [] [] [] [] [] | 12 - gphoto2 | [] [] [] | 11 - gprof | [] [] | 9 - gpsdrive | [] [] | 4 - gramadoir | | 3 - grep | [] [] [] [] [] | 26 - gretl | | 2 - gtick | [] | 5 - hello | [] [] [] [] [] | 33 - id-utils | [] [] [] | 12 - indent | [] [] [] [] [] | 21 - jpilot | [] [] [] [] [] | 9 - jtag | [] | 1 - jwhois | () () [] [] | 11 - kbd | [] [] | 11 - latrine | | 1 - ld | [] [] | 5 - libc | [] [] [] [] | 20 - libgpewidget | [] [] [] [] | 13 - libiconv | [] [] [] [] [] [] [] [] [] | 27 - lifelines | [] | 2 - lilypond | [] | 3 - lingoteach | | 2 - lingoteach_lessons | () | 0 - lynx | [] [] [] [] | 14 - m4 | [] [] [] | 15 - mailutils | [] | 5 - make | [] [] [] [] | 16 - man-db | [] | 5 - minicom | [] | 11 - mysecretdiary | [] [] | 10 - nano | [] [] [] [] [] | 17 - nano_1_0 | [] [] [] [] | 17 - opcodes | [] [] | 6 - parted | [] [] [] | 15 - ptx | [] [] [] | 22 - python | | 0 - radius | [] | 4 - recode | [] [] [] [] | 20 - rpm | [] [] [] | 7 - screem | [] [] | 2 - scrollkeeper | [] [] [] [] | 15 - sed | [] [] [] [] [] [] | 23 - sh-utils | [] [] [] | 14 - shared-mime-info | [] [] | 4 - sharutils | [] [] [] [] [] | 17 - silky | () | 2 - skencil | [] | 6 - sketch | [] | 6 - soundtracker | [] [] | 9 - sp | [] | 3 - tar | [] [] [] [] [] | 24 - texinfo | [] [] [] [] | 14 - textutils | [] [] [] [] [] | 16 - tin | | 1 - tuxpaint | [] [] [] [] [] | 29 - util-linux | [] [] [] | 15 - vorbis-tools | [] | 8 - wastesedge | | 0 - wdiff | [] [] [] [] | 18 - wget | [] [] [] [] [] [] [] [] | 23 - xchat | [] [] [] [] [] | 14 - xfree86_xkb_xml | [] [] [] [] [] [] | 8 - xpad | | 4 - +-------------------------------------------+ - 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW - 120 domains 59 42 16 25 81 0 56 12 1 10 21 22 1260 + nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +------------------------------------------------------+ + GNUnet | | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] | + bash | [] [] [] | + batchelor | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + darkstat | [] [] [] [] [] [] | + dialog | [] [] [] [] [] [] [] [] [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + error | [] [] [] [] | + fetchmail | [] [] [] | + fileutils | [] [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] [] [] [] | + gas | | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gimp-print | [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () | + gnucash | () [] | + gnucash-glossary | [] [] [] | + gnuedu | | + gnulib | [] [] [] [] [] | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] [] [] [] [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] | + gretl | [] | + gsasl | [] [] | + gss | [] [] [] | + gst-plugins | [] [] [] [] | + gst-plugins-base | [] | + gst-plugins-good | [] [] [] [] | + gstreamer | [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + impost | [] | + indent | [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | [] [] [] [] | + iso_4217 | [] [] [] [] | + iso_639 | [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | [] [] | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailutils | [] [] [] [] | + make | [] [] [] [] | + man-db | [] [] | + minicom | [] [] [] [] [] | + mysecretdiary | [] [] [] [] | + nano | [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | [] | + psmisc | [] [] | + pwdutils | [] [] | + python | | + qof | [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + silky | [] | + skencil | [] [] [] | + sketch | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + stardict | [] [] [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] | + tin | () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | + xpad | [] [] [] | + +------------------------------------------------------+ + nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2 + + tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + +---------------------------------------------------+ + GNUnet | [] | 2 + a2ps | [] [] [] | 19 + aegis | | 0 + ant-phone | [] [] | 6 + anubis | [] [] [] | 11 + ap-utils | () [] | 4 + aspell | [] [] [] | 14 + bash | [] | 11 + batchelor | [] [] | 9 + bfd | | 1 + bibshelf | [] | 7 + binutils | [] [] [] | 9 + bison | [] [] [] | 19 + bison-runtime | [] [] [] | 16 + bluez-pin | [] [] [] [] [] [] | 28 + cflow | [] [] | 4 + clisp | | 6 + console-tools | [] [] | 5 + coreutils | [] [] | 17 + cpio | [] [] [] | 9 + cpplib | [] [] [] [] | 11 + cryptonit | | 5 + darkstat | [] () () | 15 + dialog | [] [] [] [] [] | 30 + diffutils | [] [] [] [] | 28 + doodle | [] | 6 + e2fsprogs | [] [] | 10 + enscript | [] [] [] | 16 + error | [] [] [] [] | 18 + fetchmail | [] [] | 12 + fileutils | [] [] [] | 18 + findutils | [] [] [] | 17 + flex | [] [] | 15 + fslint | [] | 9 + gas | [] | 3 + gawk | [] [] | 15 + gbiff | [] | 5 + gcal | [] | 5 + gcc | [] [] [] | 6 + gettext-examples | [] [] [] [] [] [] | 26 + gettext-runtime | [] [] [] [] [] [] | 28 + gettext-tools | [] [] [] [] [] | 19 + gimp-print | [] [] | 12 + gip | [] [] | 12 + gliv | [] [] | 8 + glunarclock | [] [] [] | 15 + gmult | [] [] [] [] | 15 + gnubiff | [] | 1 + gnucash | () | 2 + gnucash-glossary | [] [] | 9 + gnuedu | [] | 2 + gnulib | [] [] [] [] [] | 28 + gnunet-gtk | | 1 + gnutls | | 2 + gpe-aerial | [] [] | 14 + gpe-beam | [] [] | 14 + gpe-calendar | [] [] [] [] | 19 + gpe-clock | [] [] [] [] | 20 + gpe-conf | [] [] | 14 + gpe-contacts | [] [] | 10 + gpe-edit | [] [] [] [] | 19 + gpe-filemanager | [] | 5 + gpe-go | [] [] | 14 + gpe-login | [] [] [] [] [] | 20 + gpe-ownerinfo | [] [] [] [] | 20 + gpe-package | [] | 5 + gpe-sketchbook | [] [] | 16 + gpe-su | [] [] [] | 19 + gpe-taskmanager | [] [] [] | 19 + gpe-timesheet | [] [] [] [] | 18 + gpe-today | [] [] [] [] [] | 20 + gpe-todo | [] | 6 + gphoto2 | [] [] [] [] | 20 + gprof | [] [] | 11 + gpsdrive | | 4 + gramadoir | [] | 7 + grep | [] [] [] [] | 33 + gretl | | 4 + gsasl | [] [] | 6 + gss | [] | 5 + gst-plugins | [] [] [] | 15 + gst-plugins-base | [] [] [] | 9 + gst-plugins-good | [] [] [] | 18 + gstreamer | [] [] [] | 17 + gtick | [] | 11 + gtkam | [] | 13 + gtkorphan | [] | 7 + gtkspell | [] [] [] [] [] [] | 26 + gutenprint | | 3 + hello | [] [] [] [] [] | 39 + id-utils | [] [] | 14 + impost | [] | 4 + indent | [] [] [] [] | 25 + iso_3166 | [] [] [] | 15 + iso_3166_1 | [] [] | 20 + iso_3166_2 | | 2 + iso_3166_3 | [] [] | 9 + iso_4217 | [] [] | 14 + iso_639 | [] | 14 + jpilot | [] [] [] [] | 7 + jtag | [] | 3 + jwhois | [] [] [] | 13 + kbd | [] [] | 12 + keytouch | [] | 4 + keytouch-editor | | 2 + keytouch-keyboa... | | 2 + latrine | [] [] | 8 + ld | [] [] [] [] | 8 + leafpad | [] [] [] [] | 23 + libc | [] [] [] | 23 + libexif | [] | 4 + libextractor | [] | 5 + libgpewidget | [] [] [] | 19 + libgpg-error | [] | 4 + libgphoto2 | [] | 8 + libgphoto2_port | [] [] [] | 11 + libgsasl | [] | 8 + libiconv | [] | 4 + libidn | [] [] | 10 + lifelines | | 4 + lilypond | | 2 + lingoteach | [] | 6 + lynx | [] [] [] | 15 + m4 | [] [] [] | 18 + mailutils | [] | 8 + make | [] [] [] | 20 + man-db | [] | 6 + minicom | [] | 14 + mysecretdiary | [] [] | 12 + nano | [] [] | 15 + nano_1_0 | [] [] [] | 18 + opcodes | [] [] | 10 + parted | [] [] [] | 10 + pilot-qof | [] | 3 + psmisc | [] | 10 + pwdutils | [] | 3 + python | | 0 + qof | [] | 2 + radius | [] | 6 + recode | [] [] [] | 25 + rpm | [] [] [] [] | 14 + screem | [] | 2 + scrollkeeper | [] [] [] [] | 26 + sed | [] [] [] | 22 + sh-utils | [] | 15 + shared-mime-info | [] [] [] [] | 23 + sharutils | [] [] [] | 23 + shishi | | 1 + silky | [] | 4 + skencil | [] | 7 + sketch | | 6 + solfege | | 2 + soundtracker | [] [] | 9 + sp | [] | 3 + stardict | [] [] [] [] | 11 + system-tools-ba... | [] [] [] [] [] [] [] | 37 + tar | [] [] [] [] | 19 + texinfo | [] [] [] | 15 + textutils | [] [] [] | 17 + tin | | 1 + tp-robot | [] [] [] | 10 + tuxpaint | [] [] [] | 16 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] [] | 20 + vorbis-tools | [] [] | 11 + wastesedge | | 1 + wdiff | [] [] | 22 + wget | [] [] [] | 19 + xchat | [] [] [] [] | 28 + xkeyboard-config | [] [] [] [] | 11 + xpad | [] [] [] | 14 + +---------------------------------------------------+ + 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -691,13 +1085,13 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If December 2003 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If July 2006 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. -Using `gettext' in new packages -=============================== +1.6 Using `gettext' in new packages +=================================== If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your @@ -714,3 +1108,4 @@ developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact `translation@iro.umontreal.ca' to make the `.pot' files available to the translation teams. + diff --git a/BUGS b/BUGS index 4465d25..86a046e 100644 --- a/BUGS +++ b/BUGS @@ -2,42 +2,23 @@ This file lists the major bugs from the Nagios Plugins page on Sourceforge at http://sourceforge.net/tracker/?group_id=29880&atid=397597. These are not necessarily verified as errors. -For the 1.4.8 release: +For the 1.4.9 release: -1687867 - check_http: buffer overflow vulnerability -1675306 - check_dhcp: does not add mandatory 'end' option -1675286 - check_ssh: -S flag not working -1652471 - check_http: missing Accept header -1648570 - check_dhcp error by asking 2 dhcp servers -1637767 - check_ping on FreeBSD 5.4 fails -1614168 - not compatible with OpenSSL 0.9.8d -1595449 - check_procs bus error on Solaris 8,9,10 -1573700 - check_swap on HP-UX incorrect -1573638 - check_swap SEGVs on Sol 10 -1541340 - check_procs won't execute on Solaris 9 x86 +1724055 - check_dns: does not sort address data +1681516 - output too verbose for various checks +1670261 - check_snmp might require snmpget with LD_LIBRARY_PATH +1569488 - check_ifoperstatus.pl: -n option does't work (help required!) 1523748 - check_disk should error if warn range is subset of critical -1506121 - check_http problem with protocol change in redirect 1498923 - check_ldap build error on Solaris 9 -1495828 - pst3 failure on solaris 10 x86 -1494629 - check_icmp fails after a time on FreeBSD 1480574 - check_disk missing -lm on Solaris 1478287 - check_dns fails with CNAMEs -1475899 - check_tcp segfaults with multiple -s or -e args -1470013 - check_tcp complains about double values in parameter -1469472 - check_ping dns lookup problem 1469468 - signal handler in popen.c is broken -1466426 - check_ldaps doesn't default to port 636 -1447642 - check_ping segfault on Sol 10 -1433179 - check_jabber does not honor --mismatch 1381604 - Perlsec breaks any perl plugin with perl 5.8.x 1373801 - check_ping timeout on Mandrake 10.1 1370031 - check_disk_smb requires DNS agree with NetBIOS names -1344584 - check_snmp counter64 values not handled correctly -1291987 - urlize useragent does not work +1250982 - check_postgresql: configure test for -lcrypto on OpenBSD 1225470 - check_swap perf data incorrect -1218438 - check_radius linking to wrong header 1108499 - check_ping with -U on Debian fails -1094326 - check_ide_smart usage errors 1090549 - check_dhcp ignores DHCP replies 990948 - check_disk_smb doesn't allow spaces in share names diff --git a/ChangeLog b/ChangeLog index 166b2a5..db6c33e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,294 +1,1102 @@ -2007-04-10 08:17 dermoth +2007-09-26 10:57 hweiss - * po/: POTFILES.in, de.po, fr.po, nagios-plugins.pot: Add some - check_ntp translations + * [r1800] NEWS, plugins/check_radius.c: + Drop the weird and undocumented behaviour of using positional + argument + parsing instead of getopt(3) if 8 command line arguments were + given (as + suggested by Matthias) and check whether all required arguments + have + been specified in order to spit out proper error messages and to + avoid a + possible segfault (as suggested by Thomas). -2007-04-10 08:17 dermoth +2007-09-26 04:16 dermoth - * plugins/check_ntp.c: - Fix possibility of printing scientific - numbers in perfdata - Use fperfdata function for perfdata - formatting - Make the printing part a bit more flexible (similar - to check_disk) + * [r1799] NEWS, THANKS.in, plugins/check_ntp.c: + Patch #1798774: check_ntp: honor ntp flags -2007-04-10 06:58 dermoth +2007-09-24 19:34 tonvoon - * po/: de.po, fr.po, nagios-plugins.pot: Hopefully this is correct. - Need to make more changes so I'm commiting these. + * [r1798] perlmods, perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Nagios-Plugin-0.21.tar.gz: + Update N::P with new version, redirecting help, version and usage + to + stdout -2007-04-04 21:08 dermoth +2007-09-24 18:51 tonvoon - * plugins/check_ntp.c: Fix for getting dispersion instead of jitter - on older servers (like xntpd on Solaris). + * [r1796] doc/developer-guidelines.sgml: + State that stderr should not have any output -2007-04-03 18:19 hweiss +2007-09-24 00:30 hweiss - * plugins/check_ntp.c: Fix the synchronization source selection on - big-endian systems. + * [r1794] NEWS, configure.in, plugins/netutils.c: + Let ./configure --without-ipv6 suppress non-IPv4 DNS lookups + (noted by + Mark Frost on nagios-users@) -2007-04-03 02:31 dermoth +2007-09-23 12:29 psychotrahe - * plugins/check_ntp.c: Temporary fix for jitter calculation + * [r1793] plugins/check_disk.c, plugins/negate.c: + Removed some c99 style comments -2007-04-02 13:39 hweiss +2007-09-23 12:26 psychotrahe - * plugins/check_ntp.c: Don't rely on the assumption that the size - of a READSTAT response is a multiple of - sizeof(ntp_assoc_status_pair). + * [r1792] NEWS, plugins/check_by_ssh.c: + Added multiline output capability to check_by_ssh. Thanks to + Matthias Flacke (#1769653) -2007-04-02 10:28 tonvoon +2007-09-23 11:18 psychotrahe - * lib/tests/Makefile.am: Add libgnu.a as regex functions required + * [r1791] BUGS: + removed solved issues -2007-04-02 08:32 dermoth +2007-09-23 11:03 psychotrahe - * plugins/check_ntp.c: Fix byte order in verbose logging + * [r1790] REQUIREMENTS: + Added radiusclient-ng support to requirement notes -2007-04-02 07:00 dermoth +2007-09-23 10:58 psychotrahe - * plugins/check_ntp.c: Seems like we don't get any jitter - sometimes. While this needs to be fixed we should at least handle - it gracefully. + * [r1789] NEWS, plugins/check_disk.c: + Fixed bug: stat was called on remote fs even if -l was given + Added -L option to call stat on remote fs but without threshold + comparison -2007-04-01 15:21 psychotrahe +2007-09-23 09:48 psychotrahe - * plugins/t/check_http.t: check_http.t: - added internet_access - variable to skip tests where internet access is required. - - added host_tcp_http2 variable for a webserver serving - the string 'nagios' in index - no tests are - skipped if the new vars are not defined (existing installations) + * [r1788] NEWS, THANKS.in, configure.in, plugins/check_radius.c: + Added radiusclient-ng support for check_radius. Thanks to + Sebastien Guay (#1218438) -2007-04-01 12:17 psychotrahe +2007-09-22 17:48 psychotrahe - * lib/utils_disk.c: utils_disk: fixed handling if check_disk -p is - a device (np_set_best_match()) + * [r1787] lib/utils_disk.c, lib/utils_tcp.c, plugins/check_disk.c: + substituted bool/true/false with int/TRUE/FALSE (discussed on + np-devel) -2007-03-31 19:49 hweiss +2007-09-22 17:40 psychotrahe - * NEWS: Various check_ntp fixes + * [r1786] NEWS, lib/tests/test_disk.c, lib/utils_disk.c, + lib/utils_disk.h, plugins/check_disk.c, plugins/t/check_disk.t: + Added -i/-I to ignore pathes/partitions based on regular + expressions + Added check_disk -A selecting all filesystems + -E option must now be passed before -p or -r/-R + Passing -E after -p or -r results in UNKNOWN state + Fixed bug when mixing case sensitive and insensitive regexes -2007-03-31 19:48 hweiss +2007-09-22 03:00 dermoth - * plugins/check_ntp.c: Fix an out-of-bounds memcpy(3) and add a - realloc(3) error check in jitter_request(). + * [r1785] NEWS, plugins/negate.c, plugins/t/negate.t: + Rewrite the "map changes to return codes" patch nearly from + scratch. -2007-03-31 18:35 hweiss +2007-09-21 23:01 tonvoon - * plugins/check_ntp.c: Add a warning to the verbose output if - jitter_request() found no synchronization source. + * [r1784] NEWS, configure.in, lib/Makefile.am, + lib/tests/Makefile.am, lib/tests/test_cmd.c, + lib/tests/test_cmd.t, lib/utils_cmd.c, lib/utils_cmd.h, + plugins/Makefile.am, plugins/negate.c, plugins/t/negate.pl, + plugins/t/negate.t: + Stop double expansion of parameters for negate - works like + time command now -2007-03-31 18:29 hweiss +2007-09-21 05:05 dermoth - * plugins/check_ntp.c: Avoid division by zero. + * [r1783] plugins/check_disk.c: + My solaris box needs %llu to display 64bits integers. -2007-03-31 18:25 hweiss +2007-09-21 04:59 dermoth - * plugins/check_ntp.c: Remove the '-O' option, as it's ignored. + * [r1782] plugins/check_disk.c: + - Added some variables at verbose==3 + - Removed support for verbose<0 (-q). -q was broken and tried to + to the same as -e. + - -q in now an undocumented alias of -e (for + backward-compatibility). + NB: Long help text for -d was already missing. + - Reordered the switches so that: +   a. less-important ones are in alphabetical order + b. short and long help orders match. + - Enclosed "-p | -x" inside braces instead of brackets as one or + the other is required. -2007-03-30 16:45 tonvoon +2007-09-17 08:19 tonvoon - * m4/np_mysqlclient.m4: Use AS_HELP_STRING instead of - ACX_HELP_STRING + * [r1781] Makefile.am: + Include directories and files required for perl modules -2007-03-30 15:08 tonvoon +2007-09-15 14:25 hweiss - * NEWS, configure.in, m4/np_mysqlclient.m4: Fix AC_CHECK_LIB for - mysql_init - add dependent libraries. mysql detection separated - into external m4 file + * [r1780] NEWS, plugins/check_smtp.c: + Properly handle SMTP server responses which are split into + multiple + packets (noted by Chris Adams on nagiosplug-help@). TODO: The new + recvline()/recvlines() functions should buffer received data + instead of + reading one byte at a time and they should be moved to netutils.c + so + that other plugins can use them, too. -2007-03-30 10:00 psychotrahe +2007-09-15 11:55 hweiss - * lib/tests/test_disk.c, plugins/t/check_disk.t: Test Cases for - check_disk's -r, -R, -C and -g + * [r1779] NEWS, plugins-root/check_icmp.c: + Correct all instances of misaligned memory access. This fixes bus + erros + on platforms which require alignment (such as SPARC and MIPS). -2007-03-30 09:56 psychotrahe +2007-09-15 11:34 hweiss - * plugins/check_disk.c: check_disk: minor fix for -C if bestmatch - != -p + * [r1778] tools/devmode: + Remove "-Wtraditional" from our development GCC flags. We use + ANSI C. -2007-03-30 09:53 psychotrahe +2007-09-13 11:36 tonvoon - * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: + * [r1777] Makefile.am, configure.in, perlmods, + perlmods/Class-Accessor-0.31.tar.gz, + perlmods/Config-Tiny-2.10.tar.gz, perlmods/Makefile.am, + perlmods/Math-Calc-Units-1.06.tar.gz, + perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Params-Validate-0.88.tar.gz, + perlmods/Test-Simple-0.70.tar.gz, perlmods/install_order, + tools/build_perl_modules: + Adding in optional Nagios::Plugin perl module (and + dependencies) compilation and installation + +2007-08-28 03:19 dermoth + + * [r1771] contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_linux_raid.pl, contrib/check_snmp_procs.pl: + These plugins assumed the "use lib util.pm;" would be substituted + like standard Perl plugins (in plugins-scripts) which isn't the + case in contrib. I changed the "use lib" line to use the default + path. People using custom paths will have to change it manually. + +2007-08-09 12:32 hweiss + + * [r1770] plugins/check_disk.c: + Don't use C++ style comments (noted by Johannes Kingma on + nagiosplug-help@) + +2007-07-31 14:47 hweiss + + * [r1769] plugins/check_smtp.c: + Read the response to an SMTP QUIT command before closing the + socket + (noted by Dieter Hendricks on nagiosplug-help@) + +2007-07-29 12:42 hweiss + + * [r1768] lib/utils_base.c: + Don't use C++ style comments. + +2007-07-27 15:49 hweiss + + * [r1767] tools/tinderbox_build: + If the TMPDIR environment variable is set, use that instead of + "/tmp" as + the installation directory. + +2007-07-26 17:32 hweiss + + * [r1766] NEWS, plugins-root/check_dhcp.c: + The "--serverip" and "--requestedip" options now accept host + names, too. + This doesn't quite fit the option names and so far I haven't + changed the + "--help" output which currently only talks about IP addresses. + However, + I don't see why resolving host names should not be supported. + + Also note that for the moment, I added a quick'n'dirty + resolve_host() + function which should really go into netutils.c. I just wanted to + think + about its interface a bit more before providing such a function + globally. + +2007-07-26 12:38 hweiss + + * [r1765] NEWS, plugins-root/check_dhcp.c: + New "-m, --mac" option which allows for specifying the MAC + address to + use in the DHCP request. + +2007-07-26 00:46 hweiss + + * [r1764] plugins-root/check_dhcp.c: + Make sure strncpy(3)d buffers are nul-terminated. + +2007-07-26 00:07 hweiss + + * [r1763] plugins-root/check_dhcp.c: + A few minor fixes/improvements which were included with (but + unrelated + to) the "--unicast" patch (Andreas Ericsson and Heiti Ernits - + 1218235) + +2007-07-26 00:02 hweiss + + * [r1762] NEWS, THANKS.in, configure.in, plugins-root/check_dhcp.c: + New "-u, --unicast" option which gives check_dhcp the ability to + mimic a + DHCP relay server in order to check remote subnets (Heiti Ernits + and + Andreas Ericsson - 1218235) + +2007-07-24 00:35 tonvoon + + * [r1761] .cvsignore, build-aux/.cvsignore, doc/.cvsignore, + gl/.cvsignore, intl/.cvsignore, lib/.cvsignore, + lib/tests/.cvsignore, m4/.cvsignore, pkg/solaris/.cvsignore, + plugins-root/.cvsignore, plugins-scripts/.cvsignore, + plugins/.cvsignore, plugins/t/.cvsignore, po/.cvsignore: + Removing all .cvsignore files + +2007-07-24 00:35 tonvoon + + * [r1760] tools/sfsnapshot, tools/sfwebcron: + Updated to use svn instead of cvs + +2007-07-21 16:29 hweiss + + * [r1759] NEWS, plugins/check_http.c: + Add "Connection: close" to the HTTP request header, which tells + HTTP/1.1 + servers to close the connection after completion of the response. + This + should be compatible with HTTP/1.0, as HTTP/1.0 allows for custom + header + fields which should be ignored if not recognized by the server. + With + some server configurations, the server would keep the connection + alive + without this header line (despite the plugin requesting + HTTP/1.0), + resulting in the plugin running into either the server's or it's + own + timeout (reported by Roman Schliessmeyer and Jesse Morgan via + IRC). + +2007-07-15 15:21 psychotrahe + + * [r1758] THANKS.in, plugins/check_procs.c: + Make ps column count in zombie detection less restrictive. Thanks + to Andrew Elwell (#1280470) + +2007-07-14 19:36 psychotrahe + + * [r1757] THANKS.in, plugins/check_smtp.c: + Fixed segfault in argument processing. Thanks to Christoph Schell + (#1742066) + +2007-07-14 18:30 psychotrahe + + * [r1756] THANKS.in, plugins/check_ntp.c: + check_ntp: Fixed typo in typo in argument sanity check. Thanks to + Aurelien Bompard (#1753506) + +2007-07-10 20:45 psychotrahe + + * [r1755] NEWS, plugins/check_disk.c: + Added examples for new features to check_disk + +2007-07-10 20:18 psychotrahe + + * [r1754] NEWS, plugins/check_disk.c, plugins/t/check_disk.t: + Check_disk now calls stat() for all filesystems to check. + Check_disk prints an strerror() message if the call of stat() + fails. + +2007-07-07 22:20 psychotrahe + + * [r1753] plugins/check_ldap.c: + Added -v/--verbose argument to call ldap_perror() for detailed + messages on failure. + +2007-07-07 12:02 psychotrahe + + * [r1752] plugins/utils.c: + Changed output order of print_revision + print_revision now uses clean_revstring + +2007-07-07 11:55 psychotrahe + + * [r1751] plugins-scripts/utils.pm.in: + Changed print_revision output order in utils.pm + +2007-07-07 11:54 psychotrahe + + * [r1750] plugins-scripts/check_file_age.pl: + substituted $ID$ through $Revision: 1801 $ in print_revision call + +2007-07-07 11:40 psychotrahe + + * [r1749] plugins-scripts/check_log.sh, + plugins-scripts/check_oracle.sh, plugins-scripts/utils.sh.in: + Changed order in -V/--version output + Fixed -V output for check_log and check_oracle + +2007-07-06 23:03 psychotrahe + + * [r1748] doc/developer-guidelines.sgml: + Added hint to avoid using the boolean type in C as discussed on + the devel list + +2007-06-20 11:09 psychotrahe + + * [r1747] plugins/check_ldap.c: + Fixed default behaviour of check_ldaps + +2007-06-20 11:00 psychotrahe + + * [r1746] NEWS, plugins/check_ldap.c: + Clarified check_ldaps behaviour. New arguments to explicitly + select secure connect behaviour (--starttls/--ssl). + +2007-06-20 09:01 psychotrahe + + * [r1745] plugins/check_cluster.c: + added -V/--version to check_cluster + +2007-06-18 20:20 psychotrahe + + * [r1744] REQUIREMENTS, configure.in, plugins, plugins/.cvsignore: + Make Linux specific plugin check_ide_smart build if appropriate + headers are found + +2007-06-17 19:34 hweiss + + * [r1743] plugins/check_http.c: + Minor fixes. + +2007-06-17 19:22 hweiss + + * [r1742] NEWS, plugins/check_http.c: + Fix buffer overflow vulnerabilities when parsing HTTP redirect + 'Location:' strings using sscanf(3) (Nobuhiro Ban - 1687867) + +2007-06-15 18:37 hweiss + + * [r1741] plugins/check_http.c: + When following redirects, the plugin supported 'Location:' header + fields + which spanned multiple lines. However, it was not checked whether + extra + lines are preceeded with white space, which could lead to the + following + header field name being interpreted as the value of the + 'Location:' + field if the latter was empty for some reason. + +2007-06-15 18:31 hweiss + + * [r1740] plugins/check_http.c: + `host_name' is a NULL pointer if the "-I" flag is used instead of + "-H", + so use `server_address' instead. Fixes a possible segfault when + following redirects to relative URLs (reported by Ingo + Lantschner). + +2007-06-13 09:43 psychotrahe + + * [r1739] plugins/check_ide_smart.c: + Fixed some syntax errors to make check_ide_smart build + +2007-06-12 23:18 hweiss + + * [r1738] plugins/check_by_ssh.c: + Add "-v" to help/usage output. + +2007-06-12 07:13 psychotrahe + + * [r1737] plugins/popen.c: + Removed debug line + +2007-06-11 20:54 psychotrahe + + * [r1736] THANKS.in, plugins/popen.c: + Fixed problem with popen.c not parsing --longopt='foo bar' + correctly (Daniel Bimschas #1291987) + +2007-06-04 09:07 tonvoon + + * [r1735] THANKS.in: + Removed duplicate names + +2007-06-04 08:58 tonvoon + + * [r1733] BUGS, ChangeLog, NEWS, configure.in, package.def: + For 1.4.9 release + +2007-06-03 15:58 psychotrahe + + * [r1732] lib/tests/test_tcp.c: + Minor corrections to test_tcp.c + +2007-06-03 15:14 psychotrahe + + * [r1731] lib/tests/Makefile.am: + Makefile.am changes for test_tcp.c + +2007-06-03 15:00 psychotrahe + + * [r1730] configure.in, lib/tests, lib/tests/.cvsignore, + lib/tests/test_tcp.c, lib/tests/test_tcp.t: + Added test cases for utils_tcp + +2007-06-03 14:40 psychotrahe + + * [r1729] NEWS, lib/Makefile.am, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: + Moved check_tcp's expect string testing into utils_tcp for + testing purposes. + Added -A/--all flag to test for every expect string passed. + +2007-06-01 23:11 hweiss + + * [r1728] BUGS, NEWS: + Fix possible check_http segfaults when following HTTP redirects. + +2007-06-01 23:08 hweiss + + * [r1727] plugins/check_http.c: + Fix an off-by-one error where a realloc(3) call doesn't allocate + space + for nul-termination (Aravind Gottipati - 1729692) + +2007-06-01 22:57 hweiss + + * [r1726] plugins/sslutils.c: + Call the SSL library initialization functions only once (not for + every + SSL connection). + +2007-06-01 17:06 hweiss + + * [r1725] plugins/sslutils.c: + Save an entire CPU cycle if c points to NULL already. + +2007-06-01 16:42 hweiss + + * [r1724] plugins/sslutils.c: + Set the pointers to the SSL and SSL_CTX objects back to NULL + after + freeing them in np_net_ssl_cleanup(). This fixes a check_http + segfault + if an SSL site redirects to a non-SSL one (reported by Aravind + Gottipati + via IRC). + +2007-05-29 20:01 psychotrahe + + * [r1723] plugins/check_tcp.c: + Fix segfault when -e is specified multiple times. Thanks to John + Rouillard and Ralph Roessner (#1475899) + +2007-05-29 19:11 psychotrahe + + * [r1722] plugins/check_tcp.c: + No more warn/crit values in performance data if -w and -c are not + specified. + Thanks to Simon Bellwood (#1181554) + +2007-05-29 05:22 dermoth + + * [r1721] NEWS, plugins/check_snmp.c: + check_snmp don't warn anymore if something is printed on stderr + +2007-05-29 04:25 dermoth + + * [r1720] plugins/check_snmp.c: + change a bunch of whitespaces (no code was harmed) + +2007-05-27 14:49 psychotrahe + + * [r1719] THANKS.in, plugins-scripts/check_oracle.sh: + check_oracle does not need a valid ORACLE_HOME if called with + --db. Thanks to Jason Martin (#1505551) + +2007-05-27 13:46 seanius + + * [r1718] lib/utils_base.c, lib/utils_base.h, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c: + added functions to utils_base: + np_check_if_root() - returns nonzero if geteuid()==0 + np_warn_if_not_root() - uses the above to print an informative + warning + added uses of these functions to check_dhcp and check_icmp. + +2007-05-24 08:53 tonvoon + + * [r1717] plugins/t/negate.pl: + Test for new functionality in negate (not automatically run in + make test) + +2007-05-24 08:35 tonvoon + + * [r1716] plugins/check_dummy.c, plugins/t/check_dummy.t: + Tests for check_dummy + +2007-05-23 08:22 dermoth + + * [r1715] NEWS, plugins/check_http.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: + Update many strings in check_http to get more consistent output + Update translation files; fix all check_http changes in French + and most changes in German. + +2007-05-18 07:17 dermoth + + * [r1714] plugins/t/check_tcp.t: + Make check_tcp.t compatible with picky web servers. + +2007-05-13 20:02 hweiss + + * [r1713] plugins/check_http.c: + Add missing options to the usage output. + +2007-05-13 12:28 psychotrahe + + * [r1712] THANKS.in, plugins-root/check_dhcp.c: + check_dhcp now adds mandatory end option (Thanks to Enrico Scholz + - #1675306) + +2007-05-12 07:45 psychotrahe + + * [r1711] plugins/check_cluster.c: + Fixed glibc error caused in utils_base.c due to uninitialized + thresholds struct (spotted on ubundu 6.06 LTS). + +2007-05-12 00:49 tonvoon + + * [r1710] ABOUT-NLS, build-aux/mkinstalldirs, configure.in: + Updating gettext files from coreutils-6.9. mkinstalldirs needs to + be in + build-aux for some systems without gettext natively. Also have at + top level, + though gettext documentation says file not neceesary + +2007-05-09 09:16 psychotrahe + + * [r1709] plugins/check_ups.c: + small typo in --help + +2007-05-09 09:09 psychotrahe + + * [r1708] THANKS.in, plugins/check_ups.c: + Fixed --help output (Ask Bjoern Hansen - #1714823) + +2007-05-09 08:16 psychotrahe + + * [r1707] plugins/t/check_disk.t: + added testcase to verify that old positional arguments only + select one path + +2007-05-03 20:43 psychotrahe + + * [r1706] ChangeLog, THANKS.in, plugins/check_disk.c: + fixed backward incompatibility introduced in 1.4.8 where all + partitions are selected, + if path is specified as last argument (without using -p). + Thanks to Emil Michles (Emilis) on #nagios + +2007-05-02 10:11 dermoth + + * [r1705] tools/distclean: + Making Solaris happy + +2007-05-02 05:30 dermoth + + * [r1704] NEWS: + /* Nothing */ + +2007-05-02 05:22 dermoth + + * [r1703] NEWS, THANKS.in, plugins/check_time.c: + Fix check_time returning wrong OK when time is before the epoch + on some arch + +2007-04-28 21:57 psychotrahe + + * [r1702] plugins/t/check_cluster.t: + added test cases for check_cluster + +2007-04-25 22:21 tonvoon + + * [r1701] tools/tinderbox_build: + Test installs into temporary directories + +2007-04-25 22:10 tonvoon + + * [r1700] NEWS, configure.in, plugins/check_load.c, + plugins/common.h, plugins/t/check_load.t: + check_load can optionally divide by number of cpus + +2007-04-23 07:30 hweiss + + * [r1699] plugins/check_ping.c: + #ifdef can only test a single macro, not an expression. + +2007-04-20 17:55 hweiss + + * [r1698] plugins-root/check_dhcp.c: + Remove unused variables. + +2007-04-20 17:46 hweiss + + * [r1697] plugins/check_cluster.c: + Include "utils_base.h". + +2007-04-20 17:45 hweiss + + * [r1696] lib/utils_base.h: + Declare print_thresholds(). + +2007-04-20 17:39 hweiss + + * [r1695] plugins/check_cluster.c: + Predeclare functions and remove unused variables. + +2007-04-20 17:25 hweiss + + * [r1694] THANKS.in, plugins-root/check_dhcp.c: + Use the 'server identifier' option instead of the 'siaddr' field + as the + DHCP server address; see RFC 2131, 2. (Denis Knauf - 1667488) + +2007-04-19 03:46 dermoth + + * [r1693] NEWS, configure.in: + Fix compilation of check_ldap, check_radius and check_pgsql + (*ding*) + +2007-04-18 19:31 hweiss + + * [r1692] NEWS, plugins/check_by_ssh.c: + Revert my previous change to "-S/--skip" in favour of the two + options + "-E/--skip-stderr" and "-S/--skip-stdout". Both of them support + omitting the number of lines to skip, in which case all output on + the + respective file descriptor is skipped. "--skip" is kept as an + alias for + "--skip-stdout" for backwards compatibility with recent releases. + + Also, print a message if no (non-skipped) stdout/stderr output is + available. This fixes a segfault if the remote command prints no + output. + +2007-04-15 15:17 dermoth + + * [r1691] plugins/check_cluster.c: + Localization and help fixes (Thanks Benoit M.) + +2007-04-15 09:03 dermoth + + * [r1690] plugins/check_cluster.c: + Cosmetic change + +2007-04-15 08:56 dermoth + + * [r1689] contrib/check_cluster2.README: + More details about the changes + +2007-04-15 08:50 dermoth + + * [r1688] NEWS, plugins/Makefile.am, plugins/check_cluster.c: + Add thresholds support for check_cluster + lots of + standardization. + Add forgotten items to NEWS. + +2007-04-15 06:44 dermoth + + * [r1687] BUGS, plugins/check_snmp.c: + Fix bug #1344584: Counter64 values not handled correctly + +2007-04-14 15:07 dermoth + + * [r1686] BUGS: + Works for me + +2007-04-14 03:09 hweiss + + * [r1685] BUGS, plugins/check_by_ssh.c: + Up to revision 1.35, the "-S" option skipped the specified number + of + lines written to stderr. With revision 1.36 and newer, "-S" + skipped the + specified number of lines written to stdout. Now, "-S" skips the + specified number of lines written to stderr; and if the number + specified + via "-S" minus the number of lines written to stderr is larger + than 0, + the difference is used as the number of lines written to stdout + to skip. + Also, the "--help" output was fixed. (Hector - 1675286) + +2007-04-13 11:38 dermoth + + * [r1684] plugins, plugins/.cvsignore: + ... Some CVS magic too + +2007-04-13 11:35 dermoth + + * [r1683] contrib/check_cluster2.README, plugins/Makefile.am, + plugins/check_cluster.c: + automake magic for check_cluster + +2007-04-11 14:43 tonvoon + + * [r1682] doc/RELEASING: + Add news item to nagiosplugins.org + +2007-04-11 12:08 tonvoon + + * [r1680] AUTHORS, BUGS, ChangeLog, NEWS, configure.in, + package.def: + 1.4.8 release + +2007-04-10 07:17 dermoth + + * [r1679] po/POTFILES.in, po/de.po, po/fr.po, + po/nagios-plugins.pot: + Add some check_ntp translations + +2007-04-10 07:17 dermoth + + * [r1678] plugins/check_ntp.c: + - Fix possibility of printing scientific numbers in perfdata + - Use fperfdata function for perfdata formatting + - Make the printing part a bit more flexible (similar to + check_disk) + +2007-04-10 05:58 dermoth + + * [r1677] po/de.po, po/fr.po, po/nagios-plugins.pot: + Hopefully this is correct. Need to make more changes so I'm + commiting these. + +2007-04-04 20:08 dermoth + + * [r1676] plugins/check_ntp.c: + Fix for getting dispersion instead of jitter on older servers + (like xntpd on Solaris). + +2007-04-03 17:19 hweiss + + * [r1675] plugins/check_ntp.c: + Fix the synchronization source selection on big-endian systems. + +2007-04-03 01:31 dermoth + + * [r1674] plugins/check_ntp.c: + Temporary fix for jitter calculation + +2007-04-02 12:39 hweiss + + * [r1673] plugins/check_ntp.c: + Don't rely on the assumption that the size of a READSTAT response + is a + multiple of sizeof(ntp_assoc_status_pair). + +2007-04-02 09:28 tonvoon + + * [r1672] lib/tests/Makefile.am: + Add libgnu.a as regex functions required + +2007-04-02 07:32 dermoth + + * [r1671] plugins/check_ntp.c: + Fix byte order in verbose logging + +2007-04-02 06:00 dermoth + + * [r1670] plugins/check_ntp.c: + Seems like we don't get any jitter sometimes. While this needs to + be fixed we should at least handle it gracefully. + +2007-04-01 14:21 psychotrahe + + * [r1669] plugins/t/check_http.t: + check_http.t: - added internet_access variable to skip tests + where internet access is required. + - added host_tcp_http2 variable for a webserver serving the + string 'nagios' in index + - no tests are skipped if the new vars are not defined (existing + installations) + +2007-04-01 11:17 psychotrahe + + * [r1668] lib/utils_disk.c: + utils_disk: fixed handling if check_disk -p is a device + (np_set_best_match()) + +2007-03-31 18:49 hweiss + + * [r1667] NEWS: + Various check_ntp fixes + +2007-03-31 18:48 hweiss + + * [r1666] plugins/check_ntp.c: + Fix an out-of-bounds memcpy(3) and add a realloc(3) error check + in + jitter_request(). + +2007-03-31 17:35 hweiss + + * [r1665] plugins/check_ntp.c: + Add a warning to the verbose output if jitter_request() found no + synchronization source. + +2007-03-31 17:29 hweiss + + * [r1664] plugins/check_ntp.c: + Avoid division by zero. + +2007-03-31 17:25 hweiss + + * [r1663] plugins/check_ntp.c: + Remove the '-O' option, as it's ignored. + +2007-03-30 15:45 tonvoon + + * [r1662] m4/np_mysqlclient.m4: + Use AS_HELP_STRING instead of ACX_HELP_STRING + +2007-03-30 14:08 tonvoon + + * [r1661] NEWS, configure.in, m4/np_mysqlclient.m4: + Fix AC_CHECK_LIB for mysql_init - add dependent libraries. mysql + detection + separated into external m4 file + +2007-03-30 09:00 psychotrahe + + * [r1660] lib/tests/test_disk.c, plugins/t/check_disk.t: + Test Cases for check_disk's -r, -R, -C and -g + +2007-03-30 08:56 psychotrahe + + * [r1659] plugins/check_disk.c: + check_disk: minor fix for -C if bestmatch != -p + +2007-03-30 08:53 psychotrahe + + * [r1658] lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: added regex functionality -r and -R. see np-devel mail (2007-02-10) -2007-03-30 09:52 psychotrahe +2007-03-30 08:52 psychotrahe - * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: + * [r1657] lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: added grouping functionality. see np-devel mail (2007-02-10) -2007-03-30 09:48 psychotrahe +2007-03-30 08:48 psychotrahe - * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: + * [r1656] lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk -C is more flexible now. See np-devel post (2007-02-10) -2007-03-29 18:58 hweiss +2007-03-29 17:58 hweiss - * THANKS.in, plugins/check_mysql.c: Fix argument processing (Felix - Frank - 1690697) + * [r1655] THANKS.in, plugins/check_mysql.c: + Fix argument processing (Felix Frank - 1690697) -2007-03-29 18:34 hweiss +2007-03-29 17:34 hweiss - * plugins-root/Makefile.am: Set the "read" and "execute" bits only - for "user" and "group" in order to not overwrite - "--without-world-permissions" for the root plugins. + * [r1654] plugins-root/Makefile.am: + Set the "read" and "execute" bits only for "user" and "group" in + order + to not overwrite "--without-world-permissions" for the root + plugins. -2007-03-29 11:32 tonvoon +2007-03-29 10:32 tonvoon - * BUGS, NEWS, configure.in, package.def, ChangeLog: 1.4.7 release + * [r1652] BUGS, ChangeLog, NEWS, configure.in, package.def: + 1.4.7 release -2007-03-29 11:25 tonvoon +2007-03-29 10:25 tonvoon - * plugins/check_ntp.c: Adding help text for jitter flags + * [r1651] plugins/check_ntp.c: + Adding help text for jitter flags -2007-03-27 07:53 dermoth +2007-03-27 06:53 dermoth - * THANKS.in, plugins-root/check_icmp.c: Fix bug #1494629 - - check_icmp fails after some time on FreeBSD + * [r1650] THANKS.in, plugins-root/check_icmp.c: + Fix bug #1494629 - check_icmp fails after some time on FreeBSD -2007-03-25 14:55 tonvoon +2007-03-25 13:55 tonvoon - * configure.in, NEWS: Reinstate --with-nagios-user/group and new + * [r1649] NEWS, configure.in: + Reinstate --with-nagios-user/group and new --without-group-permissions ./configure options 2007-03-22 17:54 hweiss - * THANKS.in, plugins/common.h: Increase MAX_INPUT_BUFFER from 1k to - 8k in order to increase I/O performance (Stefan Meier) + * [r1646] THANKS.in, plugins/common.h: + Increase MAX_INPUT_BUFFER from 1k to 8k in order to increase I/O + performance (Stefan Meier) 2007-03-16 12:11 gonzai - * plugins-scripts/check_ifoperstatus.pl: Fix bogus 'eq ( || )' - constructions in check_ifoperstatus.pl. + * [r1642] plugins-scripts/check_ifoperstatus.pl: + Fix bogus 'eq ( || )' constructions in check_ifoperstatus.pl. 2007-03-12 10:51 tonvoon - * NEWS, plugins/check_ping.c, plugins/t/check_ping.t: check_ping's - timeout interval is only +1 if ping command has a timeout value. + * [r1639] NEWS, plugins/check_ping.c, plugins/t/check_ping.t: + check_ping's timeout interval is only +1 if ping command has a + timeout value. Tests updated to check for 100% packet loss (always if ping has - timeout), otherwise will check for "timed out" string + timeout), otherwise + will check for "timed out" string 2007-03-11 06:51 dermoth - * plugins-root/t/check_icmp.t: Add tests for new check_icmp switch - -m + * [r1638] plugins-root/t/check_icmp.t: + Add tests for new check_icmp switch -m 2007-03-11 02:27 tonvoon - * plugins/t/check_ping.t, plugins-root/t/check_icmp.t: Converted - check_ping.t to new-style testcases. Added test case for - check_icmp - requires sudo access + * [r1637] plugins-root/t, plugins-root/t/check_icmp.t, + plugins/t/check_ping.t: + Converted check_ping.t to new-style testcases. Added test case + for check_icmp - + requires sudo access 2007-03-11 01:57 tonvoon - * plugins/check_ping.c: Fixed some help display. Removed -L from - usage as deprecated option + * [r1636] plugins/check_ping.c: + Fixed some help display. Removed -L from usage as deprecated + option 2007-03-08 09:09 dermoth - * NEWS, THANKS.in, plugins-root/check_icmp.c: New switch to - check_icmp to set the minimum required hosts for success. + * [r1635] NEWS, THANKS.in, plugins-root/check_icmp.c: + New switch to check_icmp to set the minimum required hosts for + success. 2007-03-08 06:12 dermoth - * config_test/child_test.c: Ficing C++ style comments + * [r1634] config_test/child_test.c: + Ficing C++ style comments 2007-03-08 06:09 dermoth - * plugins-root/check_icmp.c: Fixed C++ style comments, but I don't - get why those lines were originally commented out. + * [r1633] plugins-root/check_icmp.c: + Fixed C++ style comments, but I don't get why those lines were + originally commented out. 2007-03-06 22:45 tonvoon - * plugins/check_http.c: Fix option handling (Nobuhiro Ban - - 1657280) + * [r1632] plugins/check_http.c: + Fix option handling (Nobuhiro Ban - 1657280) 2007-03-06 22:29 tonvoon - * plugins/check_smtp.c: Fixed compile errors in check_smtp.c + * [r1631] plugins/check_smtp.c: + Fixed compile errors in check_smtp.c 2007-03-06 22:17 tonvoon - * NEWS, THANKS.in, plugins/check_smtp.c: Fixed broken HELO cmd - (Enrico Scholz - 1675279) + * [r1630] NEWS, THANKS.in, plugins/check_smtp.c: + Fixed broken HELO cmd (Enrico Scholz - 1675279) 2007-03-06 17:29 tonvoon - * NEWS, configure.in, plugins/check_procs.c: Use /usr/ucb/ps on - Solaris in preference to pst3 (problems in 64bit mode) + * [r1629] NEWS, configure.in, plugins/check_procs.c: + Use /usr/ucb/ps on Solaris in preference to pst3 (problems in + 64bit mode) 2007-03-06 17:26 tonvoon - * plugins/t/check_disk.t: Test failure if a filesystem which is a - subset of another fails the inode check (Matthias Elbe - 1660953) + * [r1628] plugins/t/check_disk.t: + Test failure if a filesystem which is a subset of another fails + the inode + check (Matthias Elbe - 1660953) 2007-03-06 14:18 tonvoon - * NEWS, configure.in: Detect if check_mysql compile will work at - ./configure time, due to some Redhat systems distributing - mysql_config, but not the include files + * [r1627] NEWS, configure.in: + Detect if check_mysql compile will work at ./configure time, due + to some + Redhat systems distributing mysql_config, but not the include + files 2007-03-06 11:03 tonvoon - * configure.in: Clearer message when --with-nagios-user is used for - ./configure + * [r1626] configure.in: + Clearer message when --with-nagios-user is used for ./configure 2007-03-06 10:48 tonvoon - * FAQ, INSTALLING, NEWS, README, plugins-root/Makefile.am: Root - plugins installed with world executable permissions. Removed - references to --with-nagios-user and --with-nagios-group in - README + * [r1625] FAQ, INSTALLING, NEWS, README, plugins-root/Makefile.am: + Root plugins installed with world executable permissions. Removed + references + to --with-nagios-user and --with-nagios-group in README 2007-03-02 01:38 egalstad - * plugins/check_mrtgtraf.c: Fix for broken check_mrtgtraf + * [r1624] plugins/check_mrtgtraf.c: + Fix for broken check_mrtgtraf 2007-02-24 01:03 dermoth - * doc/makefile: Fix the makefile ('[[' is bash-specific, 'rm -f' - don't remove directories) + * [r1623] doc/makefile: + Fix the makefile ('[[' is bash-specific, 'rm -f' don't remove + directories) 2007-02-14 20:56 tonvoon - * NEWS, contrib/check_sybase: check_sybase now maintained in - NagiosExchange + * [r1622] NEWS, contrib/check_sybase: + check_sybase now maintained in NagiosExchange 2007-02-14 20:52 tonvoon - * plugins/check_disk.c: Fixed typo in help for -M + * [r1621] plugins/check_disk.c: + Fixed typo in help for -M 2007-02-14 10:11 tonvoon - * plugins/: check_tcp.c, t/check_tcp.t: Documentation fix re: - --escape flag. Fix of ./check_tcp test to webservers to make it - more standards compliant + * [r1620] plugins/check_tcp.c, plugins/t/check_tcp.t: + Documentation fix re: --escape flag. Fix of ./check_tcp test to + webservers + to make it more standards compliant 2007-02-09 14:35 tonvoon - * NEWS, THANKS.in, po/.cvsignore, po/Makefile.in.in: Fixed - MKINSTALLDIRS problem on some systems - Lars Stavholm + * [r1619] NEWS, THANKS.in, po, po/.cvsignore, po/Makefile.in.in: + Fixed MKINSTALLDIRS problem on some systems - Lars Stavholm 2007-02-07 14:46 tonvoon - * lib/: Makefile.config-opts, parse_ini.c, - tests/Makefile.config-opts, tests/config-tiny.ini, - tests/plugin.ini, tests/test_ini.c: Added test files to test the - parse_ini.c routines. Requires libtap + * [r1614] lib/Makefile.config-opts, lib/parse_ini.c, + lib/tests/Makefile.config-opts, lib/tests/config-tiny.ini, + lib/tests/plugin.ini, lib/tests/test_ini.c: + Added test files to test the parse_ini.c routines. Requires + libtap 2007-02-07 14:06 hweiss - * plugins/check_swap.c: Include before - in order to fix compilation on OpenBSD (nsturm - 1653934) + * [r1613] plugins/check_swap.c: + Include before in order to fix + compilation on + OpenBSD (nsturm - 1653934) 2007-02-06 23:30 dermoth - * plugins/check_tcp.c: Correct vim typo in comment block :P + * [r1612] plugins/check_tcp.c: + Correct vim typo in comment block :P 2007-02-06 21:03 opensides - * plugins/check_disk.c, plugins/check_http.c, + * [r1611] plugins/check_disk.c, plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_overcr.c, plugins/check_smtp.c, plugins/check_tcp.c, po/de.po, po/fr.po, @@ -297,103 +1105,117 @@ 2007-02-06 19:33 seanius - * lib/: parse_ini.c, parse_ini.h: initial version of ini file - parsing routines in C + * [r1610] lib/parse_ini.c, lib/parse_ini.h: + initial version of ini file parsing routines in C 2007-02-06 18:34 opensides - * po/Makevars: + * [r1609] po/Makevars: adding PACKAGE_BUGREPORT to fix Report-Msgid-Bugs-To: 2007-02-05 13:51 tonvoon - * AUTHORS, doc/RELEASING: Update list of team members. More notes - on new releases + * [r1608] AUTHORS, doc/RELEASING: + Update list of team members. More notes on new releases 2007-02-05 13:13 tonvoon - * BUGS, NEWS, ChangeLog, configure.in, package.def: For 1.4.6 - release + * [r1606] BUGS, ChangeLog, NEWS, configure.in, package.def: + For 1.4.6 release 2007-02-02 09:10 dermoth - * plugins/check_snmp.c: Fix parsing of multiple OIDs sets needmibs - = TRUE + * [r1605] plugins/check_snmp.c: + Fix parsing of multiple OIDs sets needmibs = TRUE 2007-02-01 06:53 dermoth - * plugins/: check_tcp.c, t/check_jabber.t: Fix progname being - partly set to upper case Change formating of invalid hostname - output + * [r1604] plugins/check_tcp.c, plugins/t/check_jabber.t: + Fix progname being partly set to upper case + Change formating of invalid hostname output 2007-02-01 05:37 dermoth - * NEWS: Adding NEWS entry for check_jabber + * [r1603] NEWS: + Adding NEWS entry for check_jabber 2007-02-01 05:33 dermoth - * plugins-scripts/check_log.sh: Fix bug #1593073 Check_Log problem - with log rotation + * [r1602] plugins-scripts/check_log.sh: + Fix bug #1593073 Check_Log problem with log rotation 2007-01-31 22:50 tonvoon - * plugins/t/check_jabber.t: Converted to new style object and - Test::More testing. Skipped jabber server tests if not defined + * [r1601] plugins/t/check_jabber.t: + Converted to new style object and Test::More testing. Skipped + jabber server + tests if not defined 2007-01-31 06:18 dermoth - * plugins/t/check_jabber.t: Add check_jabber test. Will ask for a - jabber host (default should be OK) + * [r1600] plugins/t/check_jabber.t: + Add check_jabber test. Will ask for a jabber host (default should + be OK) 2007-01-31 04:47 dermoth - * plugins/check_tcp.c: Fix Debian Bug #392610: check_jabber always - return warning + * [r1599] plugins/check_tcp.c: + Fix Debian Bug #392610: check_jabber always return warning 2007-01-30 14:24 dermoth - * plugins/check_tcp.c: Jail does not requires any arguments + * [r1598] plugins/check_tcp.c: + Jail does not requires any arguments 2007-01-30 09:56 tonvoon - * config.rpath: make dist failing without config.rpath in top - level. File copied from build-aux/ + * [r1597] config.rpath: + make dist failing without config.rpath in top level. File copied + from build-aux/ 2007-01-30 05:01 dermoth - * plugins/: check_tcp.c, t/check_tcp.t: Fix reporting bug using - expect, affecting (not fixing) Debian bug #392610: check_jabber - always return warning + * [r1596] plugins/check_tcp.c, plugins/t/check_tcp.t: + Fix reporting bug using expect, affecting (not fixing) Debian bug + #392610: check_jabber always return warning 2007-01-30 02:22 hweiss - * configure.in: grep(1) "-q" isn't portable (e.g., it won't work on - Solaris 8), redirect output to /dev/null instead. + * [r1595] configure.in: + grep(1) "-q" isn't portable (e.g., it won't work on Solaris 8), + redirect + output to /dev/null instead. 2007-01-29 14:14 dermoth - * plugins/: check_disk.c, t/check_disk.t: Revert 1643463 (reversed - disk thresholds) keeping the thresholds checks. + * [r1594] plugins/check_disk.c, plugins/t/check_disk.t: + Revert 1643463 (reversed disk thresholds) keeping the thresholds + checks. 2007-01-29 12:13 hweiss - * configure.in: Automake 1.10 says: "compiling `test_disk.c' with - per-target flags requires `AM_PROG_CC_C_O' in `configure.in'". + * [r1593] configure.in: + Automake 1.10 says: "compiling `test_disk.c' with per-target + flags + requires `AM_PROG_CC_C_O' in `configure.in'". 2007-01-29 10:06 tonvoon - * config.rpath, build-aux/config.rpath: Move config.rpath into - build-aux for automake 1.10 + * [r1592] build-aux/config.rpath, config.rpath: + Move config.rpath into build-aux for automake 1.10 2007-01-28 22:00 hweiss - * INSTALLING: Remove description of deprecated ./configure - --with-nagios-{user,group} options. + * [r1591] INSTALLING: + Remove description of deprecated ./configure + --with-nagios-{user,group} + options. 2007-01-28 21:46 hweiss - * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dig.c, - plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + * [r1590] plugins-root/check_dhcp.c, plugins/check_apt.c, + plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, @@ -406,70 +1228,82 @@ plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, - plugins/urlize.c, plugins/utils.c, plugins/utils.h, - plugins-root/check_dhcp.c: Don't try to print `optarg' (which - will be a NULL pointer) if an unknown command line option was - used, as this leads to a segfault on some systems. The unknown - option will be printed by getopt(3) anyway. So, simply call - print_usage() and exit UNKNOWN via the new usage5() instead. + plugins/urlize.c, plugins/utils.c, plugins/utils.h: + Don't try to print `optarg' (which will be a NULL pointer) if an + unknown + command line option was used, as this leads to a segfault on some + systems. The unknown option will be printed by getopt(3) anyway. + So, + simply call print_usage() and exit UNKNOWN via the new usage5() + instead. 2007-01-27 21:49 dermoth - * plugins/: check_disk.c, t/check_disk.t: Fix #1643463: - Miscalculating thresholds check_disk + * [r1589] plugins/check_disk.c, plugins/t/check_disk.t: + Fix #1643463: Miscalculating thresholds check_disk 2007-01-27 17:49 hweiss - * lib/utils_base.c: Change the variable names `true' and `false' - (which are keywords in C99) to `yes' and `no'. Fixes compilation - when using SGI's MIPSpro c99(1). + * [r1588] lib/utils_base.c: + Change the variable names `true' and `false' (which are keywords + in C99) + to `yes' and `no'. Fixes compilation when using SGI's MIPSpro + c99(1). 2007-01-27 17:42 hweiss - * plugins/common.h: Include GNULib's "dirname.h" in order to pull - in the base_name() prototype, fixes compilation of check_procs - using SGI's MIPSpro C. + * [r1587] plugins/common.h: + Include GNULib's "dirname.h" in order to pull in the base_name() + prototype, fixes compilation of check_procs using SGI's MIPSpro + C. 2007-01-27 16:56 hweiss - * ACKNOWLEDGEMENTS, NEWS: Fix typos. + * [r1586] ACKNOWLEDGEMENTS, NEWS: + Fix typos. 2007-01-27 16:51 hweiss - * NEWS: Added "-o,--ssh-option=OPTION" which hands "-o OPTION" over - to ssh(1) and "-q,--quiet" which tells ssh(1) to suppress - warnings (Gerhard Lausser - 1472491) + * [r1585] NEWS: + Added "-o,--ssh-option=OPTION" which hands "-o OPTION" over to + ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard + Lausser - 1472491) 2007-01-27 16:37 hweiss - * plugins-root/check_dhcp.c: Include which is a - prerequisite for on NetBSD and OpenBSD (at least). + * [r1584] plugins-root/check_dhcp.c: + Include which is a prerequisite for + on + NetBSD and OpenBSD (at least). 2007-01-25 00:58 tonvoon - * Makefile.am, README, configure.in, doc/RELEASING: Update - references to NEWS instead of CHANGES. Fix compile of libtap test - programs + * [r1583] Makefile.am, README, configure.in, doc/RELEASING: + Update references to NEWS instead of CHANGES. Fix compile of + libtap + test programs 2007-01-25 00:26 tonvoon - * config.guess, config.sub, configure.in, ltmain.sh, - build-aux/.cvsignore, build-aux/ltmain.sh: Use build-aux - directory. Removed unnecessary checks in configure.in. Keeping - libtool to link to libtap - can't find a suitable replacement - method + * [r1582] build-aux, build-aux/.cvsignore, build-aux/ltmain.sh, + config.guess, config.sub, configure.in, ltmain.sh: + Use build-aux directory. Removed unnecessary checks in + configure.in. + Keeping libtool to link to libtap - can't find a suitable + replacement method 2007-01-24 23:18 tonvoon - * ACKNOWLEDGEMENTS, CHANGES, NEWS, config.rpath, configure.in, - doc/developer-guidelines.sgml, gl/.cvsignore, + * [r1581] ACKNOWLEDGEMENTS, CHANGES, NEWS, config.rpath, + configure.in, doc/developer-guidelines.sgml, gl, gl/.cvsignore, plugins/Makefile.am, plugins/check_procs.c, po/POTFILES.in: Various cleanups in the syncing with gnulib -2007-01-24 22:46 tonvoon +2007-01-24 22:47 tonvoon - * Makefile.am, NEWS, config.rpath, configure.in, - doc/developer-guidelines.sgml, gl/Makefile.am, gl/alloca.c, + * [r1580] Makefile.am, NEWS, config.rpath, configure.in, + doc/developer-guidelines.sgml, gl, gl/Makefile.am, gl/alloca.c, gl/alloca_.h, gl/asnprintf.c, gl/asprintf.c, gl/basename.c, gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, gl/creat-safer.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, @@ -479,22 +1313,7 @@ gl/full-write.h, gl/gai_strerror.c, gl/getaddrinfo.c, gl/getaddrinfo.h, gl/gethostname.c, gl/getloadavg.c, gl/getopt.c, gl/getopt1.c, gl/getopt_.h, gl/getopt_int.h, gl/gettext.h, - gl/inet_ntop.c, gl/inet_ntop.h, gl/intprops.h, gl/malloc.c, - gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, gl/minmax.h, - gl/mountlist.c, gl/mountlist.h, gl/open-safer.c, gl/pipe-safer.c, - gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, - gl/printf-parse.h, gl/regcomp.c, gl/regex.c, gl/regex.h, - gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, - gl/safe-read.c, gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, - gl/size_max.h, gl/snprintf.c, gl/snprintf.h, gl/socket_.h, - gl/stdbool_.h, gl/stdint_.h, gl/strcase.h, gl/strcasecmp.c, - gl/strdup.c, gl/strdup.h, gl/stripslash.c, gl/strncasecmp.c, - gl/strndup.c, gl/strndup.h, gl/strnlen.c, gl/strnlen.h, - gl/strnlen1.c, gl/strnlen1.h, gl/unistd--.h, gl/unistd-safer.h, - gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, - gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, gl/wchar_.h, - gl/wctype_.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, - gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, + gl/inet_ntop.c, gl/inet_ntop.h, gl/intprops.h, gl/m4, gl/m4/absolute-header.m4, gl/m4/alloca.m4, gl/m4/arpa_inet_h.m4, gl/m4/c-strtod.m4, gl/m4/cloexec.m4, gl/m4/codeset.m4, gl/m4/dirname.m4, gl/m4/dos.m4, gl/m4/double-slash-root.m4, @@ -524,7 +1343,22 @@ gl/m4/vasnprintf.m4, gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, gl/m4/wchar.m4, gl/m4/wchar_t.m4, gl/m4/wctype.m4, gl/m4/wcwidth.m4, gl/m4/wint_t.m4, - gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, + gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, gl/malloc.c, + gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, gl/minmax.h, + gl/mountlist.c, gl/mountlist.h, gl/open-safer.c, gl/pipe-safer.c, + gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, + gl/printf-parse.h, gl/regcomp.c, gl/regex.c, gl/regex.h, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, + gl/safe-read.c, gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, + gl/size_max.h, gl/snprintf.c, gl/snprintf.h, gl/socket_.h, + gl/stdbool_.h, gl/stdint_.h, gl/strcase.h, gl/strcasecmp.c, + gl/strdup.c, gl/strdup.h, gl/stripslash.c, gl/strncasecmp.c, + gl/strndup.c, gl/strndup.h, gl/strnlen.c, gl/strnlen.h, + gl/strnlen1.c, gl/strnlen1.h, gl/unistd--.h, gl/unistd-safer.h, + gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, + gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, gl/wchar_.h, + gl/wctype_.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, + gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, lib/Makefile.am, lib/alloca.c, lib/alloca_.h, lib/basename.c, lib/c-strtod.c, lib/c-strtod.h, lib/c-strtold.c, lib/cloexec.c, lib/cloexec.h, lib/creat-safer.c, lib/dirname.h, lib/dup-safer.c, @@ -539,9 +1373,9 @@ lib/regex_internal.c, lib/regex_internal.h, lib/regexec.c, lib/safe-read.c, lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, lib/snprintf.c, lib/stdbool_.h, lib/strcase.h, - lib/strtod.c, lib/unistd--.h, lib/unistd-safer.h, - lib/unlocked-io.h, lib/xalloc-die.c, lib/xalloc.h, lib/xmalloc.c, - lib/xstrdup.c, lib/tests/Makefile.am, m4/Makefile.am.in, + lib/strtod.c, lib/tests/Makefile.am, lib/unistd--.h, + lib/unistd-safer.h, lib/unlocked-io.h, lib/xalloc-die.c, + lib/xalloc.h, lib/xmalloc.c, lib/xstrdup.c, m4/Makefile.am.in, m4/afs.m4, m4/alloca.m4, m4/basename.m4, m4/c-strtod.m4, m4/codeset.m4, m4/dos.m4, m4/error.m4, m4/exitfail.m4, m4/extensions.m4, m4/fcntl-safer.m4, m4/fstypename.m4, @@ -554,803 +1388,911 @@ m4/restrict.m4, m4/signed.m4, m4/stdbool.m4, m4/stdint_h.m4, m4/uintmax_t.m4, m4/ulonglong.m4, m4/unistd-safer.m4, m4/unlocked-io.m4, m4/wchar_t.m4, m4/wint_t.m4, m4/xalloc.m4, - plugins/Makefile.am, plugins/check_smtp.c, plugins/common.h, - plugins/getaddrinfo.c, plugins/getaddrinfo.h, - plugins/gethostbyname.c, plugins/gethostbyname.h, - plugins/netutils.h, plugins-root/Makefile.am, tools/setup, - tools/update_coreutils: Sync with gnulib - lots of extraneous - code removed in preference to GNU code + plugins-root/Makefile.am, plugins/Makefile.am, + plugins/check_smtp.c, plugins/common.h, plugins/getaddrinfo.c, + plugins/getaddrinfo.h, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/netutils.h, tools/setup, + tools/update_coreutils: + Sync with gnulib - lots of extraneous code removed in preference + to GNU code 2007-01-23 18:34 hweiss - * THANKS.in, plugins/check_ssh.c: Support `check_ssh - --hostname=ADDRESS' (but keep `--host=ADDRESS' for backward + * [r1579] THANKS.in, plugins/check_ssh.c: + Support `check_ssh --hostname=ADDRESS' (but keep `--host=ADDRESS' + for backward compatibility) (Ville Mattila - 1642780) 2007-01-23 18:20 hweiss - * REQUIREMENTS: Location updates + * [r1578] REQUIREMENTS: + Location updates 2007-01-23 17:20 hweiss - * plugins/check_tcp.c: Add missing `break' to the switch-case block - that handles the `-m' option (Nobuhiro Ban - 1642682) + * [r1577] plugins/check_tcp.c: + Add missing `break' to the switch-case block that handles the + `-m' option + (Nobuhiro Ban - 1642682) 2007-01-23 16:42 hweiss - * THANKS.in, plugins/check_radius.c: Initialize `data' to zero, - fixes potential segfault (Nobuhiro Ban - 1642658) + * [r1576] THANKS.in, plugins/check_radius.c: + Initialize `data' to zero, fixes potential segfault (Nobuhiro Ban + - 1642658) 2007-01-23 14:39 hweiss - * lib/mountlist.c: Add support for statvfs(2) which is needed in - order to compile the plugins on NetBSD 3.0 and newer. The - current coreutils release supports statvfs(2), so this patch - won't be needed anymore when updating the coreutils files. + * [r1575] lib/mountlist.c: + Add support for statvfs(2) which is needed in order to compile + the plugins on + NetBSD 3.0 and newer. The current coreutils release supports + statvfs(2), so + this patch won't be needed anymore when updating the coreutils + files. 2007-01-22 04:05 hweiss - * plugins/check_by_ssh.c: Added "-o,--ssh-option=OPTION" which - hands "-o OPTION" over to ssh(1) and "-q,--quiet" which tells - ssh(1) to suppress warnings (Gerhard Lausser - 1472491) + * [r1574] plugins/check_by_ssh.c: + Added "-o,--ssh-option=OPTION" which hands "-o OPTION" over to + ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard + Lausser - 1472491) 2007-01-20 20:45 tonvoon - * doc/developer-guidelines.sgml: Updated policy on contributed - plugins + * [r1573] doc/developer-guidelines.sgml: + Updated policy on contributed plugins 2007-01-20 20:06 tonvoon - * doc/: LEAVERS, NEW_STARTERS, RELEASING: Administrative notes + * [r1572] doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: + Administrative notes 2007-01-20 10:59 seanius - * plugins/check_ntp.c: compilation fixes for check_ntp.c: - - check_ntp.c:290: warning: overflow in implicit constant - conversion fixed with an explicit cast to int8_t. - - check_ntp.c:544: warning: pointer of type ‘void *’ used in - arithmetic fixed by casting to ptrdiff_t before arithmetic and - (void*) afterwards - in TVtoNTP64, cast arithmetic result passed - to R32 as uint64_t. + * [r1571] plugins/check_ntp.c: + compilation fixes for check_ntp.c: + - check_ntp.c:290: warning: overflow in implicit constant + conversion + fixed with an explicit cast to int8_t. + - check_ntp.c:544: warning: pointer of type ‘void *’ used in + arithmetic + fixed by casting to ptrdiff_t before arithmetic and (void*) + afterwards + - in TVtoNTP64, cast arithmetic result passed to R32 as uint64_t. 2007-01-20 07:18 dermoth - * plugins/: check_http.c, check_ldap.c: Fix bug #1632091: printf - format string typos. Add some more cosmetic changes. + * [r1570] plugins/check_http.c, plugins/check_ldap.c: + Fix bug #1632091: printf format string typos. Add some more + cosmetic changes. 2007-01-20 06:27 dermoth - * plugins-root/check_icmp.c: Fix bug #1632078: critical threshold % - incorrectly displayed by check_icmp + * [r1569] plugins-root/check_icmp.c: + Fix bug #1632078: critical threshold % incorrectly displayed by + check_icmp 2007-01-20 06:07 dermoth - * CHANGES, THANKS.in, plugins/netutils.c: Fix bug #1632072 pointer - error in plugins/netutils.c. Add changelog entry for previous - commit. + * [r1568] CHANGES, THANKS.in, plugins/netutils.c: + Fix bug #1632072 pointer error in plugins/netutils.c. Add + changelog entry for previous commit. 2007-01-17 05:28 dermoth - * THANKS.in, plugins/check_procs.c: Fix bug #1630970 Fix for buffer - overflow of check_procs procprog string + * [r1566] THANKS.in, plugins/check_procs.c: + Fix bug #1630970 Fix for buffer overflow of check_procs procprog + string 2007-01-08 11:05 tonvoon - * CHANGES, THANKS.in, plugins/t/check_disk.t: Added notes about - check_disk perf data fix. Added test to check perf data is same - when mount points reversed + * [r1565] CHANGES, THANKS.in, plugins/t/check_disk.t: + Added notes about check_disk perf data fix. Added test to check + perf data is + same when mount points reversed 2007-01-07 07:14 dermoth - * plugins/check_disk.c: Fix bug #1627970: check_disk performance - output for more then one partition + * [r1564] plugins/check_disk.c: + Fix bug #1627970: check_disk performance output for more then one + partition 2007-01-06 06:41 dermoth - * plugins/check_ping.c: Fix bug #1629008: check_ping fails to - handle Packet filtered error + * [r1563] plugins/check_ping.c: + Fix bug #1629008: check_ping fails to handle Packet filtered + error 2007-01-06 06:33 dermoth - * plugins/check_ping.c: Revert last patch: it works but not really - for the reason I though. + * [r1562] plugins/check_ping.c: + Revert last patch: it works but not really for the reason I + though. 2007-01-06 04:52 dermoth - * plugins/check_ping.c: Fix the way check_ping calculate the - maximum run time + * [r1561] plugins/check_ping.c: + Fix the way check_ping calculate the maximum run time 2007-01-04 11:51 dermoth - * plugins/check_real.c: Fix bug #1574863: check_real does not - accept the '-v' option + * [r1560] plugins/check_real.c: + Fix bug #1574863: check_real does not accept the '-v' option 2007-01-04 11:35 dermoth - * plugins/check_ping.c: Fix bug #1592605: check_ping times out + * [r1559] plugins/check_ping.c: + Fix bug #1592605: check_ping times out 2007-01-04 11:18 dermoth - * tools/: README, distclean: Adding my distclean script + * [r1558] tools/README, tools/distclean: + Adding my distclean script 2006-12-23 18:59 dermoth - * plugins/t/check_snmp.t: Regexps in check_snmp tests fails where - they shouldn't. + * [r1557] plugins/t/check_snmp.t: + Regexps in check_snmp tests fails where they shouldn't. 2006-12-21 05:25 dermoth - * NPTest.pm: - Fixing small error (wrong file name) in NPTest.pm + * [r1556] NPTest.pm: + - Fixing small error (wrong file name) in NPTest.pm documentation. 2006-12-20 22:33 tonvoon - * CHANGES, THANKS.in, plugins/check_http.c, plugins/t/check_http.t: - Removed unused timestamp variable (Matthias Eble) Fixed - redirection test. Added extra tests for funny syntax when - checking certificates, updated help for more common syntax + * [r1555] CHANGES, THANKS.in, plugins/check_http.c, + plugins/t/check_http.t: + Removed unused timestamp variable (Matthias Eble) + Fixed redirection test. Added extra tests for funny syntax when + checking + certificates, updated help for more common syntax 2006-12-20 19:25 tonvoon - * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, - plugins/t/check_disk.t: Fixed inode thresholds, regressed from - previous release + * [r1554] lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, + plugins/t/check_disk.t: + Fixed inode thresholds, regressed from previous release 2006-12-20 11:32 opensides - * po/: de.po, fr.po, nagios-plugins.pot: + * [r1553] po/de.po, po/fr.po, po/nagios-plugins.pot: updated the nagios-pulgins.pot files now that localization is - clean first pass at updating the french locale + clean + first pass at updating the french locale 2006-12-12 12:59 tonvoon - * plugins-scripts/t/utils.t: Enhanced test for single letters in - fqdn + * [r1549] plugins-scripts/t/utils.t: + Enhanced test for single letters in fqdn 2006-12-12 08:56 tonvoon - * plugins-scripts/utils.pm.in: Allow single characters in fqdn - (Dave Alden) + * [r1548] plugins-scripts/utils.pm.in: + Allow single characters in fqdn (Dave Alden) 2006-12-07 22:38 tonvoon - * CHANGES, THANKS.in, configure.in: Fixed HP/UX's swapinfo command - for check_procs (Dick van den Burg - 1573700) + * [r1547] CHANGES, THANKS.in, configure.in: + Fixed HP/UX's swapinfo command for check_procs (Dick van den Burg + - 1573700) 2006-12-07 16:07 tonvoon - * THANKS.in, plugins/check_disk.c, plugins/check_swap.c, - plugins/common.h, plugins/netutils.h: Fix coredump on 64bit - Solaris. Also adds more error conditions and moves swap specific - includes out of common.h (Duncan Ferguson - 1588031) + * [r1546] THANKS.in, plugins/check_disk.c, plugins/check_swap.c, + plugins/common.h, plugins/netutils.h: + Fix coredump on 64bit Solaris. Also adds more error conditions + and moves + swap specific includes out of common.h (Duncan Ferguson - + 1588031) 2006-12-06 20:34 tonvoon - * plugins/Makefile.am: Move SSL libs to correct order per plugin + * [r1545] plugins/Makefile.am: + Move SSL libs to correct order per plugin 2006-12-06 17:36 tonvoon - * plugins/Makefile.am: Only include -lssl for plugins that require - it + * [r1544] plugins/Makefile.am: + Only include -lssl for plugins that require it 2006-12-06 17:00 tonvoon - * configure.in: Flag common compile error because of no ar on - Solaris + * [r1543] configure.in: + Flag common compile error because of no ar on Solaris 2006-12-06 15:58 tonvoon - * Makefile.am: Remove CVS files from distribution + * [r1542] Makefile.am: + Remove CVS files from distribution 2006-12-06 15:53 tonvoon - * doc/developer-guidelines.sgml: Add libtool requirement for - development + * [r1541] doc/developer-guidelines.sgml: + Add libtool requirement for development 2006-11-09 11:44 tonvoon - * CHANGES, THANKS.in, plugins/check_ping.c, plugins/netutils.c: + * [r1535] CHANGES, THANKS.in, plugins/check_ping.c, + plugins/netutils.c: Reduced DNS lookups in check_ping and netutils.c in IPv6 - configurations (Pawel Malachowski) + configurations + (Pawel Malachowski) 2006-11-03 15:40 tonvoon - * lib/: Makefile.am, alloca.c, alloca_.h: Add alloca files, - required for *BSD + * [r1534] lib/Makefile.am, lib/alloca.c, lib/alloca_.h: + Add alloca files, required for *BSD 2006-11-01 21:15 tonvoon - * ChangeLog, configure.in, package.def: For 1.4.5 release + * [r1532] ChangeLog, configure.in, package.def: + For 1.4.5 release -2006-10-27 16:37 tonvoon +2006-10-27 15:37 tonvoon - * plugins-scripts/: utils.pm.in, t/utils.t: More edge testcases. - Allow anything if ends with a . as long as correct characters + * [r1531] plugins-scripts/t/utils.t, plugins-scripts/utils.pm.in: + More edge testcases. Allow anything if ends with a . as long as + correct + characters -2006-10-26 22:32 tonvoon +2006-10-26 21:32 tonvoon - * NPTest.pm: New test variables default to "none", so no changes - required to tinderbox satelites + * [r1530] NPTest.pm: + New test variables default to "none", so no changes required to + tinderbox satelites -2006-10-26 22:10 tonvoon +2006-10-26 21:10 tonvoon - * THANKS.in, plugins-scripts/check_oracle.sh: Fixed error if - dba_free_space has no free segments (Florian Gleixner) + * [r1529] THANKS.in, plugins-scripts/check_oracle.sh: + Fixed error if dba_free_space has no free segments (Florian + Gleixner) -2006-10-26 22:02 tonvoon +2006-10-26 21:02 tonvoon - * plugins-scripts/: Makefile.am, utils.pm.in, t/utils.t: Fixed - regression where hostnames with hyphens were rejected (1581402 - - Holger Weiss) + * [r1528] plugins-scripts/Makefile.am, plugins-scripts/t/utils.t, + plugins-scripts/utils.pm.in: + Fixed regression where hostnames with hyphens were rejected + (1581402 - Holger Weiss) -2006-10-26 21:56 tonvoon +2006-10-26 20:56 tonvoon - * contrib/tarballs/check_traffic-0.90b.tar.gz: Removing unnecessary - tarball + * [r1527] contrib/tarballs/check_traffic-0.90b.tar.gz: + Removing unnecessary tarball -2006-10-26 21:51 tonvoon +2006-10-26 20:51 tonvoon - * THANKS.in, plugins/check_disk.c, plugins/check_http.c: Remove C - style comments (1583467 - Markus Baertschi) + * [r1526] THANKS.in, plugins/check_disk.c, plugins/check_http.c: + Remove C style comments (1583467 - Markus Baertschi) -2006-10-24 22:54 opensides +2006-10-24 21:54 opensides - * plugins-root/check_icmp.c: + * [r1525] plugins-root/check_icmp.c: more fixes and removal of certain sentences not needed -2006-10-24 22:48 opensides +2006-10-24 21:48 opensides - * plugins/check_nt.c, plugins-root/check_icmp.c: + * [r1524] plugins-root/check_icmp.c, plugins/check_nt.c: last localization fixes for core plugins in c -2006-10-24 22:01 opensides +2006-10-24 21:01 opensides - * plugins/check_nt.c: + * [r1523] plugins/check_nt.c: next round of localization fixes -2006-10-24 10:48 tonvoon +2006-10-24 09:48 tonvoon - * plugins-root/: Makefile.am, check_icmp.c: Fixed compile on - non-glibc platforms + * [r1522] plugins-root/Makefile.am, plugins-root/check_icmp.c: + Fixed compile on non-glibc platforms -2006-10-24 09:34 tonvoon +2006-10-24 08:34 tonvoon - * plugins/check_http.c: Restored accidently regressed fix + * [r1521] plugins/check_http.c: + Restored accidently regressed fix -2006-10-23 22:47 opensides +2006-10-23 21:47 opensides - * plugins/check_http.c: + * [r1520] plugins/check_http.c: localization fixes -2006-10-23 01:02 opensides +2006-10-23 00:02 opensides - * plugins-root/check_icmp.c: + * [r1519] plugins-root/check_icmp.c: first pass a making check icmp respecting nagiosplugins rules -2006-10-22 23:34 opensides +2006-10-22 22:34 opensides - * plugins/check_nt.c: + * [r1518] plugins/check_nt.c: latest localization fixes for tonight ;-) -2006-10-22 23:24 opensides +2006-10-22 22:24 opensides - * plugins/check_ldap.c: - localization fixes + * [r1517] plugins/check_ldap.c: + localization fixes -2006-10-22 23:14 opensides +2006-10-22 22:14 opensides - * plugins-root/check_icmp.c: + * [r1516] plugins-root/check_icmp.c: putting default template for copyright and explanations -2006-10-22 23:07 opensides +2006-10-22 22:07 opensides - * plugins-root/check_icmp.c: + * [r1515] plugins-root/check_icmp.c: revert mistake when commiting fixes -2006-10-22 23:03 opensides +2006-10-22 22:03 opensides - * plugins/check_apt.c, plugins/check_procs.c, - plugins-root/check_icmp.c: + * [r1514] plugins-root/check_icmp.c, plugins/check_apt.c, + plugins/check_procs.c: more localization fixes -2006-10-20 08:53 tonvoon +2006-10-20 07:53 tonvoon - * plugins/check_snmp.c: Reverting back accidently regressed code + * [r1513] plugins/check_snmp.c: + Reverting back accidently regressed code -2006-10-20 08:39 opensides +2006-10-20 07:39 opensides - * plugins/check_mrtg.c: + * [r1512] plugins/check_mrtg.c: more localization fixes -2006-10-20 07:24 opensides +2006-10-20 06:24 opensides - * plugins/check_apt.c, plugins-root/check_dhcp.c: + * [r1511] plugins-root/check_dhcp.c, plugins/check_apt.c: localization updates -2006-10-20 00:56 opensides +2006-10-19 23:56 opensides - * plugins/check_snmp.c: + * [r1510] plugins/check_snmp.c: adding missing check_snmp -2006-10-20 00:53 opensides +2006-10-19 23:53 opensides - * plugins/: check_radius.c, check_real.c, check_smtp.c, - check_ssh.c, check_swap.c, check_tcp.c, check_time.c, - check_ups.c, check_users.c, negate.c, urlize.c: + * [r1509] plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/urlize.c: another round of localization cleaning -2006-10-19 21:04 tonvoon +2006-10-19 20:04 tonvoon - * BUGS, ChangeLog, configure.in, package.def: For 1.4.4 release + * [r1507] BUGS, ChangeLog, configure.in, package.def: + For 1.4.4 release -2006-10-19 20:52 tonvoon +2006-10-19 19:52 tonvoon - * CHANGES: Added info re: 1.4.4 in prep for release + * [r1506] CHANGES: + Added info re: 1.4.4 in prep for release -2006-10-19 20:36 tonvoon +2006-10-19 19:36 tonvoon - * THANKS.in, plugins/check_snmp.c: Initialise strings for Fedora - Core 5 (Henning Schmiedehausen) + * [r1505] THANKS.in, plugins/check_snmp.c: + Initialise strings for Fedora Core 5 (Henning Schmiedehausen) -2006-10-19 20:25 tonvoon +2006-10-19 19:25 tonvoon - * THANKS.in, plugins/check_snmp.c: Removed asprintf for perf data - (Craig Orsinger, Robby Giffin - 1310495) + * [r1504] THANKS.in, plugins/check_snmp.c: + Removed asprintf for perf data (Craig Orsinger, Robby Giffin - + 1310495) -2006-10-19 20:13 tonvoon +2006-10-19 19:13 tonvoon - * THANKS.in, plugins/check_snmp.c: type variable not cleared in Sol - 10 (Kyle Tucker) + * [r1503] THANKS.in, plugins/check_snmp.c: + type variable not cleared in Sol 10 (Kyle Tucker) -2006-10-19 19:59 tonvoon +2006-10-19 18:59 tonvoon - * THANKS.in, plugins/check_http.c, plugins/t/check_http.t: + * [r1502] THANKS.in, plugins/check_http.c, plugins/t/check_http.t: Redirection error if other headers beginning with L (Aravind Gottipati - 1562572) -2006-10-19 19:44 tonvoon +2006-10-19 18:44 tonvoon - * THANKS.in, plugins-scripts/utils.pm.in: Allow hostnames beginning - with digits (O'Shaughnessy Evans - 1567390) + * [r1501] THANKS.in, plugins-scripts/utils.pm.in: + Allow hostnames beginning with digits (O'Shaughnessy Evans - + 1567390) -2006-10-19 12:56 tonvoon +2006-10-19 11:56 tonvoon - * plugins/t/check_smtp.t: Added tests for SMTP servers without TLS - and with TLS + * [r1500] plugins/t/check_smtp.t: + Added tests for SMTP servers without TLS and with TLS -2006-10-19 01:25 opensides +2006-10-19 00:25 opensides - * plugins/: check_apt.c, check_by_ssh.c, check_dig.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ide_smart.c, check_ldap.c, check_load.c, - check_mrtg.c, check_mrtgtraf.c, check_mysql.c, - check_mysql_query.c, check_nagios.c, check_nt.c, check_ntp.c, - check_nwstat.c, check_overcr.c, check_pgsql.c, check_ping.c, - check_procs.c: - first pass at cleaning localization for new release first pass at - making all the headre be the same licence, plugin, etc... + * [r1499] plugins/check_apt.c, plugins/check_by_ssh.c, + plugins/check_dig.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_ntp.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c: + first pass at cleaning localization for new release + first pass at making all the headre be the same licence, plugin, + etc... -2006-10-18 13:12 tonvoon +2006-10-18 12:12 tonvoon - * plugins/: check_disk.c, t/check_disk.t: Re-added perf data to - check_disk + * [r1498] plugins/check_disk.c, plugins/t/check_disk.t: + Re-added perf data to check_disk -2006-10-18 13:05 tonvoon +2006-10-18 12:05 tonvoon - * lib/: utils_disk.h, tests/test_disk.c: Fix tests for exact - matches when searching filesystems + * [r1497] lib/tests/test_disk.c, lib/utils_disk.h: + Fix tests for exact matches when searching filesystems -2006-10-18 13:03 tonvoon +2006-10-18 12:03 tonvoon - * lib/: utils_base.c, utils_base.h: Cater for different errors when - setting thresholds + * [r1496] lib/utils_base.c, lib/utils_base.h: + Cater for different errors when setting thresholds -2006-10-12 21:36 tonvoon +2006-10-12 20:36 tonvoon - * plugins/: check_smtp.c, t/check_smtp.t: Resend EHLO after TLS - negotiation as per RFC3207 (Holger Weiss - 1482832) + * [r1493] plugins/check_smtp.c, plugins/t/check_smtp.t: + Resend EHLO after TLS negotiation as per RFC3207 (Holger Weiss - + 1482832) -2006-10-12 15:22 tonvoon +2006-10-12 14:22 tonvoon - * plugins/check_ntp.c: Removed extraneous comma in perf data output + * [r1492] plugins/check_ntp.c: + Removed extraneous comma in perf data output -2006-10-12 15:14 tonvoon +2006-10-12 14:14 tonvoon - * plugins/: check_disk.c, t/check_disk.t: Remove the "- free space" - if status is OK + * [r1491] plugins/check_disk.c, plugins/t/check_disk.t: + Remove the "- free space" if status is OK -2006-10-12 14:58 tonvoon +2006-10-12 13:58 tonvoon - * NPTest.pm, THANKS.in, plugins/check_disk.c, - plugins/t/check_disk.t: Fixed output from -e in check_disk - (Andreas Behal) + * [r1490] NPTest.pm, THANKS.in, plugins/check_disk.c, + plugins/t/check_disk.t: + Fixed output from -e in check_disk (Andreas Behal) -2006-10-02 13:09 tonvoon +2006-10-02 12:09 tonvoon - * plugins/t/check_load.t: Fix test failure on poseidon + * [r1487] plugins/t/check_load.t: + Fix test failure on poseidon -2006-09-21 11:41 tonvoon +2006-09-21 10:41 tonvoon - * THANKS.in, plugins/check_nwstat.c: Added perfdata for most - variables and new parameters: VMU, VMF, VMP, NRMH, NRMP, NRMM, - NRMS, NSS1 to NSS7 (Christian Mies) + * [r1480] THANKS.in, plugins/check_nwstat.c: + Added perfdata for most variables and new parameters: VMU, VMF, + VMP, NRMH, NRMP, NRMM, NRMS, NSS1 to NSS7 (Christian Mies) -2006-09-02 21:41 seanius +2006-09-02 20:41 seanius - * lib/utils_base.h, plugins/utils.h: - explicitly include - utils_base.h from utils.h - put utils.h inside of an - #ifndef/#endif + * [r1474] lib/utils_base.h, plugins/utils.h: + - explicitly include utils_base.h from utils.h + - put utils.h inside of an #ifndef/#endif -2006-09-02 21:32 seanius +2006-09-02 20:32 seanius - * plugins/check_tcp.c: - fix for warning/critical timeouts in - check_tcp.c, in which the plugin would exit with a usage error - if non-int timeouts were passed. - change - --warning-time/--critical-time to just --warning/--critical, as - it's what --help says. + * [r1473] plugins/check_tcp.c: + - fix for warning/critical timeouts in check_tcp.c, in which the + plugin + would exit with a usage error if non-int timeouts were passed. + - change --warning-time/--critical-time to just + --warning/--critical, + as it's what --help says. -2006-08-14 10:04 tonvoon +2006-08-14 09:04 tonvoon - * THANKS.in, plugins/check_disk.c: Fixed inode percent free output - (Mike Emigh - 1531899) + * [r1469] THANKS.in, plugins/check_disk.c: + Fixed inode percent free output (Mike Emigh - 1531899) -2006-08-14 09:42 tonvoon +2006-08-14 08:42 tonvoon - * plugins/t/check_ntp.t: Fixed skip of no ntp test + * [r1468] plugins/t/check_ntp.t: + Fixed skip of no ntp test -2006-08-11 09:26 tonvoon +2006-08-11 08:26 tonvoon - * plugins/: check_ntp.c, t/check_ntp.t: Catch no responses from any - server (1538341 - nmdias) + * [r1467] plugins/check_ntp.c, plugins/t/check_ntp.t: + Catch no responses from any server (1538341 - nmdias) -2006-08-03 09:14 tonvoon +2006-08-03 08:14 tonvoon - * tools/tinderbox_build: Interpret the snapshot datestamp as GMT + * [r1465] tools/tinderbox_build: + Interpret the snapshot datestamp as GMT -2006-07-31 19:55 harpermann +2006-07-31 18:55 harpermann - * plugins/check_nt.c: Bug: 694259 fix. After consulting with the - target service authors, we decided to keep the default port as - 1248 and add a note about other services sometimes using this - port and suggesting to change the port. Closing bug. + * [r1464] plugins/check_nt.c: + Bug: 694259 fix. After consulting with the target service + authors, we + decided to keep the default port as 1248 and add a note about + other services + sometimes using this port and suggesting to change the port. + Closing bug. -2006-07-31 15:09 tonvoon +2006-07-31 14:09 tonvoon - * doc/developer-guidelines.sgml: M4 requirement for developer - platform + * [r1463] doc/developer-guidelines.sgml: + M4 requirement for developer platform -2006-07-29 02:43 tonvoon +2006-07-29 01:43 tonvoon - * plugins/common.h, plugins-root/check_dhcp.c: Fix two Solaris - compile problems + * [r1462] plugins-root/check_dhcp.c, plugins/common.h: + Fix two Solaris compile problems -2006-07-29 01:04 tonvoon +2006-07-29 00:04 tonvoon - * po/POTFILES.in: Remove reference to check_udp.c + * [r1461] po/POTFILES.in: + Remove reference to check_udp.c -2006-07-29 00:59 tonvoon +2006-07-28 23:59 tonvoon - * configure.in, plugins/Makefile.am, plugins-scripts/Makefile.am: + * [r1460] configure.in, plugins-scripts/Makefile.am, + plugins/Makefile.am: Cleanup references to old check_udp and INSTALL_OPTS. Error if --with-nagios-user or --with-nagios-group specified for configure -2006-07-28 23:44 tonvoon +2006-07-28 22:44 tonvoon - * CHANGES, plugins/Makefile.am, plugins/check_udp.c, - plugins/t/check_udp.t: check_udp.c deprecated and check_udp now - linked to check_tcp. check_udp2 removed + * [r1459] CHANGES, plugins/Makefile.am, plugins/check_udp.c, + plugins/t/check_udp.t: + check_udp.c deprecated and check_udp now linked to check_tcp. + check_udp2 removed -2006-07-27 12:29 tonvoon +2006-07-27 11:29 tonvoon - * doc/developer-guidelines.sgml: Example ranges (Nathan Vonnahme) + * [r1458] doc/developer-guidelines.sgml: + Example ranges (Nathan Vonnahme) -2006-07-20 00:05 tonvoon +2006-07-19 23:05 tonvoon - * THANKS.in, configure.in: Stricter autoconf 2.60 rules (Lance - Albertson - 1522900) + * [r1457] THANKS.in, configure.in: + Stricter autoconf 2.60 rules (Lance Albertson - 1522900) -2006-07-19 23:56 tonvoon +2006-07-19 22:56 tonvoon - * plugins/common.h: Fix to add uintmax_t, for check_disk.c compile + * [r1456] plugins/common.h: + Fix to add uintmax_t, for check_disk.c compile -2006-07-19 23:37 tonvoon +2006-07-19 22:37 tonvoon - * plugins/common.h: Fix for CHAR_MAX on Solaris 9 + * [r1455] plugins/common.h: + Fix for CHAR_MAX on Solaris 9 -2006-07-14 10:47 tonvoon +2006-07-14 09:47 tonvoon - * lib/: Makefile.am, utils_base.c: Missing header files + * [r1454] lib/Makefile.am, lib/utils_base.c: + Missing header files -2006-07-14 10:43 tonvoon +2006-07-14 09:43 tonvoon - * plugins/check_disk.c: Fix inode percents using coreutils' - percentage calculation technique + * [r1453] plugins/check_disk.c: + Fix inode percents using coreutils' percentage calculation + technique -2006-07-14 00:58 tonvoon +2006-07-13 23:58 tonvoon - * CHANGES, lib/utils_base.c, lib/utils_base.h, lib/utils_disk.c, - lib/utils_disk.h, lib/tests/test_utils.c, plugins/check_disk.c, - plugins/t/check_disk.t: Major fixes to check_disk. Now should - return same data as df + * [r1452] CHANGES, lib/tests/test_utils.c, lib/utils_base.c, + lib/utils_base.h, lib/utils_disk.c, lib/utils_disk.h, + plugins/check_disk.c, plugins/t/check_disk.t: + Major fixes to check_disk. Now should return same data as df -2006-07-13 13:50 tonvoon +2006-07-13 12:50 tonvoon - * Makefile.am, configure.in, lib/Makefile.am, lib/tests/.cvsignore, - lib/tests/Makefile.am, lib/tests/README, lib/tests/test_disk.c, - lib/tests/test_disk.t, lib/tests/test_utils.c, - lib/tests/test_utils.t, plugins/Makefile.am, - plugins/check_disk.c, plugins/check_dns.c, plugins/check_mysql.c, - plugins/check_mysql_query.c, plugins/utils.c, plugins/utils.h, - plugins/utils_disk.c, plugins/utils_disk.h, + * [r1451] Makefile.am, configure.in, lib/Makefile.am, lib/tests, + lib/tests/.cvsignore, lib/tests/Makefile.am, lib/tests/README, + lib/tests/test_disk.c, lib/tests/test_disk.t, + lib/tests/test_utils.c, lib/tests/test_utils.t, + plugins/Makefile.am, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, plugins/tests/.cvsignore, plugins/tests/Makefile.am, plugins/tests/README, plugins/tests/test_disk.c, plugins/tests/test_disk.t, plugins/tests/test_utils.c, - plugins/tests/test_utils.t: Move new util_* functions to lib/ + plugins/tests/test_utils.t, plugins/utils.c, plugins/utils.h, + plugins/utils_disk.c, plugins/utils_disk.h: + Move new util_* functions to lib/ -2006-07-13 09:54 tonvoon +2006-07-13 08:54 tonvoon - * configure.in, lib/basename.c, lib/dirname.h, m4/basename.m4, - m4/dos.m4, m4/np_coreutils.m4, plugins/check_procs.c, - plugins/utils.c, plugins/utils.h: Using coreutils' base_name - function because of portability issues with Tru64 + * [r1450] configure.in, lib/basename.c, lib/dirname.h, + m4/basename.m4, m4/dos.m4, m4/np_coreutils.m4, + plugins/check_procs.c, plugins/utils.c, plugins/utils.h: + Using coreutils' base_name function because of portability issues + with + Tru64 -2006-07-12 23:53 tonvoon +2006-07-12 22:53 tonvoon - * plugins/: check_disk.c, utils_disk.c, utils_disk.h, - t/check_disk.t: Added -E option for exact match of filesystem. - Restructured main filesystem loop. Added extra tests for possible - duplicate filesystems. + * [r1449] plugins/check_disk.c, plugins/t/check_disk.t, + plugins/utils_disk.c, plugins/utils_disk.h: + Added -E option for exact match of filesystem. Restructured main + filesystem + loop. Added extra tests for possible duplicate filesystems. -2006-07-12 20:30 tonvoon +2006-07-12 19:30 tonvoon - * plugins/: check_disk.c, utils_disk.c, utils_disk.h, - tests/.cvsignore, tests/test_disk.c: Moving parameter_list into - utils_disk.h. Given list of mount points, can now work out best - match or exact match. + * [r1448] plugins/check_disk.c, plugins/tests, + plugins/tests/.cvsignore, plugins/tests/test_disk.c, + plugins/utils_disk.c, plugins/utils_disk.h: + Moving parameter_list into utils_disk.h. Given list of mount + points, can + now work out best match or exact match. -2006-07-12 13:15 tonvoon +2006-07-12 12:15 tonvoon - * plugins/: Makefile.am, check_disk.c, utils_disk.c, utils_disk.h, - tests/Makefile.am, tests/test_disk.c, tests/test_disk.t: Moving - check_disk functions into utils_disk.c and testing them + * [r1447] plugins/Makefile.am, plugins/check_disk.c, + plugins/tests/Makefile.am, plugins/tests/test_disk.c, + plugins/tests/test_disk.t, plugins/utils_disk.c, + plugins/utils_disk.h: + Moving check_disk functions into utils_disk.c and testing them -2006-07-11 13:38 tonvoon +2006-07-11 12:38 tonvoon - * m4/fcntl-safer.m4, m4/np_coreutils.m4, m4/unistd-safer.m4, - lib/creat-safer.c, lib/dup-safer.c, lib/fcntl--.h, + * [r1446] lib/creat-safer.c, lib/dup-safer.c, lib/fcntl--.h, lib/fcntl-safer.h, lib/fd-safer.c, lib/open-safer.c, - lib/pipe-safer.c, lib/unistd--.h, lib/unistd-safer.h: Extra files - from coreutils required for getloadavg.c to compile on Tru64 - (Ciro Iriarte - 1520331) + lib/pipe-safer.c, lib/unistd--.h, lib/unistd-safer.h, + m4/fcntl-safer.m4, m4/np_coreutils.m4, m4/unistd-safer.m4: + Extra files from coreutils required for getloadavg.c to compile + on Tru64 (Ciro Iriarte - 1520331) -2006-07-10 09:44 tonvoon +2006-07-10 08:44 tonvoon - * lib/Makefile.am: Didn't add intprops.h into distribution - correctly + * [r1445] lib/Makefile.am: + Didn't add intprops.h into distribution correctly -2006-07-07 07:36 harpermann +2006-07-07 06:36 harpermann - * plugins/urlize.c: Added check for two arguments. Was segfaulting - if no or one arg. Now returns help. + * [r1444] plugins/urlize.c: + Added check for two arguments. Was segfaulting if no or one arg. + Now returns + help. -2006-07-05 14:45 tonvoon +2006-07-05 13:45 tonvoon - * plugins-scripts/check_mailq.pl: Fixed checking of return codes - from external mailq programs + * [r1443] plugins-scripts/check_mailq.pl: + Fixed checking of return codes from external mailq programs -2006-07-05 09:55 tonvoon +2006-07-05 08:55 tonvoon - * tools/tinderbox_build: Add instructions for manually sending - Tinderbox build logs + * [r1442] tools/tinderbox_build: + Add instructions for manually sending Tinderbox build logs -2006-07-05 09:26 tonvoon +2006-07-05 08:26 tonvoon - * lib/: Makefile.am, intprops.h: Missing intprops.h for Tru64 (Ciro - Iriarte - 1517379) + * [r1441] lib/Makefile.am, lib/intprops.h: + Missing intprops.h for Tru64 (Ciro Iriarte - 1517379) -2006-07-04 10:47 tonvoon +2006-07-04 09:47 tonvoon - * THANKS.in, m4/alloca.m4, m4/np_coreutils.m4: Added alloca.h check - and fixed locale.h, wchar.h (Ari Pollak - 1516578) + * [r1440] THANKS.in, m4/alloca.m4, m4/np_coreutils.m4: + Added alloca.h check and fixed locale.h, wchar.h (Ari Pollak - + 1516578) -2006-07-03 09:03 tonvoon +2006-07-03 08:03 tonvoon - * plugins/check_dig.c: Fixed -p getopt call (Allan Bennett - - 1511650) + * [r1439] plugins/check_dig.c: + Fixed -p getopt call (Allan Bennett - 1511650) -2006-07-03 08:55 tonvoon +2006-07-03 07:55 tonvoon - * THANKS.in, lib/c-strtod.c, lib/c-strtod.h, lib/c-strtold.c, - m4/c-strtod.m4, m4/np_coreutils.m4, plugins/Makefile.am: Fixed - compile on Tru64 5.1b (Ciro Iriarte - 1515435) + * [r1438] THANKS.in, lib/c-strtod.c, lib/c-strtod.h, + lib/c-strtold.c, m4/c-strtod.m4, m4/np_coreutils.m4, + plugins/Makefile.am: + Fixed compile on Tru64 5.1b (Ciro Iriarte - 1515435) -2006-06-21 12:05 opensides +2006-06-21 11:05 opensides - * plugins/: check_snmp.c, check_ssh.c: + * [r1437] plugins/check_snmp.c, plugins/check_ssh.c: cleaning help and usage -2006-06-21 10:49 opensides +2006-06-21 09:49 opensides - * po/LINGUAS: + * [r1436] po/LINGUAS: fixing bug id #1509699 -2006-06-20 12:17 opensides +2006-06-20 11:17 opensides - * plugins/: check_procs.c, check_radius.c, check_real.c, - check_smtp.c, check_snmp.c, check_ssh.c: + * [r1435] plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c: cleaning help and usage + license -2006-06-18 20:36 opensides +2006-06-18 19:36 opensides - * plugins/: check_disk.c, check_time.c, check_udp.c, check_ups.c, - check_users.c, gethostbyname.c, gethostbyname.h, negate.c, - netutils.c, popen.c, runcmd.c, sslutils.c, urlize.c, utils.c: + * [r1434] plugins/check_disk.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/gethostbyname.c, plugins/gethostbyname.h, + plugins/negate.c, plugins/netutils.c, plugins/popen.c, + plugins/runcmd.c, plugins/sslutils.c, plugins/urlize.c, + plugins/utils.c: updating help and usage and license -2006-06-17 13:28 opensides +2006-06-17 12:28 opensides - * plugins/: check_hpjd.c, check_nt.c, check_ntp.c, check_nwstat.c, - check_overcr.c, check_pgsql.c, check_ping.c, check_procs.c: + * [r1433] plugins/check_hpjd.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c: cleaning up help and usage -2006-06-15 13:52 opensides +2006-06-15 12:52 opensides - * plugins/: check_ldap.c, check_load.c, check_mrtg.c, - check_mysql.c, check_mysql_query.c, check_nagios.c: + * [r1432] plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c: cleaning help and usage -2006-06-15 11:16 opensides +2006-06-15 10:16 opensides - * plugins/check_ide_smart.c: + * [r1430] plugins/check_ide_smart.c: cleaning help and usage -2006-06-14 22:27 opensides +2006-06-14 21:27 opensides - * plugins/: check_dns.c, check_dummy.c, check_fping.c, - check_game.c: + * [r1427] plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c: updating the help and usage for localization -2006-06-14 20:15 tonvoon +2006-06-14 19:15 tonvoon - * INSTALLING, doc/developer-guidelines.sgml: Updated requirements - for development platform + * [r1426] INSTALLING, doc/developer-guidelines.sgml: + Updated requirements for development platform -2006-06-14 19:48 opensides +2006-06-14 18:48 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c: + * [r1425] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c: starting the BIG locale update ;-) -2006-06-07 15:28 seanius +2006-06-07 14:28 seanius - * contrib/check_linux_raid.pl: some gratuitous whitespace changes, - and a fix to the "recovery =" detection logic in - check_linux_raid.pl + * [r1418] contrib/check_linux_raid.pl: + some gratuitous whitespace changes, and a fix to the "recovery =" + detection + logic in check_linux_raid.pl -2006-06-07 15:23 seanius +2006-06-07 14:23 seanius - * plugins-scripts/utils.pm.in: removed stale references to - PATH_TO_NTPFOO, as it's no longer used. + * [r1417] plugins-scripts/utils.pm.in: + removed stale references to PATH_TO_NTPFOO, as it's no longer + used. -2006-06-07 08:59 tonvoon +2006-06-07 07:59 tonvoon - * plugins-root/Makefile.am: Do not install setuid programs unless - run as root + * [r1416] plugins-root/Makefile.am: + Do not install setuid programs unless run as root -2006-06-07 08:18 tonvoon +2006-06-07 07:18 tonvoon - * tools/setup, plugins-root/Makefile.am: Fixed two build problems - re: libtool and pst3 + * [r1415] plugins-root/Makefile.am, tools/setup: + Fixed two build problems re: libtool and pst3 -2006-06-06 17:48 seanius +2006-06-06 16:48 seanius - * plugins/check_pgsql.c: modify the is_pg_dbname() function to - allow databases with '-' in their name. reference: sf tracker - #1500752 + * [r1414] plugins/check_pgsql.c: + modify the is_pg_dbname() function to allow databases with '-' in + their name. + reference: sf tracker #1500752 -2006-06-04 00:06 seanius +2006-06-03 23:06 seanius - * configure.in: removed the -R for openssl, as it should be figured - out automatically by libtool and also controlled via the - --enable-rpath/--disable-rpath configure options. furthermore - keeping it in forces the rpath option on in spite of what's - passed on the configure line. + * [r1413] configure.in: + removed the -R for openssl, as it should be figured out + automatically by + libtool and also controlled via the + --enable-rpath/--disable-rpath configure + options. furthermore keeping it in forces the rpath option on in + spite of + what's passed on the configure line. -2006-06-01 23:30 seanius +2006-06-01 22:30 seanius - * contrib/check_linux_raid.pl: gave some TLC to check_linux_raid + * [r1412] contrib/check_linux_raid.pl: + gave some TLC to check_linux_raid -2006-05-30 10:55 tonvoon +2006-05-30 09:55 tonvoon - * configure.in: Default to search path for mysql_config + * [r1411] configure.in: + Default to search path for mysql_config -2006-05-30 10:39 tonvoon +2006-05-30 09:39 tonvoon - * THANKS.in: For reporting check_radius compile problem + * [r1410] THANKS.in: + For reporting check_radius compile problem -2006-05-30 10:19 tonvoon +2006-05-30 09:19 tonvoon - * .cvsignore, config.guess, config.sub, ltmain.sh, - doc/developer-guidelines.sgml: Added libtool files, at version - 1.5.22, into CVS + * [r1409] ., .cvsignore, config.guess, config.sub, + doc/developer-guidelines.sgml, ltmain.sh: + Added libtool files, at version 1.5.22, into CVS -2006-05-25 18:40 egalstad +2006-05-25 17:40 egalstad - * plugins-root/check_dhcp.c: Applied patch for responses from - helpers/relays, cleaned up different coding styles for - consistency + * [r1408] plugins-root/check_dhcp.c: + Applied patch for responses from helpers/relays, cleaned up + different coding styles for consistency -2006-05-25 17:59 tonvoon +2006-05-25 16:59 tonvoon - * lib/regex.o: Removed unnecessary file + * [r1407] lib/regex.o: + Removed unnecessary file -2006-05-25 17:58 tonvoon +2006-05-25 16:58 tonvoon - * configure.in, lib/Makefile.am, plugins/common.h: Gettext fixes to - sync with coreutils + * [r1406] configure.in, lib/Makefile.am, plugins/common.h: + Gettext fixes to sync with coreutils -2006-05-25 17:53 egalstad +2006-05-25 16:53 egalstad - * plugins-root/check_dhcp.c: Fixed short interface name length, - UNKNOWN return code (patches from tracker) + * [r1405] plugins-root/check_dhcp.c: + Fixed short interface name length, UNKNOWN return code (patches + from tracker) -2006-05-25 16:34 tonvoon +2006-05-25 15:34 tonvoon - * plugins/: check_http.c, t/check_http.t: Option to invert results - from a regexp pattern match + * [r1404] plugins/check_http.c, plugins/t/check_http.t: + Option to invert results from a regexp pattern match -2006-05-25 13:33 tonvoon +2006-05-25 12:33 tonvoon - * configure.in, lib/.cvsignore, lib/regcomp.c, lib/regex.c, - lib/regex.h, lib/regex.o, lib/regex_internal.c, - lib/regex_internal.h, lib/regexec.c, lib/strcase.h, + * [r1403] configure.in, lib, lib/.cvsignore, lib/regcomp.c, + lib/regex.c, lib/regex.h, lib/regex.o, lib/regex_internal.c, + lib/regex_internal.h, lib/regexec.c, lib/strcase.h, m4, m4/.cvsignore, m4/np_coreutils.m4, m4/regex.m4, m4/restrict.m4, plugins/check_apt.c, plugins/check_http.c, plugins/check_smtp.c, - plugins/check_snmp.c: Use coreutils' regexp libraries, so regexp - always available now + plugins/check_snmp.c: + Use coreutils' regexp libraries, so regexp always available now -2006-05-25 13:13 tonvoon +2006-05-25 12:13 tonvoon - * m4/ls-mntd-fs.m4: Sync with coreutils 5.96 + * [r1402] m4/ls-mntd-fs.m4: + Sync with coreutils 5.96 -2006-05-24 13:48 tonvoon +2006-05-24 12:48 tonvoon - * THANKS.in, configure.in: Fix for mysql 3.x (Jeremy Reed, Michael - Tiernan - 1491936) + * [r1401] THANKS.in, configure.in: + Fix for mysql 3.x (Jeremy Reed, Michael Tiernan - 1491936) -2006-05-24 10:23 tonvoon +2006-05-24 09:23 tonvoon - * doc/developer-guidelines.sgml: Reminder of no inline variable - declarations + * [r1400] doc/developer-guidelines.sgml: + Reminder of no inline variable declarations -2006-05-24 10:05 tonvoon +2006-05-24 09:05 tonvoon - * plugins/check_snmp.c: Variables need to be declared at top of - code for better portability (Gerhard Lausser) + * [r1399] plugins/check_snmp.c: + Variables need to be declared at top of code for better + portability + (Gerhard Lausser) -2006-05-19 22:41 tonvoon +2006-05-19 21:41 tonvoon - * configure.in, doc/developer-guidelines.sgml: Requirement of - automake 1.8.3, as coreutils needs it + * [r1398] configure.in, doc/developer-guidelines.sgml: + Requirement of automake 1.8.3, as coreutils needs it -2006-05-19 22:30 tonvoon +2006-05-19 21:30 tonvoon - * .cvsignore, config.rpath, mkinstalldirs, po/.cvsignore, - po/remove-potcdate.sin: Adding more required files from gettext + * [r1397] ., .cvsignore, config.rpath, mkinstalldirs, po, + po/.cvsignore, po/remove-potcdate.sin: + Adding more required files from gettext -2006-05-19 00:17 tonvoon +2006-05-18 23:17 tonvoon - * tools/setup: Bug in Makefile.am creation + * [r1396] tools/setup: + Bug in Makefile.am creation -2006-05-19 00:09 tonvoon +2006-05-18 23:09 tonvoon - * .cvsignore, ABOUT-NLS, m4/Makefile.am, m4/Makefile.am.in, - po/.cvsignore, po/Makefile.in.in, tools/setup: Fixes from - coreutils sync: some files now required and removed generateable - files + * [r1395] ., .cvsignore, ABOUT-NLS, m4/Makefile.am, + m4/Makefile.am.in, po, po/.cvsignore, po/Makefile.in.in, + tools/setup: + Fixes from coreutils sync: some files now required and removed + generateable files -2006-05-18 23:05 tonvoon +2006-05-18 22:05 tonvoon - * .cvsignore, Makefile.am, configure.in, + * [r1394] ., .cvsignore, Makefile.am, configure.in, doc/developer-guidelines.sgml, lib/Makefile.am, lib/cloexec.c, lib/cloexec.h, lib/error.c, lib/error.h, lib/exit.h, lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, lib/fsusage.h, @@ -1361,7 +2303,7 @@ lib/safe-read.c, lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, lib/stdbool_.h, lib/strtod.c, lib/unlocked-io.h, lib/xalloc-die.c, lib/xalloc.h, lib/xmalloc.c, - m4/.cvsignore, m4/Makefile.am, m4/afs.m4, m4/codeset.m4, + m4, m4/.cvsignore, m4/Makefile.am, m4/afs.m4, m4/codeset.m4, m4/error.m4, m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, m4/fsusage.m4, m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/intdiv0.m4, m4/inttypes-pri.m4, m4/inttypes.m4, @@ -1372,494 +2314,579 @@ m4/onceonly_2_57.m4, m4/po.m4, m4/progtest.m4, m4/realloc.m4, m4/signed.m4, m4/stdbool.m4, m4/stdint_h.m4, m4/uintmax_t.m4, m4/ulonglong.m4, m4/unlocked-io.m4, m4/wchar_t.m4, m4/wint_t.m4, - m4/xalloc.m4, plugins/.cvsignore, plugins/check_disk.c, - plugins/common.h, plugins/tests/.cvsignore, - plugins-root/.cvsignore, plugins-root/check_dhcp.c, - po/.cvsignore, tools/setup: Synchronise with coreutils 2.95. - Gettext now synced with coreutils, so no longer development - platform requirement + m4/xalloc.m4, plugins, plugins-root, plugins-root/.cvsignore, + plugins-root/check_dhcp.c, plugins/.cvsignore, + plugins/check_disk.c, plugins/common.h, plugins/tests, + plugins/tests/.cvsignore, po, po/.cvsignore, tools/setup: + Synchronise with coreutils 2.95. Gettext now synced with + coreutils, + so no longer development platform requirement -2006-05-17 11:10 tonvoon +2006-05-17 10:10 tonvoon - * configure.in: Fix for loading SSL libraries at runtime + * [r1393] configure.in: + Fix for loading SSL libraries at runtime -2006-05-17 09:56 tonvoon +2006-05-17 08:56 tonvoon - * configure.in, plugins-root/Makefile.am: Fix compile problems on - Solaris for pst3 and ssl libs + * [r1392] configure.in, plugins-root/Makefile.am: + Fix compile problems on Solaris for pst3 and ssl libs -2006-05-15 14:20 tonvoon +2006-05-15 13:20 tonvoon - * CHANGES, contrib/check_disk_snmp.pl: check_disk_snmp.pl removed. - Notice added to CHANGES + * [r1391] CHANGES, contrib/check_disk_snmp.pl: + check_disk_snmp.pl removed. Notice added to CHANGES -2006-05-15 14:07 tonvoon +2006-05-15 13:07 tonvoon - * tools/sfsnapshot: Changed snapshot generator due to cvs changes - on SF + * [r1390] tools/sfsnapshot: + Changed snapshot generator due to cvs changes on SF -2006-05-03 15:12 tonvoon +2006-05-03 14:12 tonvoon - * doc/LEAVERS: Leavers process documented + * [r1389] doc/LEAVERS: + Leavers process documented -2006-05-02 09:30 tonvoon +2006-05-02 08:30 tonvoon - * plugins/check_disk.c: Inode thresholds not always being - initialised (James Fidell - 1476457) + * [r1388] plugins/check_disk.c: + Inode thresholds not always being initialised (James Fidell - + 1476457) -2006-05-02 09:21 tonvoon +2006-05-02 08:21 tonvoon - * CHANGES: New check_ntp and check_apt plugins by Sean + * [r1387] CHANGES: + New check_ntp and check_apt plugins by Sean -2006-05-01 22:52 seanius +2006-05-01 21:52 seanius - * configure.in, plugins/Makefile.am, plugins/check_ntp.c, - plugins/common.h, plugins/runcmd.c, plugins-scripts/Makefile.am: - - check_ntp: - now roughly feature-complete. - various - bugfixes, esp. offset calculation. - enhanced the asynchronous - offset polling to set requests that haven't recieved a - response in >= 1 second to stale and retransmit them, which - results in much better performance on unreliable networks. - - we only spend timeout/2 seconds polling offsets, and if we don't - get everything by that point we work with what we have and - set status to warning/critical depending on how much data we - have. - set the same defaults as the perl script. - commit - changes to configure.in to support automatic building of - check_apt (if apt-get is installed and regex libraries - available) and check_ntp (unconditionally), now defaulting to - check_ntp.c instead of the perl script. if this is an issue we - can back out the commit of course. an eye should be kept on - check_ntp building and running correctly in different + * [r1386] configure.in, plugins-scripts/Makefile.am, + plugins/Makefile.am, plugins/check_ntp.c, plugins/common.h, + plugins/runcmd.c: + - check_ntp: + - now roughly feature-complete. + - various bugfixes, esp. offset calculation. + - enhanced the asynchronous offset polling to set requests that + haven't recieved a response in >= 1 second to stale and + retransmit them, + which results in much better performance on unreliable networks. + - we only spend timeout/2 seconds polling offsets, and if we + don't get + everything by that point we work with what we have and set status + to + warning/critical depending on how much data we have. + - set the same defaults as the perl script. + - commit changes to configure.in to support automatic building of + check_apt + (if apt-get is installed and regex libraries available) and + check_ntp + (unconditionally), now defaulting to check_ntp.c instead of the + perl script. + if this is an issue we can back out the commit of course. an eye + should be kept on check_ntp building and running correctly in + different environments, esp. 64-bit and big-endian platforms, and those - with more "esoteric" API's (do any of the platforms not have - poll()?). - similar changes to Makefile.am's. - common.h: add - statement to include sys/poll.h - runcmd.c: exit STATE_UNKNOWN if - execve() fails. + with more + "esoteric" API's (do any of the platforms not have poll()?). + - similar changes to Makefile.am's. + - common.h: add statement to include sys/poll.h + - runcmd.c: exit STATE_UNKNOWN if execve() fails. -2006-04-28 16:52 tonvoon +2006-04-28 15:52 tonvoon - * configure.in: Remove stupid error where pst3 was always compiled + * [r1385] configure.in: + Remove stupid error where pst3 was always compiled -2006-04-28 09:45 tonvoon +2006-04-28 08:45 tonvoon - * configure.in, plugins-root/Makefile.am: Added pst3 into - distribution (Jason Kau - 1476451) + * [r1384] configure.in, plugins-root/Makefile.am: + Added pst3 into distribution (Jason Kau - 1476451) -2006-04-27 14:25 tonvoon +2006-04-27 13:25 tonvoon - * configure.in, plugins/check_procs.c, plugins/utils.c, - plugins/utils.h, plugins/tests/test_utils.c: Internal version of - basename if one not found in system + * [r1383] configure.in, plugins/check_procs.c, + plugins/tests/test_utils.c, plugins/utils.c, plugins/utils.h: + Internal version of basename if one not found in system -2006-04-19 10:33 tonvoon +2006-04-19 09:33 tonvoon - * plugins/t/check_nagios.t: Fix check_nagios tests on MacOSX 10.4 + * [r1382] plugins/t/check_nagios.t: + Fix check_nagios tests on MacOSX 10.4 -2006-04-19 04:47 sghosh +2006-04-19 03:47 sghosh - * ChangeLog: ChangeLog update - release pending + * [r1380] ChangeLog: + ChangeLog update - release pending -2006-04-19 04:42 sghosh +2006-04-19 03:42 sghosh - * configure.in, package.def: version update - release pending + * [r1379] configure.in, package.def: + version update - release pending -2006-04-17 22:08 opensides +2006-04-17 21:08 opensides - * po/fr.po: + * [r1378] po/fr.po: Final commit of fr.po -2006-04-17 14:54 opensides +2006-04-17 13:54 opensides - * po/fr.po: + * [r1377] po/fr.po: another big chunk of fr.po - + Still 20 to go ;) -2006-04-16 15:24 opensides +2006-04-16 14:24 opensides - * po/fr.po: + * [r1376] po/fr.po: big revision of po file for 1.4.3 -2006-04-15 11:46 opensides +2006-04-15 10:46 opensides - * po/fr.po: + * [r1375] po/fr.po: second part of fr.po updating -2006-04-14 23:44 opensides +2006-04-14 22:44 opensides - * po/: de.po, fr.po, nagios-plugins.pot: - updated pot file sarted updating fr.po for nagios 1.4.3 + * [r1374] po/de.po, po/fr.po, po/nagios-plugins.pot: + updated pot file + sarted updating fr.po for nagios 1.4.3 -2006-04-12 11:00 seanius +2006-04-12 10:00 seanius - * plugins/check_ntp.c: the offset_requests are now parallelized. - still stuff needs to be done (conveniently marked with XXX), but - on well behaving networks the plugin should behave more or less - identical to check_ntp.pl now. + * [r1373] plugins/check_ntp.c: + the offset_requests are now parallelized. still stuff needs to be + done (conveniently marked with XXX), but on well behaving + networks + the plugin should behave more or less identical to check_ntp.pl + now. -2006-04-12 07:33 seanius +2006-04-12 06:33 seanius - * plugins/check_ntp.c: added a currently unused but "good for - reference" version of offset_request which attempts to behave - more like ntpdate, but this doesn't yet and the code isn't - actually used yet. + * [r1372] plugins/check_ntp.c: + added a currently unused but "good for reference" version of + offset_request + which attempts to behave more like ntpdate, but this doesn't yet + and + the code isn't actually used yet. -2006-04-12 00:24 seanius +2006-04-11 23:24 seanius - * plugins/check_ntp.c: another big code-commit to check_ntp. - jitter calculations now work, and the program is becoming much - closer on the packet-for-packet level to how check_ntp.pl - behaves. i'll send an email in the morning :) + * [r1371] plugins/check_ntp.c: + another big code-commit to check_ntp. jitter calculations now + work, and + the program is becoming much closer on the packet-for-packet + level to + how check_ntp.pl behaves. i'll send an email in the morning :) -2006-04-06 11:08 tonvoon +2006-04-06 10:08 tonvoon - * THANKS.in, plugins/utils.c: Stop coredump on Solaris if arg not - specified (Jason Kau - 1465288) + * [r1370] THANKS.in, plugins/utils.c: + Stop coredump on Solaris if arg not specified (Jason Kau - + 1465288) -2006-04-05 09:11 tonvoon +2006-04-05 08:11 tonvoon - * CHANGES: Notice added re: check_udp in next release + * [r1369] CHANGES: + Notice added re: check_udp in next release -2006-04-05 09:06 tonvoon +2006-04-05 08:06 tonvoon - * plugins/check_procs.c: Use pid_t for pids (1463853) + * [r1368] plugins/check_procs.c: + Use pid_t for pids (1463853) -2006-04-05 08:58 tonvoon +2006-04-05 07:58 tonvoon - * plugins/: check_http.c, t/check_http.t: Allow multiple -k - parameters (Gerd Mueller - 1457726) + * [r1367] plugins/check_http.c, plugins/t/check_http.t: + Allow multiple -k parameters (Gerd Mueller - 1457726) -2006-04-05 07:58 seanius +2006-04-05 06:58 seanius - * plugins/check_apt.c: finally??? cvs works again???? let me dig - up my week-old cvs commit message..... - - i'm becoming very happy with check_apt now :) - now has support - for an externally (configure.in) path to apt-get, though i - still have that in #ifdefs for the time being. - support for - defining what packages are "critical updates", via the - already-existing security regexp or overridable on the cmdline - - allow overriding of apt-get cmdline options - introduce a "no - upgrade" in case someone just wants to check that they can - download the package lists with -u but not check for upgrades. + * [r1366] plugins/check_apt.c: + finally??? cvs works again???? let me dig up my week-old cvs + commit message..... + + i'm becoming very happy with check_apt now :) + - now has support for an externally (configure.in) path to + apt-get, + though i still have that in #ifdefs for the time being. + - support for defining what packages are "critical updates", via + the already-existing security regexp or overridable on the + cmdline + - allow overriding of apt-get cmdline options + - introduce a "no upgrade" in case someone just wants to check + that + they can download the package lists with -u but not check for + upgrades. might need to change the name of this option to prevent - confusion. - improved -h documentation + confusion. + - improved -h documentation -2006-03-29 17:33 tonvoon +2006-03-29 16:33 tonvoon - * THANKS.in, plugins/check_tcp.c, plugins/utils.c, plugins/utils.h, - plugins/tests/test_utils.c: New function to for escaped strings - from command line for send/quit. Adapted from Sebastian - Wiesinger's patch (1292404) + * [r1365] THANKS.in, plugins/check_tcp.c, + plugins/tests/test_utils.c, plugins/utils.c, plugins/utils.h: + New function to for escaped strings from command line for + send/quit. + Adapted from Sebastian Wiesinger's patch (1292404) -2006-03-29 16:30 tonvoon +2006-03-29 15:30 tonvoon - * NPTest.pm: Will die if signal received from a testCmd + * [r1364] NPTest.pm: + Will die if signal received from a testCmd -2006-03-29 15:37 tonvoon +2006-03-29 14:37 tonvoon - * plugins/t/check_udp.t: Allow 1 second delay in check_udp timeout + * [r1363] plugins/t/check_udp.t: + Allow 1 second delay in check_udp timeout -2006-03-29 09:18 tonvoon +2006-03-29 08:18 tonvoon - * plugins/t/check_http.t: Fix possible timeout issue on - hostname_invalid + * [r1362] plugins/t/check_http.t: + Fix possible timeout issue on hostname_invalid -2006-03-29 09:13 tonvoon +2006-03-29 08:13 tonvoon - * plugins/t/check_dns.t: Fix test if response time is one second + * [r1361] plugins/t/check_dns.t: + Fix test if response time is one second -2006-03-29 09:01 seanius +2006-03-29 08:01 seanius - * plugins/check_apt.c: now support for detecting critical/security - updates, which sets the return code to STATE_CRITICAL instead of - just STATE_WARNING as it was previously doing. + * [r1360] plugins/check_apt.c: + now support for detecting critical/security updates, which sets + the return code to STATE_CRITICAL instead of just STATE_WARNING + as it was previously doing. -2006-03-27 09:39 tonvoon +2006-03-27 08:39 tonvoon - * plugins/t/check_udp.t: Set timeout within nc, rather than the - test script + * [r1359] plugins/t/check_udp.t: + Set timeout within nc, rather than the test script -2006-03-27 09:19 tonvoon +2006-03-27 08:19 tonvoon - * plugins/check_disk.c: Fixed bug with malloc of wrong size + * [r1358] plugins/check_disk.c: + Fixed bug with malloc of wrong size 2006-03-24 17:26 tonvoon - * plugins/t/check_dns.t: Fixing defaults to work + * [r1357] plugins/t/check_dns.t: + Fixing defaults to work 2006-03-24 16:49 tonvoon - * CHANGES: Reintroduced --with-mysql configure option. Note about - SSL cleanup + * [r1356] CHANGES: + Reintroduced --with-mysql configure option. Note about SSL + cleanup 2006-03-24 16:25 tonvoon - * plugins/check_http.c: -C now implies -S/--ssl as well + * [r1355] plugins/check_http.c: + -C now implies -S/--ssl as well 2006-03-24 16:13 tonvoon - * plugins/t/: check_hpjd.t, check_http.t: Tests converted to new - style + * [r1354] plugins/t/check_hpjd.t, plugins/t/check_http.t: + Tests converted to new style 2006-03-24 16:12 tonvoon - * plugins/: check_tcp.c, t/check_udp.t: udp checks require and send - and receive option. Tests updated so if nc is available, will - check send and receive working correctly + * [r1353] plugins/check_tcp.c, plugins/t/check_udp.t: + udp checks require and send and receive option. Tests updated so + if + nc is available, will check send and receive working correctly 2006-03-23 22:58 seanius - * plugins/check_apt.c: - addition of include/exclude option for - package names in check_apt, using POSIX regexp support. - - various commenting and tidying of code/logic/output. - still - haven't committed the Makefile.am/configure.in stuff. + * [r1352] plugins/check_apt.c: + - addition of include/exclude option for package names in + check_apt, + using POSIX regexp support. + - various commenting and tidying of code/logic/output. + - still haven't committed the Makefile.am/configure.in stuff. 2006-03-23 17:16 tonvoon - * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: + * [r1351] NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: check_disk now errors if a specified directory does not exist (cf df /foo) 2006-03-23 16:06 tonvoon - * plugins/t/check_disk.t: Some versions of Test::More do not like - the m#foo# syntax + * [r1350] plugins/t/check_disk.t: + Some versions of Test::More do not like the m#foo# syntax 2006-03-23 12:01 tonvoon - * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: + * [r1349] NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: Incorrect output when checking non-existent disk (John Rouillard - 1326050) 2006-03-23 00:01 seanius - * plugins/check_apt.c: more work on check_apt. more graceful error - handling and information reporting, a couple new cmdline options. - still not quite ready for prime-time, maybe tomorrow :) + * [r1348] plugins/check_apt.c: + more work on check_apt. more graceful error handling and + information + reporting, a couple new cmdline options. still not quite ready + for prime-time, maybe tomorrow :) 2006-03-22 17:32 tonvoon - * REQUIREMENTS, configure.in: Reinstated --with-mysql option + * [r1347] REQUIREMENTS, configure.in: + Reinstated --with-mysql option 2006-03-22 16:45 tonvoon - * plugins/: check_dns.c, t/check_dns.t: Added warning and critical - response times (John Rouillard - 1343159) + * [r1346] plugins/check_dns.c, plugins/t/check_dns.t: + Added warning and critical response times (John Rouillard - + 1343159) 2006-03-22 15:45 tonvoon - * plugins/t/check_pop.t: Convert to new style tests + * [r1345] plugins/t/check_pop.t: + Convert to new style tests 2006-03-22 15:45 tonvoon - * THANKS.in, plugins/check_tcp.c: Options to change line ends for - -s and -q (John Rouillard - 1346104) + * [r1344] THANKS.in, plugins/check_tcp.c: + Options to change line ends for -s and -q (John Rouillard - + 1346104) 2006-03-22 14:32 tonvoon - * plugins-scripts/check_log.sh: Remove PATH restriction + * [r1343] plugins-scripts/check_log.sh: + Remove PATH restriction 2006-03-22 14:17 tonvoon - * plugins/: check_dns.c, t/check_dns.t: New style tests. Cleanup of - presentation of help. Added '' around -a checks + * [r1342] plugins/check_dns.c, plugins/t/check_dns.t: + New style tests. Cleanup of presentation of help. Added '' around + -a checks 2006-03-22 13:18 tonvoon - * plugins/check_by_ssh.c: Typo (Thomas Guettler - 1433447) + * [r1341] plugins/check_by_ssh.c: + Typo (Thomas Guettler - 1433447) 2006-03-22 12:59 tonvoon - * plugins-scripts/: check_log.sh, utils.sh.in: Remove hardlink to - /bin/sed. Leave to PATH (Abs - 1391483) + * [r1340] plugins-scripts/check_log.sh, + plugins-scripts/utils.sh.in: + Remove hardlink to /bin/sed. Leave to PATH (Abs - 1391483) 2006-03-22 00:00 seanius - * plugins/check_apt.c: initial version of a check_apt plugin... not - editing configure/Makefile.am's until i'm happier with it (better - output, better ways to define warning vs. critical thresholds... - etc). + * [r1339] plugins/check_apt.c: + initial version of a check_apt plugin... not editing + configure/Makefile.am's + until i'm happier with it (better output, better ways to define + warning + vs. critical thresholds... etc). 2006-03-21 14:20 tonvoon - * THANKS.in, configure.in: Stop check_dns from compiling if - nslookup does not exist (Sakari Lehtonen - 1412721) + * [r1338] THANKS.in, configure.in: + Stop check_dns from compiling if nslookup does not exist (Sakari + Lehtonen - + 1412721) 2006-03-21 13:42 tonvoon - * plugins/t/check_load.t: Updated to new Test::More method for - testing + * [r1337] plugins/t/check_load.t: + Updated to new Test::More method for testing 2006-03-21 13:32 tonvoon - * configure.in: Fix for mysql 3.x + * [r1336] configure.in: + Fix for mysql 3.x 2006-03-21 13:31 tonvoon - * plugins/check_tcp.c: Return CRITICAL if hostname invalid, as per - guidelines + * [r1335] plugins/check_tcp.c: + Return CRITICAL if hostname invalid, as per guidelines 2006-03-21 12:56 tonvoon - * tools/setup: Patch to workaround SFnot having libtool installed + * [r1334] tools/setup: + Patch to workaround SFnot having libtool installed 2006-03-21 11:42 tonvoon - * REQUIREMENTS, CHANGES, THANKS.in, configure.in, - plugins/Makefile.am, plugins/tests/Makefile.am: mysql discovery - based on mysql_config (Johan Fischer - 1359414) + * [r1333] CHANGES, REQUIREMENTS, THANKS.in, configure.in, + plugins/Makefile.am, plugins/tests/Makefile.am: + mysql discovery based on mysql_config (Johan Fischer - 1359414) 2006-03-20 22:06 seanius - * plugins/check_ntp.c: - shuffling some code around to keep things - tidy. - now average the result of 4 queries just as ntpdate does + * [r1332] plugins/check_ntp.c: + - shuffling some code around to keep things tidy. + - now average the result of 4 queries just as ntpdate does - put things in place for jitter calculation 2006-03-20 17:18 seanius - * plugins/check_ntp.c: ipv6 support for c-version of check_ntp + * [r1331] plugins/check_ntp.c: + ipv6 support for c-version of check_ntp 2006-03-18 19:00 seanius - * plugins/check_ntp.c: initial version of the pure-c check_ntp - implementation. jitter not yet implemented, and a couple other - misc things to do, so i haven't yet patched Makefile.am + * [r1330] plugins/check_ntp.c: + initial version of the pure-c check_ntp implementation. jitter + not yet + implemented, and a couple other misc things to do, so i haven't + yet patched Makefile.am 2006-03-18 14:47 seanius - * plugins/check_http.c: return-logic related fix for cert checking, - thanks to emmet hogan. + * [r1329] plugins/check_http.c: + return-logic related fix for cert checking, thanks to emmet + hogan. 2006-03-17 14:08 tonvoon - * plugins/tests/test_utils.t: Better error message re: tap library + * [r1328] plugins/tests/test_utils.t: + Better error message re: tap library 2006-03-17 14:07 tonvoon - * REQUIREMENTS, configure.in, plugins/Makefile.am, + * [r1327] REQUIREMENTS, configure.in, plugins/Makefile.am, plugins/check_mysql.c, plugins/check_mysql_query.c, - plugins/t/check_mysql.t: mysql detection cleanup: fixes runtime - linking, autodetection of main locations, detection of lib64 and - different layouts + plugins/t/check_mysql.t: + mysql detection cleanup: fixes runtime linking, autodetection of + main + locations, detection of lib64 and different layouts 2006-03-17 10:20 tonvoon - * doc/developer-guidelines.sgml: Added requirement for developer - system to have gnu libtool + * [r1326] doc/developer-guidelines.sgml: + Added requirement for developer system to have gnu libtool 2006-03-16 17:31 tonvoon - * configure.in, plugins/tests/Makefile.am, tools/setup: Using - libtool to get runpath for tap library + * [r1325] configure.in, plugins/tests/Makefile.am, tools/setup: + Using libtool to get runpath for tap library 2006-03-15 19:54 tonvoon - * THANKS.in, plugins/check_mysql.c, plugins/t/check_mysql.t: Alert - on amount of time a slave is behind (Steven Kreuzer) + * [r1324] THANKS.in, plugins/check_mysql.c, + plugins/t/check_mysql.t: + Alert on amount of time a slave is behind (Steven Kreuzer) 2006-03-13 17:59 seanius - * plugins/check_swap.c: fix for (tracker id 1420741) "check_swap: - incorrect totals for multiple partitions (BSD)" thanks to scott - thompson + * [r1323] plugins/check_swap.c: + fix for (tracker id 1420741) + "check_swap: incorrect totals for multiple partitions (BSD)" + thanks to scott thompson 2006-03-13 11:08 tonvoon - * plugins/check_ping.c: Change warning message if there is stderr - output. This catches a problem where time was shifting backwards - on a linux VMware guest during the ping + * [r1322] plugins/check_ping.c: + Change warning message if there is stderr output. This catches a + problem + where time was shifting backwards on a linux VMware guest during + the ping 2006-03-07 10:33 tonvoon - * plugins/t/check_http.t: Added tests for two external websites - with certificates + * [r1321] plugins/t/check_http.t: + Added tests for two external websites with certificates 2006-03-07 10:23 tonvoon - * plugins/t/check_http.t: Tests re-written in new object format + * [r1320] plugins/t/check_http.t: + Tests re-written in new object format 2006-02-24 17:03 tonvoon - * doc/developer-guidelines.sgml: Updated doc as tap library is now - automatically discovered + * [r1319] doc/developer-guidelines.sgml: + Updated doc as tap library is now automatically discovered 2006-02-24 16:41 tonvoon - * configure.in, plugins/tests/Makefile.am: Use the installed tap - library instead of requesting a compiled object + * [r1318] configure.in, plugins/tests/Makefile.am: + Use the installed tap library instead of requesting a compiled + object 2006-02-17 09:08 tonvoon - * THANKS.in, plugins/popen.c: SIGALRM could be received before - child_process is created (Jason Crawford) + * [r1317] THANKS.in, plugins/popen.c: + SIGALRM could be received before child_process is created (Jason + Crawford) 2006-02-17 06:24 seanius - * plugins/check_procs.c: set LC_NUMERIC to POSIX in check_procs.c + * [r1316] plugins/check_procs.c: + set LC_NUMERIC to POSIX in check_procs.c 2006-02-01 13:23 tonvoon - * plugins/t/check_mysql_query.t: If a mysql server has anonymous - login, tests will always fail + * [r1315] plugins/t/check_mysql_query.t: + If a mysql server has anonymous login, tests will always fail 2006-02-01 11:53 tonvoon - * plugins/tests/Makefile.am: Need to distribute perl test file + * [r1314] plugins/tests/Makefile.am: + Need to distribute perl test file 2006-01-31 16:48 tonvoon - * CHANGES: check_mysql_query included + * [r1313] CHANGES: + check_mysql_query included 2006-01-31 16:47 tonvoon - * REQUIREMENTS: Note on MacOSX difference in mysql package + * [r1312] REQUIREMENTS: + Note on MacOSX difference in mysql package 2006-01-31 16:45 tonvoon - * configure.in, plugins/Makefile.am: Clean compile of - check_mysql_query on MacOSX + * [r1311] configure.in, plugins/Makefile.am: + Clean compile of check_mysql_query on MacOSX 2006-01-31 15:40 tonvoon - * NPTest.pm: Sort ordering of tests + * [r1310] NPTest.pm: + Sort ordering of tests 2006-01-31 14:52 tonvoon - * configure.in, plugins/.cvsignore, plugins/Makefile.am, - plugins/check_mysql_query.c, plugins/utils.h, - plugins/t/check_mysql_query.t: Adding check_mysql_query, using - new ranges and threshold checking + * [r1309] configure.in, plugins, plugins/.cvsignore, + plugins/Makefile.am, plugins/check_mysql_query.c, + plugins/t/check_mysql_query.t, plugins/utils.h: + Adding check_mysql_query, using new ranges and threshold checking 2006-01-31 14:37 tonvoon - * plugins/t/check_mysql.t: Extra explanation in tests + * [r1308] plugins/t/check_mysql.t: + Extra explanation in tests 2006-01-31 14:36 tonvoon - * plugins/tests/test_utils.c: Fixed invalid free + * [r1307] plugins/tests/test_utils.c: + Fixed invalid free 2006-01-31 10:06 tonvoon - * doc/developer-guidelines.sgml: Updated instructions on using - libtap as configure option changed + * [r1306] doc/developer-guidelines.sgml: + Updated instructions on using libtap as configure option changed 2006-01-31 10:05 tonvoon - * configure.in: Changed configure option to --with-libtap-srcdir - because requires tap.h as well as tap.o + * [r1305] configure.in: + Changed configure option to --with-libtap-srcdir because requires + tap.h as well as tap.o 2006-01-30 22:24 tonvoon - * doc/developer-guidelines.sgml, plugins/utils.c, plugins/utils.h, - plugins/tests/test_utils.c: Clearly defined thresholds & ranges - in docs. Added get_status routine. Added set_thresholds routine. - Tests enhanced to check new routines + * [r1304] doc/developer-guidelines.sgml, + plugins/tests/test_utils.c, plugins/utils.c, plugins/utils.h: + Clearly defined thresholds & ranges in docs. Added get_status + routine. Added + set_thresholds routine. Tests enhanced to check new routines 2006-01-30 16:10 tonvoon - * configure.in, doc/developer-guidelines.sgml, plugins/Makefile.am, - plugins/utils.c, plugins/utils.h, plugins/tests/.cvsignore, + * [r1303] configure.in, doc/developer-guidelines.sgml, + plugins/Makefile.am, plugins/tests, plugins/tests/.cvsignore, plugins/tests/Makefile.am, plugins/tests/README, plugins/tests/check_disk, plugins/tests/check_dns, plugins/tests/check_ftp, plugins/tests/check_hpjd, @@ -1867,1257 +2894,1455 @@ plugins/tests/check_ping, plugins/tests/check_procs, plugins/tests/check_swap, plugins/tests/check_users, plugins/tests/check_vsz, plugins/tests/test_utils.c, - plugins/tests/test_utils.t: Added libtap tests for utils.c - library functions. Removed redundant test files + plugins/tests/test_utils.t, plugins/utils.c, plugins/utils.h: + Added libtap tests for utils.c library functions. Removed + redundant + test files 2006-01-21 21:46 tonvoon - * tools/sfsnapshot: Have to use own id for cvs checkout. Change - compile server because old one not working consistently + * [r1302] tools/sfsnapshot: + Have to use own id for cvs checkout. Change compile server + because + old one not working consistently 2005-12-19 09:25 tonvoon - * NPTest.pm: Break out of testing if a new parameter is required + * [r1301] NPTest.pm: + Break out of testing if a new parameter is required 2005-12-16 18:41 harpermann - * contrib/check_log2.pl: Added ability to output critical on error. - Fixed open so it properly fails if the log file open throws an - error, turned on -w in the perl call, fixed warnings + * [r1300] contrib/check_log2.pl: + Added ability to output critical on error. Fixed open so it + properly fails if the log file open throws an error, turned on -w + in the perl call, fixed warnings 2005-12-15 17:06 tonvoon - * NPTest.pm, plugins/check_mysql.c, plugins/t/check_mysql.t: + * [r1299] NPTest.pm, plugins/check_mysql.c, + plugins/t/check_mysql.t: Display errors with slave queries correctly. Added extra tests for slaves 2005-12-15 15:19 tonvoon - * NPTest.pm, doc/developer-guidelines.sgml, plugins/t/check_disk.t: + * [r1298] NPTest.pm, doc/developer-guidelines.sgml, + plugins/t/check_disk.t: New 3 parameter version of getTestParameters. Updated - check_disk.t to reflect. Added notes re: testing in developer - guidelines. + check_disk.t to reflect. + Added notes re: testing in developer guidelines. 2005-12-15 15:17 tonvoon - * plugins-scripts/: check_file_age.pl, t/check_file_age.t: Allow - directories and links to be tested by check_file_age. Sanitise - output. Added tests + * [r1297] plugins-scripts/check_file_age.pl, + plugins-scripts/t/check_file_age.t: + Allow directories and links to be tested by check_file_age. + Sanitise output. + Added tests 2005-12-07 19:32 harpermann - * plugins/urlize.c: Nagiosplug bug 1266977. Added code to insert - the closing after the plugin output but before the - performance output. + * [r1296] plugins/urlize.c: + Nagiosplug bug 1266977. Added code to insert the closing + after the plugin output but before the performance output. 2005-12-07 15:10 tonvoon - * THANKS.in, plugins/common.h: No floorf on Solaris 9 (Jon - Vandegrift - 1374705) + * [r1295] THANKS.in, plugins/common.h: + No floorf on Solaris 9 (Jon Vandegrift - 1374705) 2005-12-02 22:28 tonvoon - * THANKS.in, doc/developer-guidelines.sgml, plugins/check_nagios.c, + * [r1294] THANKS.in, doc/developer-guidelines.sgml, + plugins/check_nagios.c, plugins/t/check_nagios.nagios1.status.log, plugins/t/check_nagios.nagios2.status.dat, - plugins/t/check_nagios.t: Support for Nagios 1 and Nagios 2 - status files (Gerhard Lausser - 1296242) + plugins/t/check_nagios.t: + Support for Nagios 1 and Nagios 2 status files (Gerhard Lausser - + 1296242) 2005-12-02 22:25 tonvoon - * plugins/t/.cvsignore: Ignore temporary files created for tests + * [r1293] plugins/t, plugins/t/.cvsignore: + Ignore temporary files created for tests 2005-12-01 01:05 tonvoon - * configure.in, config_test/Makefile, config_test/run_tests: Run - longer test on redhat for spopen/pthread problem. Allow - enable/disable of pthread fix via configure option + * [r1292] config_test/Makefile, config_test/run_tests, + configure.in: + Run longer test on redhat for spopen/pthread problem. Allow + enable/disable of + pthread fix via configure option 2005-11-30 00:49 harpermann - * plugins-scripts/check_ntp.pl: Nagiosplug bug # 1251096 check_ntp - wasn't properly handing a bad exit status from the external - programs it calls (ntpdate and ntpq), so jitter wasn't set. - Added check of $? on close and proper error output if status from - the sub program call completion is non-zero. This includes "host - not found". + * [r1291] plugins-scripts/check_ntp.pl: + Nagiosplug bug # 1251096 + check_ntp wasn't properly handing a bad exit status from the + external programs it calls (ntpdate and ntpq), so jitter wasn't + set. Added check of $? on close and proper error output if status + from the sub program call completion is non-zero. This includes + "host not found". 2005-11-29 23:21 harpermann - * contrib/check_email_loop.pl: UNKNOWN exit status was returning - status of "-1", changed to "3" + * [r1290] contrib/check_email_loop.pl: + UNKNOWN exit status was returning status of "-1", changed to "3" 2005-11-29 23:19 harpermann - * contrib/check_email_loop.pl: Bug: 1355304 Added patch for ePN and - perl warnings. Fixed some text and a warning about type - comparison. + * [r1289] contrib/check_email_loop.pl: + Bug: 1355304 Added patch for ePN and perl warnings. Fixed some + text and + a warning about type comparison. 2005-11-18 12:56 tonvoon - * tools/sfsnapshot: Create a permanent link to HEAD snapshot + * [r1288] tools/sfsnapshot: + Create a permanent link to HEAD snapshot 2005-11-18 11:56 tonvoon - * doc/developer-guidelines.sgml: Updated with more detailed - description of UNKNOWN states + * [r1287] doc/developer-guidelines.sgml: + Updated with more detailed description of UNKNOWN states 2005-11-16 17:26 tonvoon - * plugins/check_disk.c: Fixed some compile errors with new - translations. Also reintroduced formatting after discussion with - Benoit + * [r1286] plugins/check_disk.c: + Fixed some compile errors with new translations. Also + reintroduced formatting + after discussion with Benoit 2005-11-15 16:26 tonvoon - * plugins/t/check_disk.t: Updated tests to minimise false - positives. Breaking down so more obvious what the tests are doing + * [r1285] plugins/t/check_disk.t: + Updated tests to minimise false positives. Breaking down so more + obvious + what the tests are doing 2005-11-14 14:43 tonvoon - * doc/developer-guidelines.sgml: Added section re: translations + * [r1284] doc/developer-guidelines.sgml: + Added section re: translations 2005-11-14 01:18 opensides - * plugins/check_http.c: - localization cleaning ... last commit before sleeping + * [r1283] plugins/check_http.c: + localization cleaning ... + last commit before sleeping 2005-11-14 00:51 opensides - * plugins/: check_dig.c, check_disk.c, check_dns.c, check_dummy.c, - check_fping.c, check_game.c: + * [r1282] plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c: start of the cleaning of the localization 2005-11-12 23:48 tonvoon - * THANKS.in, plugins/t/check_disk.t: Updated check_disk tests to - use Test::More (Serhan Kiymaz) + * [r1281] THANKS.in, plugins/t/check_disk.t: + Updated check_disk tests to use Test::More (Serhan Kiymaz) 2005-11-09 17:27 tonvoon - * plugins/t/check_mysql.t: Using Test::More + * [r1280] plugins/t/check_mysql.t: + Using Test::More 2005-11-09 16:40 tonvoon - * NPTest.pm, plugins/t/check_imap.t, plugins/t/check_swap.t: Added - new NPTest->testCmd which returns objects back for testing at the - test script level. Updated check_swap and check_imap to this new - format + * [r1279] NPTest.pm, plugins/t/check_imap.t, + plugins/t/check_swap.t: + Added new NPTest->testCmd which returns objects back for testing + at the test script level. Updated check_swap and check_imap to + this + new format 2005-11-09 16:37 tonvoon - * plugins/check_swap.c: Problem where absolute thresholds not - working on /proc/meminfo systems. Suffixed all variables with the - unit of measurement + * [r1278] plugins/check_swap.c: + Problem where absolute thresholds not working on /proc/meminfo + systems. Suffixed all variables with the unit of measurement 2005-11-09 16:34 tonvoon - * configure.in: Typo with predetermined values + * [r1277] configure.in: + Typo with predetermined values 2005-11-09 14:10 tonvoon - * doc/developer-guidelines.sgml: Added copyright/license info - required in submissions + * [r1276] doc/developer-guidelines.sgml: + Added copyright/license info required in submissions 2005-11-09 09:31 tonvoon - * doc/: NEW_STARTERS, developer-guidelines.sgml: Updated dev - guidelines to link to NagiosExchange. Removed project admin notes - from guidelines into separate file + * [r1275] doc/NEW_STARTERS, doc/developer-guidelines.sgml: + Updated dev guidelines to link to NagiosExchange. Removed project + admin + notes from guidelines into separate file 2005-11-07 12:46 seanius - * configure.in: incorporated patch from Elan Ruusamäe (ahmake) to - override program autodetection (see Feature Requests-1341528). i - would not call this quite complete just yet (i'll explain more in - the tracker), but should be functional and useful enough to - commit now, in any case. + * [r1274] configure.in: + incorporated patch from Elan Ruusamäe (ahmake) to override + program autodetection (see Feature Requests-1341528). i would + not call this quite complete just yet (i'll explain more in the + tracker), but should be functional and useful enough to commit + now, in any case. 2005-11-04 09:38 tonvoon - * THANKS.in, plugins/check_tcp.c, plugins/t/check_imap.t: Fixed - --mismatch option for check_tcp. Added tests into check_imap + * [r1273] THANKS.in, plugins/check_tcp.c, plugins/t/check_imap.t: + Fixed --mismatch option for check_tcp. Added tests into + check_imap (Rick Fey - 1339134) 2005-11-03 15:21 tonvoon - * Makefile.am, tools/tinderbox_build: Adding new tinderbox build - script + * [r1272] Makefile.am, tools/tinderbox_build: + Adding new tinderbox build script 2005-11-03 15:13 tonvoon - * plugins/t/: check_disk.t, check_procs.t: Invalid mount point - doesn't make sense because most df implementations would work out - the actual mount point. And fixed typo in check_procs.t + * [r1271] plugins/t/check_disk.t, plugins/t/check_procs.t: + Invalid mount point doesn't make sense because most df + implementations + would work out the actual mount point. And fixed typo in + check_procs.t 2005-11-03 15:04 tonvoon - * NPTest.pm, plugins/t/check_http.t, plugins/t/check_time.t: Fixing - some test failures + * [r1270] NPTest.pm, plugins/t/check_http.t, + plugins/t/check_time.t: + Fixing some test failures 2005-11-02 08:59 seanius - * plugins/check_disk.c: #995761: patch from ben o'hara to include - inode calculations in check_disk.c. - + * [r1269] plugins/check_disk.c: + #995761: patch from ben o'hara to include inode calculations in + check_disk.c. + previous commit also had a patch for smtp auth support, but i - accidentally sent a blank commit message. + accidentally + sent a blank commit message. 2005-11-02 08:47 seanius - * plugins/check_smtp.c: check_smtp.c + * [r1268] plugins/check_smtp.c: + check_smtp.c 2005-10-31 20:03 seanius - * configure.in, plugins/check_game.c, plugins/check_http.c, + * [r1267] configure.in, plugins/check_game.c, plugins/check_http.c, plugins/check_nagios.c, plugins/check_snmp.c, plugins/check_swap.c, plugins/check_tcp.c, plugins/common.h, - plugins/netutils.c, plugins/netutils.h, plugins/sslutils.c: code - cleanups, largely resulting from turning on -Wall. mostly unused - variables and explicit casting issues, but there were a couple - gotchas in there too. + plugins/netutils.c, plugins/netutils.h, plugins/sslutils.c: + code cleanups, largely resulting from turning on -Wall. mostly + unused variables and explicit casting issues, but there were a + couple gotchas in there too. 2005-10-30 22:45 seanius - * plugins/Makefile.am: turned on -Wall in plugins/Makefile.am via - AM_CFLAGS. shouldn't keep our heads in the sand for potential - errors, after all :) + * [r1266] plugins/Makefile.am: + turned on -Wall in plugins/Makefile.am via AM_CFLAGS. shouldn't + keep + our heads in the sand for potential errors, after all :) 2005-10-30 18:05 seanius - * plugins/check_tcp.c: another fix from alex: check for '/' in the - server_address before trying to resolve it via is_host(). + * [r1265] plugins/check_tcp.c: + another fix from alex: check for '/' in the server_address before + trying to resolve it via is_host(). 2005-10-30 10:25 seanius - * plugins/check_tcp.c: fixes for some bugs found in my merging of - the tcp socket patch + * [r1264] plugins/check_tcp.c: + fixes for some bugs found in my merging of the tcp socket patch -2005-10-29 16:38 seanius +2005-10-29 15:38 seanius - * plugins-scripts/check_log.sh: check_log fixes from Ade Rixon + * [r1263] plugins-scripts/check_log.sh: + check_log fixes from Ade Rixon -2005-10-29 13:46 seanius +2005-10-29 12:46 seanius - * plugins/Makefile.am: patch from nsturm: Makefile.am should have - been checking for check_ldap instead of check_ldaps. the result - was that check_ldaps was not being created during the build - process. + * [r1262] plugins/Makefile.am: + patch from nsturm: Makefile.am should have been checking for + check_ldap + instead of check_ldaps. the result was that check_ldaps was not + being + created during the build process. -2005-10-25 11:38 seanius +2005-10-25 10:38 seanius - * COPYING, configure.in, plugins/Makefile.am, plugins/check_tcp.c, - plugins/netutils.c, plugins/netutils.h, plugins/utils.h, - po/de.po, po/fr.po: - added code to allow check_tcp (via - np_net_connect) work with local unix sockets. some testing - would be welcome. based on idea from Alex Samorukov. - also - introduced a check_clamd behavior in check_tcp. + * [r1261] COPYING, configure.in, plugins/Makefile.am, + plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h, + plugins/utils.h, po/de.po, po/fr.po: + - added code to allow check_tcp (via np_net_connect) work with + local + unix sockets. some testing would be welcome. based on idea from + Alex Samorukov. + - also introduced a check_clamd behavior in check_tcp. -2005-10-24 12:10 seanius +2005-10-24 11:10 seanius - * plugins/: Makefile.am, check_by_ssh.c, check_dig.c, check_dns.c, - check_game.c, check_nagios.c, netutils.c, runcmd.c, runcmd.h, - utils.c, utils.h: initial merging of ae's np_runcmd code into - selected plugins. + * [r1260] plugins/Makefile.am, plugins/check_by_ssh.c, + plugins/check_dig.c, plugins/check_dns.c, plugins/check_game.c, + plugins/check_nagios.c, plugins/netutils.c, plugins/runcmd.c, + plugins/runcmd.h, plugins/utils.c, plugins/utils.h: + initial merging of ae's np_runcmd code into selected plugins. -2005-10-23 13:01 seanius +2005-10-23 12:01 seanius - * configure.in: whoops, missed this one, same as last commit + * [r1259] configure.in: + whoops, missed this one, same as last commit -2005-10-23 12:59 seanius +2005-10-23 11:59 seanius - * plugins/: Makefile.am, netutils.c, sslutils.c: - - compartmentalized ssl code into seperate sslutils.c - ssl-related - cleanups in configure.in, and now openssl/gnutls options + * [r1258] plugins/Makefile.am, plugins/netutils.c, + plugins/sslutils.c: + - compartmentalized ssl code into seperate sslutils.c + - ssl-related cleanups in configure.in, and now openssl/gnutls + options automatically disable each other. -2005-10-19 21:22 seanius +2005-10-19 20:22 seanius - * plugins/: check_http.c, check_smtp.c, check_tcp.c, netutils.c, - netutils.h: all plugins now using centralized ssl functions in - netutils.c + * [r1257] plugins/check_http.c, plugins/check_smtp.c, + plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: + all plugins now using centralized ssl functions in netutils.c -2005-10-19 14:05 seanius +2005-10-19 13:05 seanius - * plugins/check_http.c: endif was a few lines off of where it - should be + * [r1256] plugins/check_http.c: + endif was a few lines off of where it should be -2005-10-19 13:59 seanius +2005-10-19 12:59 seanius - * configure.in, plugins/Makefile.am, plugins/check_http.c, - plugins/check_smtp.c, plugins/check_tcp.c, plugins/common.h, - plugins/netutils.c, plugins/netutils.h, plugins-root/Makefile.am: + * [r1255] configure.in, plugins-root/Makefile.am, + plugins/Makefile.am, plugins/check_http.c, plugins/check_smtp.c, + plugins/check_tcp.c, plugins/common.h, plugins/netutils.c, + plugins/netutils.h: - initial attempt at consolidating ssl-related code into - netutils.{c,h} - added some #ifdefs to common.h and netutils.h to - prevent multiple inclusions (as netlibs now includes common.h) + netutils.{c,h} + - added some #ifdefs to common.h and netutils.h to prevent + multiple + inclusions (as netlibs now includes common.h) - all ssl plugins (tcp/http/smtp) compile cleanly against gnutls, - though certificate checking still needs to be done. - modified - configure script so you can also explicitly say "without-gnutls" + though + certificate checking still needs to be done. + - modified configure script so you can also explicitly say + "without-gnutls" too (otherwise if you disable openssl you have no way of - disabling gnutls too) + disabling + gnutls too) -2005-10-18 23:35 seanius +2005-10-18 22:35 seanius - * configure.in, plugins/check_tcp.c: initial "experimental" support - for gnutls. by default openssl is still used if available, and - gnutls is only used if openssl is not available or explicitly - disabled (--without-openssl). currently the only plugin i've - verified to work is check_tcp, but i had to disable cert + * [r1254] configure.in, plugins/check_tcp.c: + initial "experimental" support for gnutls. by default openssl is + still + used if available, and gnutls is only used if openssl is not + available + or explicitly disabled (--without-openssl). currently the only + plugin + i've verified to work is check_tcp, but i had to disable cert checking. -2005-10-18 10:26 tonvoon +2005-10-18 09:26 tonvoon - * README: Added license information to README with exemption for - use of OpenSSL + * [r1253] README: + Added license information to README with exemption for use of + OpenSSL -2005-10-13 12:51 tonvoon +2005-10-13 11:51 tonvoon - * configure.in: Run spopen tests for Redhat ES SMP (Hans Engelen) + * [r1252] configure.in: + Run spopen tests for Redhat ES SMP (Hans Engelen) -2005-10-13 11:22 seanius +2005-10-13 10:22 seanius - * po/de.po: debian bts #313960: - grammatical german fixes. i'm - taking the reporter's word for it :) + * [r1251] po/de.po: + debian bts #313960: + - grammatical german fixes. i'm taking the reporter's word for it + :) -2005-10-13 11:20 seanius +2005-10-13 10:20 seanius - * plugins-scripts/check_ntp.pl: debian bts #268044: - use a "less - beastly" regex for parsing ntpq output. probably need some - more widespread testing on this one. + * [r1250] plugins-scripts/check_ntp.pl: + debian bts #268044: + - use a "less beastly" regex for parsing ntpq output. probably + need + some more widespread testing on this one. -2005-10-13 11:18 seanius +2005-10-13 10:18 seanius - * plugins/check_disk.c: debian bts #296278: - it seems that when - check_disk uses the "df" routines and is told to check a - non-mountpoint, it would check the filesystem on which the + * [r1249] plugins/check_disk.c: + debian bts #296278: + - it seems that when check_disk uses the "df" routines and is + told to + check a non-mountpoint, it would check the filesystem on which + the directory was mounted (i.e. /var/log -> /var if no /var/log - mount). the system-call routines now do this too. might need - a bit more widespread testing, but looks good for me and i did - it without modifying any of the system-call-specific - codeblocks. + mount). + the system-call routines now do this too. might need a bit more + widespread testing, but looks good for me and i did it without + modifying any of the system-call-specific codeblocks. -2005-10-13 11:16 seanius +2005-10-13 10:16 seanius - * plugins/check_game.c: debian bts #307905: - someone changed the - cmdline syntax of check game without also updating the - usage/help function ;p + * [r1248] plugins/check_game.c: + debian bts #307905: + - someone changed the cmdline syntax of check game without also + updating the usage/help function ;p -2005-10-13 11:14 seanius +2005-10-13 10:14 seanius - * plugins-scripts/check_disk_smb.pl: debian bts #300701: - - check_smb fix for freespace threshold parsing from the cmdline + * [r1247] plugins-scripts/check_disk_smb.pl: + debian bts #300701: + - check_smb fix for freespace threshold parsing from the cmdline options. -2005-10-13 11:11 seanius +2005-10-13 10:11 seanius - * plugins/check_smtp.c: multiple fixes in check_smtp from debian - (bts #285554): - fix for double free via SSL_CTX_free. looks - like the previous author knew this was a problem but didn't - care enough to fix it ;p. - use defines instead of const chars - for SMTP strings. - default to send our fqdn (via gethostbyname - lookup on gethostname) in the HELO string, as this is an - RFC/SMTP requirement. overridable via cmdline. - use EHLO - instead of HELO if using STARTTLS, as it is not SMTP but ESMTP. - - verify the server supports STARTTLS before initializing it. - - always send QUIT before disconnecting when possible. + * [r1246] plugins/check_smtp.c: + multiple fixes in check_smtp from debian (bts #285554): + - fix for double free via SSL_CTX_free. looks like the previous + author + knew this was a problem but didn't care enough to fix it ;p. + - use defines instead of const chars for SMTP strings. + - default to send our fqdn (via gethostbyname lookup on + gethostname) + in the HELO string, as this is an RFC/SMTP requirement. + overridable + via cmdline. + - use EHLO instead of HELO if using STARTTLS, as it is not SMTP + but + ESMTP. + - verify the server supports STARTTLS before initializing it. + - always send QUIT before disconnecting when possible. -2005-10-13 10:58 seanius +2005-10-13 09:58 seanius - * plugins/check_mrtg.c: was this plugin even working? i don't - think the if/else logic was doing what was intended. + * [r1245] plugins/check_mrtg.c: + was this plugin even working? i don't think the if/else logic + was doing what was intended. -2005-10-13 10:55 seanius +2005-10-13 09:55 seanius - * plugins/check_mysql.c: check mysql now reads [client] defaults - from my.cnf (debian bug #278817) + * [r1244] plugins/check_mysql.c: + check mysql now reads [client] defaults from my.cnf (debian bug + #278817) -2005-10-06 13:16 seanius +2005-10-06 12:16 seanius - * plugins/check_ups.c: fix for misreporting temperature in perfdata - output for check_ups (debian bts id: #316534) + * [r1243] plugins/check_ups.c: + fix for misreporting temperature in perfdata output for check_ups + (debian bts id: #316534) -2005-10-06 13:12 seanius +2005-10-06 12:12 seanius - * configure.in, plugins-root/Makefile.am: whoops. now using - automake conditionals to prevent attempted compiles of pst3 on - non solaris systems. + * [r1242] configure.in, plugins-root/Makefile.am: + whoops. now using automake conditionals to prevent attempted + compiles + of pst3 on non solaris systems. -2005-09-25 17:34 seanius +2005-09-25 16:34 seanius - * plugins-root/Makefile.am: added rules to Makefile.am for pst3 + * [r1241] plugins-root/Makefile.am: + added rules to Makefile.am for pst3 -2005-09-24 21:01 seanius +2005-09-24 20:01 seanius - * configure.in: a final change to hardcode the path for where - plugins are installed. it's a very, very ugly hack... if anyone - can think of a better way to do it, i'm all ears. + * [r1240] configure.in: + a final change to hardcode the path for where plugins are + installed. + it's a very, very ugly hack... if anyone can think of a better + way + to do it, i'm all ears. -2005-09-22 13:10 seanius +2005-09-22 12:10 seanius - * configure.in: use test instead of '[ ... ]' in configure.in. the - check_procs/pst3 situation is still not quite fixed. + * [r1239] configure.in: + use test instead of '[ ... ]' in configure.in. the + check_procs/pst3 + situation is still not quite fixed. -2005-09-22 10:43 seanius +2005-09-22 09:43 seanius - * THANKS.in, configure.in, plugins-root/pst3.c: first version of - bob ingraham's pst3 to allow checking for longer cmdline names - than otherwise possible, by querying solaris kmem directly (ps - forcibly truncates). added requisite configure.in voodoo and - updated THANKS.in. + * [r1238] THANKS.in, configure.in, plugins-root/pst3.c: + first version of bob ingraham's pst3 to allow checking for longer + cmdline names than otherwise possible, by querying solaris kmem + directly (ps forcibly truncates). added requisite configure.in + voodoo + and updated THANKS.in. -2005-09-22 09:10 tonvoon +2005-09-22 08:10 tonvoon - * po/POTFILES.in: Mark moving of check_dhcp and check_icmp for - translation + * [r1237] po/POTFILES.in: + Mark moving of check_dhcp and check_icmp for translation -2005-09-21 14:07 tonvoon +2005-09-21 13:07 tonvoon - * AUTHORS, THANKS.in: Updated with contributors and new team member + * [r1236] AUTHORS, THANKS.in: + Updated with contributors and new team member -2005-09-21 14:04 tonvoon +2005-09-21 13:04 tonvoon - * plugins/check_nwstat.c: Reopen connections for each query - (1296296 - David Sullivan) + * [r1235] plugins/check_nwstat.c: + Reopen connections for each query (1296296 - David Sullivan) -2005-09-21 11:09 tonvoon +2005-09-21 10:09 tonvoon - * plugins/: check_dhcp.c, check_icmp.c: Moved into plugins-root/ + * [r1234] plugins/check_dhcp.c, plugins/check_icmp.c: + Moved into plugins-root/ -2005-09-21 11:06 tonvoon +2005-09-21 10:06 tonvoon - * ACKNOWLEDGEMENTS, CHANGES, Makefile.am, README, configure.in, - plugins/Makefile.am, plugins-root/.cvsignore, + * [r1233] ACKNOWLEDGEMENTS, CHANGES, Makefile.am, README, + configure.in, plugins-root, plugins-root/.cvsignore, plugins-root/Makefile.am, plugins-root/check_dhcp.c, - plugins-root/check_icmp.c: Separation of root setuid plugins into - plugins-root/ + plugins-root/check_icmp.c, plugins/Makefile.am: + Separation of root setuid plugins into plugins-root/ -2005-09-20 17:11 tonvoon +2005-09-20 16:11 tonvoon - * configure.in: Incorrect assignment of procppid in configure.in - (1296497 - Pascal Larisch) + * [r1232] configure.in: + Incorrect assignment of procppid in configure.in (1296497 - + Pascal Larisch) -2005-09-20 12:34 tonvoon +2005-09-20 11:34 tonvoon - * configure.in, plugins/t/check_procs.t: Support for Tru64 for - check_procs + additional test cases + * [r1231] configure.in, plugins/t/check_procs.t: + Support for Tru64 for check_procs + additional test cases -2005-09-19 15:18 tonvoon +2005-09-19 14:18 tonvoon - * doc/RELEASING: Note to update version number before creating - ChangeLog + * [r1230] doc/RELEASING: + Note to update version number before creating ChangeLog -2005-09-19 14:51 tonvoon +2005-09-19 13:51 tonvoon - * configure.in, package.def: For 1.4.2 release + * [r1228] configure.in, package.def: + For 1.4.2 release -2005-09-19 14:48 tonvoon +2005-09-19 13:48 tonvoon - * ChangeLog: Updated for 1.4.2 release + * [r1227] ChangeLog: + Updated for 1.4.2 release -2005-09-19 14:46 tonvoon +2005-09-19 13:46 tonvoon - * doc/RELEASING: Reminders for news item and tag format + * [r1226] doc/RELEASING: + Reminders for news item and tag format -2005-09-19 14:42 tonvoon +2005-09-19 13:42 tonvoon - * BUGS: Updated BUGS for 1.4.2 release + * [r1225] BUGS: + Updated BUGS for 1.4.2 release -2005-09-19 11:58 tonvoon +2005-09-19 10:58 tonvoon - * THANKS.in: More contributors + * [r1224] THANKS.in: + More contributors -2005-09-15 09:39 tonvoon +2005-09-15 08:39 tonvoon - * plugins/t/check_ping.t: Added test to make sure hostname has to - be specified + * [r1223] plugins/t/check_ping.t: + Added test to make sure hostname has to be specified -2005-09-15 09:27 tonvoon +2005-09-15 08:27 tonvoon - * plugins/: check_procs.c, check_swap.c: - Cleanup minor compile - errors on Irix + * [r1222] plugins/check_procs.c, plugins/check_swap.c: + - Cleanup minor compile errors on Irix -2005-09-14 15:40 tonvoon +2005-09-14 14:40 tonvoon - * plugins/check_ping.c: Using common message + * [r1221] plugins/check_ping.c: + Using common message -2005-09-14 15:36 tonvoon +2005-09-14 14:36 tonvoon - * plugins/check_ping.c: Required hostname not flagging as an error + * [r1220] plugins/check_ping.c: + Required hostname not flagging as an error -2005-09-14 13:40 tonvoon +2005-09-14 12:40 tonvoon - * plugins/Makefile.am: Some makes do not like blank lines after - "\". Fixed check_ldaps to only generate if check_ldap was created - (Chester Hosey) + * [r1219] plugins/Makefile.am: + Some makes do not like blank lines after "\". Fixed check_ldaps + to only + generate if check_ldap was created (Chester Hosey) -2005-09-14 10:53 tonvoon +2005-09-14 09:53 tonvoon - * plugins/check_load.c: Fix to parsing of uptime (Ronald Tin - - 1254656) + * [r1218] plugins/check_load.c: + Fix to parsing of uptime (Ronald Tin - 1254656) -2005-09-14 10:49 tonvoon +2005-09-14 09:49 tonvoon - * configure.in: - Removing typos + * [r1217] configure.in: + - Removing typos -2005-09-13 16:48 tonvoon +2005-09-13 15:48 tonvoon - * plugins/check_ping.c: More diagnostic messages from check_ping + * [r1216] plugins/check_ping.c: + More diagnostic messages from check_ping -2005-09-12 12:20 seanius +2005-09-12 11:20 seanius - * plugins/check_ping.c: re-add a call to setlocale(LC_ALL, "") in - check_ping.c + * [r1215] plugins/check_ping.c: + re-add a call to setlocale(LC_ALL, "") in check_ping.c -2005-09-12 11:37 tonvoon +2005-09-12 10:37 tonvoon - * THANKS.in: For help in fixing Red Hat problem with ECHILD and - waitpid + * [r1214] THANKS.in: + For help in fixing Red Hat problem with ECHILD and waitpid -2005-09-12 11:31 tonvoon +2005-09-12 10:31 tonvoon - * plugins/popen.c, Makefile.am, configure.in, config_test/Makefile, - config_test/child_test.c, config_test/run_tests: ECHILD error at - waitpid on Red Hat systems (Peter Pramberger and Sascha Runschke - - 1250191) + * [r1213] Makefile.am, config_test, config_test/Makefile, + config_test/child_test.c, config_test/run_tests, configure.in, + plugins/popen.c: + ECHILD error at waitpid on Red Hat systems (Peter Pramberger and + Sascha Runschke - 1250191) -2005-08-30 23:11 tonvoon +2005-08-30 22:11 tonvoon - * plugins-scripts/subst.in: Better comments for what the - substitutions are doing + * [r1212] plugins-scripts/subst.in: + Better comments for what the substitutions are doing -2005-08-01 22:30 tonvoon +2005-08-01 21:30 tonvoon - * doc/BRANCHING: Move notes on branching away from RELEASING + * [r1210] doc/BRANCHING: + Move notes on branching away from RELEASING -2005-08-01 22:28 tonvoon +2005-08-01 21:28 tonvoon - * package.def: For 1.4.1 release + * [r1209] BUGS, ChangeLog, REQUIREMENTS, configure.in, package.def: + For 1.4.1 release -2005-08-01 22:23 tonvoon +2005-07-25 14:17 illumino - * ChangeLog, configure.in, BUGS, REQUIREMENTS: For 1.4.1 release + * [r1208] NPTest.pm: + Change the environment variable NPTESTCACHE to NPTEST_CACHE for + consistancy -2005-07-25 15:17 illumino +2005-07-25 01:47 illumino - * NPTest.pm: Change the environment variable NPTESTCACHE to - NPTEST_CACHE for consistancy - -2005-07-25 02:47 illumino - - * Helper.pm, Makefile.am, NPTest.pm, configure.in, test.pl.in, - plugins/t/check_disk.t, plugins/t/check_dns.t, - plugins/t/check_fping.t, plugins/t/check_ftp.t, - plugins/t/check_hpjd.t, plugins/t/check_http.t, - plugins/t/check_imap.t, plugins/t/check_load.t, - plugins/t/check_mysql.t, plugins/t/check_ping.t, - plugins/t/check_pop.t, plugins/t/check_procs.t, - plugins/t/check_smtp.t, plugins/t/check_snmp.t, - plugins/t/check_swap.t, plugins/t/check_tcp.t, - plugins/t/check_time.t, plugins/t/check_udp.t, - plugins/t/check_users.t, plugins/t/check_vsz.t, - plugins-scripts/t/check_rpc.t: [1185704] New Testing - Infrastructure. Complete rewrite of the original testing - infrastructure and all test cases (to use the new infrastructure) + * [r1207] Helper.pm, Makefile.am, NPTest.pm, configure.in, + plugins-scripts/t/check_rpc.t, plugins/t/check_disk.t, + plugins/t/check_dns.t, plugins/t/check_fping.t, + plugins/t/check_ftp.t, plugins/t/check_hpjd.t, + plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_load.t, plugins/t/check_mysql.t, + plugins/t/check_ping.t, plugins/t/check_pop.t, + plugins/t/check_procs.t, plugins/t/check_smtp.t, + plugins/t/check_snmp.t, plugins/t/check_swap.t, + plugins/t/check_tcp.t, plugins/t/check_time.t, + plugins/t/check_udp.t, plugins/t/check_users.t, + plugins/t/check_vsz.t, test.pl.in: + [1185704] New Testing Infrastructure. + Complete rewrite of the original testing infrastructure and + all test cases (to use the new infrastructure) See NPTest.pm and issue 1185704 for more details. -2005-07-20 23:39 tonvoon +2005-07-20 22:39 tonvoon - * THANKS.in: More contributors + * [r1206] THANKS.in: + More contributors -2005-07-20 23:38 tonvoon +2005-07-20 22:38 tonvoon - * plugins/check_ping.c: Fix parsing for netkit-ping and - iputils-ping (Christian G Warden) + * [r1205] plugins/check_ping.c: + Fix parsing for netkit-ping and iputils-ping (Christian G Warden) -2005-07-11 23:15 tonvoon +2005-07-11 22:15 tonvoon - * plugins/check_nwstat.c: Miscelleneous bug fixes (Gerd Mueller - - 1235879) + * [r1204] plugins/check_nwstat.c: + Miscelleneous bug fixes (Gerd Mueller - 1235879) -2005-07-09 05:44 tonvoon +2005-07-09 04:44 tonvoon - * BRANCHES: Changed format (already!) for awk simplicity + * [r1203] BRANCHES: + Changed format (already!) for awk simplicity -2005-07-09 05:03 tonvoon +2005-07-09 04:03 tonvoon - * BRANCHES: Master file to describe the current branches in CVS. - Will be used by sfsnapshot to create the snapshot tarballs + * [r1202] BRANCHES: + Master file to describe the current branches in CVS. Will be used + by + sfsnapshot to create the snapshot tarballs -2005-07-06 23:21 tonvoon +2005-07-06 22:21 tonvoon - * configure.in: Removed ",", causing problems with MacOSX compile + * [r1201] configure.in: + Removed ",", causing problems with MacOSX compile -2005-07-06 23:10 tonvoon +2005-07-06 22:10 tonvoon - * plugins/check_swap.c: Updated help file to remove swap -s - reference (Sivakumar Nellurandi) + * [r1200] plugins/check_swap.c: + Updated help file to remove swap -s reference (Sivakumar + Nellurandi) -2005-07-06 22:00 tonvoon +2005-07-06 21:00 tonvoon - * AUTHORS, THANKS.in: Sean Finney moved to main list of plugin - developers + * [r1199] AUTHORS, THANKS.in: + Sean Finney moved to main list of plugin developers -2005-07-04 10:52 opensides +2005-07-04 09:52 opensides - * contrib/tarballs/check_traffic-0.90b.tar.gz: + * [r1198] contrib/tarballs/check_traffic-0.90b.tar.gz: replace the version of check_traffic who was missing the plugin by a good one -2005-06-29 05:11 seanius +2005-06-29 04:11 seanius - * plugins/: runcmd.c, runcmd.h: initial versions of the runcmd - framework by andreas + * [r1197] plugins/runcmd.c, plugins/runcmd.h: + initial versions of the runcmd framework by andreas -2005-06-29 02:04 seanius +2005-06-29 01:04 seanius - * plugins/check_swap.c: divide by 0 fix for check_swap + * [r1196] plugins/check_swap.c: + divide by 0 fix for check_swap -2005-06-28 03:26 seanius +2005-06-28 02:26 seanius - * plugins/check_load.c: set LC_NUMERIC to POSIX in check_load - (1164325) + * [r1195] plugins/check_load.c: + set LC_NUMERIC to POSIX in check_load (1164325) -2005-06-28 01:26 seanius +2005-06-28 00:26 seanius - * configure.in, plugins/Makefile.am, plugins/check_swap.c: scanf - parsing fix for check_swap from tracker id 1123292. now use - floor(3) to round down floating point numbers. requires -lm on - many systems, so support for testing for this was added to the - configure.in and automake template + * [r1194] configure.in, plugins/Makefile.am, plugins/check_swap.c: + scanf parsing fix for check_swap from tracker id 1123292. now use + floor(3) + to round down floating point numbers. requires -lm on many + systems, + so support for testing for this was added to the configure.in and + automake template -2005-06-27 14:07 seanius +2005-06-27 13:07 seanius - * plugins/check_hpjd.c: fixes from richard brodie (tracker id - 1216576) + * [r1193] plugins/check_hpjd.c: + fixes from richard brodie (tracker id 1216576) -2005-06-26 17:27 seanius +2005-06-26 16:27 seanius - * contrib/: check_dl_size.pl, check_ftpget.pl, check_logins.c, - check_mysql.c, check_mysql.pl, check_mysqlslave.pl, - check_nwstat.pl, check_pop3.pl, check_procl.sh, check_procr.sh: + * [r1192] contrib/check_dl_size.pl, contrib/check_ftpget.pl, + contrib/check_logins.c, contrib/check_mysql.c, + contrib/check_mysql.pl, contrib/check_mysqlslave.pl, + contrib/check_nwstat.pl, contrib/check_pop3.pl, + contrib/check_procl.sh, contrib/check_procr.sh: spring cleaning of contrib directory from andreas -2005-06-26 17:18 seanius +2005-06-26 16:18 seanius - * contrib/tarballs/: berger-ping.tar.gz, check_memory.tgz, - check_spread.tar, radius.tar.gz: removal of obsolete tarballs + * [r1191] contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/check_memory.tgz, + contrib/tarballs/check_spread.tar, + contrib/tarballs/radius.tar.gz: + removal of obsolete tarballs -2005-06-26 02:23 seanius +2005-06-26 01:23 seanius - * plugins/check_swap.c: "asprintf madness" fix from andreas' patch - to np-d, minus the comments. + * [r1190] plugins/check_swap.c: + "asprintf madness" fix from andreas' patch to np-d, minus the + comments. -2005-06-05 18:43 seanius +2005-06-05 17:43 seanius - * plugins/check_tcp.c: check_tcp code cleanup from andreas plus fix - to andreas' patch from sean + * [r1189] plugins/check_tcp.c: + check_tcp code cleanup from andreas plus fix to andreas' patch + from sean -2005-06-03 14:53 seanius +2005-06-03 13:53 seanius - * plugins/check_procs.c: gcc 2.x fixes from edward + * [r1188] plugins/check_procs.c: + gcc 2.x fixes from edward -2005-06-01 20:41 sghosh +2005-06-01 19:41 sghosh - * plugins/check_snmp.c: only load mibs if needed or specified - - patch 1212395 + * [r1187] plugins/check_snmp.c: + only load mibs if needed or specified - patch 1212395 -2005-05-28 02:21 seanius +2005-05-28 01:21 seanius - * plugins/check_load.c: bugfixes to check_load thanks to andreas + * [r1186] plugins/check_load.c: + bugfixes to check_load thanks to andreas -2005-05-26 03:13 seanius +2005-05-26 02:13 seanius - * plugins/check_mysql.c: fix for check_msyql so that it doesn't use - column numbers but the names instead for determining slave - status. thanks to james kingston. + * [r1185] plugins/check_mysql.c: + fix for check_msyql so that it doesn't use column numbers but the + names instead for determining slave status. thanks to james + kingston. -2005-05-25 18:42 sghosh +2005-05-25 17:42 sghosh - * plugins/check_time.c: 64bit sys support - 1185713 + * [r1183] plugins/check_time.c: + 64bit sys support - 1185713 -2005-05-25 16:40 sghosh +2005-05-25 15:40 sghosh - * plugins/check_snmp.c: support for getnext - 1106430 + * [r1182] plugins/check_snmp.c: + support for getnext - 1106430 -2005-05-25 15:25 sghosh +2005-05-25 14:25 sghosh - * plugins/check_ping.c: RH9 pattern + * [r1181] plugins/check_ping.c: + RH9 pattern -2005-05-25 15:05 sghosh +2005-05-25 14:05 sghosh - * plugins-scripts/check_ntp.pl: perfdata patch - 1172539 + * [r1180] plugins-scripts/check_ntp.pl: + perfdata patch - 1172539 -2005-05-25 04:37 sghosh +2005-05-25 03:37 sghosh - * plugins-scripts/check_ntp.pl: new option for zero offset - - 1159317 + * [r1179] plugins-scripts/check_ntp.pl: + new option for zero offset - 1159317 -2005-05-25 04:23 sghosh +2005-05-25 03:23 sghosh - * plugins/check_snmp.c: v2c support - 1155754 + * [r1178] plugins/check_snmp.c: + v2c support - 1155754 -2005-05-25 01:43 seanius +2005-05-25 00:43 seanius - * configure.in, plugins/check_nagios.c, plugins/check_procs.c: - fixes for check_procs: - added support for printing the pid in - all the ps outputs - don't use the proc name to ignore self, use - the pid vs getpid(). - initialize procetime to null string - otherwise -vvv can have funny results + * [r1177] configure.in, plugins/check_nagios.c, + plugins/check_procs.c: + fixes for check_procs: + - added support for printing the pid in all the ps outputs + - don't use the proc name to ignore self, use the pid vs + getpid(). + - initialize procetime to null string otherwise -vvv can have + funny results -2005-05-25 01:30 seanius +2005-05-25 00:30 seanius - * plugins/: check_tcp.c, netutils.c, netutils.h: bah, my_connect is - taken by mysql. now calling it np_net_connect. + * [r1176] plugins/check_tcp.c, plugins/netutils.c, + plugins/netutils.h: + bah, my_connect is taken by mysql. now calling it np_net_connect. -2005-05-24 23:33 sghosh +2005-05-24 22:33 sghosh - * plugins-scripts/check_ntp.pl: patched bug id 1200030 - regex - update + * [r1175] plugins-scripts/check_ntp.pl: + patched bug id 1200030 - regex update -2005-05-24 23:10 sghosh +2005-05-24 22:10 sghosh - * plugins-scripts/check_ntp.pl: patched bug id 1204636 + * [r1174] plugins-scripts/check_ntp.pl: + patched bug id 1204636 -2005-05-24 21:25 seanius +2005-05-24 20:25 seanius - * plugins/: check_tcp.c, netutils.c, netutils.h: optimizations and - cleanup from andreas + * [r1173] plugins/check_tcp.c, plugins/netutils.c, + plugins/netutils.h: + optimizations and cleanup from andreas -2005-05-23 06:09 seanius +2005-05-23 05:09 seanius - * nagios-plugins.spec.in: build fix + * [r1172] nagios-plugins.spec.in: + build fix -2005-05-03 03:00 seanius +2005-05-03 02:00 seanius - * plugins/check_ping.c: setlocale(LC_ALL, "") should be - setlocale(LC_NUMERIC, "C") to properly parse the output of ping. + * [r1171] plugins/check_ping.c: + setlocale(LC_ALL, "") should be setlocale(LC_NUMERIC, "C") to + properly parse the output of ping. -2005-05-03 02:52 seanius +2005-05-03 01:52 seanius - * plugins/check_tcp.c: if check_tcp was called with -e but not -s, - it would hang in a call to my_recv. the fix committed here adds - on more piece of logic to the check to see if more data needs to - be read, avoiding the deadlock call. a better fix would be to - not use these "voodoo" heuristics and instead use poll() or - select(), but that's quite a bit more complicated. + * [r1170] plugins/check_tcp.c: + if check_tcp was called with -e but not -s, it would hang in a + call to my_recv. the + fix committed here adds on more piece of logic to the check to + see if more data needs + to be read, avoiding the deadlock call. a better fix would be to + not use these "voodoo" + heuristics and instead use poll() or select(), but that's quite a + bit more complicated. -2005-05-01 21:12 seanius +2005-05-01 20:12 seanius - * plugins/: popen.c, popen.h: better error checking in spopen - signal handler (see 1107524) + * [r1169] plugins/popen.c, plugins/popen.h: + better error checking in spopen signal handler (see 1107524) -2005-05-01 20:50 seanius +2005-05-01 19:50 seanius - * configure.in: provide a --with-perl option + * [r1168] configure.in: + provide a --with-perl option -2005-04-29 01:27 stanleyhopcroft +2005-04-29 00:27 stanleyhopcroft - * contrib/check_sybase: check_sybase 0.7 from Simon Bellman. Thx + * [r1167] contrib/check_sybase: + check_sybase 0.7 from Simon Bellman. Thx -2005-04-19 01:16 seanius +2005-04-19 00:16 seanius - * plugins-scripts/check_ntp.pl: regexp fix for check_ntp + * [r1166] plugins-scripts/check_ntp.pl: + regexp fix for check_ntp -2005-04-19 01:09 seanius +2005-04-19 00:09 seanius - * configure.in: check for the -w flag for ping6 as well as ping + * [r1165] configure.in: + check for the -w flag for ping6 as well as ping -2005-04-17 23:22 seanius +2005-04-17 22:22 seanius - * plugins-scripts/check_disk_smb.pl: also change the --help output - to reflect that check_disk_smb defaults to empty passwords + * [r1164] plugins-scripts/check_disk_smb.pl: + also change the --help output to reflect that check_disk_smb + defaults to empty passwords -2005-04-16 07:09 seanius +2005-04-16 06:09 seanius - * plugins-scripts/check_disk_smb.pl: patch to check_disk_smb to - allow empty passwords + * [r1163] plugins-scripts/check_disk_smb.pl: + patch to check_disk_smb to allow empty passwords -2005-04-14 05:13 seanius +2005-04-14 04:13 seanius - * plugins-scripts/check_mailq.pl: check_mailq fix, don't be case - sensitive matching /^\s+Total\sRequests:\s(\d+)$/ + * [r1162] plugins-scripts/check_mailq.pl: + check_mailq fix, don't be case sensitive matching + /^\s+Total\sRequests:\s(\d+)$/ -2005-04-14 05:07 seanius +2005-04-14 04:07 seanius - * plugins-scripts/check_ntp.pl: typographical fix in check_ntp + * [r1161] plugins-scripts/check_ntp.pl: + typographical fix in check_ntp -2005-04-11 19:02 seanius +2005-04-11 18:02 seanius - * plugins/check_ssh.c: properly call close() on the ssh connection - before exiting. + * [r1160] plugins/check_ssh.c: + properly call close() on the ssh connection before exiting. -2005-04-11 04:07 seanius +2005-04-11 03:07 seanius - * configure.in, plugins/check_tcp.c: this should add support for - check_ssmtp, based on the 1.3.x patch in 1155562, but fixed to - follow how things are done in 1.4 (using strdup instead of + * [r1159] configure.in, plugins/check_tcp.c: + this should add support for check_ssmtp, based on the 1.3.x patch + in 1155562, + but fixed to follow how things are done in 1.4 (using strdup + instead of asprintf) and patching configure.in instead of configure. -2005-04-07 05:33 seanius - - * plugins/check_smtp.c: in honor of joining up, my first bugfix. - this should resolve 1174070. +2005-04-07 04:33 seanius + * [r1158] plugins/check_smtp.c: + in honor of joining up, my first bugfix. this should resolve + 1174070. + note i don't have an exchange server to test this against, but it does what the requester mentioned (slightly cleaner than the - patch attached in the tracker). - + patch + attached in the tracker). + it does, however, still work against my own postfix server :) + + sean - sean +2005-04-05 21:26 harpermann -2005-04-05 22:26 harpermann + * [r1157] plugins/check_snmp.c: + This is a first cut at adding performance data to check_snmp. I + wasn't sure + how to handle UOM so only values that return SNMP type Counter32: + are labled + with "c". All other values have a blank UOM. I also left off + warn, crit, + max and min values in the performance data until we come up with + a way to + handle them. - * plugins/check_snmp.c: This is a first cut at adding performance - data to check_snmp. I wasn't sure how to handle UOM so only - values that return SNMP type Counter32: are labled with "c". All - other values have a blank UOM. I also left off warn, crit, max - and min values in the performance data until we come up with a - way to handle them. +2005-04-04 18:25 tonvoon -2005-04-04 19:25 tonvoon + * [r1156] THANKS.in: + More contributors - * THANKS.in: More contributors +2005-04-04 18:24 tonvoon -2005-04-04 19:23 tonvoon - - * plugins/: check_smtp.c: Fix static buffer (Nikolay Sturm) + * [r1155] plugins/check_smtp.c: + Fix static buffer (Nikolay Sturm) 2005-03-18 03:14 mattkent - * plugins/check_mysql.c: Replication check support for 4.1.x from - Gerrit Beine + * [r1154] plugins/check_mysql.c: + Replication check support for 4.1.x from Gerrit Beine 2005-03-08 06:19 tonvoon - * plugins-scripts/check_ntp.pl: Added OS info for offset issue + * [r1149] plugins-scripts/check_ntp.pl: + Added OS info for offset issue 2005-03-04 22:20 tonvoon - * plugins-scripts/check_ntp.pl: Ignore extra check on offset - 0.00000 (John Warburton - 1150777) - -2005-03-04 22:10 tonvoon - - * plugins/: check_disk.c, check_smtp.c, check_ups.c: Fixed // - comments + * [r1148] plugins-scripts/check_ntp.pl: + Ignore extra check on offset 0.00000 (John Warburton - 1150777) 2005-03-04 21:58 tonvoon - * plugins/: check_disk.c, check_smtp.c, check_ups.c: Fixed // - comments (Steve Greenland - 1143836) + * [r1146] plugins/check_disk.c, plugins/check_smtp.c, + plugins/check_ups.c: + Fixed // comments (Steve Greenland - 1143836) 2005-03-04 21:50 tonvoon - * plugins-scripts/check_ntp.pl: Support for IPv6 (Merijn Evertse - - 1119917) + * [r1145] plugins-scripts/check_ntp.pl: + Support for IPv6 (Merijn Evertse - 1119917) 2005-03-04 21:04 tonvoon - * configure.in, package.def: Changed to next version number + * [r1144] configure.in, package.def: + Changed to next version number 2005-03-04 21:03 tonvoon - * doc/RELEASING: Notes on branching + * [r1143] doc/RELEASING: + Notes on branching 2005-03-04 20:43 tonvoon - * CHANGES: Missed check_disk addition to 1.4 + * [r1141] CHANGES: + Missed check_disk addition to 1.4 2005-02-11 11:49 stanleyhopcroft - * plugins/Makefile.am: Fix for check_icmp build on Solaris from - Andreas Ericsson + * [r1140] plugins/Makefile.am: + Fix for check_icmp build on Solaris from Andreas Ericsson + 2005-02-04 00:44 tonvoon - * configure.in: For 1.4 release + * [r1138] configure.in: + For 1.4 release 2005-02-04 00:43 tonvoon - * ChangeLog: Updated for 1.4 release + * [r1137] ChangeLog: + Updated for 1.4 release 2005-02-04 00:29 tonvoon - * BUGS: New file to note known bugs for major releases + * [r1136] BUGS: + New file to note known bugs for major releases 2005-02-04 00:28 tonvoon - * CHANGES: Reordering of items with most important announcements - first + * [r1135] CHANGES: + Reordering of items with most important announcements first 2005-02-04 00:27 stanleyhopcroft - * contrib/check_oracle_tbs: New version (1.1) from John Koyle + * [r1134] contrib/check_oracle_tbs: + New version (1.1) from John Koyle 2005-02-04 00:26 tonvoon - * Makefile.am: BUGS file addition to release + * [r1133] Makefile.am: + BUGS file addition to release 2005-02-04 00:26 tonvoon - * README: Cleanup and addition of reference to BUGS file + * [r1132] README: + Cleanup and addition of reference to BUGS file 2005-02-04 00:25 tonvoon - * doc/RELEASING: Updated with corrections. Added note to update - BUGS file + * [r1131] doc/RELEASING: + Updated with corrections. Added note to update BUGS file 2005-02-03 23:52 tonvoon - * THANKS.in: Patch against check_log + * [r1130] THANKS.in: + Patch against check_log 2005-02-03 23:51 tonvoon - * plugins-scripts/check_log.sh: Check for log file readability + * [r1129] plugins-scripts/check_log.sh: + Check for log file readability 2005-02-02 09:47 stanleyhopcroft - * contrib/check_email_loop.pl: Add debug option from John Rouillard + * [r1128] contrib/check_email_loop.pl: + Add debug option from John Rouillard 2005-02-02 06:42 stanleyhopcroft - * plugins/check_ide_smart.c: try again to stop looping + * [r1127] plugins/check_ide_smart.c: + try again to stop looping 2005-02-02 05:44 stanleyhopcroft - * plugins/check_ide_smart.c: restructure main() to stop looping on - -n + * [r1126] plugins/check_ide_smart.c: + restructure main() to stop looping on -n 2005-02-01 12:43 stanleyhopcroft - * contrib/check_traceroute-pure_perl.pl: Thank you to Myke Place - for check_traceroute-pure_perl.pl + * [r1125] contrib/check_traceroute-pure_perl.pl: + Thank you to Myke Place for check_traceroute-pure_perl.pl 2005-02-01 12:42 stanleyhopcroft - * THANKS.in: Thank you for contributed plugins + * [r1124] THANKS.in: + Thank you for contributed plugins 2005-02-01 12:30 stanleyhopcroft - * plugins/Makefile.am: check_icmp added to libexec_PROGRAMS + * [r1123] plugins/Makefile.am: + check_icmp added to libexec_PROGRAMS 2005-02-01 12:25 stanleyhopcroft - * CHANGES: check_icmp no longer regarded as volatile; built by - default + * [r1122] CHANGES: + check_icmp no longer regarded as volatile; built by default 2005-02-01 12:23 stanleyhopcroft - * plugins/linux.h: plugins/linux.h, vestigeal header required for - prior versions of check_icmp, no longer required. + * [r1121] plugins/linux.h: + plugins/linux.h, vestigeal header required for prior versions of + check_icmp, no longer required. 2005-02-01 07:35 stanleyhopcroft - * CHANGES: Amendments for check_icmp + * [r1120] CHANGES: + Amendments for check_icmp 2005-02-01 07:34 stanleyhopcroft - * plugins/Makefile.am: hacks to partly support check_icmp.c (1.0). + * [r1119] plugins/Makefile.am: + hacks to partly support check_icmp.c (1.0). 2005-02-01 07:33 stanleyhopcroft - * plugins/check_icmp.c: Revised check_icmp (1.0) from A Ericsson. + * [r1118] plugins/check_icmp.c: + Revised check_icmp (1.0) from A Ericsson. -2005-02-01 04:19 stanleyhopcroft +2005-02-01 04:20 stanleyhopcroft - * contrib/: check_asterisk.pl, - check_http-with-client-certificate.c, check_email_loop.pl, - tarballs/check_traffic-0.91b.tar.gz: New or revised plugin in - /contrib + * [r1117] contrib/check_asterisk.pl, contrib/check_email_loop.pl, + contrib/check_http-with-client-certificate.c, + contrib/tarballs/check_traffic-0.91b.tar.gz: + New or revised plugin in /contrib 2005-01-28 22:42 stanleyhopcroft - * contrib/check_sybase: New version of Simon Bellwoods check_sybase - (0.4). Thank you. + * [r1116] contrib/check_sybase: + New version of Simon Bellwoods check_sybase (0.4). Thank you. 2005-01-27 10:34 stanleyhopcroft - * contrib/check_traceroute.pl: Jon Meek's check_traceroute for Mon - hacked by YT for Nagios. Prob pretty weak + * [r1115] contrib/check_traceroute.pl: + Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob + pretty weak 2005-01-27 10:32 stanleyhopcroft - * contrib/check_smart.pl: Candidate successor to - /plugins/check_ide_smart.c. Now in /contrib. NB there is another - new plugin with sim function + * [r1114] contrib/check_smart.pl: + Candidate successor to /plugins/check_ide_smart.c. Now in + /contrib. NB there is another new plugin with sim function -2005-01-27 04:52 stanleyhopcroft +2005-01-27 04:54 stanleyhopcroft - * contrib/: check_fan_cpq_present, check_fan_fsc_present, - check_temp_cpq, check_temp_fsc, check_mysqlslave.pl: New /contrib - plugin + * [r1113] contrib/check_fan_cpq_present, + contrib/check_fan_fsc_present, contrib/check_mysqlslave.pl, + contrib/check_temp_cpq, contrib/check_temp_fsc: + New /contrib plugin -2005-01-27 04:43 stanleyhopcroft +2005-01-27 04:46 stanleyhopcroft - * contrib/: check_pfstate, check_logins.c, check_arping.pl, - check_frontpage, check_oracle_tbs, check_pcpmetric.py, - check_cpqarray.c: New /contrib plugin + * [r1112] contrib/check_arping.pl, contrib/check_cpqarray.c, + contrib/check_frontpage, contrib/check_logins.c, + contrib/check_oracle_tbs, contrib/check_pcpmetric.py, + contrib/check_pfstate: + New /contrib plugin 2005-01-27 02:27 stanleyhopcroft - * CHANGES, THANKS.in, contrib/README.TXT, po/de.po, po/fr.po: - - 1 New /contrib plugins 2 Revised check_dhcp.c status in CHANGES + * [r1111] CHANGES, THANKS.in, contrib/README.TXT, po/de.po, + po/fr.po: + 1 New /contrib plugins + 2 Revised check_dhcp.c status in CHANGES 2005-01-27 01:38 harpermann - * plugins/Makefile.am: Added check_dhcp bask into libexec_PROGRAMS - after talking with Stanley. + * [r1110] plugins/Makefile.am: + Added check_dhcp bask into libexec_PROGRAMS after talking with + Stanley. 2005-01-26 21:39 tonvoon - * THANKS.in: More contributors + * [r1109] THANKS.in: + More contributors 2005-01-26 21:21 tonvoon - * plugins/check_dig.c: Convert tabs to spaces from dig's answer - section (Randy O'Meara - 1107651) + * [r1108] plugins/check_dig.c: + Convert tabs to spaces from dig's answer section (Randy O'Meara - + 1107651) 2005-01-26 20:53 tonvoon - * REQUIREMENTS: Add recommendation for check_procs on Mandrake - systems (Paulo Fessel - 1106849) + * [r1107] REQUIREMENTS: + Add recommendation for check_procs on Mandrake systems (Paulo + Fessel - 1106849) 2005-01-25 22:15 stanleyhopcroft - * plugins/check_ide_smart.c: Display usage if no argv (Reuben - Farrelly) + * [r1106] plugins/check_ide_smart.c: + Display usage if no argv (Reuben Farrelly) 2005-01-25 18:11 harpermann - * plugins/check_dhcp.c: Tracker:1109261 This was an alignment - problem on Solaris. Linux kernel fixes alignment so this was not - seen there. Memcpy takes care of proper alignment. Tested on - RHEL V3 U3, RHEL V4, FreeBSD 4.10 (Thanks Stanley!) and Solaris 9 - with the GNU env. + * [r1105] plugins/check_dhcp.c: + Tracker:1109261 This was an alignment problem on Solaris. Linux + kernel fixes alignment so this was not seen there. Memcpy takes + care of proper alignment. Tested on RHEL V3 U3, RHEL V4, FreeBSD + 4.10 (Thanks Stanley!) and Solaris 9 with the GNU env. 2005-01-25 12:43 stanleyhopcroft - * plugins/check_ide_smart.c: Trivial text changes (print_help, - commentary & -n option) + * [r1104] plugins/check_ide_smart.c: + Trivial text changes (print_help, commentary & -n option) 2005-01-25 09:20 stanleyhopcroft - * contrib/tarballs/check_icmp-0.8.tar.gz: moved to /plugins (core - plugin) + * [r1103] contrib/check_dhcp.c, + contrib/tarballs/check_icmp-0.8.tar.gz: + moved to /plugins (core plugin) 2005-01-25 09:19 stanleyhopcroft - * contrib/tarballs/check_cit.tgz: replaced by contrib/check_ica* - (esp check_ica_metaframe_pub_apps) - -2005-01-25 09:16 stanleyhopcroft - - * contrib/check_dhcp.c: moved to /plugins (core plugin) + * [r1102] contrib/tarballs/check_cit.tgz: + replaced by contrib/check_ica* (esp check_ica_metaframe_pub_apps) 2005-01-25 09:15 stanleyhopcroft - * contrib/check_citrix: Replaced by the check_ica* pair of plugins - (mainly check_ica_metaframe_pub_apps) + * [r1101] contrib/check_citrix: + Replaced by the check_ica* pair of plugins (mainly + check_ica_metaframe_pub_apps) 2005-01-25 09:12 stanleyhopcroft - * contrib/packet_utils.pm: packet creation and dumping hacks used - by check_ica* and check_lotus + * [r1100] contrib/packet_utils.pm: + packet creation and dumping hacks used by check_ica* and + check_lotus 2005-01-25 09:09 stanleyhopcroft - * contrib/check_ica_master_browser.pl: New plugin - checks that ICA - master browser is what it should be (important for firewalled - dialup) + * [r1099] contrib/check_ica_master_browser.pl: + New plugin - checks that ICA master browser is what it should be + (important for firewalled dialup) 2005-01-25 09:07 stanleyhopcroft - * contrib/check_ica_metaframe_pub_apps.pl: Replacement (structured - name mainly) for check_citrix: check of ICA browse service + * [r1098] contrib/check_ica_metaframe_pub_apps.pl: + Replacement (structured name mainly) for check_citrix: check of + ICA browse service 2005-01-25 09:05 stanleyhopcroft - * contrib/check_ica_program_neigbourhood.pl: New plugin to check - Citrix Metaframe XP "Program Neighbourhood" + * [r1097] contrib/check_ica_program_neigbourhood.pl: + New plugin to check Citrix Metaframe XP "Program Neighbourhood" 2005-01-25 09:04 stanleyhopcroft - * contrib/check_lotus.pl: New plugin to check responsiveness of - Louts Notes (v5 at least) servers + * [r1096] contrib/check_lotus.pl: + New plugin to check responsiveness of Louts Notes (v5 at least) + servers 2005-01-24 23:17 stanleyhopcroft - * plugins/Makefile.am: Removed check_dhcp and check_icmp from - libexec_PROGRAMS (ie dont build by defaut) + * [r1095] plugins/Makefile.am: + Removed check_dhcp and check_icmp from libexec_PROGRAMS (ie dont + build by defaut) 2005-01-24 23:15 stanleyhopcroft - * CHANGES: Notes about check_dhcp and check_icmp (no longer built - by default, use at own peril, volatile) + * [r1094] CHANGES: + Notes about check_dhcp and check_icmp (no longer built by + default, use at own peril, volatile) 2005-01-21 09:24 stanleyhopcroft - * configure.in: Set arch specifc preprocessor symbols in config.h. - TEMPORARY hack for check_dhcp.c [on FreeBSD 4: /check_dhcp -i - fxp0 -> DHCP ok: Received 1 DHCPOFFER(s), max lease time = 259200 - sec. + * [r1093] configure.in: + Set arch specifc preprocessor symbols in config.h. TEMPORARY hack + for check_dhcp.c [on FreeBSD 4: /check_dhcp -i fxp0 -> DHCP ok: + Received 1 DHCPOFFER(s), max lease time = 259200 sec. 2005-01-21 01:03 harpermann - * plugins/check_snmp.c: Tracker 1106378 fixed - The -t (timeout) - arg was not handled correctly when passed to the snmpget command. - Added -e --retries for the correct retries value to snmpcmd. + * [r1092] plugins/check_snmp.c: + Tracker 1106378 fixed - The -t (timeout) arg was not handled + correctly when passed to the snmpget command. Added -e --retries + for the correct retries value to snmpcmd. 2005-01-21 00:01 tonvoon - * doc/developer-guidelines.sgml: Changing copyright to the Nagios - Plugins Development Team, rather than individual names. Also, - clarified use of ACKNOWLEDGEMENTS, THANKS.in and AUTHORS + * [r1091] doc/developer-guidelines.sgml: + Changing copyright to the Nagios Plugins Development Team, rather + than + individual names. Also, clarified use of ACKNOWLEDGEMENTS, + THANKS.in and + AUTHORS 2005-01-20 23:40 harpermann - * plugins/check_http.c: Changed long argument --minmax to - --pagesize and updated help and usage + * [r1090] plugins/check_http.c: + Changed long argument --minmax to --pagesize and updated help and + usage 2005-01-20 23:39 tonvoon - * AUTHORS, Makefile.am, THANKS.in: The AUTHORS file now used for - the plugin team, with THANKS.in as the contributors list. + * [r1089] AUTHORS, Makefile.am, THANKS.in: + The AUTHORS file now used for the plugin team, with THANKS.in as + the + contributors list. 2005-01-20 23:37 harpermann - * CHANGES: Added comment about check_http --pagesize and added max - value to page size check + * [r1088] CHANGES: + Added comment about check_http --pagesize and added max value to + page size check 2005-01-20 23:25 tonvoon - * AUTHORS: Added Sean for bug reports + * [r1087] AUTHORS: + Added Sean for bug reports 2005-01-20 22:50 harpermann - * plugins/check_http.c: Tracker 1099682 fix. Now getting the page - size from Content-Length in the header. Added max value to the - -m switch so can do "-m min:max". Retained "-m min" convention. - Renamed long arg name to --minmax + * [r1086] plugins/check_http.c: + Tracker 1099682 fix. Now getting the page size from + Content-Length in the header. Added max value to the -m switch so + can do "-m min:max". Retained "-m min" convention. Renamed long + arg name to --minmax 2005-01-19 23:39 harpermann - * plugins/check_nt.c: In the CHECK_COUNTER block, there were - several strcats writing to unallocated memory. Changed to - asprintf. We're not freeing since plugin run is short. + * [r1085] plugins/check_nt.c: + In the CHECK_COUNTER block, there were several strcats writing to + unallocated + memory. Changed to asprintf. We're not freeing since plugin run + is short. 2005-01-19 21:14 tonvoon - * plugins/check_swap.c: Fixed parsing of AIX lsps command (1093522) + * [r1084] plugins/check_swap.c: + Fixed parsing of AIX lsps command (1093522) 2005-01-14 14:39 tonvoon - * AUTHORS: More contributors - -2005-01-14 14:13 tonvoon - - * plugins/check_disk.c: Fix logic error with -e switch where result - not set (Daniel Austin - 1102012) + * [r1083] AUTHORS: + More contributors 2005-01-14 10:59 tonvoon - * configure.in: Fixed ssl configure problems on Solaris (Bug - 1096091) + * [r1081] configure.in: + Fixed ssl configure problems on Solaris (Bug 1096091) 2005-01-13 18:24 tonvoon - * configure.in, plugins/check_swap.c: Use floats for holding memory - values to avoid different types on different OSes. Seems to have - a problem with the perf data for check_swap on Sol 2.6, but not - critical + * [r1080] configure.in, plugins/check_swap.c: + Use floats for holding memory values to avoid different types on + different + OSes. Seems to have a problem with the perf data for check_swap + on Sol 2.6, + but not critical 2005-01-05 21:32 tonvoon - * configure.in, package.def: Update version number to next release + * [r1079] configure.in, package.def: + Update version number to next release 2005-01-04 00:16 opensides - * plugins/check_ide_smart.c: + * [r1078] plugins/check_ide_smart.c: still trying to fix #1094326 2005-01-03 01:37 opensides - * plugins/check_ide_smart.c: + * [r1077] plugins/check_ide_smart.c: more fixes for #1094326 2005-01-03 00:59 opensides - * plugins-scripts/check_mailq.pl: + * [r1076] plugins-scripts/check_mailq.pl: fixes for #1094324 2005-01-02 14:00 opensides - * plugins/check_ide_smart.c: + * [r1075] plugins/check_ide_smart.c: fixing bug #1094326 - + still need to check the makefile for check_ide_smart.c 2005-01-01 16:15 tonvoon - * plugins/check_smtp.c: Removed old terminate function (Bug - 1093491) + * [r1074] plugins/check_smtp.c: + Removed old terminate function (Bug 1093491) 2004-12-30 17:17 tonvoon - * ChangeLog: Updated with r1_4-beta1 details + * [r1072] ChangeLog: + Updated with r1_4-beta1 details 2004-12-30 14:23 tonvoon - * CHANGES: Note some syntax changes to check_disk + * [r1071] CHANGES: + Note some syntax changes to check_disk 2004-12-30 14:22 tonvoon - * doc/RELEASING: Update package files for version + * [r1070] doc/RELEASING: + Update package files for version 2004-12-30 14:21 tonvoon - * AUTHORS: For help with ps on FreeBSD 4 + * [r1069] AUTHORS: + For help with ps on FreeBSD 4 2004-12-30 14:19 tonvoon - * configure.in: Get ps command for FreeBSD 4 (Tomasz Pilat) + * [r1068] configure.in: + Get ps command for FreeBSD 4 (Tomasz Pilat) 2004-12-30 00:41 opensides - * plugins/check_dhcp.c, plugins/check_dns.c, plugins/check_ping.c, - plugins/check_procs.c, plugins/check_smtp.c, - plugins/check_snmp.c, plugins/check_swap.c, plugins/check_tcp.c, - po/de.po, po/fr.po, po/nagios-plugins.pot: - more internationalization fixes internationalization freeze for - beta1 + * [r1067] plugins/check_dhcp.c, plugins/check_dns.c, + plugins/check_ping.c, plugins/check_procs.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/check_tcp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + more internationalization fixes + internationalization freeze for beta1 2004-12-28 23:40 opensides - * AUTHORS, po/fr.po: + * [r1066] AUTHORS, po/fr.po: more internationalization 2004-12-28 23:18 opensides - * plugins/Makefile.am, plugins/check_smtp.c, po/fr.po: + * [r1065] plugins/Makefile.am, plugins/check_smtp.c, po/fr.po: starttls support for check_smtp #1041576 2004-12-28 22:34 opensides - * AUTHORS, plugins/check_ping.c: + * [r1064] AUTHORS, plugins/check_ping.c: String match in check_ping for Solaris 10 #1091043 2004-12-28 20:40 tonvoon - * configure.in: sys/param.h needed for sys/swap.h on openbsd 3.6 - (Julien Touche) + * [r1063] configure.in: + sys/param.h needed for sys/swap.h on openbsd 3.6 (Julien Touche) 2004-12-27 22:44 opensides - * po/fr.po: + * [r1062] po/fr.po: more internationalization 2004-12-25 23:17 opensides - * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, - plugins/check_dummy.c, plugins/check_fping.c, - plugins/check_game.c, plugins/check_hpjd.c, plugins/check_icmp.c, + * [r1061] plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_icmp.c, plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, @@ -3135,399 +4360,464 @@ 2004-12-25 16:18 opensides - * po/: de.po, fr.po, nagios-plugins.pot: + * [r1060] po/de.po, po/fr.po, po/nagios-plugins.pot: new version of po files and pot file 2004-12-25 12:25 opensides - * package.def, po/POTFILES.in: - change realase name on package.def adding check_dhcp.c to - potfiles.in + * [r1059] package.def, po/POTFILES.in: + change realase name on package.def + adding check_dhcp.c to potfiles.in 2004-12-25 12:09 opensides - * plugins/: check_by_ssh.c, check_dhcp.c: - internationalization of check_dhcp internationalization fixes of - check_ssh + * [r1058] plugins/check_by_ssh.c, plugins/check_dhcp.c: + internationalization of check_dhcp + internationalization fixes of check_ssh 2004-12-24 18:06 opensides - * plugins/check_icmp.c, po/POTFILES.in, po/fr.po: - first pass at adapting to plugin guidelines and start of - localization + * [r1057] plugins/check_icmp.c, po/POTFILES.in, po/fr.po: + first pass at adapting to plugin guidelines + and start of localization 2004-12-23 18:54 opensides - * plugins/check_http.c, po/fr.po: + * [r1056] plugins/check_http.c, po/fr.po: internationalization fixes 2004-12-23 16:47 mwirtgen - * po/de.po: german translations 391 to go + * [r1055] po/de.po: + german translations 391 to go 2004-12-23 09:30 tonvoon - * ACKNOWLEDGEMENTS, configure.in, m4/np_curl.m4, - plugins/Makefile.am: Another attempt at fixing check_http compile - on Redhat EL3. Fixed check_icmp compile (Lynne Lawrence - - 1087171) - still some code changes to check_icmp outstanding. - Fixed compile of check_dhcp (complaining about socklen_t). Added - acknowledgements for Coreutils and curl + * [r1054] ACKNOWLEDGEMENTS, configure.in, m4/np_curl.m4, + plugins/Makefile.am: + Another attempt at fixing check_http compile on Redhat EL3. Fixed + check_icmp + compile (Lynne Lawrence - 1087171) - still some code changes to + check_icmp + outstanding. Fixed compile of check_dhcp (complaining about + socklen_t). + Added acknowledgements for Coreutils and curl 2004-12-22 23:02 harpermann - * plugins/check_nt.c: Added check for "%" in COUNTER . - If it exists, is used as an arg to asprintf. If - it doesn't exist, is used as a label. If the - formatting is wrong, the program will segv. + * [r1053] plugins/check_nt.c: + Added check for "%" in COUNTER . If it exists, + is used as an arg to asprintf. If it doesn't exist, + is used as a label. If the formatting is wrong, the + program will segv. 2004-12-22 07:24 tonvoon - * lib/: Makefile.am, stdbool_.h: File required from coreutils + * [r1052] lib/Makefile.am, lib/stdbool_.h: + File required from coreutils 2004-12-21 22:52 tonvoon - * configure.in, plugins/Makefile.am: Revert back to previous - openssl checks (the ones from curl kept having problems with - later Redhat versions) + * [r1051] configure.in, plugins/Makefile.am: + Revert back to previous openssl checks (the ones from curl kept + having + problems with later Redhat versions) 2004-12-21 22:36 tonvoon - * m4/stdbool.m4: Another m4 from coreutils + * [r1050] m4/stdbool.m4: + Another m4 from coreutils 2004-12-21 15:45 tonvoon - * AUTHORS: For their bug reports - -2004-12-21 12:47 tonvoon - - * configure.in: Fix for FreeBSD ps command (reported by Michael - Bakker) + * [r1049] AUTHORS: + For their bug reports 2004-12-21 09:32 tonvoon - * lib/Makefile.am, m4/Makefile.am, m4/np_coreutils.m4: Fixed - compile problem on Sol2.6 with stdbool.h + * [r1047] lib/Makefile.am, m4/Makefile.am, m4/np_coreutils.m4: + Fixed compile problem on Sol2.6 with stdbool.h 2004-12-21 08:56 stanleyhopcroft - * plugins/check_dhcp.c: Commentary changes only: cite origin of - copied code with reference to ACK file + * [r1046] plugins/check_dhcp.c: + Commentary changes only: cite origin of copied code with + reference to ACK file 2004-12-21 08:55 stanleyhopcroft - * ACKNOWLEDGEMENTS: ACK file contains the details of the authors of - code copied by the plugins + * [r1045] ACKNOWLEDGEMENTS: + ACK file contains the details of the authors of code copied by + the plugins 2004-12-21 05:00 mattkent - * plugins/check_dns.c: Add another error string match from Pasi - Tiittanen + * [r1044] plugins/check_dns.c: + Add another error string match from Pasi Tiittanen 2004-12-20 22:20 tonvoon - * plugins/check_nagios.c: Corrected help for expiry units. Restored - functionality of searching for process arguments + * [r1043] plugins/check_nagios.c: + Corrected help for expiry units. Restored functionality of + searching for + process arguments 2004-12-20 22:01 tonvoon - * plugins/check_nagios.c: Updating help text to reflect using - shortname instead of full path for command + * [r1042] plugins/check_nagios.c: + Updating help text to reflect using shortname instead of full + path for command 2004-12-20 21:38 tonvoon - * configure.in: - stupid typo + * [r1041] configure.in: + - stupid typo 2004-12-20 21:26 tonvoon - * configure.in: Fix compile errors when looking for openssl + * [r1040] configure.in: + Fix compile errors when looking for openssl 2004-12-20 09:04 stanleyhopcroft - * COPYING, plugins/check_dhcp.c, po/de.po, po/fr.po: Compilation - fixes for check_dhcp.c HP-UX 11. Still fails on HP-UX 10. Unknown - if check_dhcp works on UX. + * [r1039] COPYING, plugins/check_dhcp.c, po/de.po, po/fr.po: + Compilation fixes for check_dhcp.c HP-UX 11. Still fails on HP-UX + 10. Unknown if check_dhcp works on UX. 2004-12-18 18:28 mwirtgen - * po/de.po: Initial commit on german translation - 428 to go + * [r1038] po/de.po: + Initial commit on german translation - 428 to go 2004-12-17 18:14 tonvoon - * configure.in: Support for FreeBSD 5.2.1 and 5.3 in check_procs + * [r1037] configure.in: + Support for FreeBSD 5.2.1 and 5.3 in check_procs 2004-12-15 23:12 tonvoon - * configure.in: Bump version to next release + * [r1036] configure.in: + Bump version to next release 2004-12-15 23:11 tonvoon - * doc/developer-guidelines.sgml: Mistake in automake version - back - to 1.8 + * [r1035] doc/developer-guidelines.sgml: + Mistake in automake version - back to 1.8 2004-12-15 23:10 tonvoon - * doc/RELEASING: Clarified notes + * [r1034] doc/RELEASING: + Clarified notes 2004-12-15 21:56 tonvoon - * ChangeLog: Updated for r1_4_0-alpha3 + * [r1032] ChangeLog: + Updated for r1_4_0-alpha3 2004-12-15 21:27 tonvoon - * doc/developer-guidelines.sgml: Updated requirements for GNU tools + * [r1031] doc/developer-guidelines.sgml: + Updated requirements for GNU tools 2004-12-15 21:01 tonvoon - * m4/Makefile.am: Makefile for m4 files + * [r1030] m4/Makefile.am: + Makefile for m4 files 2004-12-15 20:54 tonvoon - * Makefile.am, configure.in, plugins/Makefile.am, tools/setup: + * [r1029] Makefile.am, configure.in, plugins/Makefile.am, + tools/setup: Support for coreutils lib. Configure tests via m4 scripts from coreutils 2004-12-15 20:51 tonvoon - * m4/: Makefile.am.in, afs.m4, codeset.m4, error.m4, exitfail.m4, - extensions.m4, fstypename.m4, fsusage.m4, getopt.m4, gettext.m4, - glibc21.m4, iconv.m4, intdiv0.m4, inttypes-pri.m4, inttypes.m4, - inttypes_h.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4, - lib-link.m4, lib-prefix.m4, ls-mntd-fs.m4, malloc.m4, - mountlist.m4, np_coreutils.m4, onceonly.m4, progtest.m4, - realloc.m4, stdint_h.m4, uintmax_t.m4, ulonglong.m4, - unlocked-io.m4, xalloc.m4: Moving m4 files from lib/ + * [r1028] m4, m4/Makefile.am.in, m4/afs.m4, m4/codeset.m4, + m4/error.m4, m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, + m4/fsusage.m4, m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, + m4/iconv.m4, m4/intdiv0.m4, m4/inttypes-pri.m4, m4/inttypes.m4, + m4/inttypes_h.m4, m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-ld.m4, + m4/lib-link.m4, m4/lib-prefix.m4, m4/ls-mntd-fs.m4, m4/malloc.m4, + m4/mountlist.m4, m4/np_coreutils.m4, m4/onceonly.m4, + m4/progtest.m4, m4/realloc.m4, m4/stdint_h.m4, m4/uintmax_t.m4, + m4/ulonglong.m4, m4/unlocked-io.m4, m4/xalloc.m4: + Moving m4 files from lib/ 2004-12-15 20:47 tonvoon - * lib/: Makefile.am, afs.m4, error.m4, exitfail.m4, fstypename.m4, - fsusage.m4, full-read.c, full-write.c, full-write.h, getopt.m4, - ls-mntd-fs.m4, onceonly.m4, safe-read.c, safe-read.h, - safe-write.c, safe-write.h, unlocked-io.m4, xalloc.m4: Moving m4 - files into m4/. Added extra coreutils files required from + * [r1027] lib/Makefile.am, lib/afs.m4, lib/error.m4, + lib/exitfail.m4, lib/fstypename.m4, lib/fsusage.m4, + lib/full-read.c, lib/full-write.c, lib/full-write.h, + lib/getopt.m4, lib/ls-mntd-fs.m4, lib/onceonly.m4, + lib/safe-read.c, lib/safe-read.h, lib/safe-write.c, + lib/safe-write.h, lib/unlocked-io.m4, lib/xalloc.m4: + Moving m4 files into m4/. Added extra coreutils files required + from autoconf tests. Updated Makefile.am to have nagiosplug lib and a - separate coreutils lib + separate + coreutils lib 2004-12-15 00:10 opensides - * po/: de.po, fr.po: + * [r1026] po/de.po, po/fr.po: fr.po work in progress still 88 to translate ;-) 2004-12-11 06:25 mattkent - * plugins/check_tcp.c: Patch from Ollie Cook to define return code - when expected value not received (#1082275). Also included - another change from Ollie Cook to do stricter matching of - expected values from the beginning of the line. When a user - defines an expected string this is changed to the old style - strstr matching. + * [r1025] plugins/check_tcp.c: + Patch from Ollie Cook to define return code when expected value + not received (#1082275). + Also included another change from Ollie Cook to do stricter + matching of expected values from the beginning of the line. When + a user defines an expected string this is changed to the old + style strstr matching. 2004-12-10 21:18 tonvoon - * plugins/check_ldap.c: Fixed compile warning + * [r1024] plugins/check_ldap.c: + Fixed compile warning 2004-12-10 06:10 mattkent - * plugins/Makefile.am: Compile broken - fixing link flags. + * [r1023] plugins/Makefile.am: + Compile broken - fixing link flags. 2004-12-10 05:57 mattkent - * plugins/check_dns.c: Error catching improvements from Ollie Cook + * [r1022] plugins/check_dns.c: + Error catching improvements from Ollie Cook 2004-12-10 05:54 mattkent - * plugins/check_pgsql.c: Fixing broken compile + * [r1021] plugins/check_pgsql.c: + Fixing broken compile 2004-12-10 05:39 mattkent - * AUTHORS: More contributers + * [r1020] AUTHORS: + More contributers 2004-12-10 00:54 stanleyhopcroft - * plugins/Makefile.am: Changes to link flags for check_dhcp.c + * [r1019] plugins/Makefile.am: + Changes to link flags for check_dhcp.c 2004-12-10 00:52 stanleyhopcroft - * plugins/check_dhcp.c: Extensive changes to get MAC address from - Solaris via DLPI + * [r1018] plugins/check_dhcp.c: + Extensive changes to get MAC address from Solaris via DLPI 2004-12-10 00:20 tonvoon - * plugins/: check_dns.c, check_procs.c: Reverting back ngettext - calls + * [r1017] plugins/check_dns.c, plugins/check_procs.c: + Reverting back ngettext calls 2004-12-10 00:13 tonvoon - * plugins/common.h: Fix includes for gettext + * [r1016] plugins/common.h: + Fix includes for gettext 2004-12-09 22:33 tonvoon - * configure.in: Include $libsuff for systems that define this - (based on advice from Daniel Stenberg) + * [r1015] configure.in: + Include $libsuff for systems that define this (based on advice + from + Daniel Stenberg) 2004-12-08 23:14 tonvoon - * configure.in: Removed redundant check and make export - LD_LIBRARY_PATH more sh friendly + * [r1014] configure.in: + Removed redundant check and make export LD_LIBRARY_PATH more sh + friendly 2004-12-08 00:36 opensides - * configure.in, plugins/Makefile.am, plugins/check_by_ssh.c, - plugins/check_game.c, plugins/check_http.c, - plugins/check_ide_smart.c, plugins/check_ldap.c, - plugins/check_snmp.c, plugins/check_tcp.c: + * [r1013] configure.in, plugins/Makefile.am, + plugins/check_by_ssh.c, plugins/check_game.c, + plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_snmp.c, plugins/check_tcp.c: patch 1028033 - + minor internationalization fixes 2004-12-08 00:22 tonvoon - * configure.in: Fixed output info for openssl and LD_LIBRARY_PATH - for subsequent compiles (otherwise get ld.so.1: ./conftest: - fatal: libssl.so.0.9.7: open failed) + * [r1012] configure.in: + Fixed output info for openssl and LD_LIBRARY_PATH for subsequent + compiles + (otherwise get ld.so.1: ./conftest: fatal: libssl.so.0.9.7: open + failed) 2004-12-07 06:51 tonvoon - * configure.in, plugins/Makefile.am: Better SSL checking (inspired - by curl 7.12.2's configure.ac) + * [r1011] configure.in, plugins/Makefile.am: + Better SSL checking (inspired by curl 7.12.2's configure.ac) 2004-12-07 03:13 mattkent - * plugins-scripts/check_ifoperstatus.pl: Option to check for admin - down (#1012191) from Raúl Pedroche. + * [r1010] plugins-scripts/check_ifoperstatus.pl: + Option to check for admin down (#1012191) from Raúl Pedroche. 2004-12-07 02:45 stanleyhopcroft - * plugins/Makefile.am: Correct dependencies for check_dhcp.c. + * [r1009] plugins/Makefile.am: + Correct dependencies for check_dhcp.c. -2004-12-07 02:31 stanleyhopcroft +2004-12-07 02:33 stanleyhopcroft - * plugins/: Makefile.am, check_dhcp.c: New plugin: check_dhcp.c. - Attempt to port to non Linux platform. + * [r1008] plugins/Makefile.am, plugins/check_dhcp.c: + New plugin: check_dhcp.c. Attempt to port to non Linux platform. 2004-12-06 18:49 opensides - * po/fr.po: + * [r1007] po/fr.po: new version of fr.po 2004-12-05 22:07 mattkent - * plugins/check_snmp.c: Fix for -s string matching (#756567, Tony - Missana) + * [r1006] plugins/check_snmp.c: + Fix for -s string matching (#756567, Tony Missana) 2004-12-05 12:59 opensides - * plugins/check_nt.c, po/fr.po, po/nagios-plugins.pot: + * [r1005] plugins/check_nt.c, po/fr.po, po/nagios-plugins.pot: cleaned fr.po nagios-plugins.pot 2004-12-05 00:54 opensides - * plugins/: check_http.c, check_icmp.c, check_nwstat.c, - check_ping.c, check_smtp.c, check_swap.c, utils.h: - fix patch 998291 fix patch 1078934 expect check_ssh fix and - check_nt perfdata should stay on one word like in nagios + * [r1004] plugins/check_http.c, plugins/check_icmp.c, + plugins/check_nwstat.c, plugins/check_ping.c, + plugins/check_smtp.c, plugins/check_swap.c, plugins/utils.h: + fix patch 998291 + fix patch 1078934 expect check_ssh fix and check_nt perfdata + should stay + on one word like in nagios 2004-12-04 12:34 opensides - * po/nagios-plugins.pot: + * [r1003] po/nagios-plugins.pot: new version of pot file 2004-12-04 12:31 opensides - * plugins/check_by_ssh.c, plugins/check_dns.c, po/POTFILES.in: + * [r1002] plugins/check_by_ssh.c, plugins/check_dns.c, + po/POTFILES.in: various internationalization fixes 2004-12-04 12:12 opensides - * plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, - plugins/check_http.c, plugins/check_ide-smart.c, - plugins/check_ide_smart.c, plugins/check_mrtg.c, - plugins/check_nt.c, plugins/check_nwstat.c, + * [r1001] plugins/Makefile.am, plugins/check_by_ssh.c, + plugins/check_dig.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ide_smart.c, + plugins/check_mrtg.c, plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, po/POTFILES.in: - internationalization fixes bugfixes + internationalization fixes + bugfixes 2004-12-04 10:57 opensides - * plugins/: check_dns.c, check_hpjd.c: + * [r1000] plugins/check_dns.c, plugins/check_hpjd.c: check_dns needs a space between 'time' and the hostname check_hpjd needs a parenthesis removed in print_usage() 2004-12-04 00:23 opensides - * plugins/check_swap.c: + * [r999] plugins/check_swap.c: Bug Fix [ 1024735 ] check_swap providing inaccurate swap information on Sol6 2004-12-03 23:55 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_game.c, check_hpjd.c, check_http.c, - check_ldap.c, check_load.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_nagios.c, check_nt.c, check_nwstat.c, - check_overcr.c, check_pgsql.c, check_ping.c, check_procs.c, - check_radius.c, check_real.c, check_smtp.c, check_snmp.c, - check_ssh.c, check_swap.c, check_tcp.c, check_time.c, - check_udp.c, check_ups.c, check_users.c, negate.c: + * [r998] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c: reverting my changes from !=TRUE to == ERROR, that's not good ;-( sorry 2004-12-03 23:23 opensides - * plugins/check_tcp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + * [r997] plugins/check_tcp.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: check_tcp parenthesis bug, header fix for po files -2004-12-03 23:01 opensides +2004-12-03 23:02 opensides - * plugins/: check_dig.c, check_disk.c, check_dns.c, check_dummy.c, - check_fping.c, check_game.c, check_hpjd.c, check_http.c, - check_ide-smart.c, check_ldap.c, check_mrtg.c, check_mrtgtraf.c, - check_nagios.c, check_nt.c, check_nwstat.c, check_overcr.c, - check_pgsql.c, check_procs.c, check_radius.c, check_real.c, - check_smtp.c, check_snmp.c, check_swap.c, check_tcp.c, - check_time.c, check_udp.c, check_ups.c: + * [r996] plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c: print_help and print_usage() cleanup - + other misc cleanups 2004-12-03 21:56 stanleyhopcroft - * plugins/check_tcp.c: 1041571: -D option processing corrected - (Eric Chen). Changed process_arguments() to return TRUE. Dont - know why this was necessary. + * [r995] plugins/check_tcp.c: + 1041571: -D option processing corrected (Eric Chen). Changed + process_arguments() to return TRUE. Dont know why this was + necessary. 2004-12-03 20:28 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ide-smart.c, check_ldap.c, check_load.c, - check_mrtg.c, check_mrtgtraf.c, check_mysql.c, check_nagios.c, - check_nt.c, check_nwstat.c, check_overcr.c, check_pgsql.c, - check_ping.c, check_procs.c, check_radius.c, check_real.c, - check_smtp.c, check_snmp.c, check_ssh.c, check_swap.c, - check_tcp.c, check_time.c, check_udp.c, check_ups.c, - check_users.c, negate.c, urlize.c: remove UT_HLP_VRS from - print_usage this was not a good idea ;-) + * [r994] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/urlize.c: + remove UT_HLP_VRS from print_usage + this was not a good idea ;-) 2004-12-03 19:20 opensides - * plugins/utils.c: - removing support fonction removing warranty from print_revision + * [r993] plugins/utils.c: + removing support fonction + removing warranty from print_revision 2004-12-03 17:48 opensides - * ROADMAP, package.def, plugins/negate.c, plugins/utils.h: + * [r992] ROADMAP, package.def, plugins/negate.c, plugins/utils.h: some minor fixes 2004-12-03 17:15 opensides - * plugins/: check_load.c, check_ssh.c: + * [r991] plugins/check_load.c, plugins/check_ssh.c: correcting parenthesis error 2004-12-03 16:56 opensides - * AUTHORS, plugins/check_load.c, plugins/check_pgsql.c, + * [r990] AUTHORS, plugins/check_load.c, plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, @@ -3538,505 +4828,586 @@ 2004-12-03 11:45 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ide-smart.c, check_ldap.c, check_load.c, - check_mrtg.c, check_mrtgtraf.c, check_mysql.c, check_nagios.c, - check_nt.c, check_nwstat.c: + * [r989] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c: internationalization fixes and help fixes 2004-12-03 09:19 opensides - * plugins/check_by_ssh.c, plugins/check_dig.c, + * [r988] plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_http.c, plugins/check_nwstat.c, plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_udp.c, - po/.cvsignore: + po, po/.cvsignore: Localization fixes 2004-12-03 08:45 opensides - * plugins/: check_ide-smart.c, check_pgsql.c: + * [r987] plugins/check_ide-smart.c, plugins/check_pgsql.c: correcting copyright and remaning int result = STATE_UNKNOWN; 2004-12-03 04:37 mattkent - * plugins/check_nagios.c: Affected by elapsed time patch. + * [r986] plugins/check_nagios.c: + Affected by elapsed time patch. 2004-12-03 04:16 mattkent - * AUTHORS: Another contributer. + * [r985] AUTHORS: + Another contributer. 2004-12-03 04:10 mattkent - * configure.in, plugins/check_procs.c: Patch from Russell Miller - which adds elapsed time as a metric. Only for linux so far. - (991359) + * [r984] configure.in, plugins/check_procs.c: + Patch from Russell Miller which adds elapsed time as a metric. + Only for linux so far. (991359) 2004-12-03 02:21 mattkent - * plugins/check_ldap.c: Fix typo breaking compile. + * [r983] plugins/check_ldap.c: + Fix typo breaking compile. 2004-12-03 00:55 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_ide-smart.c, check_ldap.c, check_load.c, check_mrtg.c, - check_mrtgtraf.c, check_mysql.c, check_nagios.c, check_nt.c, - check_nwstat.c, check_overcr.c, check_pgsql.c, check_ping.c, - check_procs.c, check_radius.c, check_real.c, check_smtp.c, - check_snmp.c, check_ssh.c, check_swap.c, check_tcp.c, - check_time.c, check_udp.c, check_ups.c, check_users.c, negate.c, - urlize.c: - bump copyright year initialize result to STATE_UNKNOW in place of - STATE_OK + * [r982] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_ide-smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/urlize.c: + bump copyright year + initialize result to STATE_UNKNOW in place of STATE_OK 2004-12-02 21:23 opensides - * plugins/: check_dns.c, check_ldap.c, check_procs.c: + * [r981] plugins/check_dns.c, plugins/check_ldap.c, + plugins/check_procs.c: --disable-nls throws an error on check_dns, check_procs and check_ldap without this patch. 2004-12-02 21:03 stanleyhopcroft - * plugins/check_tcp.c: Tracker 1041571: appended :D to - getopt_long() args (for cert expiry check). Eric Chen. + * [r980] plugins/check_tcp.c: + Tracker 1041571: appended :D to getopt_long() args (for cert + expiry check). Eric Chen. 2004-12-02 16:51 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_game.c, check_hpjd.c, check_http.c, - check_ldap.c, check_load.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_nagios.c, check_nt.c, check_nwstat.c, - check_overcr.c, check_pgsql.c, check_ping.c, check_procs.c, - check_radius.c, check_real.c, check_smtp.c, check_snmp.c, - check_ssh.c, check_swap.c, check_tcp.c, check_time.c, - check_udp.c, check_ups.c, check_users.c, negate.c, popen.c, - utils.c: - More internationalization work new usage4 function to permit - localisation of think like check_ssh: xxxxx + * [r979] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/utils.c: + More internationalization work + new usage4 function to permit localisation of think like + check_ssh: xxxxx 2004-12-02 14:54 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_game.c, check_hpjd.c, check_ldap.c, - check_load.c, check_mrtg.c, check_mrtgtraf.c, check_mysql.c, - check_nagios.c, check_nt.c, check_nwstat.c, check_overcr.c, - check_pgsql.c, check_ping.c, check_procs.c, check_radius.c, - check_real.c, check_smtp.c, check_snmp.c, check_ssh.c, - check_swap.c, check_tcp.c, check_time.c, check_udp.c, - check_ups.c, check_users.c, negate.c: + * [r978] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c: return of process_arguments() is TRUE not OK ! 2004-12-02 14:35 opensides - * plugins/check_http.c: return of process_arguments() is TRUE not - OK ! + * [r977] plugins/check_http.c: + return of process_arguments() is TRUE not OK ! 2004-12-02 08:45 stanleyhopcroft - * plugins/Makefile.am: Add check_icmp plugin + * [r976] plugins/Makefile.am: + Add check_icmp plugin 2004-12-02 08:44 stanleyhopcroft - * plugins/check_icmp.c: check_icmp plugin from A Ericsson + * [r975] plugins/check_icmp.c: + check_icmp plugin from A Ericsson 2004-12-02 08:44 stanleyhopcroft - * plugins/linux.h: For check_icmp plugin from A Ericsson + * [r974] plugins/linux.h: + For check_icmp plugin from A Ericsson 2004-12-02 04:48 mattkent - * command.cfg.in: Fix typo. + * [r973] command.cfg.in: + Fix typo. 2004-12-02 04:36 mattkent - * AUTHORS, REQUIREMENTS, command.cfg.in, plugins/check_ups.c: Patch - from Arnaud Quette to bring support to NUT 2.0 plus couple + * [r972] AUTHORS, REQUIREMENTS, command.cfg.in, + plugins/check_ups.c: + Patch from Arnaud Quette to bring support to NUT 2.0 plus couple improvements and fixes (1038413 which includes 1032009, 815785). 2004-12-02 01:11 opensides - * plugins/: check_dns.c, check_game.c, check_http.c, - check_ide-smart.c, check_load.c, check_mrtgtraf.c, check_mysql.c, - check_nagios.c, check_nt.c, check_nwstat.c, check_overcr.c, - check_pgsql.c, check_ping.c, check_procs.c, check_radius.c, - check_real.c, check_snmp.c, check_ssh.c, check_tcp.c, - check_time.c, check_udp.c, check_ups.c, negate.c, popen.c: - changed Error: by CRITICAL - more localization fixes + * [r971] plugins/check_dns.c, plugins/check_game.c, + plugins/check_http.c, plugins/check_ide-smart.c, + plugins/check_load.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/negate.c, plugins/popen.c: + changed Error: by CRITICAL - + more localization fixes 2004-12-02 00:30 opensides - * contrib/check_rbl.c: + * [r970] contrib/check_rbl.c: adapted for localization 2004-12-01 23:54 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ide-smart.c, check_ldap.c, check_load.c, - check_mrtg.c, check_mrtgtraf.c, check_mysql.c, check_nagios.c, - check_nt.c, check_nwstat.c, check_overcr.c, check_pgsql.c, - check_ping.c, check_procs.c, check_radius.c, check_real.c, - check_smtp.c, check_snmp.c, check_ssh.c, check_swap.c, - check_tcp.c, check_time.c, check_udp.c, check_ups.c, - check_users.c, common.h, getaddrinfo.c, getaddrinfo.h, - gethostbyname.c, gethostbyname.h, negate.c, netutils.c, - netutils.h, popen.c, urlize.c, utils.c, utils.h: - standardize localization string standardize unknow arguments + * [r969] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/common.h, plugins/getaddrinfo.c, + plugins/getaddrinfo.h, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/negate.c, plugins/netutils.c, + plugins/netutils.h, plugins/popen.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h: + standardize localization string + standardize unknow arguments 2004-12-01 22:02 tonvoon - * doc/RELEASING: Notes on releasing + * [r968] doc/RELEASING: + Notes on releasing 2004-12-01 21:55 tonvoon - * configure.in: Next version number + * [r967] configure.in: + Next version number 2004-12-01 21:01 tonvoon - * ChangeLog: Updated for r1_4_0-alpha2 + * [r965] ChangeLog: + Updated for r1_4_0-alpha2 2004-12-01 20:43 tonvoon - * tools/devmode: eval not working - instructions now in comments + * [r964] tools/devmode: + eval not working - instructions now in comments 2004-12-01 20:09 tonvoon - * plugins-scripts/check_oracle.sh: Fixed pmon process checking from - a change I made earlier + * [r963] plugins-scripts/check_oracle.sh: + Fixed pmon process checking from a change I made earlier 2004-12-01 19:33 opensides - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_ssh.c: + * [r962] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_ssh.c: first pass at standardization of messages for the localization 2004-12-01 08:41 stanleyhopcroft - * configure.in: Bryan Loniewski contributed check_jabber plugin - (SSL/check_tcp); Eric Chen check_nntps plugin + SSL certficate - expiry check [added -D option to check_tcp] + * [r961] configure.in: + Bryan Loniewski contributed check_jabber plugin (SSL/check_tcp); + Eric Chen check_nntps plugin + SSL certficate expiry check [added + -D option to check_tcp] 2004-12-01 08:28 stanleyhopcroft - * plugins/netutils.c: 1075725: patch to my_connect() to deal with - SEGV if connect fails + * [r960] plugins/netutils.c: + 1075725: patch to my_connect() to deal with SEGV if connect fails 2004-12-01 08:26 stanleyhopcroft - * plugins/check_tcp.c: 1041571 & 664615: check_tcp with cert check - + nntps, simap, jabber + * [r959] plugins/check_tcp.c: + 1041571 & 664615: check_tcp with cert check + nntps, simap, + jabber 2004-12-01 03:50 mattkent - * contrib/check_nmap.py: Small fix from David Rippel (996800) for - newer versions of nmap + * [r958] contrib/check_nmap.py: + Small fix from David Rippel (996800) for newer versions of nmap 2004-12-01 03:26 mattkent - * plugins-scripts/check_oracle.sh: Perf data and other improvements - by Florian Gleixner (1027787) + * [r957] plugins-scripts/check_oracle.sh: + Perf data and other improvements by Florian Gleixner (1027787) 2004-11-30 07:40 opensides - * po/fr.po: + * [r956] po/fr.po: more french translations 2004-11-30 00:25 tonvoon - * plugins/check_ide-smart.c: Capitalized some error messages + * [r955] plugins/check_ide-smart.c: + Capitalized some error messages 2004-11-30 00:24 tonvoon - * plugins/urlize.c: Updated output to UNKNOWN + * [r954] plugins/urlize.c: + Updated output to UNKNOWN 2004-11-30 00:21 opensides - * po/fr.po: + * [r953] po/fr.po: translating fr.po new part 2004-11-29 23:52 tonvoon - * lib/: Makefile.am, exitfail.m4, getopt.m4: Extra files required - from coreutils + * [r952] lib/Makefile.am, lib/exitfail.m4, lib/getopt.m4: + Extra files required from coreutils 2004-11-29 23:46 tonvoon - * SUPPORT: Cleanup and statement re: contrib plugins + * [r951] SUPPORT: + Cleanup and statement re: contrib plugins 2004-11-29 22:42 tonvoon - * configure.in: Patches for configure on *BSD (Julien Touche) + * [r950] configure.in: + Patches for configure on *BSD (Julien Touche) 2004-11-29 05:07 stanleyhopcroft - * contrib/: README.TXT, rblcheck-dns, rblcheck-web, - tarballs/check_icmp-0.8.tar.gz: [no log message] + * [r949] contrib/README.TXT, contrib/rblcheck-dns, + contrib/rblcheck-web, contrib/tarballs/check_icmp-0.8.tar.gz: + *** empty log message *** 2004-11-29 04:49 mattkent - * contrib/check_linux_raid.pl: Better error checking (820806) + * [r948] contrib/check_linux_raid.pl: + Better error checking (820806) 2004-11-29 00:56 opensides - * po/fr.po: + * [r947] po/fr.po: second version of french .po still 300 ;-) to translate 2004-11-28 22:57 opensides - * po/fr.po: + * [r946] po/fr.po: first new translation of fr.po 2004-11-27 21:00 mattkent - * plugins/check_ssh.c: Add remote version check (1030269, Daniel - Gullin) + * [r945] plugins/check_ssh.c: + Add remote version check (1030269, Daniel Gullin) 2004-11-26 08:54 stanleyhopcroft - * AUTHORS: New plugin/bugfix: tracker 1070929. check_hpjdres + * [r944] AUTHORS: + New plugin/bugfix: tracker 1070929. check_hpjdres 2004-11-25 05:09 mattkent - * plugins/check_disk.c: From old test harness code, make - ./check_disk -w 0 -c 0 / valid parameters again + * [r943] plugins/check_disk.c: + From old test harness code, make ./check_disk -w 0 -c 0 / valid + parameters again 2004-11-25 05:06 mattkent - * test.pl.in, plugins/t/check_dns.t, plugins/t/check_http.t, - plugins/t/check_load.t, plugins/t/check_mysql.t: Updating test - harness + * [r942] plugins/t/check_dns.t, plugins/t/check_http.t, + plugins/t/check_load.t, plugins/t/check_mysql.t, test.pl.in: + Updating test harness 2004-11-25 04:49 stanleyhopcroft - * contrib/README.TXT: Removed reference to non existent tar balls - (Hopcroft plugins) + * [r941] contrib/README.TXT: + Removed reference to non existent tar balls (Hopcroft plugins) 2004-11-25 04:46 stanleyhopcroft - * contrib/check_wins.pl: Non functional tidy ups to check_wins + * [r940] contrib/check_wins.pl: + Non functional tidy ups to check_wins 2004-11-25 04:30 stanleyhopcroft - * contrib/check_hw.sh: Added /contrib/check_hw.sh by Rok Debevc + * [r939] contrib/check_hw.sh: + Added /contrib/check_hw.sh by Rok Debevc 2004-11-25 04:28 stanleyhopcroft - * contrib/check_sybase: Added /contrib/check_sybase by Simon - Bellwood + * [r938] contrib/check_sybase: + Added /contrib/check_sybase by Simon Bellwood 2004-11-25 03:01 stanleyhopcroft - * contrib/check_hprsc.pl: update check_hprsc.pl for Net-SNMP - versions >=4 + * [r937] contrib/check_hprsc.pl: + update check_hprsc.pl for Net-SNMP versions >=4 2004-11-24 21:34 tonvoon - * tools/sfsnapshot: Removing build directory after creating - distribution + * [r936] tools/sfsnapshot: + Removing build directory after creating distribution 2004-11-24 21:19 tonvoon - * doc/makefile: Added clean - -2004-11-24 21:01 tonvoon - - * configure.in: Fix snapshot build on SF + * [r935] doc/makefile: + Added clean 2004-11-24 06:36 stanleyhopcroft - * plugins/check_hpjd.c: add -OQa to command_line in check_hpjd.c. - Correct nagiosplug-Bugs-889948, 846329 + * [r933] plugins/check_hpjd.c: + add -OQa to command_line in check_hpjd.c. Correct + nagiosplug-Bugs-889948, 846329 2004-11-24 04:35 mattkent - * plugins/check_nwstat.c: Attempting to fix a reported segfault - (1055054) + * [r932] plugins/check_nwstat.c: + Attempting to fix a reported segfault (1055054) 2004-11-24 04:25 mattkent - * plugins/check_http.c: Added support for sending port in host - header (913633) + * [r931] plugins/check_http.c: + Added support for sending port in host header (913633) 2004-11-24 00:46 tonvoon - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ldap.c, check_load.c, check_mrtg.c, - check_mrtgtraf.c, check_mysql.c, check_nwstat.c, check_overcr.c, - check_pgsql.c, check_ping.c, check_procs.c, check_radius.c, - check_real.c, check_smtp.c, check_snmp.c, check_ssh.c, - check_tcp.c, check_time.c, check_udp.c, check_ups.c, - check_users.c, negate.c, urlize.c: Making messages more - consistent + * [r930] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: + Making messages more consistent 2004-11-23 23:53 tonvoon - * plugins/: check_hpjd.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_real.c, check_smtp.c, check_swap.c, - check_by_ssh.c, check_dns.c, check_time.c: Standardising - translation texts + * [r929] plugins/check_by_ssh.c, plugins/check_dns.c, + plugins/check_hpjd.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/check_time.c: + Standardising translation texts 2004-11-23 23:35 tonvoon - * doc/developer-guidelines.sgml: Guidelines on translated text - (Yves Mettier, Simon Bellwood, Andreas Ericsson) + * [r928] doc/developer-guidelines.sgml: + Guidelines on translated text (Yves Mettier, Simon Bellwood, + Andreas Ericsson) 2004-11-23 22:49 tonvoon - * doc/developer-guidelines.sgml: Adding notes on developer and - translator access in SF + * [r927] doc/developer-guidelines.sgml: + Adding notes on developer and translator access in SF 2004-11-23 06:06 mattkent - * AUTHORS: More contributers. + * [r926] AUTHORS: + More contributers. 2004-11-23 05:49 mattkent - * plugins/check_disk.c: Fix integer warning and critical options. - Take values from current unit instead of always KB. + * [r925] plugins/check_disk.c: + Fix integer warning and critical options. Take values from + current unit instead of always KB. 2004-11-23 00:06 stanleyhopcroft - * doc/developer-guidelines.sgml: trivial changes to Perl plugin - section. + * [r924] doc/developer-guidelines.sgml: + trivial changes to Perl plugin section. 2004-11-22 22:44 tonvoon - * AUTHORS: More contributors + * [r923] AUTHORS: + More contributors 2004-11-22 22:30 tonvoon - * plugins/check_nt.c: Fixed some messages that should not be - translated (Benoit Mortier) - -2004-11-22 20:35 tonvoon - - * lib/getloadavg.m4: Not required - autoconf has own macros + * [r922] plugins/check_nt.c: + Fixed some messages that should not be translated (Benoit + Mortier) 2004-11-21 05:24 mattkent - * plugins/check_mysql.c: Patch from Nathan Shafer to add - replication slave check (1006777) + * [r920] plugins/check_mysql.c: + Patch from Nathan Shafer to add replication slave check (1006777) 2004-11-20 22:56 mattkent - * AUTHORS: Oops, forgot one. + * [r919] AUTHORS: + Oops, forgot one. 2004-11-20 22:46 mattkent - * AUTHORS: More contributers. + * [r918] AUTHORS: + More contributers. 2004-11-20 22:43 mattkent - * contrib/check_linux_raid.pl: Fix always reading status from the - last line (1045506) + * [r917] contrib/check_linux_raid.pl: + Fix always reading status from the last line (1045506) 2004-11-20 22:28 mattkent - * plugins/check_ping.c: New output format reported by pumuckel1980 - (946857) + * [r916] plugins/check_ping.c: + New output format reported by pumuckel1980 (946857) 2004-11-20 21:36 mattkent - * plugins/check_http.c: Bit of cleanup, fix verbose output. + * [r915] plugins/check_http.c: + Bit of cleanup, fix verbose output. 2004-11-20 07:04 tonvoon - * configure.in: Fixed va_copy problem on AIX by copying samba's - configure.in + * [r914] configure.in: + Fixed va_copy problem on AIX by copying samba's configure.in 2004-11-19 15:58 tonvoon - * CODING: Added perl coding guidelines, from Programming Perl book - (Andreas Ericsson) + * [r913] CODING: + Added perl coding guidelines, from Programming Perl book (Andreas + Ericsson) 2004-11-19 14:28 tonvoon - * lib/getloadavg.m4: I think getloadavg.m4 is no longer required - (as autoconf has built-in function) + * [r912] lib/getloadavg.m4: + I think getloadavg.m4 is no longer required (as autoconf has + built-in function) 2004-11-19 14:24 tonvoon - * lib/Makefile.am: Removed getloadavg.m4 (built-in function in - autoconf) and added cloexec.[hc] for getloadavg.c + * [r911] lib/Makefile.am: + Removed getloadavg.m4 (built-in function in autoconf) and added + cloexec.[hc] + for getloadavg.c -2004-11-19 14:22 tonvoon +2004-11-19 14:23 tonvoon - * lib/: cloexec.h, cloexec.c: Files required for getloadavg.c + * [r910] lib/cloexec.c, lib/cloexec.h: + Files required for getloadavg.c 2004-11-19 03:59 mattkent - * plugins-scripts/check_ntp.pl: Fix incorrectly labelled units in - output (1025905, Jason Martin) + * [r909] plugins-scripts/check_ntp.pl: + Fix incorrectly labelled units in output (1025905, Jason Martin) 2004-11-19 03:44 mattkent - * plugins/check_procs.c: Enabling timeout flag (1010097, Jason - Martin) + * [r908] plugins/check_procs.c: + Enabling timeout flag (1010097, Jason Martin) 2004-11-19 02:53 mattkent - * plugins/check_http.c: Make -L notice ssl use to output a proper - href (1035234, Abid Rasheed) + * [r907] plugins/check_http.c: + Make -L notice ssl use to output a proper href (1035234, Abid + Rasheed) 2004-11-19 02:39 mattkent - * plugins/check_smtp.c: Change unit from 'us' to 's' to match other - core plugins for simplicity. + * [r906] plugins/check_smtp.c: + Change unit from 'us' to 's' to match other core plugins for + simplicity. 2004-11-19 00:21 tonvoon - * AUTHORS: - More great contributors... + * [r905] AUTHORS: + - More great contributors... 2004-11-19 00:12 tonvoon - * plugins/check_http.c: Options for User Agent string and extra - headers (Ibere Tizio) + * [r904] plugins/check_http.c: + Options for User Agent string and extra headers (Ibere Tizio) 2004-11-18 22:48 tonvoon - * configure.in: Remove unnecessary CPPFLAGS for openssl (Lutz - Behnke - 686476) + * [r903] configure.in: + Remove unnecessary CPPFLAGS for openssl (Lutz Behnke - 686476) 2004-11-18 22:42 tonvoon - * plugins/check_tcp.c: Enhance SSL initialization problems (Phil - Dibowitz - 1055120) + * [r902] plugins/check_tcp.c: + Enhance SSL initialization problems (Phil Dibowitz - 1055120) 2004-11-18 05:36 mattkent - * plugins/check_smtp.c: Go critical on no route to host instead of - warning (934025) + * [r901] plugins/check_smtp.c: + Go critical on no route to host instead of warning (934025) 2004-11-18 00:27 tonvoon - * tools/setup: Use copy of tools for consistency if building on - different platforms from shared source + * [r900] tools/setup: + Use copy of tools for consistency if building on different + platforms from + shared source 2004-11-17 23:35 tonvoon - * plugins/check_tcp.c: Ignore output from tcp port (949070 - - Jan-Piet Mens) + * [r899] plugins/check_tcp.c: + Ignore output from tcp port (949070 - Jan-Piet Mens) 2004-11-17 23:22 tonvoon - * plugins/check_http.c: --no-body and --max-age options (949521 - - Jamie Zawinski) + * [r898] plugins/check_http.c: + --no-body and --max-age options (949521 - Jamie Zawinski) 2004-11-17 22:19 tonvoon - * doc/developer-guidelines.sgml: Added section on using - Sourceforge, mainly for administrators + * [r897] doc/developer-guidelines.sgml: + Added section on using Sourceforge, mainly for administrators 2004-11-12 00:51 tonvoon - * tools/update_coreutils: Tool to pull newer coreutil libs into - nagiosplug's lib directory + * [r896] tools/update_coreutils: + Tool to pull newer coreutil libs into nagiosplug's lib directory 2004-11-12 00:49 tonvoon - * lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, + * [r895] lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, lib/exit.h, lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, lib/fsusage.h, lib/fsusage.m4, lib/full-read.h, lib/getloadavg.c, lib/getopt.c, lib/getopt.h, lib/getopt1.c, lib/gettext.h, @@ -4044,4251 +5415,4684 @@ lib/mountlist.h, lib/onceonly.m4, lib/realloc.c, lib/snprintf.c, lib/strtod.c, lib/unlocked-io.h, lib/unlocked-io.m4, lib/xalloc.h, lib/xalloc.m4, lib/xmalloc.c, lib/xstrdup.c, - plugins/check_disk.c, po/de.po, po/fr.po: Update to using - coreutils 5.2.1 libraries and snprintf.c from samba 3.0.8 + plugins/check_disk.c, po/de.po, po/fr.po: + Update to using coreutils 5.2.1 libraries and snprintf.c from + samba 3.0.8 -2004-09-07 21:27 tonvoon +2004-09-07 20:27 tonvoon - * doc/developer-guidelines.sgml: Clarity based on comments by Ben - Clewett + * [r894] doc/developer-guidelines.sgml: + Clarity based on comments by Ben Clewett -2004-08-23 22:59 tonvoon +2004-08-23 21:59 tonvoon - * AUTHORS: For patch to check_nt + * [r893] AUTHORS: + For patch to check_nt -2004-08-23 22:58 tonvoon +2004-08-23 21:58 tonvoon - * plugins/check_nt.c: Restore divisor for memory size reported by - Windows. Also, implements warning and critical levels for - performance counters. (Paulo Afonso Graner Fessel) + * [r892] plugins/check_nt.c: + Restore divisor for memory size reported by Windows. Also, + implements warning + and critical levels for performance counters. (Paulo Afonso + Graner Fessel) -2004-08-23 22:18 tonvoon +2004-08-23 21:18 tonvoon - * configure.in, plugins/check_swap.c, plugins/common.h: Using - swapctl for Solaris, Tru64 and *BSD (Sean Finney) + * [r891] configure.in, plugins/check_swap.c, plugins/common.h: + Using swapctl for Solaris, Tru64 and *BSD (Sean Finney) -2004-08-19 20:05 tonvoon +2004-08-19 19:05 tonvoon - * configure.in, plugins/check_swap.c, plugins/common.h: Patch for - tru64 using swapctl calls (Sean Finney) + * [r890] configure.in, plugins/check_swap.c, plugins/common.h: + Patch for tru64 using swapctl calls (Sean Finney) -2004-08-18 22:32 tonvoon +2004-08-18 21:32 tonvoon - * AUTHORS: Another day's work... - -2004-08-18 22:25 tonvoon - - * plugins/check_dig.c: Checks different record types and checks - against an expected address (Bill Kunkel) - -2004-08-18 21:36 tonvoon - - * configure.in: Support for check_swap on NetBSD/OpenBSD (Sean - Finney) + * [r889] AUTHORS: + Another day's work... 2004-08-18 21:25 tonvoon - * plugins-scripts/check_oracle.sh: More specific test for sid (Paul - Allen) + * [r888] plugins/check_dig.c: + Checks different record types and checks against an expected + address (Bill Kunkel) -2004-08-18 21:21 tonvoon +2004-08-18 20:36 tonvoon - * plugins/check_disk.c: Fixed perfdata so that shows amount used - (Garry Cook) + * [r887] configure.in: + Support for check_swap on NetBSD/OpenBSD (Sean Finney) -2004-08-18 20:51 tonvoon +2004-08-18 20:25 tonvoon - * plugins-scripts/check_ifstatus.pl: Perfdata corrected (Garry - Cook) + * [r886] plugins-scripts/check_oracle.sh: + More specific test for sid (Paul Allen) -2004-08-18 20:46 tonvoon +2004-08-18 20:21 tonvoon - * plugins-scripts/check_oracle.sh: Fix for similar dataabase sids - (Carole Verdon) + * [r885] plugins/check_disk.c: + Fixed perfdata so that shows amount used (Garry Cook) -2004-08-18 20:41 tonvoon +2004-08-18 19:51 tonvoon - * AUTHORS: Gary Cook for perfdata for check_nt + * [r884] plugins-scripts/check_ifstatus.pl: + Perfdata corrected (Garry Cook) -2004-08-18 20:40 tonvoon +2004-08-18 19:46 tonvoon - * plugins/check_nt.c: Perfdata added (Gary Cook) + * [r883] plugins-scripts/check_oracle.sh: + Fix for similar dataabase sids (Carole Verdon) -2004-06-26 17:39 tonvoon +2004-08-18 19:41 tonvoon - * tools/sfsnapshot: Change of compile server and cleanups + * [r882] AUTHORS: + Gary Cook for perfdata for check_nt -2004-06-26 06:13 tonvoon +2004-08-18 19:40 tonvoon - * tools/sfsnapshot: Remove need to alter configure.in. Using - different compile farms for SF to do the compiling + * [r881] plugins/check_nt.c: + Perfdata added (Gary Cook) -2004-05-24 15:22 tonvoon +2004-06-26 16:39 tonvoon - * AUTHORS: Ben Clewett + * [r880] tools/sfsnapshot: + Change of compile server and cleanups -2004-05-24 15:21 tonvoon +2004-06-26 05:13 tonvoon - * lib/Makefile.am: Missed getloadavg.c (Ben Clewett) + * [r879] tools/sfsnapshot: + Remove need to alter configure.in. Using different compile farms + for + SF to do the compiling -2004-05-20 07:09 egalstad +2004-05-24 14:22 tonvoon - * contrib/check_dhcp.c: DHCP bug fix + * [r878] AUTHORS: + Ben Clewett -2004-05-10 11:25 tonvoon +2004-05-24 14:21 tonvoon - * configure.in: Set EXTRAS with check_swap if ac_cv_have_swap is - set + * [r877] lib/Makefile.am: + Missed getloadavg.c (Ben Clewett) -2004-04-30 12:12 tonvoon +2004-05-20 06:09 egalstad - * configure.in: ps -el for HP-UX + * [r876] contrib/check_dhcp.c: + DHCP bug fix -2004-04-29 16:08 tonvoon +2004-05-10 10:25 tonvoon - * configure.in: Bug in ps -el for AIX 4.1 + * [r875] configure.in: + Set EXTRAS with check_swap if ac_cv_have_swap is set -2004-04-29 12:13 tonvoon +2004-04-30 11:12 tonvoon - * AUTHORS: Sven for HP-UX requirements + * [r874] configure.in: + ps -el for HP-UX -2004-04-29 12:12 tonvoon +2004-04-29 15:08 tonvoon - * REQUIREMENTS: HP-UX requirements (Sven Schaffranneck) + * [r873] configure.in: + Bug in ps -el for AIX 4.1 -2004-04-19 14:13 sghosh +2004-04-29 11:13 tonvoon - * contrib/check_nagios_db_pg.pl, AUTHORS: Postgres backend monitor + * [r872] AUTHORS: + Sven for HP-UX requirements -2004-04-19 14:10 sghosh +2004-04-29 11:12 tonvoon - * AUTHORS, plugins-scripts/check_mssql.pl: check_mssql.pl + * [r871] REQUIREMENTS: + HP-UX requirements (Sven Schaffranneck) -2004-04-19 14:08 sghosh +2004-04-19 13:14 sghosh - * README: Win32 plugin repository + * [r870] AUTHORS, contrib/check_nagios_db_pg.pl: + Postgres backend monitor -2004-04-08 12:05 tonvoon +2004-04-19 13:10 sghosh - * AUTHORS: Torsten Werner for check_racle patches + * [r869] AUTHORS, plugins-scripts/check_mssql.pl: + check_mssql.pl -2004-04-08 12:05 tonvoon +2004-04-19 13:08 sghosh - * plugins-scripts/check_oracle.sh: Cleaner calls to awk and support - if Oracle has different national language settings (Torsten - Werner) + * [r868] README: + Win32 plugin repository -2004-04-08 11:50 tonvoon +2004-04-08 11:05 tonvoon - * plugins-scripts/check_oracle.sh: Cleaner calls to awk and support - if Oracle has different national language settings (Torsten - Werner) + * [r867] AUTHORS: + Torsten Werner for check_racle patches -2004-04-06 17:02 tonvoon +2004-04-08 11:05 tonvoon - * configure.in, plugins/check_procs.c: Fixed weird scanf bug on - Solaris + * [r866] plugins-scripts/check_oracle.sh: + Cleaner calls to awk and support if Oracle has different national + language settings (Torsten Werner) -2004-04-02 20:37 kdebisschop +2004-04-06 16:02 tonvoon - * plugins/check_by_ssh.c: add example invocation to help + * [r864] configure.in, plugins/check_procs.c: + Fixed weird scanf bug on Solaris -2004-04-01 00:01 tonvoon +2004-04-02 19:37 kdebisschop - * AUTHORS: Howard Wilkinson + * [r863] plugins/check_by_ssh.c: + add example invocation to help -2004-03-31 23:53 tonvoon +2004-03-31 23:01 tonvoon - * plugins/check_nt.c: Command line argument bug (Howard Wilkinson) + * [r862] AUTHORS: + Howard Wilkinson -2004-03-31 23:48 tonvoon +2004-03-31 22:53 tonvoon - * plugins/netutils.c: Set default state (Howard Wilkinson) + * [r861] plugins/check_nt.c: + Command line argument bug (Howard Wilkinson) -2004-03-31 20:20 tonvoon +2004-03-31 22:48 tonvoon - * doc/developer-guidelines.sgml: Update author list + * [r860] plugins/netutils.c: + Set default state (Howard Wilkinson) + +2004-03-31 19:20 tonvoon + + * [r859] doc/developer-guidelines.sgml: + Update author list 2004-03-23 06:35 kdebisschop - * plugins/check_fping.c: check was supposed to be agains ms - got - munged wfixeg the perfdata output to be in seconds - -2004-03-22 07:25 tonvoon - - * plugins/check_http.c: Getopt bug (Joe Rhett) + * [r858] plugins/check_fping.c: + check was supposed to be agains ms - got munged wfixeg the + perfdata output to be in seconds 2004-03-22 07:22 tonvoon - * AUTHORS: Joe Rhett for getopt bug + * [r856] AUTHORS: + Joe Rhett for getopt bug 2004-03-22 07:19 tonvoon - * plugins/check_http.c: Option --url not mapped (Joe Rhett) + * [r855] plugins/check_http.c: + Option --url not mapped (Joe Rhett) 2004-03-18 20:58 tonvoon - * AUTHORS: More help for patches + * [r854] AUTHORS: + More help for patches 2004-03-18 20:50 tonvoon - * plugins/check_disk.c: Typo in check_disk units (Matthew Kent - - 909281) + * [r853] plugins/check_disk.c: + Typo in check_disk units (Matthew Kent - 909281) 2004-03-18 20:40 tonvoon - * configure.in: Mysql include path not added correctly (Arnold - Cavazos - 912974) - -2004-03-18 20:37 tonvoon - - * configure.in: Mysql include path not added correctly (Arnold - Cavazos - 912974) + * [r852] configure.in: + Mysql include path not added correctly (Arnold Cavazos - 912974) 2004-03-18 20:31 tonvoon - * plugins/check_radius.c: Option to fill in NAS-identifier to - Emulate pam_radius behaviour (Alexander Kulak) + * [r851] plugins/check_radius.c: + Option to fill in NAS-identifier to Emulate pam_radius behaviour + (Alexander Kulak) 2004-03-17 20:38 tonvoon - * doc/developer-guidelines.sgml: Copyright information for patches + * [r850] doc/developer-guidelines.sgml: + Copyright information for patches 2004-03-14 04:09 kdebisschop - * plugins/: check_ldap.c, check_load.c, check_mrtgtraf.c, - check_pgsql.c, check_smtp.c, check_tcp.c, check_ups.c: use - fperfdata + * [r849] plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtgtraf.c, plugins/check_pgsql.c, + plugins/check_smtp.c, plugins/check_tcp.c, plugins/check_ups.c: + use fperfdata 2004-03-14 03:37 kdebisschop - * plugins/check_fping.c: use fperfdata + * [r848] plugins/check_fping.c: + use fperfdata 2004-03-12 03:40 egalstad - * contrib/check_cluster2.c: New cluster plugin for Nagios 2.x + * [r847] contrib/check_cluster2.c: + New cluster plugin for Nagios 2.x 2004-03-11 15:33 tonvoon - * CHANGES: check_procs difference + * [r846] CHANGES: + check_procs difference 2004-03-11 15:17 tonvoon - * plugins/check_nagios.c: Incorporate check_proc changes into - check_nagios. ps handling probably should be moved into utils.c - in future + * [r845] plugins/check_nagios.c: + Incorporate check_proc changes into check_nagios. ps handling + probably should + be moved into utils.c in future 2004-03-08 21:03 tonvoon - * configure.in: Require ngettext + * [r844] configure.in: + Require ngettext 2004-03-08 21:01 tonvoon - * doc/developer-guidelines.sgml: Information on plugin output - format + * [r843] doc/developer-guidelines.sgml: + Information on plugin output format 2004-03-04 05:08 kdebisschop - * plugins/: check_dig.c, check_dns.c, check_game.c: use float for - time in perf data + * [r842] plugins/check_dig.c, plugins/check_dns.c, + plugins/check_game.c: + use float for time in perf data 2004-03-03 12:33 kdebisschop - * plugins/: check_http.c, utils.c: begin writing some perfdata as - float + * [r841] plugins/check_http.c, plugins/utils.c: + begin writing some perfdata as float 2004-03-03 04:24 kdebisschop - * contrib/check_pop3.pl: fix loop and \r\n (Jason Burnett - + * [r840] contrib/check_pop3.pl: + fix loop and \r\n (Jason Burnett - http://sourceforge.net/tracker/index.php?func=detail&aid=895677&group_id=29880&atid=397599) 2004-03-03 03:48 kdebisschop - * plugins/check_disk.c: check_disk was getting blocks instead of - bytes (Michael Musikhin - + * [r839] plugins/check_disk.c: + check_disk was getting blocks instead of bytes (Michael Musikhin + - http://sourceforge.net/tracker/index.php?func=detail&aid=900215&group_id=29880&atid=397599) 2004-03-02 17:44 kdebisschop - * pkg/: redhat/requires, fedora/requires: attempt to prune requires + * [r838] pkg/fedora/requires, pkg/redhat, pkg/redhat/requires: + attempt to prune requires 2004-03-02 06:17 kdebisschop - * Makefile.am, nagios-plugins.spec.in, pkg/fedora/requires: make - specfile into a template which can generate a generic spec plus - specs suitable for various repositories + * [r837] Makefile.am, nagios-plugins.spec.in, pkg/fedora, + pkg/fedora/requires: + make specfile into a template which can generate a generic spec + plus specs suitable for various repositories 2004-03-02 06:13 kdebisschop - * configure.in: prpare for alpha2 + * [r836] configure.in: + prpare for alpha2 2004-03-02 05:25 kdebisschop - * plugins/check_http.c: relax check for -w/-c to accept floats (bug - report from Warrick FitzGerald) + * [r835] plugins/check_http.c: + relax check for -w/-c to accept floats (bug report from Warrick + FitzGerald) 2004-03-02 05:01 kdebisschop - * AUTHORS, plugins/check_swap.c: fix div by zero error when - swaptotal is zero (Flo Gleixner) + * [r834] AUTHORS, plugins/check_swap.c: + fix div by zero error when swaptotal is zero (Flo Gleixner) 2004-03-01 12:27 kdebisschop - * plugins/: check_tcp.c, netutils.c: check_tcp was returning - uninitialized string with user-defined refused outcome + * [r833] plugins/check_tcp.c, plugins/netutils.c: + check_tcp was returning uninitialized string with user-defined + refused outcome 2004-03-01 06:15 kdebisschop - * plugins/check_smtp.c: allow regex for ecpect checks + * [r832] plugins/check_smtp.c: + allow regex for ecpect checks 2004-02-29 04:09 kdebisschop - * plugins/: check_nwstat.c, netutils.c, netutils.h: was making up - to 34 separate tcp connections - now we open one and reuse + * [r831] plugins/check_nwstat.c, plugins/netutils.c, + plugins/netutils.h: + was making up to 34 separate tcp connections - now we open one + and reuse 2004-02-28 07:27 kdebisschop - * plugins/check_snmp.c: checks for warn in check_num() mistakenly - referred to crit limits + * [r830] plugins/check_snmp.c: + checks for warn in check_num() mistakenly referred to crit limits 2004-02-28 06:51 kdebisschop - * plugins/check_smtp.c: minor doco update to reflect handling of - repeated caoomand strings + * [r829] plugins/check_smtp.c: + minor doco update to reflect handling of repeated caoomand + strings 2004-02-28 06:48 kdebisschop - * plugins/check_smtp.c: work in progress to accept multiple - command/expect pairs + * [r828] plugins/check_smtp.c: + work in progress to accept multiple command/expect pairs 2004-02-28 04:54 kdebisschop - * plugins/check_swap.c: update to work with Linux 2.6 /proc/meminfo - format + * [r827] plugins/check_swap.c: + update to work with Linux 2.6 /proc/meminfo format -2004-02-25 08:50 kdebisschop +2004-02-25 08:51 kdebisschop - * AUTHORS, plugins/check_dns.c: check server for authoritative - status (from Jon Hallet) + * [r826] AUTHORS, plugins/check_dns.c: + check server for authoritative status (from Jon Hallet) 2004-02-25 08:12 kdebisschop - * plugins/check_swap.c: change some datatypes to llu for very large - swaps + * [r825] plugins/check_swap.c: + change some datatypes to llu for very large swaps 2004-02-25 07:49 kdebisschop - * configure.in, plugins/check_ping.c: pass timeout to ping if - supported with -w parameter (linux) + * [r824] configure.in, plugins/check_ping.c: + pass timeout to ping if supported with -w parameter (linux) 2004-02-21 05:37 kdebisschop - * plugins/check_by_ssh.c: add option to ignore a specified number - of lines on stderr (to suppress a login banner) - -2004-02-21 03:50 kdebisschop - - * plugins-scripts/check_breeze.pl: add $opt_C to 'use vars' (report - 882381 and patch form Jason Martin) + * [r823] plugins/check_by_ssh.c: + add option to ignore a specified number of lines on stderr + (to suppress a login banner) 2004-02-21 03:44 kdebisschop - * AUTHORS: Add Jason Martin for report of missing $opt_C for 'use - vars' in check_breeze + * [r821] AUTHORS: + Add Jason Martin for report of missing $opt_C for 'use vars' in + check_breeze 2004-02-21 03:42 kdebisschop - * plugins-scripts/check_breeze.pl: add opt_C to 'usr vars' + * [r820] plugins-scripts/check_breeze.pl: + add opt_C to 'usr vars' 2004-02-20 19:35 tonvoon - * plugins/check_http.c: - Missed out getopt for -T + * [r819] plugins/check_http.c: + - Missed out getopt for -T 2004-02-20 05:25 kdebisschop - * contrib/check_dhcp.c, contrib/check_procl.sh, - plugins/check_snmp.c, plugins/negate.c, plugins/netutils.c, - plugins/urlize.c: spell fix "received" - -2004-02-20 05:22 kdebisschop - - * plugins/check_snmp.c, plugins/negate.c, plugins/netutils.c, - plugins/urlize.c, contrib/check_dhcp.c: spell fix "received" + * [r818] contrib/check_dhcp.c, plugins/check_snmp.c, + plugins/negate.c, plugins/netutils.c, plugins/urlize.c: + spell fix "received" 2004-02-20 05:21 kdebisschop - * plugins/: utils.c, utils.h: add perfdata function for floats to - complement ints, also spell fix "received" + * [r817] plugins/utils.c, plugins/utils.h: + add perfdata function for floats to complement ints, also spell + fix "received" 2004-02-20 05:19 kdebisschop - * AUTHORS: add Ralph Rye for report of check_procs segfault on - AIX/WebSphere and proof-of-concept patch + * [r816] AUTHORS: + add Ralph Rye for report of check_procs segfault on AIX/WebSphere + and proof-of-concept patch 2004-02-20 05:04 kdebisschop - * plugins/check_procs.c: handle case where line from ps output - exceed MAX_INPUT_BUFFER + * [r815] plugins/check_procs.c: + handle case where line from ps output exceed MAX_INPUT_BUFFER 2004-02-20 03:37 tonvoon - * AUTHORS: Shaun Wills for patch to check_http + * [r814] AUTHORS: + Shaun Wills for patch to check_http 2004-02-20 03:21 tonvoon - * plugins/check_http.c: Added Content-type when POSTing (Shawn - Wills) + * [r813] plugins/check_http.c: + Added Content-type when POSTing (Shawn Wills) 2004-02-20 03:00 tonvoon - * plugins/check_procs.c: - compiler warning removed (but usage2 - messages badly broken) + * [r812] plugins/check_procs.c: + - compiler warning removed (but usage2 messages badly broken) 2004-02-20 02:58 tonvoon - * AUTHORS: Matt Pounsett for bug report + * [r811] AUTHORS: + Matt Pounsett for bug report 2004-02-20 02:09 tonvoon - * plugins/check_dns.c: Different text to scan for if multiple - addresses + * [r810] plugins/check_dns.c: + Different text to scan for if multiple addresses 2004-02-20 01:05 tonvoon - * plugins/check_swap.c: Corrected usage message (Matt Pounsett) + * [r809] plugins/check_swap.c: + Corrected usage message (Matt Pounsett) 2004-02-19 13:24 tonvoon - * AUTHORS: Michael Musikhin for check_disk patch + * [r808] AUTHORS: + Michael Musikhin for check_disk patch 2004-02-19 13:23 tonvoon - * plugins/check_disk.c: Uninitialised variables for -X (Bug 900091 - - Michael Musikhin) + * [r807] plugins/check_disk.c: + Uninitialised variables for -X (Bug 900091 - Michael Musikhin) 2004-02-18 14:57 kdebisschop - * configure.in: version bump (old) + * [r806] configure.in: + version bump (old) 2004-02-18 14:56 kdebisschop - * acinclude.m4, lib/afs.m4, lib/fstypename.m4, lib/fsusage.m4: + * [r805] acinclude.m4, lib/afs.m4, lib/fstypename.m4, + lib/fsusage.m4: underquoted defines cause warning on FC2 2004-02-18 02:11 tonvoon - * AUTHORS: Johannes Herlitz for patch to check_dns + * [r804] AUTHORS: + Johannes Herlitz for patch to check_dns 2004-02-18 02:09 tonvoon - * plugins/check_dns.c: Output message includes the query_address, - as inspired by Johannes Herlitz. Also cleanup of comments and - handles multi-line nslookup output (MacOSX 10.3) + * [r803] plugins/check_dns.c: + Output message includes the query_address, as inspired by + Johannes Herlitz. + Also cleanup of comments and handles multi-line nslookup output + (MacOSX 10.3) 2004-02-17 13:24 tonvoon - * AUTHORS: David Alden for check_snmp_procs.pl + * [r802] AUTHORS: + David Alden for check_snmp_procs.pl 2004-02-17 13:23 tonvoon - * contrib/check_snmp_procs.pl: Checks remote processes via SNMP - (David Alden) + * [r801] contrib/check_snmp_procs.pl: + Checks remote processes via SNMP (David Alden) 2004-02-09 08:32 tonvoon - * AUTHORS: Patrick McCormick + * [r800] AUTHORS: + Patrick McCormick 2004-02-09 08:27 tonvoon - * plugins/check_ping.c: Fix for check_ping old-style argument - handling (Patrick McCormick - 892211) + * [r799] plugins/check_ping.c: + Fix for check_ping old-style argument handling (Patrick McCormick + - 892211) 2004-01-28 11:42 tonvoon - * plugins/check_dummy.c: Print optional text + * [r798] plugins/check_dummy.c: + Print optional text 2004-01-21 12:50 kdebisschop - * AUTHORS: credit David Croft (patch check_tcp formultibyte malloc - bug in server_expect) + * [r797] AUTHORS: + credit David Croft (patch check_tcp formultibyte malloc bug in + server_expect) 2004-01-21 12:49 kdebisschop - * plugins/check_tcp.c: =fix segfault on malloc of server_expect for - multibyte chars (David Croft) - -2004-01-21 12:46 kdebisschop - - * AUTHORS: credit David Croft (patch check_tcp formultibyte malloc - bug in server_expect) - -2004-01-21 12:45 kdebisschop - - * plugins/check_tcp.c: =fix segfault on malloc of server_expect for - multibyte chars (David Croft) + * [r796] plugins/check_tcp.c: + =fix segfault on malloc of server_expect for multibyte chars + (David Croft) 2004-01-18 20:07 sghosh - * contrib/check_snmp_printer.pl: plugin to check printer status via - snmp, includes page count as perfdata; perl plugin + * [r795] contrib/check_snmp_printer.pl: + plugin to check printer status via snmp, includes page count as + perfdata; perl plugin 2003-12-24 08:51 tonvoon - * AUTHORS: Bug reporter + * [r794] AUTHORS: + Bug reporter 2003-12-24 08:51 tonvoon - * plugins/check_swap.c: Fixed help doc on use of % (854817 - Gunnar - Hellekson) + * [r793] plugins/check_swap.c: + Fixed help doc on use of % (854817 - Gunnar Hellekson) 2003-12-18 09:24 tonvoon - * README: Reference to CHANGES file + * [r792] README: + Reference to CHANGES file 2003-12-18 09:19 tonvoon - * Makefile.am: Add CHANGES file to distribution + * [r791] Makefile.am: + Add CHANGES file to distribution 2003-12-18 09:15 tonvoon - * CHANGES: List major changes between releases + * [r790] CHANGES: + List major changes between releases 2003-12-11 10:00 tonvoon - * AUTHORS: For patch to check_http + * [r789] AUTHORS: + For patch to check_http 2003-12-11 10:00 tonvoon - * plugins/check_http.c: Relative redirects not followed correctly - (854131 - John Sivak) + * [r788] plugins/check_http.c: + Relative redirects not followed correctly (854131 - John Sivak) 2003-12-05 18:12 tonvoon - * AUTHORS: Ben Whaley for reported Solaris 8 /usr/ucb/ps problem in + * [r787] AUTHORS: + Ben Whaley for reported Solaris 8 /usr/ucb/ps problem in configure.in 2003-12-05 18:08 tonvoon - * configure.in: Not correctly working out ps command if /usr/ucb - before /usr/bin in PATH for Solaris (reported by Ben Whaley) + * [r786] configure.in: + Not correctly working out ps command if /usr/ucb before /usr/bin + in PATH for + Solaris (reported by Ben Whaley) 2003-12-05 16:45 tonvoon - * AUTHORS: Patch to my_connect + * [r785] AUTHORS: + Patch to my_connect 2003-12-05 16:42 tonvoon - * plugins/: netutils.c, netutils.h: Fix clash of namespace for - my_connect with mysql (854339 - Ian Holsman) + * [r784] plugins/netutils.c, plugins/netutils.h: + Fix clash of namespace for my_connect with mysql (854339 - Ian + Holsman) 2003-12-02 15:27 tonvoon - * plugins/check_disk.c: Default thresholds not defined for lists in - -x parameter (raised by Matt Garrett) + * [r783] plugins/check_disk.c: + Default thresholds not defined for lists in -x parameter (raised + by Matt Garrett) 2003-12-01 02:47 kdebisschop - * po/: de.po, fr.po: commit changes caused by upstream code mods + * [r782] po/de.po, po/fr.po: + commit changes caused by upstream code mods 2003-12-01 02:46 kdebisschop - * plugins/check_procs.c: use usage2 function + * [r781] plugins/check_procs.c: + use usage2 function 2003-12-01 02:38 kdebisschop - * nagios-plugins.spec.in: add THANKS to %doc + * [r780] nagios-plugins.spec.in: + add THANKS to %doc 2003-11-28 14:18 tonvoon - * plugins/check_procs.c: Fixed listing of failed processes + * [r779] plugins/check_procs.c: + Fixed listing of failed processes 2003-11-24 14:56 tonvoon - * AUTHORS: For patches + * [r778] AUTHORS: + For patches 2003-11-24 14:53 tonvoon - * plugins/check_hpjd.c: Bug from code-clean (Antony Simmonds - - 846311) + * [r777] plugins/check_hpjd.c: + Bug from code-clean (Antony Simmonds - 846311) 2003-11-21 07:53 kdebisschop - * README: update auotmake/autoconf versions + * [r776] README: + update auotmake/autoconf versions 2003-11-21 07:52 kdebisschop - * doc/developer-guidelines.sgml: update developer names + * [r775] doc/developer-guidelines.sgml: + update developer names 2003-11-21 07:34 kdebisschop - * INSTALLING: our policy now is to use most recent versions of GNU - tool chain + * [r774] INSTALLING: + our policy now is to use most recent versions of GNU tool chain 2003-11-19 06:24 kdebisschop - * plugins/check_time.c: add perfdata + * [r773] plugins/check_time.c: + add perfdata 2003-11-19 06:00 kdebisschop - * plugins/check_smtp.c: use perfdata() to return perfoamnace data - in stanadrd format + * [r772] plugins/check_smtp.c: + use perfdata() to return perfoamnace data in stanadrd format 2003-11-17 11:45 kdebisschop - * plugins/check_ups.c: bugfix - each supported option was - overwriting the previous perfdata + * [r771] plugins/check_ups.c: + bugfix - each supported option was overwriting the previous + perfdata 2003-11-17 07:19 kdebisschop - * plugins/check_ups.c: add perfdata + * [r770] plugins/check_ups.c: + add perfdata 2003-11-17 06:37 kdebisschop - * plugins/check_pgsql.c: add perfdata + * [r769] plugins/check_pgsql.c: + add perfdata 2003-11-12 06:05 kdebisschop - * plugins/check_snmp.c: clean up compiler warnings + * [r768] plugins/check_snmp.c: + clean up compiler warnings 2003-11-12 05:53 kdebisschop - * plugins/check_nt.c: clean up compiler warnings - -2003-11-12 05:48 kdebisschop - - * plugins/check_mrtg.c: clean up compiler warnings + * [r767] plugins/check_mrtg.c, plugins/check_nt.c: + clean up compiler warnings 2003-11-12 05:41 kdebisschop - * plugins/check_mrtgtraf.c: clean up compiler warnings - -2003-11-12 05:37 kdebisschop - - * plugins/check_swap.c: clean up compiler warnings + * [r766] plugins/check_mrtgtraf.c, plugins/check_swap.c: + clean up compiler warnings 2003-11-12 05:29 kdebisschop - * plugins/check_mrtgtraf.c: add perfdata + * [r765] plugins/check_mrtgtraf.c: + add perfdata 2003-11-12 05:28 kdebisschop - * plugins/check_dig.c: remove overflow checks of strtod - HUGE_VALF - requires C99; also remove equality checks on warn/crit interval - which are no doubles + * [r764] plugins/check_dig.c: + remove overflow checks of strtod - HUGE_VALF requires C99; also + remove equality checks on warn/crit interval which are no doubles 2003-11-11 10:43 tonvoon - * plugins/check_tcp.c: Added perfdata + * [r763] plugins/check_tcp.c: + Added perfdata 2003-11-11 10:34 tonvoon - * plugins/check_users.c: Added perfdata + * [r762] plugins/check_users.c: + Added perfdata 2003-11-11 10:27 tonvoon - * plugins/check_swap.c: Added perfdata + * [r761] plugins/check_swap.c: + Added perfdata 2003-11-11 10:19 tonvoon - * plugins/check_swap.c: Fixed if only absolute warn/crit set + * [r760] plugins/check_swap.c: + Fixed if only absolute warn/crit set 2003-11-10 11:15 tonvoon - * plugins/utils.h: - typo fixes + * [r759] plugins/utils.h: + - typo fixes 2003-11-05 22:59 sghosh - * plugins-scripts/: check_ifoperstatus.pl, check_ifstatus.pl: + * [r758] plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl: added plugin timeout options 2003-10-31 04:22 kdebisschop - * plugins/check_nt.c: provide an error message + * [r757] plugins/check_nt.c: + provide an error message 2003-10-31 04:21 kdebisschop - * plugins/check_hpjd.c: line indentation + * [r756] plugins/check_hpjd.c: + line indentation 2003-10-31 04:20 kdebisschop - * plugins/check_load.c: add perfdata + * [r755] plugins/check_load.c: + add perfdata 2003-10-31 04:19 kdebisschop - * plugins/check_mrtg.c: add perf data fix bug where stale data - message would get overwritten + * [r754] plugins/check_mrtg.c: + add perf data + fix bug where stale data message would get overwritten -2003-10-24 14:28 tonvoon +2003-10-24 13:28 tonvoon - * plugins/common.h: Ignore __attribute__ for non-GNU compilers + * [r753] plugins/common.h: + Ignore __attribute__ for non-GNU compilers -2003-10-24 10:37 tonvoon +2003-10-24 09:37 tonvoon - * plugins/Makefile.am: Moved config.h to toplevel + * [r752] plugins/Makefile.am: + Moved config.h to toplevel -2003-10-23 11:24 tonvoon +2003-10-23 10:24 tonvoon - * lib/Makefile.am: Need to include intl/ for systems without - libintl.h + * [r751] lib/Makefile.am: + Need to include intl/ for systems without libintl.h -2003-10-21 17:16 tonvoon +2003-10-21 16:16 tonvoon - * AUTHORS: Matt Garrett for bug reports + * [r750] AUTHORS: + Matt Garrett for bug reports -2003-10-21 16:56 tonvoon +2003-10-21 15:56 tonvoon - * plugins-scripts/check_file_age.pl: - Fixed file name (Matt - Garrett) + * [r749] plugins-scripts/check_file_age.pl: + - Fixed file name (Matt Garrett) -2003-10-20 15:03 tonvoon +2003-10-20 14:03 tonvoon - * configure.in, lib/fsusage.c, lib/mountlist.c: Fix for config.h at - top level. Required for intl/ + * [r748] configure.in, lib/fsusage.c, lib/mountlist.c: + Fix for config.h at top level. Required for intl/ -2003-10-15 20:27 tonvoon +2003-10-15 19:27 tonvoon - * tools/mail_error: Need to export PATH for sfsnapshot to get - correct GNU toolchain - -2003-10-14 04:15 sghosh - - * plugins-scripts/check_ifoperstatus.pl: snmpv3 patches - -2003-10-14 04:14 sghosh - - * plugins-scripts/check_ifstatus.pl: more snmpv3 patches - -2003-10-14 03:40 sghosh - - * plugins-scripts/check_ntp.pl: Bug 773588: added check to warn on - matching # candidates only + * [r747] tools/mail_error: + Need to export PATH for sfsnapshot to get correct GNU toolchain 2003-10-14 03:15 sghosh - * plugins-scripts/check_ifstatus.pl: Added -M for maxmsgsize - (v1/v2c) Added v3 support + * [r746] plugins-scripts/check_ifoperstatus.pl: + snmpv3 patches -2003-09-30 14:54 tonvoon +2003-10-14 03:14 sghosh - * plugins/check_swap.c: Fixed logic problem if HAVE_SWAP, but not - on AIX or Solaris. Removed unnecessary ifdefs for help page. - Better indentation for ifdefs + * [r745] plugins-scripts/check_ifstatus.pl: + more snmpv3 patches -2003-09-29 11:02 tonvoon +2003-10-14 02:40 sghosh - * lib/Makefile.am: Missed GNU files for AIX 5.1 + * [r744] plugins-scripts/check_ntp.pl: + Bug 773588: added check to warn on matching # candidates only -2003-09-17 20:16 tonvoon +2003-10-14 02:15 sghosh - * AUTHORS: Added authors of obsolete contrib plugins + * [r743] plugins-scripts/check_ifstatus.pl: + Added -M for maxmsgsize (v1/v2c) + Added v3 support -2003-09-17 20:07 tonvoon +2003-09-30 13:54 tonvoon - * contrib/maser-oracle.pl: Obsolete from main check_oracle + * [r742] plugins/check_swap.c: + Fixed logic problem if HAVE_SWAP, but not on AIX or Solaris. + Removed + unnecessary ifdefs for help page. Better indentation for ifdefs -2003-09-17 20:05 tonvoon +2003-09-29 10:02 tonvoon - * contrib/aix/: check_crit_dsk, check_dsk, check_ping: Plugins - obsolete from main check_disk and check_ping + * [r741] lib/Makefile.am: + Missed GNU files for AIX 5.1 -2003-09-17 17:33 tonvoon +2003-09-17 19:16 tonvoon - * lib/strtod.c: Required if strtod not GNU compilant + * [r740] AUTHORS: + Added authors of obsolete contrib plugins -2003-09-17 17:31 tonvoon +2003-09-17 19:07 tonvoon - * configure.in, lib/Makefile.am, lib/error.c, lib/error.h, + * [r739] contrib/maser-oracle.pl: + Obsolete from main check_oracle + +2003-09-17 19:05 tonvoon + + * [r738] contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_ping: + Plugins obsolete from main check_disk and check_ping + +2003-09-17 16:33 tonvoon + + * [r737] lib/strtod.c: + Required if strtod not GNU compilant + +2003-09-17 16:31 tonvoon + + * [r736] configure.in, lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, lib/malloc.c, lib/realloc.c, lib/unlocked-io.h, - lib/xalloc.h, lib/xmalloc.c: Support to compile on AIX + lib/xalloc.h, lib/xmalloc.c: + Support to compile on AIX -2003-09-17 17:15 tonvoon +2003-09-17 16:15 tonvoon - * plugins/check_load.c: - typo + * [r735] plugins/check_load.c: + - typo -2003-09-17 10:31 tonvoon +2003-09-17 09:31 tonvoon - * configure.in, plugins/check_swap.c: Support for check_swap in AIX - (tested on 5.1) + * [r734] configure.in, plugins/check_swap.c: + Support for check_swap in AIX (tested on 5.1) -2003-09-17 10:25 tonvoon +2003-09-17 09:25 tonvoon - * tools/setup: Hide error message if docbook not available + * [r733] tools/setup: + Hide error message if docbook not available -2003-09-16 22:58 tonvoon +2003-09-16 21:58 tonvoon - * doc/developer-guidelines.sgml: Added in threshold range format - and updated autoconf to 2.54 for a problem on Darwin) + * [r732] doc/developer-guidelines.sgml: + Added in threshold range format and updated autoconf to 2.54 for + a problem + on Darwin) -2003-09-16 15:14 tonvoon +2003-09-16 14:14 tonvoon - * configure.in, plugins/Makefile.am, plugins/check_procs.c: Support - for AIX ps command and cleanup of configure's ps checks + * [r731] configure.in, plugins/Makefile.am, plugins/check_procs.c: + Support for AIX ps command and cleanup of configure's ps checks -2003-09-16 13:32 tonvoon +2003-09-16 12:32 tonvoon - * AUTHORS, plugins/common.h: AIX problem with enum TRUE and FALSE - (Ludse Verhoeven) + * [r730] AUTHORS, plugins/common.h: + AIX problem with enum TRUE and FALSE (Ludse Verhoeven) -2003-09-16 12:36 kdebisschop +2003-09-16 11:36 kdebisschop - * tools/sfsnapshot: here-doc format was not correct + * [r729] tools/sfsnapshot: + here-doc format was not correct -2003-09-16 06:45 kdebisschop +2003-09-16 05:45 kdebisschop - * plugins/check_ldap.c: milisecond timing and perfdata, fix NULL - pointer error in validate_arguments + * [r728] plugins/check_ldap.c: + milisecond timing and perfdata, fix NULL pointer error in + validate_arguments -2003-09-15 16:49 tonvoon +2003-09-15 15:49 tonvoon - * AUTHORS: Contributors to the perfdata discussion + * [r727] AUTHORS: + Contributors to the perfdata discussion -2003-09-15 16:28 tonvoon +2003-09-15 15:28 tonvoon - * AUTHORS, plugins-scripts/check_mailq.pl: Added Exim support - (768445 - Eric Bollengier) + * [r726] AUTHORS, plugins-scripts/check_mailq.pl: + Added Exim support (768445 - Eric Bollengier) -2003-09-15 15:57 tonvoon +2003-09-15 14:57 tonvoon - * AUTHORS, plugins/check_nt.c: Option to verify check_nt version - (799098 - Steve Hanselman) + * [r725] AUTHORS, plugins/check_nt.c: + Option to verify check_nt version (799098 - Steve Hanselman) -2003-09-15 15:30 tonvoon +2003-09-15 14:30 tonvoon - * AUTHORS: Jason Burnett for check_disk_smb patch + * [r724] AUTHORS: + Jason Burnett for check_disk_smb patch -2003-09-15 15:26 tonvoon +2003-09-15 14:26 tonvoon - * plugins-scripts/check_disk_smb.pl: Optionally specify port for - smbclient to use (781227 - Jason Burnett) + * [r723] plugins-scripts/check_disk_smb.pl: + Optionally specify port for smbclient to use (781227 - Jason + Burnett) -2003-09-15 06:03 kdebisschop +2003-09-15 05:03 kdebisschop - * plugins/check_http.c: make status code extensible (thanks to - Chris Wilson ) + * [r722] plugins/check_http.c: + make status code extensible (thanks to Chris Wilson + ) -2003-09-12 12:53 kdebisschop +2003-09-12 11:53 kdebisschop - * AUTHORS: two new additions + * [r721] AUTHORS: + two new additions -2003-09-12 12:51 kdebisschop +2003-09-12 11:38 kdebisschop - * plugins/check_ping.c: *new output format reported by Patrick - Allen , also move atrribution for - Richard Brodie to thanks file - -2003-09-12 12:38 kdebisschop - - * plugins/check_ping.c: new output format reported by Patrick Allen + * [r719] plugins/check_ping.c: + new output format reported by Patrick Allen -2003-09-11 12:50 kdebisschop +2003-09-11 11:50 kdebisschop - * plugins/check_http.c: use prefdata function for size too + * [r718] plugins/check_http.c: + use prefdata function for size too -2003-09-11 09:02 kdebisschop +2003-09-11 08:02 kdebisschop - * plugins/check_http.c: use prefdata function + * [r717] plugins/check_http.c: + use prefdata function -2003-09-11 09:02 kdebisschop +2003-09-11 08:02 kdebisschop - * configure.in, plugins/check_swap.c: last changes to configure - broke check_swap on RHLinux. Restore /proc/meminfo check and make - check_swap ifdefs safer + * [r716] configure.in, plugins/check_swap.c: + last changes to configure broke check_swap on RHLinux. Restore + /proc/meminfo check and make check_swap ifdefs safer -2003-09-04 07:43 kdebisschop +2003-09-04 06:43 kdebisschop - * Makefile.am: change so make-dist works in subdirs + * [r715] Makefile.am: + change so make-dist works in subdirs -2003-09-03 20:37 tonvoon +2003-09-03 19:37 tonvoon - * configure.in: Remove df checks and ignore swap checks if no swap - commands found + * [r714] configure.in: + Remove df checks and ignore swap checks if no swap commands found -2003-09-03 20:32 tonvoon +2003-09-03 19:32 tonvoon - * doc/developer-guidelines.sgml: No named credits in source code + * [r713] doc/developer-guidelines.sgml: + No named credits in source code -2003-09-03 11:32 tonvoon +2003-09-03 10:32 tonvoon - * configure.in: Fixed substitution for Tru64's ps format + * [r712] configure.in: + Fixed substitution for Tru64's ps format -2003-09-03 07:01 kdebisschop +2003-09-03 06:01 kdebisschop - * plugins/check_dig.c: allow warn/crit times to be floating point + * [r711] plugins/check_dig.c: + allow warn/crit times to be floating point -2003-09-03 07:00 kdebisschop +2003-09-03 06:00 kdebisschop - * configure.in, plugins/common.h: include math.h if needed for - HUGE_VAL + * [r710] configure.in, plugins/common.h: + include math.h if needed for HUGE_VAL -2003-09-02 16:04 tonvoon +2003-09-02 15:04 tonvoon - * plugins/check_procs.c: Solaris requires asprintf checks for null - variables + * [r709] plugins/check_procs.c: + Solaris requires asprintf checks for null variables -2003-09-01 21:07 tonvoon +2003-09-01 20:07 tonvoon - * Makefile.am: Report duplicates in AUTHORS file + * [r708] Makefile.am: + Report duplicates in AUTHORS file -2003-09-01 20:43 tonvoon +2003-09-01 19:43 tonvoon - * doc/developer-guidelines.sgml: Add contributor's name into CVS - comments + * [r707] doc/developer-guidelines.sgml: + Add contributor's name into CVS comments -2003-08-31 06:24 tonvoon +2003-08-31 05:24 tonvoon - * .cvsignore, AUTHORS, Makefile.am, THANKS.in: Updated AUTHORS to - include all contributors listed in comments in code and CVS for - plugins and plugins-scripts. Still need to do SF + * [r706] ., .cvsignore, AUTHORS, Makefile.am, THANKS.in: + Updated AUTHORS to include all contributors listed in comments in + code and + CVS for plugins and plugins-scripts. Still need to do SF -2003-08-31 06:13 tonvoon +2003-08-31 05:13 tonvoon - * doc/developer-guidelines.sgml: Updated perf data standard for - warn before crit + * [r705] doc/developer-guidelines.sgml: + Updated perf data standard for warn before crit -2003-08-28 12:56 kdebisschop +2003-08-28 11:56 kdebisschop - * plugins/check_game.c: add perf data + * [r704] plugins/check_game.c: + add perf data -2003-08-28 04:53 kdebisschop +2003-08-28 03:53 kdebisschop - * plugins/check_dns.c: add perf data + * [r703] plugins/check_dns.c: + add perf data -2003-08-28 04:53 kdebisschop +2003-08-28 03:53 kdebisschop - * plugins/utils.c: use single quotes per guideline, also quote when - SPC or = are found + * [r702] plugins/utils.c: + use single quotes per guideline, also quote when SPC or = are + found -2003-08-28 04:22 kdebisschop +2003-08-28 03:22 kdebisschop - * plugins/check_disk.c: add perf data + * [r701] plugins/check_disk.c: + add perf data -2003-08-28 04:21 kdebisschop +2003-08-28 03:21 kdebisschop - * plugins/utils.c: suppress quotes in perf data when not needed - (some plugins need the space to keep below line length limit + * [r700] plugins/utils.c: + suppress quotes in perf data when not needed (some plugins need + the space to keep below line length limit -2003-08-28 04:20 kdebisschop +2003-08-28 03:20 kdebisschop - * plugins/utils.h: add min() macro to complement max() + * [r699] plugins/utils.h: + add min() macro to complement max() -2003-08-26 12:08 kdebisschop +2003-08-26 11:08 kdebisschop - * plugins/check_dig.c: print perfdata + * [r698] plugins/check_dig.c: + print perfdata -2003-08-26 11:51 kdebisschop +2003-08-26 10:51 kdebisschop - * plugins/check_fping.c: print perfdata + * [r697] plugins/check_fping.c: + print perfdata -2003-08-26 11:44 kdebisschop +2003-08-26 10:44 kdebisschop - * plugins/: utils.c, utils.h: function to make perfdata output + * [r696] plugins/utils.c, plugins/utils.h: + function to make perfdata output -2003-08-23 16:07 kdebisschop +2003-08-23 15:07 kdebisschop - * plugins/check_http.c: - found and fixed memory allocation error - in rewritten redir() function + * [r695] plugins/check_http.c: + - found and fixed memory allocation error in rewritten redir() + function -2003-08-23 14:59 kdebisschop +2003-08-23 13:59 kdebisschop - * plugins/check_http.c: - hacked interim fix to segfault on - redirect - for tesing only + * [r694] plugins/check_http.c: + - hacked interim fix to segfault on redirect - for tesing only -2003-08-23 14:58 kdebisschop +2003-08-23 13:58 kdebisschop - * plugins/check_dig.c: - fix various format errors with newly added - perf data + * [r693] plugins/check_dig.c: + - fix various format errors with newly added perf data -2003-08-23 00:49 kdebisschop +2003-08-22 23:49 kdebisschop - * plugins/check_dig.c: - forgot to declare struct timeval tv for - hires timing + * [r692] plugins/check_dig.c: + - forgot to declare struct timeval tv for hires timing -2003-08-22 07:55 kdebisschop +2003-08-22 06:55 kdebisschop - * plugins/check_dig.c: - add perf data for time + * [r691] plugins/check_dig.c: + - add perf data for time -2003-08-22 07:22 kdebisschop +2003-08-22 06:22 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_game.c, check_hpjd.c, - check_http.c, check_ide-smart.c, check_ldap.c, check_load.c, - check_mrtg.c, check_mysql.c, check_nagios.c, check_nt.c, - check_nwstat.c, check_overcr.c, check_pgsql.c, check_ping.c, - check_procs.c, check_radius.c, check_real.c, check_smtp.c, - check_snmp.c, check_ssh.c, check_swap.c, check_tcp.c, - check_time.c, check_udp.c, check_ups.c, check_users.c, negate.c, - urlize.c: - bindtextdomain for gettext, a few other smale - cleanups here and there + * [r690] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: + - bindtextdomain for gettext, a few other smale cleanups here and + there -2003-08-22 05:42 kdebisschop +2003-08-22 04:43 kdebisschop - * plugins/: check_http.c: * bugfix: snprintf of timestamp truncated - '\0' + * [r689] plugins/check_http.c: + * bugfix: snprintf of timestamp truncated '\0' -2003-08-21 19:00 kdebisschop +2003-08-21 18:00 kdebisschop - * plugins/check_http.c: * Check redirections for infinte loops and - limit depth of recursion + * [r688] plugins/check_http.c: + * Check redirections for infinte loops and limit depth of + recursion -2003-08-20 10:54 tonvoon +2003-08-20 09:54 tonvoon - * plugins/check_time.c: Optionally use udp instead of tcp (Bradley - Baetz - 751646) + * [r687] plugins/check_time.c: + Optionally use udp instead of tcp (Bradley Baetz - 751646) -2003-08-20 09:31 tonvoon +2003-08-20 08:31 tonvoon - * contrib/check_wins.pl: Changed netsaint to nagios in use lib + * [r686] contrib/check_wins.pl: + Changed netsaint to nagios in use lib -2003-08-19 12:41 kdebisschop +2003-08-19 11:41 kdebisschop - * plugins/check_http.c: *BUGFIX: LWS is not required betwwen - "Location:" header field name and field value + * [r685] plugins/check_http.c: + *BUGFIX: LWS is not required betwwen "Location:" header field + name and field value -2003-08-19 12:19 kdebisschop +2003-08-19 11:19 kdebisschop - * plugins/check_http.c: *add missing status numbers from RFC 2616 - (HTTP1.1) + * [r684] plugins/check_http.c: + *add missing status numbers from RFC 2616 (HTTP1.1) -2003-08-18 12:05 kdebisschop +2003-08-18 11:05 kdebisschop - * plugins/check_ping.c: move error scans to a new separate routine - and scan both stderr and stdio + * [r683] plugins/check_ping.c: + move error scans to a new separate routine and scan both stderr + and stdio -2003-08-11 20:50 tonvoon +2003-08-11 19:50 tonvoon - * doc/developer-guidelines.sgml: Performance data guidelines added + * [r682] doc/developer-guidelines.sgml: + Performance data guidelines added -2003-08-11 20:43 tonvoon +2003-08-11 19:43 tonvoon - * tools/sfsnapshot: Fixed building snapshots - cvs update ignores - new directories. Also do not need to run make + * [r681] tools/sfsnapshot: + Fixed building snapshots - cvs update ignores new directories. + Also do not need to run make -2003-08-10 13:56 kdebisschop +2003-08-10 12:56 kdebisschop - * plugins/utils.c: config.h is redundant (common.h includes it) + * [r680] plugins/utils.c: + config.h is redundant (common.h includes it) -2003-08-10 13:48 kdebisschop +2003-08-10 12:48 kdebisschop - * plugins/: check_dns.c, check_smtp.c: perf data in integer - microseconds + * [r679] plugins/check_dns.c, plugins/check_smtp.c: + perf data in integer microseconds -2003-08-10 13:12 kdebisschop +2003-08-10 12:12 kdebisschop - * po/: POTFILES.in, de.po, fr.po: first pass at NLS markup done + * [r678] po/POTFILES.in, po/de.po, po/fr.po: + first pass at NLS markup done -2003-08-10 13:11 kdebisschop +2003-08-10 12:11 kdebisschop - * plugins-scripts/check_rpc.pl: proposed fix for LANG issue + * [r677] plugins-scripts/check_rpc.pl: + proposed fix for LANG issue -2003-08-10 07:53 kdebisschop +2003-08-10 06:53 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_game.c, check_hpjd.c, check_http.c, - check_ldap.c, check_load.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_nagios.c, check_nt.c, check_nwstat.c, - check_overcr.c, check_pgsql.c, check_ping.c, check_procs.c, - check_radius.c, check_real.c, check_smtp.c, check_snmp.c, - check_ssh.c, check_swap.c, check_tcp.c, check_time.c, - check_udp.c, check_ups.c, check_users.c, negate.c, popen.c, - urlize.c: the last round of pedantic compiler warnings + * [r676] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/urlize.c: + the last round of pedantic compiler warnings -2003-08-09 14:37 kdebisschop +2003-08-09 13:37 kdebisschop - * tools/devmode: a little shell script to make it a little easier - to produce pedantic compiler warnings + * [r675] tools/devmode: + a little shell script to make it a little easier to produce + pedantic compiler warnings -2003-08-09 14:36 kdebisschop +2003-08-09 13:36 kdebisschop - * plugins/: check_smtp.c, check_ssh.c, check_tcp.c, check_time.c, - check_udp.c, check_ups.c, check_users.c: more pedantic compiler - warnings - -2003-08-09 07:51 undrgrid - - * plugins/common.h, po/de.po, po/fr.po: Code clean-up - -2003-08-09 07:01 kdebisschop - - * plugins/: check_dig.c, check_http.c, check_load.c, check_mrtg.c, - check_mrtgtraf.c, check_nwstat.c, check_overcr.c, check_ping.c, - check_procs.c, check_real.c, utils.c, utils.h: more pedantic - compiler warns - -2003-08-09 05:19 kdebisschop - - * plugins/check_http.c: more pedantic compiler warns, change to - microsecond output for perf data, add size to perf data - -2003-08-09 05:12 kdebisschop - - * plugins/: utils.c, utils.h: add function for elapsed tim ein - microseconds - -2003-08-09 01:56 kdebisschop - - * plugins/check_http.c: more pedantic compiler warnings - -2003-08-09 01:41 kdebisschop - - * plugins/: check_disk.c, check_dummy.c, popen.c, utils.c, utils.h: + * [r674] plugins/check_smtp.c, plugins/check_ssh.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c: more pedantic compiler warnings -2003-08-08 21:31 kdebisschop +2003-08-09 06:51 undrgrid - * lib/Makefile.am: include getloadvag.m4 in distrib + * [r673] plugins/common.h, po/de.po, po/fr.po: + Code clean-up -2003-08-08 17:49 kdebisschop +2003-08-09 06:01 kdebisschop - * plugins/: check_disk.c, netutils.c, netutils.h: cleanups from - pedantic complier warnings + * [r672] plugins/check_dig.c, plugins/check_http.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_real.c, plugins/utils.c, + plugins/utils.h: + more pedantic compiler warns -2003-08-08 17:48 kdebisschop +2003-08-09 04:19 kdebisschop - * plugins/check_nt.c: change if/elseif block to case, general - streamline + * [r671] plugins/check_http.c: + more pedantic compiler warns, change to microsecond output for + perf data, add size to perf data -2003-08-08 13:14 kdebisschop +2003-08-09 04:12 kdebisschop - * plugins/check_disk.c: fix a variety of compiler warnings about - qualifier discards and other pedantic stuff + * [r670] plugins/utils.c, plugins/utils.h: + add function for elapsed tim ein microseconds -2003-08-08 06:09 kdebisschop +2003-08-09 00:56 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, - check_snmp.c, utils.c, utils.h: fix a variety of compiler - warnings about qualifier discards and other pedantic stuff + * [r669] plugins/check_http.c: + more pedantic compiler warnings -2003-08-08 05:33 kdebisschop +2003-08-09 00:41 kdebisschop - * plugins/: check_by_ssh.c, check_disk.c, check_nt.c, netutils.c, - netutils.h, popen.h, utils.h: fix a variety of compiler warnings - about qualifier discards and other pedantic stuff + * [r668] plugins/check_disk.c, plugins/check_dummy.c, + plugins/popen.c, plugins/utils.c, plugins/utils.h: + more pedantic compiler warnings -2003-08-08 04:51 kdebisschop +2003-08-08 20:31 kdebisschop - * plugins/: check_nt.c, check_smtp.c: markup for translation + * [r667] lib/Makefile.am: + include getloadvag.m4 in distrib -2003-08-08 00:17 kdebisschop +2003-08-08 16:49 kdebisschop - * plugins/check_real.c: markup for translation + * [r666] plugins/check_disk.c, plugins/netutils.c, + plugins/netutils.h: + cleanups from pedantic complier warnings -2003-08-07 13:36 kdebisschop +2003-08-08 16:48 kdebisschop - * plugins/check_procs.c: markup for translation + * [r665] plugins/check_nt.c: + change if/elseif block to case, general streamline -2003-08-07 13:09 kdebisschop +2003-08-08 12:14 kdebisschop - * plugins/check_load.c: reorder for consistency, restore prototypes - for print_foo, nest #ifdef to avoid pedantic traditional c warn + * [r664] plugins/check_disk.c: + fix a variety of compiler warnings about qualifier discards and + other pedantic stuff -2003-08-07 13:00 kdebisschop +2003-08-08 05:09 kdebisschop - * plugins/check_snmp.c: reorder for consistency (no code changes) + * [r663] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_snmp.c, plugins/utils.c, + plugins/utils.h: + fix a variety of compiler warnings about qualifier discards and + other pedantic stuff -2003-08-07 12:51 kdebisschop +2003-08-08 04:33 kdebisschop - * plugins/: check_by_ssh.c, check_disk.c, check_dns.c, - check_fping.c, check_game.c, check_http.c, check_mrtg.c, - check_mrtgtraf.c, check_nagios.c, check_nt.c, check_nwstat.c, - check_overcr.c, check_radius.c, check_real.c, check_snmp.c, - check_swap.c, check_tcp.c, check_time.c, negate.c, netutils.c, - popen.c, utils.c, utils.h: replace "terminate" with "die" for - shorter name and better readability + * [r662] plugins/check_by_ssh.c, plugins/check_disk.c, + plugins/check_nt.c, plugins/netutils.c, plugins/netutils.h, + plugins/popen.h, plugins/utils.h: + fix a variety of compiler warnings about qualifier discards and + other pedantic stuff -2003-08-07 12:49 kdebisschop +2003-08-08 03:51 kdebisschop - * plugins/check_ping.c: cleanup for better readability + * [r661] plugins/check_nt.c, plugins/check_smtp.c: + markup for translation -2003-08-07 10:51 kdebisschop +2003-08-07 23:17 kdebisschop - * plugins/check_ping.c: markup for translation + * [r660] plugins/check_real.c: + markup for translation -2003-08-07 02:23 kdebisschop +2003-08-07 12:36 kdebisschop - * tools/sfsnapshot: make must be run before make dist to creat - language files + * [r659] plugins/check_procs.c: + markup for translation -2003-08-06 21:53 tonvoon +2003-08-07 12:09 kdebisschop - * doc/developer-guidelines.sgml: Added in that Nagios plugins are - written to GNU standards + * [r658] plugins/check_load.c: + reorder for consistency, restore prototypes for print_foo, nest + #ifdef to avoid pedantic traditional c warn -2003-08-06 15:26 kdebisschop +2003-08-07 12:00 kdebisschop - * lib/.cvsignore: ignore ulonglong.m4 + * [r657] plugins/check_snmp.c: + reorder for consistency (no code changes) -2003-08-06 13:13 kdebisschop +2003-08-07 11:51 kdebisschop - * plugins/check_overcr.c: markup for translation, move send_buffer - assignment to process_args so process_tcp_request can be moved - outside the conditional, replace if/esleif with switch, replace - #defines with enum + * [r656] plugins/check_by_ssh.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_http.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/negate.c, + plugins/netutils.c, plugins/popen.c, plugins/utils.c, + plugins/utils.h: + replace "terminate" with "die" for shorter name and better + readability -2003-08-06 13:11 kdebisschop +2003-08-07 11:49 kdebisschop - * plugins/check_nwstat.c: markup for translation + * [r655] plugins/check_ping.c: + cleanup for better readability -2003-08-05 20:20 tonvoon +2003-08-07 09:51 kdebisschop - * doc/developer-guidelines.sgml: Added dev platform requirements + * [r654] plugins/check_ping.c: + markup for translation -2003-08-05 12:53 kdebisschop +2003-08-07 01:23 kdebisschop - * plugins/check_ssh.c: markup for translation + * [r653] tools/sfsnapshot: + make must be run before make dist to creat language files -2003-08-05 10:56 stanleyhopcroft +2003-08-06 20:53 tonvoon - * contrib/check_mssql.sh: Version 2.0 of MS SQL server plugin - (contrib/check_mssql.sh) from T De Blende. + * [r652] doc/developer-guidelines.sgml: + Added in that Nagios plugins are written to GNU standards -2003-08-04 12:38 kdebisschop +2003-08-06 14:26 kdebisschop - * plugins/: check_users.c, urlize.c: markup for translation + * [r651] lib, lib/.cvsignore: + ignore ulonglong.m4 -2003-08-04 09:13 kdebisschop +2003-08-06 12:13 kdebisschop - * plugins/: check_time.c, check_udp.c: markup for translation + * [r650] plugins/check_overcr.c: + markup for translation, move send_buffer assignment to + process_args so process_tcp_request can be moved outside the + conditional, replace if/esleif with switch, replace #defines with + enum -2003-08-04 08:42 kdebisschop +2003-08-06 12:11 kdebisschop - * plugins/: check_ldap.c, check_nagios.c, check_radius.c, - check_udp.c, check_ups.c, negate.c: markup for translation + * [r649] plugins/check_nwstat.c: + markup for translation -2003-08-03 15:24 kdebisschop +2003-08-05 19:20 tonvoon - * plugins/: check_ldap.c, check_mrtg.c, check_mrtgtraf.c: markup - for translation + * [r648] doc/developer-guidelines.sgml: + Added dev platform requirements -2003-08-03 07:19 kdebisschop +2003-08-05 11:53 kdebisschop - * plugins/check_load.c: markup for translation + * [r647] plugins/check_ssh.c: + markup for translation -2003-08-03 07:05 kdebisschop +2003-08-05 09:56 stanleyhopcroft - * plugins/: check_http.c, check_ldap.c, check_tcp.c: markup for - translation + * [r646] contrib/check_mssql.sh: + Version 2.0 of MS SQL server plugin (contrib/check_mssql.sh) from + T De Blende. -2003-08-03 07:03 kdebisschop +2003-08-04 11:38 kdebisschop - * plugins/: Makefile.am, check_ide-smart.c: markup for translation, - use common.h, fix problems compiling + * [r645] plugins/check_users.c, plugins/urlize.c: + markup for translation -2003-08-03 07:02 kdebisschop +2003-08-04 08:13 kdebisschop - * plugins/check_ldap.c: markup for translation + * [r644] plugins/check_time.c, plugins/check_udp.c: + markup for translation -2003-08-03 01:01 kdebisschop +2003-08-04 07:42 kdebisschop - * plugins/check_http.c: markup for translation + * [r643] plugins/check_ldap.c, plugins/check_nagios.c, + plugins/check_radius.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/negate.c: + markup for translation -2003-08-02 23:19 kdebisschop +2003-08-03 14:24 kdebisschop - * plugins/check_hpjd.c: markup for translation + * [r642] plugins/check_ldap.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c: + markup for translation -2003-08-02 23:08 kdebisschop +2003-08-03 06:19 kdebisschop - * plugins/check_mysql.c: markup for translation + * [r641] plugins/check_load.c: + markup for translation -2003-08-02 23:06 kdebisschop +2003-08-03 06:05 kdebisschop - * plugins/: check_fping.c, check_game.c, check_mysql.c, - check_snmp.c, utils.h: markupf for translation + * [r640] plugins/check_ldap.c: + markup for translation -2003-08-02 19:22 kdebisschop +2003-08-03 06:05 kdebisschop - * plugins/: utils.c, utils.h: ifdef so utils.h can be header for - utils.c + * [r639] plugins/check_http.c, plugins/check_ldap.c, + plugins/check_tcp.c: + markup for translation -2003-08-02 19:22 kdebisschop +2003-08-03 06:03 kdebisschop - * plugins/: check_fping.c, check_snmp.c: markup for translation + * [r638] plugins/Makefile.am, plugins/check_ide-smart.c: + markup for translation, use common.h, fix problems compiling -2003-08-02 17:42 kdebisschop +2003-08-03 00:01 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_pgsql.c, check_swap.c, check_tcp.c, utils.h: + * [r637] plugins/check_http.c: + markup for translation + +2003-08-02 22:19 kdebisschop + + * [r636] plugins/check_hpjd.c: + markup for translation + +2003-08-02 22:08 kdebisschop + + * [r635] plugins/check_mysql.c: + markup for translation + +2003-08-02 22:06 kdebisschop + + * [r634] plugins/check_fping.c, plugins/check_game.c, + plugins/check_mysql.c, plugins/check_snmp.c, plugins/utils.h: + markupf for translation + +2003-08-02 18:22 kdebisschop + + * [r633] plugins/utils.c, plugins/utils.h: + ifdef so utils.h can be header for utils.c + +2003-08-02 18:22 kdebisschop + + * [r632] plugins/check_fping.c, plugins/check_snmp.c: + markup for translation + +2003-08-02 16:42 kdebisschop + + * [r631] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_pgsql.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/utils.h: establish "UT_" namespace for usage text in #defines -2003-08-02 17:42 kdebisschop +2003-08-02 16:42 kdebisschop - * plugins/check_snmp.c: markup for translation + * [r630] plugins/check_snmp.c: + markup for translation -2003-08-02 06:30 kdebisschop +2003-08-01 23:56 kdebisschop - * plugins/check_dns.c: restore informative output that was lost in - previous bug fix + * [r628] plugins/check_dns.c: + terminate in error_scan() so meaningfull errors can be sent -2003-08-02 00:56 kdebisschop +2003-08-01 06:04 kdebisschop - * plugins/check_dns.c: terminate in error_scan() so meaningfull - errors can be sent + * [r627] plugins/check_dummy.c: + mark for transaltion -2003-08-01 07:04 kdebisschop +2003-08-01 06:03 kdebisschop - * plugins/check_dummy.c: mark for transaltion + * [r626] plugins/check_dns.c: + do not translate the strings that will be compared to utility + output - LC_ALL is set to C so those strings should be + untranslated regardless of the system settings -2003-08-01 07:03 kdebisschop +2003-08-01 06:01 kdebisschop - * plugins/check_dns.c: do not translate the strings that will be - compared to utility output - LC_ALL is set to C so those strings - should be untranslated regardless of the system settings + * [r625] plugins/popen.c: + set LC_ALL to C in execve environemnt -2003-08-01 07:01 kdebisschop +2003-08-01 02:12 kdebisschop - * plugins/popen.c: set LC_ALL to C in execve environemnt + * [r624] plugins/Makefile.am: + 'ln -f -s ...' is not reliable/portable. Use 'rm -f ...; ln -s + ...' -2003-08-01 03:11 kdebisschop +2003-07-31 12:06 kdebisschop - * plugins/: Makefile.am: 'ln -f -s ...' is not reliable/portable. - Use 'rm -f ...; ln -s ...' + * [r623] plugins/check_dns.c: + mark for translation (note problem here - it relies on + tranalation in underlying utility, which has a high chance of + failing) -2003-07-31 13:06 kdebisschop +2003-07-31 11:02 kdebisschop - * plugins/check_dns.c: mark for translation (note problem here - it - relies on tranalation in underlying utility, which has a high - chance of failing) + * [r622] plugins/check_disk.c, plugins/utils.h: + mark for translation -2003-07-31 12:02 kdebisschop +2003-07-30 11:39 kdebisschop - * plugins/: utils.h, check_disk.c: mark for translation + * [r621] plugins/check_by_ssh.c: + mark up for translation -2003-07-30 12:39 kdebisschop +2003-07-30 04:07 kdebisschop - * plugins/check_by_ssh.c: mark up for translation + * [r620] plugins/check_dig.c, plugins/check_pgsql.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/utils.h: + markup for translation -2003-07-30 05:07 kdebisschop +2003-07-29 11:58 kdebisschop - * plugins/: check_dig.c, check_pgsql.c, check_swap.c, check_tcp.c, - utils.h: markup for translation + * [r619] plugins/check_pgsql.c, plugins/check_swap.c, + plugins/check_tcp.c: + mark for translation -2003-07-29 12:58 kdebisschop +2003-07-29 11:57 kdebisschop - * plugins/: check_pgsql.c, check_swap.c, check_tcp.c: mark for - translation + * [r618] plugins/utils.h: + some shared text for internationalized help text -2003-07-29 12:57 kdebisschop +2003-07-29 05:49 kdebisschop - * plugins/utils.h: some shared text for internationalized help text + * [r617] plugins/utils.c: + clean up warnings about ill-formed comment and string + concatenation -2003-07-29 06:49 kdebisschop +2003-07-29 05:43 kdebisschop - * plugins/utils.c: clean up warnings about ill-formed comment and - string concatenation - -2003-07-29 06:43 kdebisschop - - * .cvsignore, ChangeLog, README, configure.in, lib/Makefile.am: + * [r616] ., .cvsignore, ChangeLog, README, configure.in, + lib/Makefile.am: bump to gettext 0.11.5 and cleanup GNU toolchain -2003-07-29 06:38 kdebisschop +2003-07-29 05:38 kdebisschop - * ABOUT-NLS, INSTALL: get from GNU files instead of storing in CVS + * [r615] ABOUT-NLS, INSTALL: + get from GNU files instead of storing in CVS -2003-07-29 06:03 kdebisschop +2003-07-29 05:03 kdebisschop - * tools/setup: move autopoint to start of gnu toolchain setup use - --force-missing instead on manually copying files (manual - process was broken on RedHat, and we should expect automake to do - its job right anyway) + * [r614] tools/setup: + move autopoint to start of gnu toolchain setup + use --force-missing instead on manually copying files + (manual process was broken on RedHat, and we should expect + automake to do its job right anyway) -2003-07-29 04:06 kdebisschop +2003-07-29 03:06 kdebisschop - * configure.in: look for getloadavg.c in $topdir/lib, not - $srcdir/lib + * [r613] configure.in: + look for getloadavg.c in $topdir/lib, not $srcdir/lib -2003-07-29 04:04 kdebisschop +2003-07-29 03:05 kdebisschop - * plugins/: check_http.c: patch attempt to reference undefined - optarg (credit Paul Farrall) + * [r612] plugins/check_http.c: + patch attempt to reference undefined optarg (credit Paul Farrall) -2003-07-29 04:03 kdebisschop +2003-07-28 11:36 tonvoon - * configure.in: look for getloadavg.c in $topdir/lib, not - $srcdir/lib + * [r611] configure.in: + - Specify srcdir so no confusion -2003-07-28 12:36 tonvoon +2003-07-28 11:30 tonvoon - * configure.in: - Specify srcdir so no confusion + * [r608] configure.in, lib/getloadavg.m4: + Readded getloadavg.m4 as using autoconf 2.50+. This fixes redhat + 6.2 compiles -2003-07-28 12:34 tonvoon +2003-07-26 12:15 kdebisschop - * configure.in, lib/getloadavg.m4: Fixes Redhat 6.2 compiles for - getloadavg.o + * [r607] plugins/check_pgsql.c: + mark for translation -2003-07-28 12:30 tonvoon +2003-07-26 12:13 kdebisschop - * configure.in, lib/getloadavg.m4: Readded getloadavg.m4 as using - autoconf 2.50+. This fixes redhat 6.2 compiles + * [r606] plugins/common.h: + add S_ macor to mark message for both translation and inclusion + into docbook SGML -2003-07-26 13:15 kdebisschop +2003-07-26 05:29 kdebisschop - * plugins/check_pgsql.c: mark for translation - -2003-07-26 13:13 kdebisschop - - * plugins/common.h: add S_ macor to mark message for both - translation and inclusion into docbook SGML - -2003-07-26 06:29 kdebisschop - - * po/: de.po, fr.po: updated check_tcp - -2003-07-26 06:25 kdebisschop - - * plugins/check_tcp.c, po/ChangeLog: internationalization - -2003-07-26 06:17 kdebisschop - - * po/.cvsignore, intl/.cvsignore, lib/.cvsignore: skip gettext - files - -2003-07-26 05:33 kdebisschop - - * lib/: Makefile.am: checkins for internationalization + * [r605] po/de.po, po/fr.po: + updated check_tcp 2003-07-26 05:25 kdebisschop - * po/Makevars: checkins for internationalization + * [r604] plugins/check_tcp.c, po/ChangeLog: + internationalization 2003-07-26 05:17 kdebisschop - * lib/gettext.h: checkins for internationalization + * [r603] intl, intl/.cvsignore, lib, lib/.cvsignore, po, + po/.cvsignore: + skip gettext files -2003-07-26 05:14 kdebisschop +2003-07-26 04:36 kdebisschop - * tools/setup: checkins for internationalization + * [r602] lib/Makefile.am: + checkins for internationalization -2003-07-26 05:09 kdebisschop +2003-07-26 04:33 kdebisschop - * configure.in, ABOUT-NLS, po/de.po, po/fr.po: checkins for - internationalization + * [r601] lib/Makefile.am: + checkins for internationalization -2003-07-26 05:06 kdebisschop +2003-07-26 04:25 kdebisschop - * .cvsignore, ChangeLog, Makefile.am, configure.in, - nagios-plugins.spec.in, lib/Makefile.am, plugins/Makefile.am, - plugins/check_tcp.c, plugins/common.h, plugins/utils.c, - po/LINGUAS, po/POTFILES.in, tools/setup: checkins for - internationalization + * [r600] po/Makevars: + checkins for internationalization -2003-07-21 13:06 kdebisschop +2003-07-26 04:17 kdebisschop - * plugins/common.h: add stubs to allow markup for translation + * [r599] configure.in, tools/setup: + checkins for internationalization -2003-07-21 12:53 kdebisschop +2003-07-26 04:17 kdebisschop - * configure.in, plugins/common.h: test GNU_SOURCE and include - features.h if present to clear warning about asprintf definition + * [r598] ., .cvsignore, ABOUT-NLS, ChangeLog, Makefile.am, + configure.in, lib/Makefile.am, lib/gettext.h, + nagios-plugins.spec.in, plugins/Makefile.am, plugins/check_tcp.c, + plugins/common.h, plugins/utils.c, po, po/LINGUAS, + po/POTFILES.in, po/de.po, po/fr.po, tools/setup: + checkins for internationalization -2003-07-20 15:40 kdebisschop +2003-07-21 12:06 kdebisschop - * doc/developer-guidelines.sgml: must use '&' in attribute - values instead of '&' id tokens (attibute values) must not have - embedded spaces + * [r597] plugins/common.h: + add stubs to allow markup for translation -2003-07-20 15:01 kdebisschop +2003-07-21 11:53 kdebisschop - * nagios-plugins.spec.in: was needed for build on RH9 + * [r596] configure.in, plugins/common.h: + test GNU_SOURCE and include features.h if present to clear + warning about asprintf definition -2003-07-17 13:14 tonvoon +2003-07-20 14:40 kdebisschop - * plugins-scripts/check_oracle.sh: - Cleanup comments + * [r595] doc/developer-guidelines.sgml: + must use '&' in attribute values instead of '&' + id tokens (attibute values) must not have embedded spaces -2003-07-17 10:35 tonvoon +2003-07-17 12:14 tonvoon - * doc/developer-guidelines.sgml: Guidelines updated to use - Sourceforge tracker system + * [r593] plugins-scripts/check_oracle.sh: + - Cleanup comments -2003-07-11 23:20 tonvoon +2003-07-17 09:35 tonvoon - * doc/developer-guidelines.sgml: - Fixed CVS commit comments + * [r592] doc/developer-guidelines.sgml: + Guidelines updated to use Sourceforge tracker system -2003-07-11 14:06 tonvoon +2003-07-11 22:20 tonvoon - * doc/developer-guidelines.sgml: Added in practice of prefixing - comments in CVS commits + * [r591] doc/developer-guidelines.sgml: + - Fixed CVS commit comments -2003-07-11 07:30 kdebisschop +2003-07-11 13:06 tonvoon - * ChangeLog: Auto Update from CVS (includes both stabel and devel - - ugh) + * [r590] doc/developer-guidelines.sgml: + Added in practice of prefixing comments in CVS commits -2003-07-11 07:12 kdebisschop +2003-07-04 10:42 kdebisschop - * configure.in, plugins/Makefile.am: link check_spop and - check_simap if ssl libs are compiled into check_tcp + * [r586] configure.in, plugins/Makefile.am: + only make links for check_spop and check_simap when SSL is built + into check_tcp -2003-07-04 11:42 kdebisschop +2003-07-03 16:49 tonvoon - * configure.in, plugins/Makefile.am: only make links for check_spop - and check_simap when SSL is built into check_tcp + * [r585] plugins/check_procs.c: + Fixed seg fault on some Sol 7/8 servers (Patch 764745 - Alexander + Matey) -2003-07-03 17:49 tonvoon +2003-07-03 15:00 tonvoon - * plugins/check_procs.c: Fixed seg fault on some Sol 7/8 servers - (Patch 764745 - Alexander Matey) + * [r584] tools/setup: + Changing $() to `` to be compatible with Solaris' sh -2003-07-03 16:00 tonvoon +2003-07-03 03:23 kdebisschop - * tools/setup: Changing $() to `` to be compatible with Solaris' sh + * [r583] autogen.sh, tools/setup: + mv GNU toolchain check into tools/setup -2003-07-03 04:23 kdebisschop +2003-07-03 03:19 kdebisschop - * autogen.sh, tools/setup: mv GNU toolchain check into tools/setup + * [r582] plugins/utils.c: + remove LABELLEN -2003-07-03 04:19 kdebisschop +2003-07-02 16:21 tonvoon - * plugins/utils.c: remove LABELLEN + * [r581] plugins-scripts/check_oracle.sh: + Check for ORA- errors for tablespace and cache (patch 755456 - + Sven Meyer) -2003-07-02 17:20 tonvoon +2003-07-02 15:57 tonvoon - * plugins-scripts/: check_oracle.sh: Check for ORA- errors for - tablespace and cache (patch 755456 - Sven Meyer) + * [r580] plugins-scripts/check_disk_smb.pl: + Update error message from smbclient v2.2.7 (Patch 740132 - Cove + Schneider) -2003-07-02 16:57 tonvoon +2003-07-02 15:01 tonvoon - * plugins-scripts/check_disk_smb.pl: Update error message from - smbclient v2.2.7 (Patch 740132 - Cove Schneider) + * [r578] contrib/check_file_age.pl, plugins-scripts, + plugins-scripts/.cvsignore, plugins-scripts/Makefile.am, + plugins-scripts/check_file_age.pl, plugins-scripts/subst.in: + Moving check_file_age into core -2003-07-02 16:52 tonvoon +2003-07-02 14:39 tonvoon - * plugins-scripts/check_disk_smb.pl: Update error message from - smbclient v2.2.7 (Patch 740132 - Cove Schneider) + * [r577] configure.in: + Fixed SUPPORT message -2003-07-02 16:01 tonvoon +2003-06-30 19:47 undrgrid - * contrib/check_file_age.pl, plugins-scripts/.cvsignore, - plugins-scripts/Makefile.am, plugins-scripts/check_file_age.pl, - plugins-scripts/subst.in: Moving check_file_age into core - -2003-07-02 15:39 tonvoon - - * configure.in: Fixed SUPPORT message - -2003-07-01 10:27 tonvoon - - * plugins/check_disk.c: Fix for large filesystems > 3TB (Stuart - Webster) - -2003-06-30 20:47 undrgrid - - * plugins/: check_http.c, check_ldap.c, check_smtp.c: Added -4 and - -6 command line options into check_http, check_ldap and + * [r575] plugins/check_http.c, plugins/check_ldap.c, + plugins/check_smtp.c: + Added -4 and -6 command line options into check_http, check_ldap + and check_smtp -2003-06-30 19:52 undrgrid +2003-06-30 18:52 undrgrid - * plugins/: check_ping.c, check_ssh.c, check_tcp.c, netutils.c: + * [r574] plugins/check_ping.c, plugins/check_ssh.c, + plugins/check_tcp.c, plugins/netutils.c: Corrections to get code to compile on systems without IPv6 support -2003-06-30 19:52 undrgrid +2003-06-30 18:52 undrgrid - * plugins/Makefile.am: Added check_simap & check_spop to - check_tcp_programs If someone knows how to make this conditional - in the Makefile only if being compiled with SSL I think this is - the only way to make it better + * [r573] plugins/Makefile.am: + Added check_simap & check_spop to check_tcp_programs + If someone knows how to make this conditional in the Makefile + only if + being compiled with SSL I think this is the only way to make it + better -2003-06-30 18:02 tonvoon +2003-06-30 17:02 tonvoon - * plugins/check_disk.c: Fixed support for "check_disk warn crit - [path]" with thresholds at used levels + * [r572] plugins/check_disk.c: + Fixed support for "check_disk warn crit [path]" with thresholds + at used levels -2003-06-29 20:54 undrgrid +2003-06-29 19:54 undrgrid - * configure.in, plugins/check_ldap.c: Included patch for check_ldap - from Patch #753621 by Ziya Suzen + * [r571] configure.in, plugins/check_ldap.c: + Included patch for check_ldap from Patch #753621 by Ziya Suzen -2003-06-29 20:22 undrgrid +2003-06-29 19:22 undrgrid - * plugins/: check_ping.c, check_tcp.c: Changed usage output to show - -4 and -6 are mutually exclusive. You can only use one or - the other but not both. The last one used will win out. + * [r570] plugins/check_ping.c, plugins/check_tcp.c: + Changed usage output to show -4 and -6 are mutually exclusive. + You can only + use one or the other but not both. The last one used will win + out. -2003-06-29 20:17 undrgrid +2003-06-29 19:17 undrgrid - * plugins/: check_ping.c, netutils.c: check_ping is now coded with - -4 & -6 options to call PING or PING6 command netutils modified - to verify hosts based on address_family setting when used with - -4 or -6 options. is_inet_addr() will not be tested if -6 is + * [r569] plugins/check_ping.c, plugins/netutils.c: + check_ping is now coded with -4 & -6 options to call PING or + PING6 command + netutils modified to verify hosts based on address_family setting + when used + with -4 or -6 options. is_inet_addr() will not be tested if -6 is used and is_inet6_addr() will not be tested if -4 is used. Also - the is_hostname() will use the address_family value to - resolve hostnames only if IPv6 support is available otherwise - defaults to AF_INET. + the + is_hostname() will use the address_family value to resolve + hostnames + only if IPv6 support is available otherwise defaults to AF_INET. -2003-06-29 07:36 undrgrid +2003-06-29 06:36 undrgrid - * plugins/: check_ssh.c, check_tcp.c, netutils.c, netutils.h: Added - address_family extern int variable to netutils to allow for -4 & - -6 options for explicit connection protocol Added support - for -4 & -6 options to check_ssh and check_tcp for testing + * [r568] plugins/check_ssh.c, plugins/check_tcp.c, + plugins/netutils.c, plugins/netutils.h: + Added address_family extern int variable to netutils to allow for + -4 & -6 + options for explicit connection protocol + Added support for -4 & -6 options to check_ssh and check_tcp for + testing -2003-06-29 03:18 tonvoon +2003-06-29 02:18 tonvoon - * plugins/check_nwstat.c: Added NLM test (Phil Randal) + * [r567] plugins/check_nwstat.c: + Added NLM test (Phil Randal) -2003-06-29 02:52 tonvoon +2003-06-29 01:52 tonvoon - * plugins/check_swap.c: Corrected reported size for PROC_MEMINFO - systems + * [r566] plugins/check_swap.c: + Corrected reported size for PROC_MEMINFO systems -2003-06-29 02:36 tonvoon +2003-06-29 01:36 tonvoon - * tools/sfwebcron: Fixed so goes to correct web area + * [r565] tools/sfwebcron: + Fixed so goes to correct web area -2003-06-29 02:07 tonvoon +2003-06-29 01:07 tonvoon - * tools/sfwebcron: New tool to run on shell.sf.net to update the - dev guidelines + * [r564] tools/sfwebcron: + New tool to run on shell.sf.net to update the dev guidelines -2003-06-29 01:58 tonvoon +2003-06-29 00:58 tonvoon - * doc/makefile: Fixed makefile + * [r563] doc/makefile: + Fixed makefile -2003-06-27 19:47 undrgrid +2003-06-27 18:47 undrgrid - * plugins/netutils.c: Modified my_connect to include ai_socktype in - the hints to be compliant with RFC3493 as pointed out by Janos - Mohacsi. + * [r562] plugins/netutils.c: + Modified my_connect to include ai_socktype in the hints to be + compliant with + RFC3493 as pointed out by Janos Mohacsi. -2003-06-27 15:43 tonvoon +2003-06-27 14:43 tonvoon - * configure.in, plugins/check_swap.c: Support for swap -s for - solaris. Also changes size of swap to MBs through a conversion - amount in configure. Possible breakage on other OSes + * [r561] configure.in, plugins/check_swap.c: + Support for swap -s for solaris. Also changes size of swap to MBs + through + a conversion amount in configure. Possible breakage on other OSes -2003-06-27 13:04 tonvoon +2003-06-27 12:04 tonvoon - * doc/makefile: Remove if which check - done in tools/setup instead + * [r560] doc/makefile: + Remove if which check - done in tools/setup instead -2003-06-27 11:30 tonvoon +2003-06-27 10:30 tonvoon - * tools/setup: Fiddling as Solaris' which command is broken + * [r559] tools/setup: + Fiddling as Solaris' which command is broken -2003-06-27 00:33 tonvoon +2003-06-26 23:33 tonvoon - * plugins/check_disk.c: Fixed different thresholds if using exclude - lists + * [r558] plugins/check_disk.c: + Fixed different thresholds if using exclude lists -2003-06-25 16:43 tonvoon +2003-06-25 15:43 tonvoon - * plugins/check_disk.c: Support for different thresholds for - different filesystems - -2003-06-25 14:38 tonvoon - - * plugins/check_disk.c: Removed -d option and just check against -p - parameter - -2003-06-25 14:28 tonvoon - - * plugins/check_disk.c: Report errors if path specified not found - -2003-06-25 14:16 tonvoon - - * plugins/check_disk.c: Problems compiling on SunOS 5.6 with gcc - 2.8.1. Fixed by specifying floating variables, rather than - letting asprintf work it out + * [r557] plugins/check_disk.c: + Support for different thresholds for different filesystems 2003-06-25 13:38 tonvoon - * plugins/check_disk.c: Returns critical if fs missing. Only works - for single fs specified in -p, otherwise will return warning as - before (reported by Jim Carroll) + * [r556] plugins/check_disk.c: + Removed -d option and just check against -p parameter -2003-06-21 06:49 kdebisschop +2003-06-25 13:28 tonvoon - * plugins/Makefile.am: soalris 8 needs 'ln -s -f' instead of 'ln - -sf' + * [r555] plugins/check_disk.c: + Report errors if path specified not found -2003-06-21 06:48 kdebisschop +2003-06-25 13:16 tonvoon - * plugins/Makefile.am: solaris 8 needs 'ln -s -f' instead of 'ln - -sf' + * [r554] plugins/check_disk.c: + Problems compiling on SunOS 5.6 with gcc 2.8.1. Fixed by + specifying + floating variables, rather than letting asprintf work it out -2003-06-21 06:31 kdebisschop +2003-06-21 05:49 kdebisschop - * plugins/check_http.c: fix character class for URI_PATH and - URI_PORT + * [r552] plugins/Makefile.am: + soalris 8 needs 'ln -s -f' instead of 'ln -sf' -2003-06-21 06:23 kdebisschop +2003-06-21 05:23 kdebisschop - * plugins/check_http.c: add remaining URI_PATH chars per RFC 2396 + * [r549] plugins/check_http.c: + add remaining URI_PATH chars per RFC 2396 remove '-' from URI_PORT -2003-06-12 05:44 undrgrid +2003-06-12 04:46 undrgrid - * command.cfg.in: Renamed duplicate check_snmp command definitions - to be unique + * [r548] command.cfg.in: + Renamed duplicate check_snmp command definitions to be unique -2003-06-12 05:14 undrgrid +2003-06-12 04:16 undrgrid - * command.cfg.in, configure.in: Made the two check_ifoperstatus - commands unique to remove conflicts + * [r547] command.cfg.in, configure.in: + Made the two check_ifoperstatus commands unique to remove + conflicts -2003-06-11 11:41 kdebisschop +2003-06-11 10:41 kdebisschop - * plugins/check_http.c: fix URI_PATH to allow ?&#: (more still - should be allowed) fix class to be POSIX compliant + * [r546] plugins/check_http.c: + fix URI_PATH to allow ?&#: (more still should be allowed) + fix class to be POSIX compliant -2003-06-11 11:39 kdebisschop +2003-06-10 05:04 kdebisschop - * plugins/check_http.c: character classes were wrong for URI_PATH - etc: 1) must include ?&#; for PATH 2) POSIX states "If a '-' is - in the scanlist and is not the first character, nor the second - where the first character is a '^' , nor the last character, the - behavior is implementation-defined" - -2003-06-10 06:04 kdebisschop - - * contrib/urlize.pl: add comment about shell quote removal to - address + * [r544] contrib/urlize.pl: + add comment about shell quote removal to address https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 -2003-06-10 06:02 kdebisschop +2003-06-10 05:02 kdebisschop - * plugins/urlize.c: add note about shell quote removal to address + * [r543] plugins/urlize.c: + add note about shell quote removal to address https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 -2003-06-10 05:55 kdebisschop +2003-06-08 22:39 tonvoon - * contrib/urlize.pl: add comment relating to - https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 + * [r540] configure.in: + Fixed quoting on SWAP_FORMAT -2003-06-10 05:53 kdebisschop +2003-06-08 22:22 tonvoon - * plugins/urlize.c: add note about effect of shell quote handling - to address - https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 + * [r539] configure.in: + Support for OpenBSD 3.2 & 3.3 ps (Julien Touche) -2003-06-08 23:39 tonvoon +2003-06-07 00:36 sghosh - * configure.in: Fixed quoting on SWAP_FORMAT - -2003-06-08 23:22 tonvoon - - * configure.in: Support for OpenBSD 3.2 & 3.3 ps (Julien Touche) - -2003-06-07 01:46 sghosh - - * plugins/check_real.c: \r\n patch from Mathias - -2003-06-07 01:36 sghosh - - * plugins/check_real.c: \r\n patch from Mathias - -2003-06-05 00:09 tonvoon - - * configure.in: Display ps command used - -2003-06-04 23:56 tonvoon - - * configure.in: Stupid bug - what happens when you don't bother - testing - -2003-06-04 23:37 tonvoon - - * configure.in: Support for OpenBSD 3.2 & 3.3 ps (Julien Touche) - -2003-06-04 23:17 tonvoon - - * plugins/check_disk.c: Argument to asprintf in wrong order + * [r537] plugins/check_real.c: + \r\n patch from Mathias 2003-06-04 22:17 tonvoon - * pkg/solaris/solpkg: Remove /usr as well. Maybe this is best done - by changing BASEDIR to configure's prefix? + * [r533] plugins/check_disk.c: + Argument to asprintf in wrong order -2003-06-02 15:46 kdebisschop +2003-06-04 21:17 tonvoon - * plugins/check_tcp.c: finish recv() loop when stream GT or EQ - maxbytes (was GT) + * [r532] pkg/solaris/solpkg: + Remove /usr as well. Maybe this is best done by changing BASEDIR + to + configure's prefix? -2003-06-02 15:43 kdebisschop +2003-06-02 14:46 kdebisschop - * plugins/check_tcp.c: finish recv() loop when stream GT or EQ - maxbytes (was GT) + * [r531] plugins/check_tcp.c: + finish recv() loop when stream GT or EQ maxbytes (was GT) -2003-06-01 06:38 kdebisschop +2003-06-01 05:38 kdebisschop - * plugins/check_tcp.c: typos in doco - -2003-06-01 06:38 kdebisschop - - * plugins/check_tcp.c: allow user to limit number of bytes fetched + * [r529] plugins/check_tcp.c: + allow user to limit number of bytes fetched fix some doco (wait is now delay, server_quit was not shown) -2003-06-01 06:19 kdebisschop +2003-05-31 14:39 kdebisschop - * plugins/check_tcp.c: allow user to limit the number of bytes to - be fetched + * [r526] plugins/check_dns.c: + first revised patch failed to trap the "break" in while() -2003-05-31 15:39 kdebisschop +2003-05-27 13:10 stanleyhopcroft - * plugins/check_dns.c: first revised patch failed to trap the - "break" in while() + * [r523] contrib/check_sap.sh: + check_sap.sh plugin to check SAP /R3 servers from Karel Salavec + and Tom De Blende. -2003-05-31 15:39 kdebisschop +2003-05-26 10:09 stanleyhopcroft - * plugins/check_dns.c: first revised patch failed to trap the - "break" in while() + * [r522] contrib/check_axis.sh, contrib/check_mssql.sh: + Revisions to Tom De Blende contributed plugins: check_axis.sh and + check_mssql.sh -2003-05-31 15:22 kdebisschop +2003-05-17 23:10 tonvoon - * plugins/check_dns.c: typo in args to terminate + * [r521] plugins/t/check_ftp.t: + Fixed test (Mathew Ericson - 738609) -2003-05-31 15:04 kdebisschop +2003-05-17 17:59 tonvoon - * plugins/check_dns.c: trap null or empty returns from nslookup + * [r520] plugins/t/check_load.t: + Fixed tests (Mathew Ericson - 738607) -2003-05-27 14:10 stanleyhopcroft +2003-05-17 17:50 tonvoon - * contrib/check_sap.sh: check_sap.sh plugin to check SAP /R3 - servers from Karel Salavec and Tom De Blende. + * [r519] plugins/t/check_procs.t: + Fixed test commands (Mathew Ericson - 738605) -2003-05-26 11:09 stanleyhopcroft +2003-05-17 17:40 tonvoon - * contrib/: check_axis.sh, check_mssql.sh: Revisions to Tom De - Blende contributed plugins: check_axis.sh and check_mssql.sh + * [r518] plugins/t/check_http.t: + Fixed tests (Mathew Ericson - 738608) -2003-05-18 00:07 tonvoon +2003-05-17 17:36 tonvoon - * plugins/t/: check_ftp.t: Fixed test (Mathew Ericson - 738609) - -2003-05-17 18:58 tonvoon - - * plugins/t/: check_load.t: Fixed tests (Mathew Ericson - 738607) - -2003-05-17 18:50 tonvoon - - * plugins/t/check_procs.t: Fixed test commands (Mathew Ericson - - 738605) - -2003-05-17 18:46 tonvoon - - * plugins/t/check_procs.t: Fixed test commands (Mathew Ericson - - 738605) - -2003-05-17 18:38 tonvoon - - * plugins/t/: check_http.t: Fixed tests (Mathew Ericson - 738608) - -2003-05-17 18:36 tonvoon - - * plugins/t/check_tcp.t: Fixed tests (Mathew Ericson - 738604) CV: + * [r517] plugins/t/check_tcp.t: + Fixed tests (Mathew Ericson - 738604) + CV: ---------------------------------------------------------------------- -2003-05-17 18:33 tonvoon +2003-05-16 17:33 sghosh - * plugins/t/check_tcp.t: Fixed tests (Mathew Ericson - 738604) + * [r515] plugins-scripts/check_ntp.pl: + bug fix -2003-05-16 18:32 sghosh +2003-05-14 23:17 tonvoon - * plugins-scripts/: check_ntp.pl: bug fix + * [r514] plugins/negate.c: + Added examples -2003-05-15 00:17 tonvoon +2003-05-14 21:59 tonvoon - * plugins/negate.c: Added examples + * [r513] plugins-scripts/check_mailq.pl: + Added postfix support (Thomas Nilsen - 735218) -2003-05-14 22:59 tonvoon +2003-05-14 21:51 tonvoon - * plugins-scripts/check_mailq.pl: Added postfix support (Thomas - Nilsen - 735218) + * [r512] plugins/check_nwstat.c: + Added DSVER and UPTIME checks (Phil Randal - 737617) -2003-05-14 22:51 tonvoon +2003-05-14 21:49 tonvoon - * plugins/check_nwstat.c: Added DSVER and UPTIME checks (Phil - Randal - 737617) + * [r511] pkg/solaris/solpkg: + Typo -2003-05-14 22:49 tonvoon +2003-05-14 21:44 tonvoon - * pkg/solaris/solpkg: Typo + * [r510] doc, doc/.cvsignore: + Ignore developer-guidelines.html as generated from docbook -2003-05-14 22:44 tonvoon +2003-05-14 21:39 tonvoon - * doc/.cvsignore: Ignore developer-guidelines.html as generated - from docbook + * [r509] Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: + Remove dependency on gnu make -2003-05-14 22:39 tonvoon +2003-05-13 23:20 tonvoon - * Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Remove - dependency on gnu make + * [r508] doc/developer-guidelines.sgml: + Updated docs to include comments, contrib->main, getopts_long and + verbose output levels -2003-05-14 00:20 tonvoon +2003-05-13 22:23 tonvoon - * doc/developer-guidelines.sgml: Updated docs to include comments, - contrib->main, getopts_long and verbose output levels + * [r507] tools/sfsnapshot: + Calls tools/setup and creates a README for the snapshot directory -2003-05-13 23:23 tonvoon +2003-05-13 22:03 tonvoon - * tools/sfsnapshot: Calls tools/setup and creates a README for the - snapshot directory + * [r506] doc/developer-guidelines.html, doc/makefile, tools/setup: + The developer-guidelines.html file is now generated from the sgml + file + by docbook2html at tools/setup time -2003-05-13 23:03 tonvoon +2003-05-13 12:14 stanleyhopcroft - * doc/developer-guidelines.html, doc/makefile, tools/setup: The - developer-guidelines.html file is now generated from the sgml - file by docbook2html at tools/setup time + * [r505] contrib/tarballs/hopcroft-plugins.tar.gz: + Removed contrib/tarballs/hopcroft-plugins.tar.gz. This is + archaic, anachronistic, unmaintained and humblingly embarrassing. -2003-05-13 13:14 stanleyhopcroft +2003-05-13 12:13 stanleyhopcroft - * contrib/tarballs/hopcroft-plugins.tar.gz: Removed - contrib/tarballs/hopcroft-plugins.tar.gz. This is archaic, - anachronistic, unmaintained and humblingly embarrassing. + * [r504] contrib/check_mssql.sh: + check_mssql.sh. A new plugin from Mr T DE BLENDE to check MS + SQLServer databases. -2003-05-13 13:13 stanleyhopcroft +2003-05-09 03:22 kdebisschop - * contrib/check_mssql.sh: check_mssql.sh. A new plugin from Mr T DE - BLENDE to check MS SQLServer databases. - -2003-05-09 04:22 kdebisschop - - * plugins/check_http.c: fix error when server closes connection + * [r503] plugins/check_http.c: + fix error when server closes connection immediately -2003-05-09 04:22 kdebisschop +2003-05-09 03:00 kdebisschop - * plugins/check_http.c: fix error when server closes connection - immediately + * [r501] plugins/check_snmp.c: + cause snmpget try try for 1 second less than the timeout + (allowing plugin to force close if needed) -2003-05-09 03:59 kdebisschop +2003-05-07 18:01 undrgrid - * plugins/: check_snmp.c: cause snmpget try try for 1 second less - than the timeout (allowing plugin to force close if needed) + * [r500] plugins/check_ping.c: + Modified check_ping to handle IPv6 as well as IPv4 ICMP checks + using the + PING6_COMMAND determined during the configure script execution. + As + USE_IPV6 may be defined and PING6_COMMAND is not defined if there + is not + IPv6 TCP stack available when configure is run I condition it off + PING6_COMMAND existing to remove build errors for being + undefined. -2003-05-07 19:01 undrgrid +2003-04-25 09:07 sghosh - * plugins/check_ping.c: Modified check_ping to handle IPv6 as well - as IPv4 ICMP checks using the PING6_COMMAND determined during the - configure script execution. As USE_IPV6 may be defined and - PING6_COMMAND is not defined if there is not IPv6 TCP stack - available when configure is run I condition it off PING6_COMMAND - existing to remove build errors for being undefined. + * [r499] plugins-scripts/check_ntp.pl: + corrected output units -2003-04-25 10:05 sghosh +2003-04-23 04:58 kdebisschop - * plugins-scripts/: check_ntp.pl: corrected output units + * [r498] plugins/check_http.c: + update to RFC1123 hostname specs -2003-04-23 05:57 kdebisschop +2003-04-17 05:56 kdebisschop - * plugins/: check_http.c, utils.c: update to RFC1123 hostname specs + * [r497] nagios-plugins.spec.in: + add check_nt, drop check_vsz -2003-04-17 06:56 kdebisschop +2003-04-17 05:55 kdebisschop - * nagios-plugins.spec.in: add check_nt, drop check_vsz + * [r496] plugins/check_dig.c, plugins/check_tcp.c, + plugins/check_users.c: + code cleanup to clear strict compiler warnings -2003-04-17 06:55 kdebisschop +2003-04-17 05:36 kdebisschop - * plugins/: check_dig.c, check_tcp.c, check_users.c: code cleanup - to clear strict compiler warnings + * [r495] plugins/check_dig.c, plugins/check_tcp.c, + plugins/netutils.c: + code cleanup to clear strict compiler warnings -2003-04-17 06:36 kdebisschop +2003-04-16 15:06 sghosh - * plugins/: check_dig.c, check_tcp.c, netutils.c: code cleanup to - clear strict compiler warnings + * [r493] plugins/check_real.c: + reset to old behavior of not checking stream by default -2003-04-16 16:31 sghosh +2003-04-13 04:49 sghosh - * plugins/check_real.c: old behavior - no stream check unless -u + * [r492] plugins/check_hpjd.c: + reduce compiler warning between gcc3 and gcc2.96 -2003-04-16 16:06 sghosh +2003-04-13 04:28 sghosh - * plugins/check_real.c: reset to old behavior of not checking - stream by default + * [r491] configure.in, plugins-scripts/utils.pm.in: + update for check_mailq - qmail support -2003-04-13 05:49 sghosh +2003-04-13 04:23 sghosh - * plugins/check_hpjd.c: reduce compiler warning between gcc3 and - gcc2.96 + * [r490] plugins-scripts/check_mailq.pl: + Added sendmail multi-queue support (Canau), merged qmail support + (Schmid) -2003-04-13 05:28 sghosh +2003-04-11 23:47 tonvoon - * configure.in: update for check_mailq - qmail support + * [r488] plugins/check_procs.c: + Match -a STRING anywhere in ps args (Laurent Vaslin - 719783) -2003-04-13 05:25 sghosh +2003-04-11 22:36 sghosh - * plugins-scripts/utils.pm.in: update for check_mailq - qmail - support + * [r487] plugins-scripts/check_ifstatus.pl: + added feature -u (list of unused ifIndex) -2003-04-13 05:23 sghosh +2003-04-11 22:09 sghosh - * plugins-scripts/check_mailq.pl: Added sendmail multi-queue - support (Canau), merged qmail support (Schmid) + * [r486] plugins-scripts/check_ifstatus.pl: + bug 691412, added feature -x (list of excluded ifTypes) -2003-04-12 01:02 tonvoon +2003-04-11 18:44 sghosh - * plugins/check_procs.c: Match -a STRING anywhere in ps args - (Laurent Vaslin - 719783) + * [r485] plugins/check_hpjd.c: + patch 698384 - order of args to snmpget + print a bit of stderr -2003-04-12 00:47 tonvoon +2003-04-09 03:46 kdebisschop - * plugins/check_procs.c: Match -a STRING anywhere in ps args - (Laurent Vaslin - 719783) + * [r483] plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_nt.c: + cleanup to suppress various strict compiler warnings -2003-04-11 23:36 sghosh +2003-04-09 03:44 kdebisschop - * plugins-scripts/check_ifstatus.pl: added feature -u (list of - unused ifIndex) + * [r482] plugins/common.h: + rewrite #elif to be compatible with traditional C -2003-04-11 23:09 sghosh +2003-04-09 02:09 kdebisschop - * plugins-scripts/check_ifstatus.pl: bug 691412, added feature -x - (list of excluded ifTypes) + * [r481] plugins/Makefile.am: + check_game needs popen.c now -2003-04-11 19:44 sghosh +2003-04-08 20:38 tonvoon - * plugins/check_hpjd.c: patch 698384 - order of args to snmpget + - print a bit of stderr + * [r479] command.cfg.in: + Updated command for new check_procs -2003-04-11 17:27 sghosh +2003-04-08 20:37 tonvoon - * plugins/check_hpjd.c: patch 698384 - order of args to snmpget + * [r478] plugins/check_hpjd.c, plugins/check_nt.c: + Changed // to /* */ comments as some compilers do not like them -2003-04-09 04:46 kdebisschop +2003-04-08 00:00 stanleyhopcroft - * plugins/: check_http.c, check_hpjd.c, check_nt.c: cleanup to - suppress various strict compiler warnings + * [r477] contrib/check_axis.sh: + check_axis.sh (Axis 5xx print servers) from Tom De Blende -2003-04-09 04:44 kdebisschop +2003-04-07 23:40 tonvoon - * plugins/common.h: rewrite #elif to be compatible with traditional - C + * [r476] plugins/check_procs.c: + Fixed zombie processes -2003-04-09 03:09 kdebisschop +2003-04-07 23:16 tonvoon - * plugins/Makefile.am: check_game needs popen.c now + * [r475] configure.in: + Missed some PS_FORMAT strings -2003-04-08 21:49 tonvoon +2003-04-07 22:53 tonvoon - * plugins/: check_nt.c, check_hpjd.c: Changed // to /* */ comments - as some compilers do not like them + * [r474] configure.in, plugins/Makefile.am, plugins/check_nagios.c, + plugins/check_procs.c, plugins/check_vsz.c: + Souped up check_procs with different metrics -2003-04-08 21:38 tonvoon +2003-04-07 21:21 tonvoon - * command.cfg.in: Updated command for new check_procs + * [r472] plugins/check_snmp.c: + Removed unnecessary regex array -2003-04-08 21:37 tonvoon +2003-04-07 11:39 kdebisschop - * plugins/: check_hpjd.c, check_nt.c: Changed // to /* */ comments - as some compilers do not like them + * [r471] plugins/check_http.c: + ste timeout one second greater than critical time -2003-04-08 01:00 stanleyhopcroft +2003-04-07 11:38 kdebisschop - * contrib/check_axis.sh: check_axis.sh (Axis 5xx print servers) - from Tom De Blende + * [r470] plugins/check_game.c: + had been grandfathered ibto core, finally use normal getopts, add + options for player, max-player array positions -2003-04-08 00:40 tonvoon +2003-04-03 21:21 tonvoon - * plugins/check_procs.c: Fixed zombie processes + * [r469] plugins-scripts/check_oracle.sh: + Cleaned up cache output -2003-04-08 00:16 tonvoon +2003-04-01 22:24 tonvoon - * configure.in: Missed some PS_FORMAT strings + * [r468] plugins-scripts/check_oracle.sh: + Fixed sqlplus calls and rearranged parameters for --tablespace & + --cache -2003-04-07 23:53 tonvoon +2003-04-01 04:00 kdebisschop - * configure.in, plugins/Makefile.am, plugins/check_nagios.c, - plugins/check_procs.c, plugins/check_vsz.c: Souped up check_procs - with different metrics + * [r467] configure.in: + remove PATH_PROG call for autoconf/automake components -2003-04-07 22:23 tonvoon +2003-03-31 12:49 kdebisschop - * plugins/check_snmp.c: Removed unnecessary array for AIX compile - (reported by Alwyn Cherrington) - -2003-04-07 22:21 tonvoon - - * plugins/check_snmp.c: Removed unnecessary regex array - -2003-04-07 12:39 kdebisschop - - * plugins/check_http.c: ste timeout one second greater than - critical time - -2003-04-07 12:38 kdebisschop - - * plugins/check_game.c: had been grandfathered ibto core, finally - use normal getopts, add options for player, max-player array - positions - -2003-04-03 22:21 tonvoon - - * plugins-scripts/check_oracle.sh: Cleaned up cache output - -2003-04-01 23:24 tonvoon - - * plugins-scripts/check_oracle.sh: Fixed sqlplus calls and - rearranged parameters for --tablespace & --cache - -2003-04-01 05:00 kdebisschop - - * configure.in: remove PATH_PROG call for autoconf/automake - components - -2003-03-31 13:49 kdebisschop - - * plugins/check_disk.c: checkpoint supresses iso9660 adds option - for checking only local adds choice of scale factor + * [r466] plugins/check_disk.c: + checkpoint + supresses iso9660 + adds option for checking only local + adds choice of scale factor 2003-03-27 22:53 tonvoon - * plugins/check_nwstat.c: Extra Netware checks (Patch 710247 - - Dietmar Ruzicka) + * [r465] plugins/check_nwstat.c: + Extra Netware checks (Patch 710247 - Dietmar Ruzicka) 2003-03-26 05:37 tonvoon - * configure.in: ipv6 check requires unistd.h for Darwin + * [r464] configure.in: + ipv6 check requires unistd.h for Darwin 2003-03-26 03:57 tonvoon - * configure.in, plugins/check_procs.c: Removal of ps_raw and - ps_vars + * [r463] configure.in, plugins/check_procs.c: + Removal of ps_raw and ps_vars 2003-03-26 03:39 tonvoon - * plugins/check_nagios.c: Uses same ps command as check_procs + * [r462] plugins/check_nagios.c: + Uses same ps command as check_procs 2003-03-25 06:33 kdebisschop - * .cvsignore: subst is no longer used + * [r461] ., .cvsignore: + subst is no longer used 2003-03-24 19:05 undrgrid - * .cvsignore, Makefile.am: Better stripping of prefix for Solaris - package install needs to remove /usr/local as package - installs there by default + * [r460] ., .cvsignore, Makefile.am: + Better stripping of prefix for Solaris package install needs to + remove + /usr/local as package installs there by default -2003-03-24 17:44 undrgrid +2003-03-24 17:45 undrgrid - * Makefile.am, pkg/solaris/.cvsignore, pkg/solaris/pkginfo.in, - plugins/check_disk.c: Minor changes to build for Solaris packages + * [r459] Makefile.am, pkg/solaris, pkg/solaris/.cvsignore, + pkg/solaris/pkginfo.in, plugins/check_disk.c: + Minor changes to build for Solaris packages 2003-03-24 16:23 tonvoon - * plugins/check_procs.c: Use max_state + * [r458] plugins/check_procs.c: + Use max_state 2003-03-24 02:57 tonvoon - * tools/: mail_error, sfsnapshot: PATH set in correct place and - extra comments + * [r457] tools/mail_error, tools/sfsnapshot: + PATH set in correct place and extra comments 2003-03-24 02:44 tonvoon - * tools/: mail_error, sfsnapshot: Bug fixes + * [r456] tools/mail_error, tools/sfsnapshot: + Bug fixes 2003-03-24 02:21 tonvoon - * tools/mail_error: Sends email if non-zero return code from - command + * [r455] tools/mail_error: + Sends email if non-zero return code from command 2003-03-24 02:19 tonvoon - * tools/sfsnapshot: Error code depending on number of files - generated + * [r454] tools/sfsnapshot: + Error code depending on number of files generated 2003-03-24 01:18 tonvoon - * lib/ls-mntd-fs.m4: Using coreutils 4.5.11 version to fix Darwin - problem + * [r453] lib/ls-mntd-fs.m4: + Using coreutils 4.5.11 version to fix Darwin problem -2003-03-24 00:40 tonvoon +2003-03-24 00:42 tonvoon - * REQUIREMENTS: Add NSClient requirement for check_nt - -2003-03-24 00:39 tonvoon - - * plugins/check_nt.c: Reference to web site to get NSClient + * [r452] REQUIREMENTS: + Add NSClient requirement for check_nt 2003-03-24 00:26 tonvoon - * plugins/check_nt.c: Reference to web site to get NSClient + * [r450] plugins/check_nt.c: + Reference to web site to get NSClient 2003-03-23 07:01 undrgrid - * Makefile.am, autogen.sh, configure.in, lib/Makefile.am, - pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Solaris package build - system + * [r449] Makefile.am, autogen.sh, configure.in, lib/Makefile.am, + pkg, pkg/solaris, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: + Solaris package build system 2003-03-23 06:20 kdebisschop - * plugins/check_disk.c: can once again exclude indiviual - path/partitions + * [r448] plugins/check_disk.c: + can once again exclude indiviual path/partitions 2003-03-23 06:11 kdebisschop - * plugins/check_disk.c: add -X to exclude FS type, now works with - more than one path/dev specified + * [r447] plugins/check_disk.c: + add -X to exclude FS type, now works with more than one path/dev + specified 2003-03-22 13:23 kdebisschop - * plugins/utils.c: declaration must precede printf - -2003-03-21 20:21 tonvoon - - * configure.in: Stupid bug! + * [r446] plugins/utils.c: + declaration must precede printf 2003-03-21 14:08 kdebisschop - * plugins/check_disk.c: checkpoint, allows selecting devices and - paths now + * [r444] plugins/check_disk.c: + checkpoint, allows selecting devices and paths now 2003-03-21 14:04 kdebisschop - * configure.in: instructions for posting plugin version number + * [r443] configure.in: + instructions for posting plugin version number 2003-03-19 23:44 kdebisschop - * plugins/check_by_ssh.c: allow to specify -1 and -2 for protocol - version - -2003-03-19 22:42 tonvoon - - * configure.in: Tru64 df support (Paul Clayton) + * [r442] plugins/check_by_ssh.c: + allow to specify -1 and -2 for protocol version 2003-03-19 13:01 kdebisschop - * plugins/: utils.c, utils.h: make state_text a function + * [r440] plugins/utils.c, plugins/utils.h: + make state_text a function 2003-03-19 12:59 kdebisschop - * lib/mountlist.c, plugins/check_disk.c: check_disk working with - mountlist.c + * [r439] lib/mountlist.c, plugins/check_disk.c: + check_disk working with mountlist.c 2003-03-19 02:28 kdebisschop - * Makefile.am, configure.in: subst.* was replaced by dist-hook + * [r438] Makefile.am, configure.in: + subst.* was replaced by dist-hook 2003-03-19 02:27 kdebisschop - * subst.in, subst.sh: these were replaced by dist-hook + * [r437] subst.in, subst.sh: + these were replaced by dist-hook 2003-03-18 15:18 kdebisschop - * configure.in: running the AFS macro causes newer AC/AM to barf + * [r436] configure.in: + running the AFS macro causes newer AC/AM to barf 2003-03-18 09:02 kdebisschop - * configure.in: afs checking + * [r435] configure.in: + afs checking 2003-03-18 08:50 kdebisschop - * lib/: ls-mntd-fs.m4, afs.m4: use AC_DEFINE_UNQOUTED + * [r434] lib/afs.m4, lib/ls-mntd-fs.m4: + use AC_DEFINE_UNQOUTED 2003-03-18 08:47 kdebisschop - * lib/ls-mntd-fs.m4: stop warning on autoheader 2.13 + * [r433] lib/ls-mntd-fs.m4: + stop warning on autoheader 2.13 2003-03-18 07:57 kdebisschop - * plugins/: netutils.c, netutils.h: common.h was doubly included + * [r432] plugins/netutils.c, plugins/netutils.h: + common.h was doubly included 2003-03-18 07:57 kdebisschop - * plugins/common.h: use enum instead of define, remove some cruft - from old snprintf implementation + * [r431] plugins/common.h: + use enum instead of define, remove some cruft from old snprintf + implementation 2003-03-18 07:48 kdebisschop - * configure.in, lib/Makefile.am, plugins/check_disk.c: use GNU - fileutils for check_disk + * [r430] configure.in, lib/Makefile.am, plugins/check_disk.c: + use GNU fileutils for check_disk 2003-03-18 07:47 kdebisschop - * lib/: afs.m4, fstypename.m4, fsusage.c, fsusage.h, fsusage.m4, - ls-mntd-fs.m4, mountlist.c, mountlist.h: from GNU fileutils for - check_disk + * [r429] lib/afs.m4, lib/fstypename.m4, lib/fsusage.c, + lib/fsusage.h, lib/fsusage.m4, lib/ls-mntd-fs.m4, + lib/mountlist.c, lib/mountlist.h: + from GNU fileutils for check_disk -2003-03-17 22:22 tonvoon +2003-03-17 22:24 tonvoon - * plugins-scripts/: check_oracle.sh: Allow default Oracle home from - oratab (reported by Walbert Oberngruber) + * [r428] plugins-scripts/check_oracle.sh: + Allow default Oracle home from oratab (reported by Walbert + Oberngruber) 2003-03-16 23:54 undrgrid - * configure.in: Modified to automatically enable getaddrinfo - emulation if lwres is not used and getaddrinfo is not found in - the system. + * [r427] configure.in: + Modified to automatically enable getaddrinfo emulation if lwres + is not used and + getaddrinfo is not found in the system. 2003-03-16 23:28 undrgrid - * plugins/: check_tcp.c, netutils.c, netutils.h: Applied patch - #660973 for tcp refusals + * [r426] plugins/check_tcp.c, plugins/netutils.c, + plugins/netutils.h: + Applied patch #660973 for tcp refusals 2003-03-15 01:28 undrgrid - * configure.in: Left over debug define + * [r425] configure.in: + Left over debug define 2003-03-15 01:25 undrgrid - * configure.in, lib/Makefile.am, lib/getaddrinfo.c, + * [r424] configure.in, lib/Makefile.am, lib/getaddrinfo.c, lib/getaddrinfo.h, lib/gethostbyname.c, lib/gethostbyname.h, plugins/Makefile.am, plugins/getaddrinfo.c, plugins/getaddrinfo.h, plugins/gethostbyname.c, plugins/gethostbyname.h, plugins/netutils.c, plugins/netutils.h, - plugins/utils.c, plugins/utils.h: Spent the day working on - backwards compatability using getaddrinfo() Moved getaddrinfo.? - and gethostbyname.? from lib/ to plugins/ due to problems with - compiling into the libnagiosplug.a as it required linking against - socket libraries which are unneeded except for network based - plugins. This code should hopefully happily work for all systems - and has been tested prior to commit on Debian GNU/Linux, SPARC - Solaris 7 and SPARC Solaris 9. + plugins/utils.c, plugins/utils.h: + Spent the day working on backwards compatability using + getaddrinfo() + Moved getaddrinfo.? and gethostbyname.? from lib/ to plugins/ due + to + problems with compiling into the libnagiosplug.a as it required + linking + against socket libraries which are unneeded except for network + based + plugins. + This code should hopefully happily work for all systems and has + been tested + prior to commit on Debian GNU/Linux, SPARC Solaris 7 and SPARC + Solaris 9. 2003-03-14 13:28 kdebisschop - * plugins-scripts/check_ntp.pl: add timeout, fix taint chacking - diom + * [r423] plugins-scripts/check_ntp.pl: + add timeout, fix taint chacking diom 2003-03-13 22:20 undrgrid - * .cvsignore, configure.in, lib/Makefile.am: Working out issues - with getaddrinfo emulation build environment + * [r422] ., .cvsignore, configure.in, lib/Makefile.am: + Working out issues with getaddrinfo emulation build environment 2003-03-13 21:14 tonvoon - * plugins/: check_dns.c, check_http.c, check_tcp.c: Strip leading - spaces in perf data + * [r421] plugins/check_dns.c, plugins/check_http.c, + plugins/check_tcp.c: + Strip leading spaces in perf data 2003-03-13 21:10 tonvoon - * plugins/check_smtp.c: Perf data without leading spaces and fix - ANSI C complaint about \n + * [r420] plugins/check_smtp.c: + Perf data without leading spaces and fix ANSI C complaint about + \n 2003-03-13 20:33 tonvoon - * plugins/check_tcp.c: Fix compiler warnings re progname + * [r419] plugins/check_tcp.c: + Fix compiler warnings re progname 2003-03-13 06:52 undrgrid - * depcomp: Removed auto-tools script that automake adds + * [r418] depcomp: + Removed auto-tools script that automake adds 2003-03-13 06:51 undrgrid - * .cvsignore, configure.in, install-sh, missing, mkinstalldirs, - plugins/.cvsignore, plugins/Makefile.am, plugins/common.h, - plugins/common.h.in, plugins/netutils.h, plugins/netutils.h.in, - plugins/popen.h, plugins/popen.h.in, plugins/utils.c, - plugins/utils.h, plugins/utils.h.in, plugins/version.h.in: - Updated cvs ignore files to reflect changes Moved header files - from being ran through configure to standard Removed auto-tools - scripts that get added by automake + * [r417] ., .cvsignore, configure.in, install-sh, missing, + mkinstalldirs, plugins, plugins/.cvsignore, plugins/Makefile.am, + plugins/common.h, plugins/common.h.in, plugins/netutils.h, + plugins/netutils.h.in, plugins/popen.h, plugins/popen.h.in, + plugins/utils.c, plugins/utils.h, plugins/utils.h.in, + plugins/version.h.in: + Updated cvs ignore files to reflect changes + Moved header files from being ran through configure to standard + Removed auto-tools scripts that get added by automake 2003-03-13 06:00 kdebisschop - * plugins/negate.c: negate must be POSIXly correct in handling - options, else wrapped options get passed to it + * [r416] plugins/negate.c: + negate must be POSIXly correct in handling options, else wrapped + options get passed to it 2003-03-13 05:59 undrgrid - * configure.in: Removed --with-ipv6 configure option so it - determines IPv6 availablity completely on it's own per suggestion - by Karl - -2003-03-13 05:29 kdebisschop - - * plugins/negate.c: negate must be POSIXly correct in handling - options, else wrapped options get passed to it + * [r415] configure.in: + Removed --with-ipv6 configure option so it determines IPv6 + availablity + completely on it's own per suggestion by Karl 2003-03-12 22:13 undrgrid - * plugins/check_tcp.c: doco standarization + * [r413] plugins/check_tcp.c: + doco standarization 2003-03-12 19:50 undrgrid - * configure.in, plugins-scripts/subst.in: Just a lil namespace - clean-up + * [r412] configure.in, plugins-scripts/subst.in: + Just a lil namespace clean-up 2003-03-12 17:42 undrgrid - * configure.in: Minor fix to --with-ipv6 behavior + * [r411] configure.in: + Minor fix to --with-ipv6 behavior 2003-03-12 17:11 undrgrid - * autogen.sh, configure.in, plugins/utils.c, plugins/utils.h.in: + * [r410] autogen.sh, configure.in, plugins/utils.c, + plugins/utils.h.in: Added autogen.sh script that rebuilds using autotools and runs - configure Modified configure.in to include some debug build - option info at the end of the scripts execution. Can be removed - by release time. Modified configure.in to include a --with-ipv6 - option Default build is without IPv6 support now to enable you - need to use the --with-ipv6 command line option to configure. + configure + Modified configure.in to include some debug build option info at + the end + of the scripts execution. Can be removed by release time. + Modified configure.in to include a --with-ipv6 option + Default build is without IPv6 support now to enable you need to + use the + --with-ipv6 command line option to configure. Modified plugins/utils.* to use USE_IPV6 2003-03-12 07:05 kdebisschop - * plugins/check_disk.c: doco standarization + * [r409] plugins/check_disk.c: + doco standarization 2003-03-12 06:44 kdebisschop - * plugins/check_disk.c: errors for statfs + * [r408] plugins/check_disk.c: + errors for statfs 2003-03-12 06:41 kdebisschop - * plugins/check_smtp.c: comment/doco cleanup for embeeded doc work, - control STMP command via options instead of defines + * [r407] plugins/check_smtp.c: + comment/doco cleanup for embeeded doc work, control STMP command + via options instead of defines 2003-03-12 06:38 kdebisschop - * configure.in: version increase, statfs work + * [r406] configure.in: + version increase, statfs work 2003-03-12 02:47 undrgrid - * plugins/.cvsignore: Add some more extra plugins + * [r405] plugins, plugins/.cvsignore: + Add some more extra plugins 2003-03-12 02:29 undrgrid - * plugins/check_dig.c: Code clean-up + * [r404] plugins/check_http.c: + Clean up of output from plugin 2003-03-12 02:29 undrgrid - * plugins/check_http.c: Clean up of output from plugin - -2003-03-12 02:24 undrgrid - - * plugins/: check_udp.c, check_ldap.c, check_http.c: Code clean-up + * [r403] plugins/check_dig.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_udp.c: + Code clean-up 2003-03-12 02:23 undrgrid - * plugins/check_tcp.c: Code cleanup + * [r402] plugins/check_tcp.c: + Code cleanup 2003-03-12 00:45 tonvoon - * plugins/check_dns.c: Removed is_host checks to speed up code. - Fixed timings so no spaces + * [r401] plugins/check_dns.c: + Removed is_host checks to speed up code. Fixed timings so no + spaces 2003-03-12 00:08 tonvoon - * plugins/check_dns.c: Timings in milliseconds and nicer output + * [r400] plugins/check_dns.c: + Timings in milliseconds and nicer output 2003-03-11 22:51 tonvoon - * plugins-scripts/.cvsignore: Add script ignores + * [r399] plugins-scripts, plugins-scripts/.cvsignore: + Add script ignores 2003-03-11 22:36 tonvoon - * plugins/negate.c: Remove getopt_long checks + * [r398] plugins/negate.c: + Remove getopt_long checks 2003-03-11 22:34 tonvoon - * plugins/negate.c: Fixed reading too many argv parameters and - changed to asprintf - -2003-03-11 22:29 tonvoon - - * plugins/negate.c: Fixed reading too many argv parameters and - changed to asprintf + * [r397] plugins/negate.c: + Fixed reading too many argv parameters and changed to asprintf 2003-03-11 22:22 tonvoon - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_fping.c, check_hpjd.c, check_http.c, check_ide-smart.c, - check_ldap.c, check_load.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_nagios.c, check_nt.c, check_nwstat.c, - check_overcr.c, check_pgsql.c, check_ping.c, check_procs.c, - check_radius.c, check_real.c, check_smtp.c, check_snmp.c, - check_ssh.c, check_swap.c, check_tcp.c, check_time.c, - check_udp.c, check_ups.c, check_users.c, check_vsz.c: Remove - getopt_long checks + * [r396] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c: + Remove getopt_long checks 2003-03-11 22:09 undrgrid - * configure.in: Fixed some ping6 variables + * [r395] configure.in: + Fixed some ping6 variables 2003-03-11 18:32 undrgrid - * configure.in: Minor change to Karl's statfs check Inclusion of - ICMPv6 ping tests to define PING6_COMMAND Minor fix to ps syntax - checking to fix bug I introduced last nite + * [r394] configure.in: + Minor change to Karl's statfs check + Inclusion of ICMPv6 ping tests to define PING6_COMMAND + Minor fix to ps syntax checking to fix bug I introduced last nite 2003-03-11 07:04 undrgrid - * Makefile.am, configure.in: Removed acconfig.h from EXTRA_DIST + * [r393] Makefile.am, configure.in: + Removed acconfig.h from EXTRA_DIST Fixed problem with test in SWAP_FORMAT and SWAP_COMMAND 2003-03-11 06:44 kdebisschop - * configure.in, plugins/check_disk.c: use statfs for check_disk - (still needs fs scan) + * [r392] configure.in, plugins/check_disk.c: + use statfs for check_disk (still needs fs scan) 2003-03-11 06:03 undrgrid - * acconfig.h, configure.in: Finishing clean-up of configure.in + * [r391] acconfig.h, configure.in: + Finishing clean-up of configure.in Removing acconfig.h as it's no longer needed 2003-03-10 23:58 undrgrid - * acconfig.h, configure.in: Cleaned up configure for PS and PING to - produce cleaner config.h + * [r390] acconfig.h, configure.in: + Cleaned up configure for PS and PING to produce cleaner config.h 2003-03-09 18:13 undrgrid - * plugins/common.h.in: Make sure sys/socket.h is explicitly - included if HAVE_SYS_SOCKET_H is defined + * [r389] plugins/common.h.in: + Make sure sys/socket.h is explicitly included if + HAVE_SYS_SOCKET_H is defined 2003-03-09 10:39 tonvoon - * plugins/check_disk.c: Implement error-only option for check_disk - (Ian Duggan) - -2003-03-09 10:36 tonvoon - - * plugins/check_disk.c: Implement error-only option for check_disk - (Ian Duggan) + * [r388] plugins/check_disk.c: + Implement error-only option for check_disk (Ian Duggan) 2003-03-08 12:08 tonvoon - * plugins/check_disk.c: Fix AIX /proc filesystem (Ian Duggan) - -2003-03-08 12:05 tonvoon - - * plugins/check_disk.c: Fix AIX /proc filesystem (Ian Duggan) + * [r387] plugins/check_disk.c: + Fix AIX /proc filesystem (Ian Duggan) 2003-03-08 11:44 tonvoon - * configure.in: snprintf checks in configure.in like samba + * [r386] configure.in: + snprintf checks in configure.in like samba 2003-03-08 02:27 undrgrid - * plugins/check_dns.c: Modified code to call is_addr() rather than - is_dotted_quad() with the new AF indepdent function routines + * [r385] plugins/check_dns.c: + Modified code to call is_addr() rather than is_dotted_quad() with + the + new AF indepdent function routines 2003-03-08 02:26 undrgrid - * plugins/: netutils.c, netutils.h.in, utils.c, utils.h.in: AF - indepedent routines introduced. Modifed process_request() & - my_connect() parameters to make 'proto' type 'int' rather - than 'char *' and use IPPROTO_* POSIX values. Removed - is_dotted_quad() & my_inet_aton() functions Added is_addr(), - is_inet_addr(), is_inet6_addr() and resolve_host_or_addr() - functions to check whether it is a valid IP address Modified - is_host() to call is_addr() and is_hostname() + * [r384] plugins/netutils.c, plugins/netutils.h.in, + plugins/utils.c, plugins/utils.h.in: + AF indepedent routines introduced. + Modifed process_request() & my_connect() parameters to make + 'proto' type + 'int' rather than 'char *' and use IPPROTO_* POSIX values. + Removed is_dotted_quad() & my_inet_aton() functions + Added is_addr(), is_inet_addr(), is_inet6_addr() and + resolve_host_or_addr() + functions to check whether it is a valid IP address + Modified is_host() to call is_addr() and is_hostname() 2003-03-08 02:02 tonvoon - * tools/sfsnapshot: Need to remove configure.in + * [r383] tools/sfsnapshot: + Need to remove configure.in 2003-03-08 01:59 tonvoon - * lib/Makefile.am, lib/snprintf.c, plugins/Makefile.am, - plugins/snprintf.c: Move snprintf into lib + * [r382] lib/Makefile.am, lib/snprintf.c, plugins/Makefile.am, + plugins/snprintf.c: + Move snprintf into lib 2003-03-08 01:48 tonvoon - * tools/sfsnapshot: Have to run through whole automake procedure as - datestamp in RELEASE variable + * [r381] tools/sfsnapshot: + Have to run through whole automake procedure as datestamp in + RELEASE variable 2003-03-08 01:13 tonvoon - * tools/sfsnapshot: Added automake parameters for config.sub and - config.guess + * [r380] tools/sfsnapshot: + Added automake parameters for config.sub and config.guess 2003-03-08 00:57 tonvoon - * tools/sfsnapshot: Fixed production OUT variable + * [r379] tools/sfsnapshot: + Fixed production OUT variable 2003-03-08 00:55 tonvoon - * tools/sfsnapshot: Adds MD5SUM file, creates multiple branch - snapshots and doesn't rerun configure/automake/autoconf - unnecessarily + * [r378] tools/sfsnapshot: + Adds MD5SUM file, creates multiple branch snapshots and doesn't + rerun configure/automake/autoconf unnecessarily -2003-03-08 00:21 tonvoon +2003-03-08 00:23 tonvoon - * Makefile.am: Use Makefile's variables (to support a shortcut in - sfsnapshot) + * [r377] Makefile.am: + Use Makefile's variables (to support a shortcut in sfsnapshot) 2003-03-07 22:11 undrgrid - * configure.in, lib/Makefile.am, lib/getaddrinfo.c, + * [r376] configure.in, lib/Makefile.am, lib/getaddrinfo.c, lib/getaddrinfo.h, lib/gethostbyname.c, lib/gethostbyname.h, plugins/check_pgsql.c, plugins/common.h.in, plugins/netutils.c, - plugins/netutils.h.in, tools/setup: Added getaddrinfo.[ch] & - gethostbyname.[ch] to provide RFC2553 functions if missing in - system libs and lwres not present Moved all references to netdb.h - and sys/socket.h into common.h.in Modified automake call in - tools/setup to include adding missing files so config.sub - and config.guess will be available - -2003-03-07 20:16 tonvoon - - * plugins/check_nt.c: Make output for CPU load nicer + plugins/netutils.h.in, tools/setup: + Added getaddrinfo.[ch] & gethostbyname.[ch] to provide RFC2553 + functions + if missing in system libs and lwres not present + Moved all references to netdb.h and sys/socket.h into common.h.in + Modified automake call in tools/setup to include adding missing + files + so config.sub and config.guess will be available 2003-03-07 07:45 kdebisschop - * plugins/check_smtp.c: millisecond timing and perf data + * [r374] plugins/check_smtp.c: + millisecond timing and perf data -2003-03-07 07:15 kdebisschop +2003-03-07 07:17 kdebisschop - * plugins/: check_smtp.c: whole timer loop was on the wrong side of - connection close code + * [r373] plugins/check_smtp.c: + whole timer loop was on the wrong side of connection close code 2003-03-07 06:43 kdebisschop - * plugins/check_udp.c: fix for -H invocation of hostname - -2003-03-07 06:40 kdebisschop - - * plugins/check_udp.c: fix for -H invocation of hostname + * [r372] plugins/check_udp.c: + fix for -H invocation of hostname 2003-03-06 06:40 undrgrid - * acinclude.m4, configure.in: Adds --with-lwres and - --enable-emulate-getaddrinfo but are not used in any of the code - at this time. Has a check for IPv6 support but only runs if using - the emulate-getaddrinfo routines, this needs to be modified. !!! - I need input from results of this run on various platforms to see - what results are seen in plugins/config.h so please help test !!! + * [r371] acinclude.m4, configure.in: + Adds --with-lwres and --enable-emulate-getaddrinfo but are not + used in any of + the code at this time. Has a check for IPv6 support but only runs + if using the + emulate-getaddrinfo routines, this needs to be modified. + !!! I need input from results of this run on various platforms to + see what + results are seen in plugins/config.h so please help test !!! 2003-03-05 07:27 kdebisschop - * plugins-scripts/check_ntp.pl: add "m" to regex for minutes - -2003-03-05 05:59 sghosh - - * plugins/check_smtp.c: remove race condition for a long HELO - -2003-03-05 04:38 sghosh - - * command.cfg.in: corrected snmp commands - -2003-03-05 04:37 sghosh - - * plugins-scripts/check_ntp.pl: regex fix per Marc Poulin + * [r370] plugins-scripts/check_ntp.pl: + add "m" to regex for minutes 2003-03-05 00:17 tonvoon - * plugins/check_http.c: check_http min size option (680467 - Dave - Viner) + * [r365] plugins/check_http.c: + check_http min size option (680467 - Dave Viner) 2003-03-04 23:56 tonvoon - * plugins/check_nt.c: Make output message for CPU Load a bit nicer + * [r364] plugins/check_nt.c: + Make output message for CPU Load a bit nicer 2003-03-04 23:35 tonvoon - * tools/sfsnapshot: To create nagiosplug daily snapshots on SF + * [r363] tools/sfsnapshot: + To create nagiosplug daily snapshots on SF 2003-03-03 03:49 kdebisschop - * plugins/check_ping.c: accept comma-delimted list of hosts for - checking if a multihomed host is alive + * [r362] plugins/check_ping.c: + accept comma-delimted list of hosts for checking if a multihomed + host is alive 2003-03-02 06:01 kdebisschop - * plugins/check_ping.c: add logic to check multiple servers + * [r361] plugins/check_ping.c: + add logic to check multiple servers 2003-03-02 04:59 kdebisschop - * ChangeLog: update from CVS + * [r360] ChangeLog: + update from CVS 2003-03-02 04:58 kdebisschop - * configure.in, nagios-plugins.spec.in: adjustments to remove beta - tagging + * [r359] configure.in, nagios-plugins.spec.in: + adjustments to remove beta tagging 2003-03-02 04:32 kdebisschop - * ChangeLog: update from CVS + * [r358] ChangeLog: + update from CVS 2003-03-01 05:09 kdebisschop - * nagios-plugins.spec.in: we were missing some docs in the RPM + * [r357] nagios-plugins.spec.in: + we were missing some docs in the RPM 2003-02-23 17:11 sghosh - * REQUIREMENTS: Novell requirements + * [r356] REQUIREMENTS: + Novell requirements 2003-02-23 17:10 sghosh - * contrib/check_bgpstate.pl: removed community string in CRIT - message + * [r355] contrib/check_bgpstate.pl: + removed community string in CRIT message 2003-02-22 19:06 tonvoon - * configure.in: Solaris and Unixware labels round the wrong way for - swap command + * [r354] configure.in: + Solaris and Unixware labels round the wrong way for swap command 2003-02-22 13:01 kdebisschop - * Makefile.am: provide target for nagios-plugins.spec + * [r353] Makefile.am: + provide target for nagios-plugins.spec 2003-02-22 07:27 kdebisschop - * Makefile.am: add CODING FAQ LEGAL to distribution tarball + * [r352] Makefile.am: + add CODING FAQ LEGAL to distribution tarball 2003-02-21 21:59 tonvoon - * plugins/check_http.c: Fixed coredump with unallocated string + * [r351] plugins/check_http.c: + Fixed coredump with unallocated string 2003-02-21 21:46 tonvoon - * plugins/check_dns.c: Strip leading spaces on dns return value - (689563 - Simon L Nielsen) + * [r350] plugins/check_dns.c: + Strip leading spaces on dns return value (689563 - Simon L + Nielsen) 2003-02-20 03:16 kdebisschop - * plugins-scripts/check_disk_smb.pl: option regexs need to include - ^ and $ + * [r348] plugins-scripts/check_disk_smb.pl: + option regexs need to include ^ and $ 2003-02-19 22:56 tonvoon - * lib/Makefile.am: Removing getloadavg.m4 from dist + * [r347] lib/Makefile.am: + Removing getloadavg.m4 from dist 2003-02-19 08:36 kdebisschop - * INSTALL, configure.in, lib/getloadavg.m4, tools/setup: remove - getloadavg.m4 + * [r346] INSTALL, configure.in, lib/getloadavg.m4, tools/setup: + remove getloadavg.m4 2003-02-19 00:45 tonvoon - * Makefile.am, configure.in, getloadavg.m4, lib/Makefile.am, + * [r345] Makefile.am, configure.in, getloadavg.m4, lib/Makefile.am, lib/getloadavg.c, lib/getloadavg.m4, plugins/Makefile.am, - plugins/getloadavg.c: Move getloadavg to lib directory. Must run - "aclocal -I lib" + plugins/getloadavg.c: + Move getloadavg to lib directory. Must run "aclocal -I lib" 2003-02-18 23:00 kdebisschop - * plugins/check_pgsql.c: spurious backslash escape + * [r344] plugins/check_pgsql.c: + spurious backslash escape 2003-02-18 22:56 kdebisschop - * configure.in: set tag for beta3, fix pgsql detection + * [r343] configure.in: + set tag for beta3, fix pgsql detection 2003-02-18 22:24 kdebisschop - * plugins/check_udp.c: never exited getopt loop + * [r342] plugins/check_udp.c: + never exited getopt loop 2003-02-18 22:20 kdebisschop - * plugins/check_tcp.c: failed if header was more than 1023 bytes + * [r341] plugins/check_tcp.c: + failed if header was more than 1023 bytes 2003-02-18 22:10 tonvoon - * plugins/check_load.c: Fixed the output messages (Bug 688729 - - Jayjay) + * [r340] plugins/check_load.c: + Fixed the output messages (Bug 688729 - Jayjay) 2003-02-18 21:58 tonvoon - * Makefile.am: Add SUPPORT file to distribution + * [r339] Makefile.am: + Add SUPPORT file to distribution 2003-02-18 21:56 tonvoon - * plugins/check_http.c: Fixed compiler warning and increased the - SSL random key for a Solaris PRNG problem + * [r338] plugins/check_http.c: + Fixed compiler warning and increased the SSL random key for a + Solaris PRNG problem 2003-02-18 05:38 kdebisschop - * configure.in: remainder of ps fix for UnixWare, and move [] in - if/elif to indicate m4 quoting instead of test invocation + * [r337] configure.in: + remainder of ps fix for UnixWare, and move [] in if/elif to + indicate m4 quoting instead of test invocation 2003-02-18 04:05 sghosh - * contrib/check_appletalk.pl: Appletalk ping plugin + * [r336] contrib/check_appletalk.pl: + Appletalk ping plugin 2003-02-18 04:04 sghosh - * plugins/check_snmp.c: OID type prefix patch [Patches-679403] + * [r335] plugins/check_snmp.c: + OID type prefix patch [Patches-679403] 2003-02-18 03:46 sghosh - * plugins/check_swap.c: support for Large swap sizes + * [r334] plugins/check_swap.c: + support for Large swap sizes 2003-02-18 03:17 sghosh - * configure.in: regex fix to catch *BSD swapinfo and not HP-UX - error and memory/file swap in addition to device for HP-UX + * [r333] configure.in: + regex fix to catch *BSD swapinfo and not HP-UX error and + memory/file swap in addition to device for HP-UX 2003-02-17 22:01 kdebisschop - * configure.in: typo in testing uname output + * [r332] configure.in: + typo in testing uname output 2003-02-17 21:57 kdebisschop - * configure.in: ping and swap for unixware + * [r331] configure.in: + ping and swap for unixware 2003-02-17 21:04 kdebisschop - * configure.in: library search dirs are part of LDFLAGS + * [r330] configure.in: + library search dirs are part of LDFLAGS 2003-02-17 19:11 sghosh - * REQUIREMENTS: location updates + * [r329] REQUIREMENTS: + location updates 2003-02-16 08:41 tonvoon - * plugins/Makefile.am: Fixed dependencies for check_nt + * [r328] plugins/Makefile.am: + Fixed dependencies for check_nt 2003-02-16 08:25 tonvoon - * plugins/check_nt.c: Coredump if no variable set (reported by Marc - C. Poulin) + * [r327] plugins/check_nt.c: + Coredump if no variable set (reported by Marc C. Poulin) 2003-02-16 02:46 egalstad - * contrib/check_dhcp.c: Interface patch byor Clemens Resen + * [r326] contrib/check_dhcp.c: + Interface patch byor Clemens Resen 2003-02-16 02:18 sghosh - * plugins-scripts/check_ntp.pl: all alphanumeric accepted for refid - on ntpq + * [r325] plugins-scripts/check_ntp.pl: + all alphanumeric accepted for refid on ntpq 2003-02-12 22:32 tonvoon - * plugins/.cvsignore: Added extra plugins + * [r324] plugins, plugins/.cvsignore: + Added extra plugins 2003-02-12 22:30 tonvoon - * lib/.cvsignore: Add ignore files + * [r323] lib, lib/.cvsignore: + Add ignore files 2003-02-12 22:29 tonvoon - * plugins/negate.c: Remove unnecessary \ and fix coredump with no - parameters specified + * [r322] plugins/negate.c: + Remove unnecessary \ and fix coredump with no parameters + specified 2003-02-12 22:27 tonvoon - * plugins/check_http.c: Remove unnecessary \ - complaints from - Tru64's cc compiler + * [r321] plugins/check_http.c: + Remove unnecessary \ - complaints from Tru64's cc compiler 2003-02-12 22:21 tonvoon - * configure.in: Inadequate quoting for PS_FORMAT & removal of grep - "*** for Tru64 + * [r320] configure.in: + Inadequate quoting for PS_FORMAT & removal of grep "*** for Tru64 2003-02-12 04:36 sghosh - * command.cfg.in: forced ntpq jitter check + * [r319] command.cfg.in: + forced ntpq jitter check 2003-02-12 04:32 sghosh - * plugins-scripts/check_ifoperstatus.pl: added timeout alarm + * [r318] plugins-scripts/check_ifoperstatus.pl: + added timeout alarm 2003-02-12 04:30 sghosh - * plugins-scripts/check_ntp.pl: fixed regex for stratum1 peer, - added logic for failed ntpq call(e.g. sntp host) + * [r317] plugins-scripts/check_ntp.pl: + fixed regex for stratum1 peer, added logic for failed ntpq + call(e.g. sntp host) 2003-02-11 00:47 tonvoon - * plugins/check_mysql.c: Patch by Dave Viner for seg fault on RH - 7.3 (655903) + * [r316] plugins/check_mysql.c: + Patch by Dave Viner for seg fault on RH 7.3 (655903) 2003-02-10 23:59 tonvoon - * configure.in: Update with references to REQUIREMENTS + * [r315] configure.in: + Update with references to REQUIREMENTS 2003-02-10 23:58 tonvoon - * Requirements: Remove file, superceded by REQUIREMENTS + * [r314] Requirements: + Remove file, superceded by REQUIREMENTS 2003-02-10 23:34 tonvoon - * plugins/: getopt.c, getopt.h, getopt1.c: Removing getopt files - - now in new lib directory + * [r313] plugins/getopt.c, plugins/getopt.h, plugins/getopt1.c: + Removing getopt files - now in new lib directory 2003-02-10 23:32 tonvoon - * lib/: Makefile.am, getopt.c, getopt.h, getopt1.c: New directory - for common library files + * [r312] lib, lib/Makefile.am, lib/getopt.c, lib/getopt.h, + lib/getopt1.c: + New directory for common library files 2003-02-10 23:28 tonvoon - * plugins/common.h.in: Added in a define for HAVE_GETOPT_H for - backwards compatibility + * [r311] plugins/common.h.in: + Added in a define for HAVE_GETOPT_H for backwards compatibility 2003-02-10 23:27 tonvoon - * plugins/Makefile.am: Remove unnecessary getopt references and - link in lib directory + * [r310] plugins/Makefile.am: + Remove unnecessary getopt references and link in lib directory 2003-02-10 23:26 tonvoon - * configure.in: Removing checks for getopt.h - now always - available. Also support lib dir + * [r309] configure.in: + Removing checks for getopt.h - now always available. Also support + lib dir 2003-02-10 23:24 tonvoon - * Makefile.am: Adding lib directory for getopts change + * [r308] Makefile.am: + Adding lib directory for getopts change 2003-02-10 23:08 tonvoon - * configure.in: Fixed Tru64 ps command (Bug 669585 - Paula Arnold) + * [r307] configure.in: + Fixed Tru64 ps command (Bug 669585 - Paula Arnold) 2003-02-10 18:36 undrgrid - * plugins/check_ssh.c: Added argc checks before attempting to - access argv[] - + * [r306] plugins/check_ssh.c: + Added argc checks before attempting to access argv[] + Corrected return codes and output 2003-02-10 14:18 undrgrid - * plugins/check_ssh.c: Revised code to use resolving and connection - code in utils.c and netutils.c rather than its own functions. + * [r305] plugins/check_ssh.c: + Revised code to use resolving and connection code in utils.c and + netutils.c rather than its own functions. Corrected code to properly handle input of server hostname and - port on commandline without option flags. + port on + commandline without option flags. 2003-02-10 04:49 kdebisschop - * contrib/check_fping_in.c: this plugin is in core as check_fping + * [r304] contrib/check_fping_in.c: + this plugin is in core as check_fping 2003-02-09 18:59 undrgrid - * tools/setup: Reordered program calls so autoheader was called - before automake thus getting rid of errors for header files not - being present when automake was called. Also puts it inline with - documentation in INSTALL & INSTALLING + * [r303] tools/setup: + Reordered program calls so autoheader was called before automake + thus + getting rid of errors for header files not being present when + automake + was called. Also puts it inline with documentation in + INSTALL & INSTALLING 2003-02-09 14:20 sghosh - * contrib/: check_adptraid.sh, check_compaq_insight.pl, - check_file_age.pl: new plugins + * [r302] contrib/check_adptraid.sh, + contrib/check_compaq_insight.pl, contrib/check_file_age.pl: + new plugins 2003-02-09 14:18 sghosh - * contrib/: README.TXT, readme.txt: file rename + * [r301] contrib/README.TXT, contrib/readme.txt: + file rename 2003-02-09 14:16 sghosh - * contrib/: check_remote_nagios_status.pl, check_wins.pl, - sched_downtime.pl: more contribs + * [r300] contrib/check_remote_nagios_status.pl, + contrib/check_wins.pl, contrib/sched_downtime.pl: + more contribs 2003-02-09 14:03 sghosh - * contrib/tarballs/: fetchlog-0.92.tar.gz, fetchlog-0.94.tar.gz: + * [r299] contrib/tarballs/fetchlog-0.92.tar.gz, + contrib/tarballs/fetchlog-0.94.tar.gz: new version -2003-02-09 12:54 kdebisschop +2003-02-09 12:56 kdebisschop - * CODING, README: spell check + * [r298] CODING, README: + spell check 2003-02-09 12:36 kdebisschop - * FAQ: spell check + * [r297] FAQ: + spell check 2003-02-09 12:17 sghosh - * SUPPORT: ispell + * [r296] SUPPORT: + ispell 2003-02-08 06:00 kdebisschop - * plugins/check_pgsql.c: use enum instead of define + * [r295] plugins/check_pgsql.c: + use enum instead of define 2003-02-08 05:58 kdebisschop - * FAQ: add item on submitting new plugins + * [r294] FAQ: + add item on submitting new plugins 2003-02-08 05:57 kdebisschop - * SUPPORT: suggest minimum standards for support requests + * [r293] SUPPORT: + suggest minimum standards for support requests 2003-02-08 05:32 kdebisschop - * plugins/check_http.c: submit request with one send + * [r292] plugins/check_http.c: + submit request with one send 2003-02-05 05:59 kdebisschop - * configure.in: fix for SSL build on RedHat rawhide + * [r291] configure.in: + fix for SSL build on RedHat rawhide 2003-02-05 05:58 kdebisschop - * plugins/check_dns.c: allow check to proceed using servers from - resolv.conf + * [r290] plugins/check_dns.c: + allow check to proceed using servers from resolv.conf 2003-02-05 05:57 kdebisschop - * plugins/check_http.c: fix segfault due to bad asprintf invocation + * [r289] plugins/check_http.c: + fix segfault due to bad asprintf invocation 2003-02-04 06:24 sghosh - * plugins-scripts/Makefile.am: install user:grp perms [patch - 679703 -Detlef Boehm] + * [r288] plugins-scripts/Makefile.am: + install user:grp perms [patch 679703 -Detlef Boehm] 2003-02-04 06:16 sghosh - * plugins-scripts/check_flexlm.pl: lmstat output update + * [r287] plugins-scripts/check_flexlm.pl: + lmstat output update 2003-02-04 05:54 sghosh - * plugins-scripts/check_ntp.pl: corrected ntpdate offset to seconds + * [r286] plugins-scripts/check_ntp.pl: + corrected ntpdate offset to seconds 2003-02-03 21:43 tonvoon - * plugins/check_snmp.c: Avoid core dump with null or invalid data - (679400 - Mathieu Masseboeuf) + * [r285] plugins/check_snmp.c: + Avoid core dump with null or invalid data (679400 - Mathieu + Masseboeuf) 2003-02-03 21:33 tonvoon - * plugins/Makefile.am: Patch for Mac OS X compile (652080 - Ton - Voon) + * [r284] plugins/Makefile.am: + Patch for Mac OS X compile (652080 - Ton Voon) 2003-02-03 20:43 sghosh - * contrib/tarballs/check_cit.tgz: Citrix plugin + * [r283] contrib/tarballs/check_cit.tgz: + Citrix plugin 2003-02-03 20:35 sghosh - * command.cfg.in: more sample command configurations + * [r282] command.cfg.in: + more sample command configurations 2003-02-03 20:29 sghosh - * configure.in, plugins-scripts/check_ntp.pl, - plugins-scripts/utils.pm.in: change ntpdc to ntpq (Jonathan - Rozes,Thomas Schimpke, bug-656237 ) + * [r281] configure.in, plugins-scripts/check_ntp.pl, + plugins-scripts/utils.pm.in: + change ntpdc to ntpq (Jonathan Rozes,Thomas Schimpke, bug-656237 + ) 2003-02-03 15:47 sghosh - * plugins-scripts/check_ntp.pl: patch for desync peer and ntpdate - (James Fidell) + * [r280] plugins-scripts/check_ntp.pl: + patch for desync peer and ntpdate (James Fidell) 2003-02-03 05:29 sghosh - * plugins-scripts/check_ifstatus.pl: bugfix [bug 651021 mperry2] + * [r279] plugins-scripts/check_ifstatus.pl: + bugfix [bug 651021 mperry2] 2003-02-03 05:07 sghosh - * plugins/check_hpjd.c: added default community [bug-patch #600349 - jbaumgartner] + * [r278] plugins/check_hpjd.c: + added default community [bug-patch #600349 jbaumgartner] 2003-01-31 18:40 tonvoon - * plugins/check_procs.c: Fix for zombie processes on Solaris (Bug - 677803 - Matthew Brown) + * [r277] plugins/check_procs.c: + Fix for zombie processes on Solaris (Bug 677803 - Matthew Brown) 2003-01-31 18:36 tonvoon - * plugins/check_nt.c: Reapply all asprintf calls. Fix for %% - problem with -l flag. + * [r276] plugins/check_nt.c: + Reapply all asprintf calls. Fix for %% problem with -l flag. 2003-01-31 01:26 tonvoon - * plugins/check_nt.c: Removed all unnecessary asprintf calls. - Replaced with original check_nt.c to minimise amount of changes - (reported by Reuben Farrelly) + * [r275] plugins/check_nt.c: + Removed all unnecessary asprintf calls. Replaced with original + check_nt.c + to minimise amount of changes (reported by Reuben Farrelly) 2003-01-30 23:18 tonvoon - * plugins/check_nt.c: Added reference to the official NSClient web - site + * [r274] plugins/check_nt.c: + Added reference to the official NSClient web site 2003-01-30 22:57 tonvoon - * plugins/check_swap.c: Fixed long --allswap option + * [r273] plugins/check_swap.c: + Fixed long --allswap option 2003-01-30 22:55 tonvoon - * plugins/check_procs.c: Fixed progname + * [r272] plugins/check_procs.c: + Fixed progname 2003-01-29 20:57 tonvoon - * plugins/check_mrtgtraf.c: Fixed error and success codes (638656 - - Paul Dlug) + * [r271] plugins/check_mrtgtraf.c: + Fixed error and success codes (638656 - Paul Dlug) 2003-01-29 20:47 tonvoon - * plugins-scripts/check_oracle.sh: Added cache and tablespace check - (621567 - John Marquart) + * [r270] plugins-scripts/check_oracle.sh: + Added cache and tablespace check (621567 - John Marquart) 2003-01-29 20:33 tonvoon - * plugins/: Makefile.am, check_nt.c: Added in check_nt for bug - 646516 + * [r269] plugins/Makefile.am, plugins/check_nt.c: + Added in check_nt for bug 646516 2003-01-29 06:38 kdebisschop - * plugins/check_mysql.c: remove incorrect check_disk() declaration + * [r268] plugins/check_mysql.c: + remove incorrect check_disk() declaration 2003-01-29 06:16 kdebisschop - * plugins/check_ldap.c: fix segfault when argc>=2 and the -H or -b - options are not supplied + * [r267] plugins/check_ldap.c: + fix segfault when argc>=2 and the -H or -b options are not + supplied 2003-01-29 06:15 kdebisschop - * plugins/check_by_ssh.c: 1.8 + * [r266] plugins/check_by_ssh.c: + 1.8 2003-01-29 05:55 tonvoon - * plugins/check_http.c: Better error if server requests client - based certificate (609382 - Olaf Greis) + * [r265] plugins/check_http.c: + Better error if server requests client based certificate (609382 + - Olaf Greis) 2003-01-29 05:27 tonvoon - * contrib/check_dns_random.pl: Exit code added (604837 - Lachlan - Cameron-Smith) + * [r264] contrib/check_dns_random.pl: + Exit code added (604837 - Lachlan Cameron-Smith) 2003-01-29 05:10 tonvoon - * plugins-scripts/check_oracle.sh: Added dummy login test (650970 - - Ton Voon) + * [r263] plugins-scripts/check_oracle.sh: + Added dummy login test (650970 - Ton Voon) 2003-01-29 04:28 tonvoon - * plugins/check_vsz.c: Error when no params passed, better invalid - params message (652086 - Ton Voon) + * [r262] plugins/check_vsz.c: + Error when no params passed, better invalid params message + (652086 - Ton Voon) 2003-01-29 04:11 tonvoon - * plugins/check_procs.c: Fixed NULL status in Solaris (644783 - - Fabian Pehla) Fixed -p options (652082 - Ton Voon) + * [r261] plugins/check_procs.c: + Fixed NULL status in Solaris (644783 - Fabian Pehla) + Fixed -p options (652082 - Ton Voon) 2003-01-28 07:44 kdebisschop - * contrib/checkciscotemp.pl: typo: had commented use Net::SNMP for - testing + * [r260] contrib/checkciscotemp.pl: + typo: had commented use Net::SNMP for testing 2003-01-28 07:42 kdebisschop - * plugins/check_real.c: make sure host_name is set and remove NULL - string inits that can lead to segfaults + * [r259] plugins/check_real.c: + make sure host_name is set and remove NULL string inits that can + lead to segfaults 2003-01-28 07:26 kdebisschop - * plugins/check_mysql.c: missed argc check on port parameter + * [r258] plugins/check_mysql.c: + missed argc check on port parameter 2003-01-28 07:17 kdebisschop - * contrib/checkciscotemp.pl: split and validate input more robustly + * [r257] contrib/checkciscotemp.pl: + split and validate input more robustly 2003-01-28 07:15 kdebisschop - * plugins/check_http.c: remove NULL string inits that can lead to - segfaults + * [r256] plugins/check_http.c: + remove NULL string inits that can lead to segfaults 2003-01-28 00:32 tonvoon - * configure.in: ps support for Darwin / MacOSX + * [r255] configure.in: + ps support for Darwin / MacOSX 2003-01-27 11:53 kdebisschop - * plugins/check_http.c: do not pass host if none is provided + * [r254] plugins/check_http.c: + do not pass host if none is provided 2003-01-27 06:04 kdebisschop - * plugins/check_http.c: we were sending extra CRLF + * [r253] plugins/check_http.c: + we were sending extra CRLF 2003-01-19 06:34 kdebisschop - * plugins-scripts/check_rpc.pl: indicate new default state in - get_rpcinfo, also fix a bunch of indents for consistent format + * [r252] plugins-scripts/check_rpc.pl: + indicate new default state in get_rpcinfo, also fix a bunch of + indents for consistent format 2003-01-17 05:56 sghosh - * plugins-scripts/check_rpc.pl: bug fix for state and opt_c - initialization + * [r251] plugins-scripts/check_rpc.pl: + bug fix for state and opt_c initialization 2003-01-17 05:37 sghosh - * plugins/check_snmp.c: Counter32 tag parsing added + * [r250] plugins/check_snmp.c: + Counter32 tag parsing added 2003-01-16 06:42 kdebisschop - * plugins/: check_mysql.c, check_pgsql.c: semicolon needed where - progname define was replaced + * [r249] plugins/check_mysql.c, plugins/check_pgsql.c: + semicolon needed where progname define was replaced 2003-01-16 06:29 kdebisschop - * plugins/check_http.c: add option to let regex span newlines + * [r248] plugins/check_http.c: + add option to let regex span newlines 2003-01-16 06:28 kdebisschop - * plugins/check_game.c: progname and print_usage need to be defined + * [r247] plugins/check_game.c: + progname and print_usage need to be defined 2003-01-16 06:22 kdebisschop - * plugins/check_radius.c: semicolon needed where praogname define - was replced + * [r246] plugins/check_radius.c: + semicolon needed where praogname define was replced 2003-01-16 06:10 kdebisschop - * plugins/check_hpjd.c: semicolon needed where praogname define was - replced + * [r245] plugins/check_hpjd.c: + semicolon needed where praogname define was replced 2003-01-16 05:22 kdebisschop - * configure.in: find kerberos libs in latest Red Hat beta + * [r244] configure.in: + find kerberos libs in latest Red Hat beta 2003-01-16 05:21 kdebisschop - * plugins/utils.c: restore max() macro + * [r243] plugins/utils.c: + restore max() macro 2003-01-16 05:20 kdebisschop - * plugins/check_tcp.c: cleanup progname assignment + * [r242] plugins/check_tcp.c: + cleanup progname assignment 2003-01-16 05:19 kdebisschop - * plugins-scripts/check_disk_smb.pl: accept $ for share and \\ for - users + * [r241] plugins-scripts/check_disk_smb.pl: + accept $ for share and \\ for users 2003-01-16 05:17 kdebisschop - * plugins/check_by_ssh.c: avoid segfault when host is not given + * [r240] plugins/check_by_ssh.c: + avoid segfault when host is not given 2003-01-13 12:21 kdebisschop - * contrib/: check_dhcp.c, check_fping_in.c, check_rbl.c: convert - PROGANE from a define to a const char + * [r239] contrib/check_dhcp.c, contrib/check_fping_in.c, + contrib/check_rbl.c: + convert PROGANE from a define to a const char 2003-01-13 12:15 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_disk.c, check_dns.c, - check_dummy.c, check_fping.c, check_hpjd.c, check_http.c, - check_ldap.c, check_load.c, check_mrtg.c, check_mrtgtraf.c, - check_mysql.c, check_nagios.c, check_nwstat.c, check_overcr.c, - check_pgsql.c, check_ping.c, check_procs.c, check_radius.c, - check_real.c, check_smtp.c, check_snmp.c, check_ssh.c, - check_swap.c, check_tcp.c, check_time.c, check_udp.c, - check_ups.c, check_users.c, check_vsz.c, negate.c, urlize.c, - utils.c, utils.h.in: convert PROGANE from a define to a const - char + * [r238] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c, plugins/negate.c, + plugins/urlize.c, plugins/utils.c, plugins/utils.h.in: + convert PROGANE from a define to a const char 2003-01-13 12:13 kdebisschop - * plugins/popen.c: change exit status to be POSIX compliant + * [r237] plugins/popen.c: + change exit status to be POSIX compliant 2003-01-13 12:09 kdebisschop - * plugins/check_nagios.c: check for a few null strings, change - PROGNAME from #define to const *char + * [r236] plugins/check_nagios.c: + check for a few null strings, change PROGNAME from #define to + const *char 2003-01-13 04:50 kdebisschop - * plugins/check_disk.c: add options for excluding devices and for - skipping OK devices in summary + * [r235] plugins/check_disk.c: + add options for excluding devices and for skipping OK devices in + summary 2003-01-03 03:24 kdebisschop - * plugins/utils.c: protect against some null strings, make formats - more uniform + * [r234] plugins/utils.c: + protect against some null strings, make formats more uniform 2002-12-19 19:30 kdebisschop - * plugins/check_tcp.c: expect is +OK for SPOP too + * [r233] plugins/check_tcp.c: + expect is +OK for SPOP too 2002-12-19 19:29 kdebisschop - * plugins/check_tcp.c: server expect not getting set, expect is +OK - for POP + * [r232] plugins/check_tcp.c: + server expect not getting set, expect is +OK for POP 2002-12-19 19:20 kdebisschop - * plugins/check_http.c: remove spurious CRLF + * [r231] plugins/check_http.c: + remove spurious CRLF 2002-11-29 12:02 stanleyhopcroft - * contrib/check_citrix: + * [r230] contrib/check_citrix: New plugin to check the ICA browse service (used by Citrix - Metaframe servers) from Ed Rolison and Tom De Blende. + Metaframe servers) from + Ed Rolison and Tom De Blende. 2002-11-25 12:00 kdebisschop - * plugins/check_tcp.c: was segfaulting if no dtat was returned + * [r228] plugins/check_tcp.c: + was segfaulting if no dtat was returned 2002-11-24 13:43 kdebisschop - * tools/snapshot: some fixes needed to move off old devel box + * [r227] tools/snapshot: + some fixes needed to move off old devel box 2002-11-24 13:09 kdebisschop - * tools/snapshot: make routine snapshots of nagios and plugin CVS - to expand testing + * [r226] tools/snapshot: + make routine snapshots of nagios and plugin CVS to expand testing 2002-11-22 10:52 kdebisschop - * plugins/check_ups.c: add replace battery condition, replace - unchecked strcat calls with asprintf (I do not think buffer - overflow was possible here, but lets be consistent) + * [r225] plugins/check_ups.c: + add replace battery condition, replace unchecked strcat calls + with asprintf (I do not think buffer overflow was possible here, + but lets be consistent) 2002-11-22 02:46 kdebisschop - * configure.in: get long args output to work on check_procs by - putting incantations with -w ahead of others + * [r224] configure.in: + get long args output to work on check_procs by putting + incantations with -w ahead of others 2002-11-22 02:33 kdebisschop - * configure.in: get long args output to work on linux check_procs, - actually works this time (needs OpenBSD testing) + * [r223] configure.in: + get long args output to work on linux check_procs, actually works + this time (needs OpenBSD testing) 2002-11-22 01:33 kdebisschop - * plugins/check_procs.c: add a few comments, trap a few place where - a NULL string might have been handled + * [r222] plugins/check_procs.c: + add a few comments, trap a few place where a NULL string might + have been handled 2002-11-22 01:31 kdebisschop - * configure.in: get long args output to work on linux check_procs - (needs OpenBSD testing) + * [r221] configure.in: + get long args output to work on linux check_procs (needs OpenBSD + testing) 2002-11-21 12:40 kdebisschop - * plugins/check_dig.c: fix empty output on errors + * [r220] plugins/check_dig.c: + fix empty output on errors 2002-11-20 11:56 kdebisschop - * plugins/check_swap.c: add switch to evaluate each swap - individually + * [r219] plugins/check_swap.c: + add switch to evaluate each swap individually 2002-11-20 11:28 kdebisschop - * plugins/check_dig.c: fix solaris SEGV, still need to print - meaningful error text + * [r218] plugins/check_dig.c: + fix solaris SEGV, still need to print meaningful error text 2002-11-20 01:19 kdebisschop - * plugins/check_by_ssh.c: in short options, t no no argument + * [r217] plugins/check_by_ssh.c: + in short options, t no no argument 2002-11-20 01:09 kdebisschop - * plugins/check_dig.c: replace some strcpy with strscpy + * [r216] plugins/check_dig.c: + replace some strcpy with strscpy 2002-11-19 19:13 kdebisschop - * plugins/Makefile.am: another try at portable symlinking + * [r215] plugins/Makefile.am: + another try at portable symlinking 2002-11-19 19:07 kdebisschop - * plugins/Makefile.am: another try at portable symlinking + * [r214] plugins/Makefile.am: + another try at portable symlinking 2002-11-19 19:06 kdebisschop - * plugins/check_time.c: explicitly cast recv() arg2 for SunOS5.6 + * [r213] plugins/check_time.c: + explicitly cast recv() arg2 for SunOS5.6 2002-11-19 07:13 kdebisschop - * plugins/Makefile.am: rewrite of install-exec-hook for solaris + * [r212] plugins/Makefile.am: + rewrite of install-exec-hook for solaris 2002-11-18 21:58 sghosh - * contrib/: check_javaproc.pl, nagios_sendim.pl: javaproc, sendim + * [r211] contrib/check_javaproc.pl, contrib/nagios_sendim.pl: + javaproc, sendim 2002-11-18 14:46 sghosh - * contrib-reporting/process_perfdata.pl: New directory to for - perfdata and reporting scripts + * [r210] contrib-reporting, contrib-reporting/process_perfdata.pl: + New directory to for perfdata and reporting scripts 2002-11-18 11:24 kdebisschop - * plugins/check_swap.c: test total swap instead of individual disks + * [r209] plugins/check_swap.c: + test total swap instead of individual disks 2002-11-18 07:23 kdebisschop - * plugins/check_disk.c: failed to handle multple disks + * [r208] plugins/check_disk.c: + failed to handle multple disks 2002-11-18 07:22 kdebisschop - * plugins/utils.c: more readable max_state() code + * [r207] plugins/utils.c: + more readable max_state() code 2002-11-16 12:57 kdebisschop - * plugins/Makefile.am: fix too many sources problem for programs - tha are symlinks to check_tcp + * [r206] plugins/Makefile.am: + fix too many sources problem for programs tha are symlinks to + check_tcp 2002-11-16 04:59 kdebisschop - * plugins/check_snmp.c: my take on Subhendu's patches, plus a few - comments for clarity + * [r205] plugins/check_snmp.c: + my take on Subhendu's patches, plus a few comments for clarity 2002-11-15 17:47 sghosh - * plugins/check_snmp.c: memory bounds in options, no output - comparison case + * [r204] plugins/check_snmp.c: + memory bounds in options, no output comparison case 2002-11-15 04:51 kdebisschop - * nagios-plugins.spec.in: make spec work again, now that release is - in source name again + * [r203] nagios-plugins.spec.in: + make spec work again, now that release is in source name again 2002-11-15 00:51 kdebisschop - * configure.in: release numbering fix + * [r202] configure.in: + release numbering fix 2002-11-15 00:50 kdebisschop - * plugins/check_snmp.c: fix label handling, replace accidentally - deleted elseif l.310 + * [r201] plugins/check_snmp.c: + fix label handling, replace accidentally deleted elseif l.310 2002-11-14 18:25 kdebisschop - * Makefile.am, acconfig.h, configure.in, nagios-plugins.spec.in, - plugins/utils.c: fix bug with gettimeofday test, improve - version/release handling, update rpm spec + * [r200] Makefile.am, acconfig.h, configure.in, + nagios-plugins.spec.in, plugins/utils.c: + fix bug with gettimeofday test, improve version/release handling, + update rpm spec 2002-11-14 18:23 kdebisschop - * plugins/Makefile.am: fix typo in snprintf build + * [r199] plugins/Makefile.am: + fix typo in snprintf build 2002-11-14 05:36 kdebisschop - * plugins/Makefile.am: can't drop these sources -- neded for dist + * [r198] plugins/Makefile.am: + can't drop these sources -- neded for dist 2002-11-14 05:27 kdebisschop - * plugins/Makefile.am: fix build rule for snprintf + * [r197] plugins/Makefile.am: + fix build rule for snprintf 2002-11-14 05:25 kdebisschop - * plugins/check_http.c: pagesize count off by one + * [r196] plugins/check_http.c: + pagesize count off by one 2002-11-14 04:45 kdebisschop - * plugins/check_http.c: clean up NULL from status on Solaris + * [r195] plugins/check_http.c: + clean up NULL from status on Solaris 2002-11-14 04:00 kdebisschop - * configure.in: typo in AC_DEFINE of PS_FORMAT for solaris + * [r194] configure.in: + typo in AC_DEFINE of PS_FORMAT for solaris 2002-11-14 03:37 kdebisschop - * plugins/Makefile.am: remove check_nt again + * [r193] plugins/Makefile.am: + remove check_nt again 2002-11-14 03:09 kdebisschop - * plugins/Makefile.am: back out last change -- it was only work in - progress + * [r192] plugins/Makefile.am: + back out last change -- it was only work in progress 2002-11-14 02:26 kdebisschop - * plugins/: Makefile.am, check_dns.c, check_ldap.c, check_mrtg.c, - check_mrtgtraf.c, check_nwstat.c, check_radius.c, utils.c, - version.h.in: remove call_getopt and ssprintf + * [r191] plugins/Makefile.am, plugins/check_dns.c, + plugins/check_ldap.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_radius.c, plugins/utils.c, plugins/version.h.in: + remove call_getopt and ssprintf 2002-11-13 11:50 kdebisschop - * plugins/: check_disk.c, check_dns.c, check_fping.c, check_hpjd.c, - check_mrtg.c, check_nwstat.c, check_ping.c, check_vsz.c, - urlize.c, utils.c: remove call_getopt and asprintf + * [r190] plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_hpjd.c, + plugins/check_mrtg.c, plugins/check_nwstat.c, + plugins/check_ping.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c: + remove call_getopt and asprintf 2002-11-12 11:28 kdebisschop - * plugins/check_dig.c: cleanup asprintf, old function decls + * [r189] plugins/check_dig.c: + cleanup asprintf, old function decls 2002-11-12 11:26 kdebisschop - * plugins/: check_mysql.c, check_real.c, check_ups.c: remove - call_getopt + * [r188] plugins/check_mysql.c, plugins/check_real.c, + plugins/check_ups.c: + remove call_getopt 2002-11-11 22:15 sghosh - * plugins/check_snmp.c: should use asprintf + * [r187] plugins/check_snmp.c: + should use asprintf 2002-11-11 20:19 sghosh - * plugins/check_snmp.c: more snmpv3 patches + * [r186] plugins/check_snmp.c: + more snmpv3 patches 2002-11-11 19:29 sghosh - * plugins/check_snmp.c: long opt for miblist, snmpv3 support - (rosenauer) + * [r185] plugins/check_snmp.c: + long opt for miblist, snmpv3 support (rosenauer) 2002-11-11 16:04 sghosh - * plugins/check_snmp.c: option to specify a miblist - llow + * [r184] plugins/check_snmp.c: + option to specify a miblist - llow 2002-11-11 15:43 sghosh - * plugins/check_snmp.c: misc doc fix, missing verbose option + * [r183] plugins/check_snmp.c: + misc doc fix, missing verbose option 2002-11-09 11:37 kdebisschop - * plugins/: check_ups.c, check_users.c: remove call_getopt + * [r182] plugins/check_ups.c, plugins/check_users.c: + remove call_getopt 2002-11-09 04:22 kdebisschop - * plugins/: check_by_ssh.c, check_dig.c, check_ping.c, - check_time.c: remove call_getopt + * [r181] plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_ping.c, plugins/check_time.c: + remove call_getopt 2002-11-09 04:21 kdebisschop - * plugins/check_snmp.c: cleaner handling of DEFAULT_PORT + * [r180] plugins/check_snmp.c: + cleaner handling of DEFAULT_PORT 2002-11-09 03:43 kdebisschop - * configure.in: add HPUX swap, try to cleanup getopt processing + * [r179] configure.in: + add HPUX swap, try to cleanup getopt processing 2002-11-09 03:39 kdebisschop - * plugins/: check_pgsql.c, check_ping.c, check_snmp.c, negate.c, - utils.h.in: define and use usage3 where second part of message is - a an int/char + * [r178] plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_snmp.c, plugins/negate.c, plugins/utils.h.in: + define and use usage3 where second part of message is a an + int/char 2002-11-09 03:16 kdebisschop - * plugins/snprintf.c: HAVE_C99_SNPRINTF is not tested, so remove - from ifdef + * [r177] plugins/snprintf.c: + HAVE_C99_SNPRINTF is not tested, so remove from ifdef 2002-11-08 08:07 kdebisschop - * plugins/check_snmp.c: user reports NULL still getting into - asprintf + * [r176] plugins/check_snmp.c: + user reports NULL still getting into asprintf 2002-11-08 08:06 kdebisschop - * plugins/check_vsz.c: remove call_getopt + * [r175] plugins/check_vsz.c: + remove call_getopt 2002-11-08 07:20 kdebisschop - * acconfig.h, configure.in, plugins/common.h.in, plugins/utils.c, - plugins/utils.h.in: patches required to build on solaris with - asprintf and gettimeofday + * [r174] acconfig.h, configure.in, plugins/common.h.in, + plugins/utils.c, plugins/utils.h.in: + patches required to build on solaris with asprintf and + gettimeofday 2002-11-08 07:18 kdebisschop - * plugins/: check_http.c, check_load.c, check_ping.c, - check_procs.c, check_smtp.c, check_tcp.c: remove unused variables + * [r173] plugins/check_http.c, plugins/check_load.c, + plugins/check_ping.c, plugins/check_procs.c, + plugins/check_smtp.c, plugins/check_tcp.c: + remove unused variables 2002-11-08 07:17 kdebisschop - * tools/oneliners: some useful onliners + * [r172] tools/oneliners: + some useful onliners 2002-11-07 14:30 kdebisschop - * plugins/check_snmp.c: bugfixes to command format and (null) text - created by asprintf switch + * [r171] plugins/check_snmp.c: + bugfixes to command format and (null) text created by asprintf + switch 2002-11-07 07:07 kdebisschop - * plugins/check_by_ssh.c: remove call_getopt, add [] arougn time + * [r170] plugins/check_by_ssh.c: + remove call_getopt, add [] arougn time 2002-11-07 07:06 kdebisschop - * configure.in: test snprintf function family for ifdefs in - snprintf.c + * [r169] configure.in: + test snprintf function family for ifdefs in snprintf.c 2002-10-30 18:47 kdebisschop - * plugins/check_tcp.c: replace fixed-lentgh buffer with asprintf + * [r168] plugins/check_tcp.c: + replace fixed-lentgh buffer with asprintf 2002-10-30 18:46 kdebisschop - * plugins/check_udp.c: forgot to remove call_getopt + * [r167] plugins/check_udp.c: + forgot to remove call_getopt -2002-10-30 18:44 kdebisschop +2002-10-30 18:45 kdebisschop - * plugins/: check_ssh.c, check_swap.c: forgot to remove call_getopt - declaration + * [r166] plugins/check_ssh.c, plugins/check_swap.c: + forgot to remove call_getopt declaration 2002-10-30 18:29 kdebisschop - * plugins/check_smtp.c: remove call_getopt, fix several buffer - overruns possible due to use of fixed size buffers + * [r165] plugins/check_smtp.c: + remove call_getopt, fix several buffer overruns possible due to + use of fixed size buffers 2002-10-30 18:22 kdebisschop - * tools/setup: debian builds not actively maintained, so suppress - error in setup script + * [r164] tools/setup: + debian builds not actively maintained, so suppress error in setup + script 2002-10-30 05:07 sghosh - * acconfig.h, configure.in, plugins-scripts/Makefile.am, + * [r163] acconfig.h, configure.in, plugins-scripts/Makefile.am, plugins-scripts/check_mailq.pl, plugins-scripts/utils.pm.in: monitor mailq 2002-10-28 13:05 kdebisschop - * plugins-scripts/: check_breeze.pl, check_disk_smb.pl, - check_flexlm.pl, check_log.sh, check_ntp.pl, check_rpc.pl, - check_sensors.sh, check_wave.pl: remove pspace in shebang since - no sequent users replied + * [r162] plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_log.sh, + plugins-scripts/check_ntp.pl, plugins-scripts/check_rpc.pl, + plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl: + remove pspace in shebang since no sequent users replied -2002-10-26 14:30 kdebisschop +2002-10-26 13:30 kdebisschop - * nagios-plugins.spec.in: release should not be in tarball name + * [r161] nagios-plugins.spec.in: + release should not be in tarball name -2002-10-25 14:58 kdebisschop +2002-10-25 13:58 kdebisschop - * nagios-plugins.spec.in: tweak source macro + * [r160] nagios-plugins.spec.in: + tweak source macro -2002-10-25 13:35 kdebisschop +2002-10-25 12:35 kdebisschop - * plugins/Makefile.am: remove check_nt + * [r159] plugins/Makefile.am: + remove check_nt -2002-10-25 03:31 kdebisschop +2002-10-25 02:31 kdebisschop - * Makefile.am, plugins/Makefile.am: include getloadavg sources, add - some Solaris pkg build support + * [r158] Makefile.am, plugins/Makefile.am: + include getloadavg sources, add some Solaris pkg build support -2002-10-22 10:13 kdebisschop +2002-10-22 09:13 kdebisschop - * plugins/check_ssh.c: remove call_getopt, replace ssprintf with - asprintf,better server version reporting + * [r157] plugins/check_ssh.c: + remove call_getopt, replace ssprintf with asprintf,better server + version reporting -2002-10-22 09:54 kdebisschop +2002-10-22 08:54 kdebisschop - * plugins/check_tcp.c: add check_spop + * [r156] plugins/check_tcp.c: + add check_spop -2002-10-22 09:19 kdebisschop +2002-10-22 08:19 kdebisschop - * plugins/check_procs.c: remove call_getopt, replace ssprintf with - asprintf + * [r155] plugins/check_procs.c: + remove call_getopt, replace ssprintf with asprintf -2002-10-22 03:57 sghosh +2002-10-22 02:57 sghosh - * contrib/check_procr.sh: From: Jerome Tytgat - checks to see if - named process is running + * [r154] contrib/check_procr.sh: + From: Jerome Tytgat - checks to see if named process is running -2002-10-22 02:31 sghosh +2002-10-22 01:31 sghosh - * README, plugins/check_nt.c: check_nt is downloadable from - nsclient.ready2run.nl - -2002-10-21 06:04 kdebisschop - - * plugins/check_swap.c: use asprintf instead of ssprintf - -2002-10-21 05:36 kdebisschop - - * plugins/Makefile.am: need to define SOURCES for check_tcp to also - build as check_ftp,check_imap,check_nntp,check_pop - -2002-10-21 05:05 kdebisschop - - * plugins/utils.c: use asprintf to do strscpy + * [r153] README, plugins/check_nt.c: + check_nt is downloadable from nsclient.ready2run.nl 2002-10-21 05:04 kdebisschop - * plugins/Makefile.am: roll check_ftp, check_imap, check_pop, and - check_nntp into check_tcp + * [r152] plugins/check_swap.c: + use asprintf instead of ssprintf -2002-10-21 05:03 kdebisschop +2002-10-21 04:36 kdebisschop - * plugins/: check_ftp.c, check_imap.c, check_nntp.c, check_pop.c: + * [r151] plugins/Makefile.am: + need to define SOURCES for check_tcp to also build as + check_ftp,check_imap,check_nntp,check_pop + +2002-10-21 04:05 kdebisschop + + * [r150] plugins/utils.c: + use asprintf to do strscpy + +2002-10-21 04:04 kdebisschop + + * [r149] plugins/Makefile.am: + roll check_ftp, check_imap, check_pop, and check_nntp into + check_tcp + +2002-10-21 04:03 kdebisschop + + * [r148] plugins/check_ftp.c, plugins/check_imap.c, + plugins/check_nntp.c, plugins/check_pop.c: these are all combined into check_tcp now -2002-10-21 04:55 kdebisschop +2002-10-21 03:55 kdebisschop - * plugins/check_load.c: remove broken call_getopt + * [r147] plugins/check_load.c: + remove broken call_getopt -2002-10-21 04:43 kdebisschop +2002-10-21 03:43 kdebisschop - * plugins/check_snmp.c: cleanup process_arguments, print_help, and - print_usage + * [r146] plugins/check_snmp.c: + cleanup process_arguments, print_help, and print_usage -2002-10-21 04:40 kdebisschop +2002-10-21 03:40 kdebisschop - * plugins/check_pgsql.c: now we provide long opts if they do not - exist + * [r145] plugins/check_pgsql.c: + now we provide long opts if they do not exist -2002-10-20 21:22 kdebisschop +2002-10-20 20:22 kdebisschop - * plugins/check_snmp.c: fixed scanning for multiple OIDs, which was - not working + * [r144] plugins/check_snmp.c: + fixed scanning for multiple OIDs, which was not working -2002-10-20 19:49 kdebisschop +2002-10-20 18:49 kdebisschop - * plugins/check_snmp.c: change ssprintf to asprintf back out change - at line 225 in r1.4 (values were mismatched to format string, - so output was nonsense) (I left a comment showing a construct - that should work, but it fails for PHBs: if my disk gets - nearly full, they want 'CRITICAL - 99%' not 'CRITICAL - Gauge32: - 99') (If someine has a rationale for the change, maybe it could - be done as an option? - it seems fairly clear that the Web - display should be sensible to PHBs so long as there's no real - loss) + * [r143] plugins/check_snmp.c: + change ssprintf to asprintf + back out change at line 225 in r1.4 + (values were mismatched to format string, so output was nonsense) + (I left a comment showing a construct that should work, but it + fails for PHBs: + if my disk gets nearly full, they want 'CRITICAL - 99%' not + 'CRITICAL - Gauge32: 99') + (If someine has a rationale for the change, maybe it could be + done as an option? - it seems + fairly clear that the Web display should be sensible to PHBs so + long as there's no real loss) -2002-10-18 07:41 kdebisschop +2002-10-18 06:41 kdebisschop - * plugins/check_swap.c: remove old call_getopt + * [r142] plugins/check_swap.c: + remove old call_getopt -2002-10-18 06:55 kdebisschop +2002-10-18 05:55 kdebisschop - * plugins/check_load.c: remove old call_getopt code, fix bug taking - single float, allow colon as separators in additin to commas + * [r141] plugins/check_load.c: + remove old call_getopt code, fix bug taking single float, allow + colon as separators in additin to commas -2002-10-18 05:41 kdebisschop +2002-10-18 04:41 kdebisschop - * plugins/utils.c: handle null src in strscat + * [r140] plugins/utils.c: + handle null src in strscat -2002-10-18 04:48 kdebisschop +2002-10-18 03:48 kdebisschop - * plugins/check_tcp.c: millisecond timing + * [r139] plugins/check_tcp.c: + millisecond timing -2002-10-18 04:46 kdebisschop +2002-10-18 03:46 kdebisschop - * plugins/utils.h.in: refine STD_LONG_OPTS + * [r138] plugins/utils.h.in: + refine STD_LONG_OPTS -2002-10-18 04:46 kdebisschop +2002-10-18 03:46 kdebisschop - * plugins/check_http.c: provide on more decimal point printing time + * [r137] plugins/check_http.c: + provide on more decimal point printing time -2002-10-18 04:45 kdebisschop +2002-10-18 03:45 kdebisschop - * plugins/check_ping.c: remove broken call_getopt stuff + * [r136] plugins/check_ping.c: + remove broken call_getopt stuff -2002-10-17 07:09 kdebisschop +2002-10-17 06:09 kdebisschop - * plugins/check_tcp.c: using asprintf + * [r135] plugins/check_tcp.c: + using asprintf -2002-10-17 07:06 kdebisschop +2002-10-17 06:06 kdebisschop - * INSTALL, INSTALLING, tools/setup: revise now that aclocal is - remved from CVS + * [r134] INSTALL, INSTALLING, tools/setup: + revise now that aclocal is remved from CVS -2002-10-16 23:26 kdebisschop +2002-10-16 22:26 kdebisschop - * configure.in: need some quoting on ifdef + * [r133] configure.in: + need some quoting on ifdef -2002-10-16 23:17 kdebisschop +2002-10-16 22:17 kdebisschop - * acinclude.m4, configure.in: finally a working fix for - AM/AC_FUNC_STRTOD nightmare + * [r132] acinclude.m4, configure.in: + finally a working fix for AM/AC_FUNC_STRTOD nightmare -2002-10-16 23:01 kdebisschop +2002-10-16 22:03 kdebisschop - * configure.in: mismatched quote + * [r131] configure.in: + mismatched quote -2002-10-16 22:54 kdebisschop +2002-10-16 22:01 kdebisschop - * configure.in: missing commas + * [r130] configure.in: + mismatched quote -2002-10-16 22:46 kdebisschop +2002-10-16 21:54 kdebisschop - * configure.in: complains on paren in comment + * [r129] configure.in: + missing commas -2002-10-16 22:43 kdebisschop +2002-10-16 21:46 kdebisschop - * acinclude.m4: lost a paren + * [r128] configure.in: + complains on paren in comment -2002-10-16 22:41 kdebisschop +2002-10-16 21:43 kdebisschop - * acinclude.m4: old auto???? has AM_FUNC_STRTOD, now renamed - AC_FUNC_STRTOD + * [r127] acinclude.m4: + lost a paren -2002-10-16 22:32 kdebisschop +2002-10-16 21:41 kdebisschop - * plugins/: check_http.c, utils.c, utils.h.in: millisecond timimg - where supported + * [r126] acinclude.m4: + old auto???? has AM_FUNC_STRTOD, now renamed AC_FUNC_STRTOD -2002-10-16 22:31 kdebisschop +2002-10-16 21:32 kdebisschop - * configure.in, missing: build cleanly on RedHat 8.0 + * [r125] plugins/check_http.c, plugins/utils.c, plugins/utils.h.in: + millisecond timimg where supported -2002-10-16 11:46 kdebisschop +2002-10-16 21:31 kdebisschop - * .cvsignore: ignore aclocal.m4 + * [r124] configure.in, missing: + build cleanly on RedHat 8.0 -2002-10-16 11:34 kdebisschop +2002-10-16 10:46 kdebisschop - * configure.in: AM_STRTOD was a typo + * [r123] ., .cvsignore: + ignore aclocal.m4 -2002-10-16 11:31 kdebisschop +2002-10-16 10:34 kdebisschop - * aclocal.m4: automake invokes acloacl on each run - it cannot be - right to include this + * [r122] configure.in: + AM_STRTOD was a typo -2002-10-16 11:18 kdebisschop +2002-10-16 10:31 kdebisschop - * acconfig.h: better checks for vsnprintf stuff + * [r121] aclocal.m4: + automake invokes acloacl on each run - it cannot be right to + include this -2002-10-16 11:14 kdebisschop +2002-10-16 10:18 kdebisschop - * plugins/check_http.c, configure.in: use asprintf + * [r120] acconfig.h: + better checks for vsnprintf stuff -2002-10-16 11:14 kdebisschop +2002-10-16 10:16 kdebisschop - * plugins/utils.c: use asprintf to construct strscat + * [r119] configure.in, plugins/check_http.c: + use asprintf -2002-10-16 05:57 kdebisschop +2002-10-16 10:14 kdebisschop - * plugins/popen.h.in: timeout interval is extern + * [r118] plugins/utils.c: + use asprintf to construct strscat -2002-10-16 05:56 kdebisschop +2002-10-16 04:57 kdebisschop - * plugins/: utils.h.in, utils.c: start support for gettimeofday and - tv_usec + * [r117] plugins/popen.h.in: + timeout interval is extern -2002-10-16 05:54 kdebisschop +2002-10-16 04:56 kdebisschop - * aclocal.m4: generated with automake 1.6 / autoconf 2.53 (maybe - should not be in CVS, however) + * [r116] plugins/utils.c, plugins/utils.h.in: + start support for gettimeofday and tv_usec -2002-10-16 05:52 kdebisschop +2002-10-16 04:54 kdebisschop - * plugins/snprintf.c: newer snprintf from samba.org + * [r115] aclocal.m4: + generated with automake 1.6 / autoconf 2.53 (maybe should not be + in CVS, however) -2002-10-16 05:43 kdebisschop +2002-10-16 04:52 kdebisschop - * Makefile.am: cosmetic line wrap before 80 chars + * [r114] plugins/snprintf.c: + newer snprintf from samba.org -2002-10-16 05:42 kdebisschop +2002-10-16 04:44 kdebisschop - * depcomp, .cvsignore: needed for automake 1.6 / autoconf 2.53 + * [r113] ., .cvsignore, depcomp: + needed for automake 1.6 / autoconf 2.53 -2002-10-16 05:41 kdebisschop +2002-10-16 04:43 kdebisschop - * configure.in: work with newer automake, begin swithc to asprintf + * [r112] Makefile.am: + cosmetic line wrap before 80 chars -2002-10-15 07:23 sghosh +2002-10-16 04:41 kdebisschop - * plugins-scripts/check_ifoperstatus.pl: new exit states, more - conditional checking + * [r111] configure.in: + work with newer automake, begin swithc to asprintf -2002-10-07 20:05 sghosh +2002-10-15 06:23 sghosh - * plugins/check_dns.c: patch for expected IP address + * [r110] plugins-scripts/check_ifoperstatus.pl: + new exit states, more conditional checking -2002-10-07 02:34 kdebisschop +2002-10-07 19:05 sghosh - * plugins/popen.c: make sure we do not run past the end of an - unterminated string + * [r109] plugins/check_dns.c: + patch for expected IP address -2002-10-07 02:19 kdebisschop +2002-10-07 01:34 kdebisschop - * plugins/negate.c: use asprintf, inhibit splint warning + * [r108] plugins/popen.c: + make sure we do not run past the end of an unterminated string -2002-10-05 12:08 kdebisschop +2002-10-07 01:19 kdebisschop - * getloadavg.m4, plugins/getloadavg.c: lets use library instead od - inconsistent command line interfaces + * [r107] plugins/negate.c: + use asprintf, inhibit splint warning -2002-09-26 03:17 kdebisschop +2002-10-05 11:08 kdebisschop - * plugins/urlize.c: use ssprintf instead of sprintf + * [r106] getloadavg.m4, plugins/getloadavg.c: + lets use library instead od inconsistent command line interfaces -2002-09-25 09:01 kdebisschop +2002-09-26 02:17 kdebisschop - * plugins/check_http.c: incorporate comment on my_recv from Russell - Scibetti + * [r105] plugins/urlize.c: + use ssprintf instead of sprintf -2002-09-25 08:58 kdebisschop +2002-09-25 08:01 kdebisschop - * plugins/check_http.c: incorporate comments from Russell Scibetti + * [r104] plugins/check_http.c: + incorporate comment on my_recv from Russell Scibetti -2002-09-24 06:16 kdebisschop +2002-09-25 07:58 kdebisschop - * plugins/check_http.c: replace remaining occurences of sprintf - with snprintf + * [r103] plugins/check_http.c: + incorporate comments from Russell Scibetti -2002-09-16 01:47 kdebisschop +2002-09-24 05:16 kdebisschop - * INSTALL: needed for latest autoconf + * [r102] plugins/check_http.c: + replace remaining occurences of sprintf with snprintf -2002-09-16 01:47 kdebisschop +2002-09-16 00:47 kdebisschop - * Makefile.am, aclocal.m4, configure.in, nagios-plugins.spec.in: + * [r101] INSTALL: + needed for latest autoconf + +2002-09-16 00:47 kdebisschop + + * [r100] Makefile.am, aclocal.m4, configure.in, + nagios-plugins.spec.in: finish ckleanup of rpm spec porcessing -2002-09-14 22:11 kdebisschop +2002-09-14 21:11 kdebisschop - * nagios-plugins.spec, nagios-plugins.spec.in: complete spec based - on confugure.in + * [r99] nagios-plugins.spec, nagios-plugins.spec.in: + complete spec based on confugure.in -2002-09-14 22:06 kdebisschop +2002-09-14 21:06 kdebisschop - * make-tarball, rpm: automake makes the dist tarball, rpmbuild -ta - makes the rpm + * [r98] make-tarball, rpm: + automake makes the dist tarball, rpmbuild -ta makes the rpm -2002-09-14 03:27 kdebisschop +2002-09-14 02:27 kdebisschop - * plugins/check_tcp.c: time data in performance string + * [r97] plugins/check_http.c, plugins/check_tcp.c: + time data in performance string -2002-09-14 03:23 kdebisschop +2002-09-14 02:13 kdebisschop - * plugins/check_http.c: time data in performance string + * [r96] plugins-scripts/check_log.sh: + patch from Matthew Peters , plus turned up a + few bugs on my own -2002-09-14 03:13 kdebisschop +2002-09-12 02:43 kdebisschop - * plugins-scripts/check_log.sh: patch from Matthew Peters - , plus turned up a few bugs on my own + * [r95] plugins/Makefile.am: + negate wrapper -2002-09-12 03:43 kdebisschop +2002-09-08 12:05 kdebisschop - * plugins/Makefile.am: negate wrapper + * [r94] plugins/negate.c: + wrapper to invert return status -2002-09-08 13:05 kdebisschop +2002-09-08 12:05 kdebisschop - * plugins/negate.c: wrapper to invert return status + * [r93] plugins/utils.c: + clears up warnings in splint -2002-09-08 13:05 kdebisschop +2002-09-06 02:25 kdebisschop - * plugins/utils.c: clears up warnings in splint + * [r92] plugins-scripts/check_rpc.pl: + case on key to ERRORS hash -2002-09-06 03:25 kdebisschop +2002-09-04 06:00 sghosh - * plugins-scripts/check_rpc.pl: case on key to ERRORS hash + * [r91] configure.in: + more Mysql patches -2002-09-04 07:00 sghosh +2002-09-04 02:12 sghosh - * configure.in: more Mysql patches + * [r90] plugins-scripts/check_ntp.pl: + dispersion check now controlled by warn and crit -2002-09-04 03:12 sghosh +2002-09-04 02:11 sghosh - * plugins-scripts/check_ntp.pl: dispersion check now controlled by - warn and crit + * [r89] configure.in: + Mysql dir fix -2002-09-04 03:11 sghosh +2002-09-04 02:10 sghosh - * configure.in: Mysql dir fix + * [r88] contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl: + moved to supported plugins-scripts -2002-09-04 03:10 sghosh +2002-09-02 18:47 sghosh - * contrib/: check_ifoperstatus.pl, check_ifstatus.pl: moved to - supported plugins-scripts + * [r87] plugins/check_smtp.c: + new -f option for adding a FROM address for RFC correctness -2002-09-02 19:47 sghosh +2002-09-01 16:22 sghosh - * plugins/check_smtp.c: new -f option for adding a FROM address for - RFC correctness + * [r86] INSTALL, INSTALLING: + file rename for MacOS X -2002-09-01 17:22 sghosh +2002-09-01 16:18 sghosh - * INSTALL, INSTALLING: file rename for MacOS X + * [r85] plugins/check_smtp.c: + Valid MAIL command -2002-09-01 17:18 sghosh +2002-08-22 22:08 sghosh - * plugins/check_smtp.c: Valid MAIL command + * [r84] contrib/check_snmp_process_monitor.pl: + updates -2002-08-22 23:08 sghosh +2002-08-22 14:43 sghosh - * contrib/check_snmp_process_monitor.pl: updates + * [r83] command.cfg.in: + smsclient config -2002-08-22 15:43 sghosh +2002-08-22 14:42 sghosh - * command.cfg.in: smsclient config + * [r82] contrib/check_snmp_disk_monitor.pl, + contrib/check_snmp_process_monitor.pl: + new plugins contrib -2002-08-22 15:42 sghosh +2002-08-18 18:03 kdebisschop - * contrib/: check_snmp_disk_monitor.pl, - check_snmp_process_monitor.pl: new plugins contrib - -2002-08-18 19:03 kdebisschop - - * plugins/check_by_ssh.c: typo in options passed to ssh for ipv6. + * [r81] plugins/check_by_ssh.c: + typo in options passed to ssh for ipv6. fix by setting a generic hook for 1-char pasthhru options -2002-08-14 20:17 sghosh +2002-08-14 19:17 sghosh - * plugins-scripts/check_disk_smb.pl: patch for admin shares + * [r80] plugins-scripts/check_disk_smb.pl: + patch for admin shares -2002-08-14 20:07 sghosh +2002-08-14 19:07 sghosh - * command.cfg.in: qpage definitions + * [r79] command.cfg.in: + qpage definitions -2002-08-14 20:06 sghosh +2002-08-14 19:06 sghosh - * plugins-scripts/check_ifstatus.pl: skip PPP interfaces + * [r78] plugins-scripts/check_ifstatus.pl: + skip PPP interfaces -2002-08-14 20:04 sghosh +2002-08-14 19:04 sghosh - * plugins/check_smtp.c: added HELO command + * [r77] plugins/check_smtp.c: + added HELO command -2002-08-14 20:04 sghosh +2002-08-14 19:04 sghosh - * plugins/check_by_ssh.c: ipv4/ipv6 switch added + * [r76] plugins/check_by_ssh.c: + ipv4/ipv6 switch added -2002-08-14 20:03 sghosh +2002-08-14 19:03 sghosh - * plugins/check_hpjd.c: net-snmp v5x fix + * [r75] plugins/check_hpjd.c: + net-snmp v5x fix -2002-08-14 20:02 sghosh +2002-08-14 19:02 sghosh - * contrib/check_apc_ups.pl: fix for ePN - -2002-08-14 20:01 sghosh - - * contrib/: check_linux_raid.pl, check_nagios_db.pl: new plugins - -2002-08-14 20:00 sghosh - - * contrib/check_inodes-freebsd.pl: check inodes - freebsd - - candidate for merge with check_inodes - -2002-08-14 16:29 sghosh - - * contrib/check_smb.sh: new smb check - users - -2002-08-13 04:18 egalstad - - * plugins/check_game.c: Mod to display current/max number of - players in a game (Frank Kannemann) - -2002-08-13 00:09 egalstad - - * contrib/check_disk_snmp.pl: Updated to use getopt (Christoph - Maser) - -2002-08-01 06:06 sghosh - - * plugins/check_snmp.c: re-patched exit state comparison - -2002-08-01 05:54 sghosh - - * plugins/check_snmp.c: port option added, -c support net-snmpv5, - complete response string output - -2002-08-01 05:46 egalstad - - * contrib/check_digitemp.pl: Add Brian Lane's Digitemp (1-wire temp - sensor) plugin - -2002-07-16 05:13 egalstad - - * contrib/check_disk_snmp.pl: Christoph Maser's plugin to check - disk usage via SNMP3 - -2002-07-16 01:04 stanleyhopcroft - - * contrib/check_ms_spooler.pl: Primitive and in need of refinement - test of MS spooler (with smbclient) - -2002-07-04 23:02 sghosh - - * contrib/check_procl.sh: Jerome Tytgat - accumulated/percentage - CPU/MEM per process - bash plugin - -2002-07-04 05:05 sghosh - - * INSTALL: doc update - -2002-06-28 22:08 sghosh - - * INSTALL: note about autoconf/automake version - -2002-06-25 22:32 sghosh - - * contrib/check_rbl.c: Check if IP address is specified on RBL - - Tim Bell - -2002-06-25 14:55 sghosh - - * contrib/check_lmmon.pl: check motherboard/cpu temp via lmmon - -2002-06-24 22:29 sghosh - - * plugins/check_http.c: ignore return status codes if user - specified status line check - -2002-06-24 21:41 sghosh - - * plugins/check_snmp.c: printf bug for large numbers - Jeff Murray - -2002-06-20 05:27 sghosh - - * plugins-scripts/check_disk_smb.pl: logic fix for disk space - thresholds - -2002-06-19 06:11 sghosh - - * plugins/: check_dig.c, check_dns.c, check_fping.c, check_hpjd.c, - check_nagios.c, check_ping.c, check_snmp.c, check_vsz.c, - urlize.c, utils.c, utils.h.in: more POSIX return value comparison - related code fixes - -2002-06-19 04:09 sghosh - - * plugins/: check_disk.c, check_ping.c, check_procs.c: fixes for - using POSIX return codes - -2002-06-18 02:06 sghosh - - * plugins/common.h.in: updated to POSIX return codes - -2002-06-18 02:05 sghosh - - * contrib/check_cluster.c: Ethan's check_cluster - -2002-06-13 21:49 sghosh - - * plugins/check_smtp.c: conformance to RFC 821 - -2002-06-13 04:03 sghosh - - * configure.in: use xntpdc on Solaris for check_ntp - -2002-06-10 04:24 sghosh - - * plugins/check_smtp.c: patch to stop NOQUEUE syslog messages - - Karl Ewald - -2002-06-08 01:33 sghosh - - * plugins-scripts/check_ntp.pl: xntpdc/ntpdc patch - John Koyle - -2002-06-06 05:16 sghosh - - * plugins-scripts/: subst.in, utils.sh.in: corrected result codes - - for sh; corrected substition for libexec - Tom Bertelson - -2002-06-06 05:15 sghosh - - * plugins/check_disk.c: added option for mount point - Tom - Bertelson - -2002-06-06 05:15 sghosh - - * plugins-scripts/check_oracle.sh: Add test for Oracle name server, - can dynamicall determine ORACLE_HOME - tom Bertelson - -2002-06-06 05:14 sghosh - - * plugins-scripts/check_flexlm.pl: conditional on lmstat - -2002-06-06 05:13 sghosh - - * plugins-scripts/check_ntp.pl: conditional on ntpdc - -2002-05-29 01:57 sghosh - - * command.cfg.in: notes added - -2002-05-28 04:14 sghosh - - * command.cfg.in: option updates, more examples - -2002-05-28 03:41 sghosh - - * command.cfg.in: option updates, more examples - -2002-05-27 03:10 sghosh - - * plugins-scripts/check_ntp.pl: checked in too quickly - -2002-05-27 03:05 sghosh - - * doc/: README, developer-guidelines.html, - developer-guidelines.sgml: added developer guidelines. - -2002-05-27 03:03 sghosh - - * configure.in: typo, AIX 4.3 ps, smbclient, Net::SNMP fixes - -2002-05-27 03:01 sghosh - - * acconfig.h, plugins-scripts/utils.pm.in: new var - smbclient - -2002-05-27 02:56 sghosh - - * plugins-scripts/check_ntp.pl: logic reorg, ePN fix and support - for utils.pm - -2002-05-27 02:55 sghosh - - * plugins-scripts/check_disk_smb.pl: ePN fix and support for - utils.pm - -2002-05-23 17:39 sghosh - - * contrib/: check_log2.pl, check_vcs.pl: New plugins from Aaron - Bostick - Veritas Cluster, logfile - -2002-05-10 04:51 sghosh - - * plugins-scripts/check_rpc.pl: updates for ePN, patch for multiple - version check - -2002-05-10 04:49 sghosh - - * configure.in, plugins-scripts/utils.pm.in: added programs to - autoconf - -2002-05-10 04:49 sghosh - - * acconfig.h: Added programs for autoconf - -2002-05-09 20:03 sghosh - - * plugins-scripts/: Makefile.am, check_ifoperstatus.pl: migrated - check_ifoperstatus to standard plugin - -2002-05-08 16:35 sghosh - - * plugins/check_ping.c: patch for Suse 8.0 loss output - -2002-05-08 06:10 sghosh - - * plugins-scripts/utils.pm.in: is_hostname added, update CODES to - POSIX - -2002-05-08 06:07 sghosh - - * plugins/: check_hpjd.c, check_ups.c: updated notes - -2002-05-08 06:04 sghosh - - * configure.in: updated messages and check for host command - -2002-05-08 05:58 sghosh - - * plugins-scripts/: Makefile.am, check_ifstatus.pl: moved updated - check_ifstatus to standard plugin - -2002-05-07 06:35 sghosh - - * plugins-scripts/: check_breeze.pl, check_flexlm.pl, - check_ircd.pl, check_netdns.pl, check_ntp.pl, check_wave.pl: 2nd + * [r74] contrib/check_apc_ups.pl: fix for ePN -2002-05-02 17:43 sghosh +2002-08-14 19:01 sghosh - * plugins-scripts/: check_breeze.pl, check_disk_smb.pl, - check_flexlm.pl, check_ircd.pl, check_netdns.pl, check_ntp.pl, - check_rpc.pl, check_wave.pl: fix for embedded perl + * [r73] contrib/check_linux_raid.pl, contrib/check_nagios_db.pl: + new plugins -2002-05-02 17:22 sghosh +2002-08-14 19:00 sghosh - * tools/: README, mini_epn.c, p1.pl: updated mini_epn and p1.pl - added to plugins distribution + * [r72] contrib/check_inodes-freebsd.pl: + check inodes - freebsd - candidate for merge with check_inodes -2002-05-01 22:12 sghosh +2002-08-14 15:29 sghosh - * contrib/tarballs/fetchlog-0.92.tar.gz: remote log check (via snmp - possible) by Alexander Haderer + * [r71] contrib/check_smb.sh: + new smb check - users -2002-04-29 03:58 kdebisschop +2002-08-13 03:18 egalstad - * plugins/getopt.h: failed to carry over from old plugins, listed - in EXTRA_DIST, needed for build + * [r70] plugins/check_game.c: + Mod to display current/max number of players in a game (Frank + Kannemann) -2002-04-23 13:50 sghosh +2002-08-12 23:09 egalstad - * plugins/check_ping.c: corrected program name and added rtt patch - for RH7.2+beta + * [r69] contrib/check_disk_snmp.pl: + Updated to use getopt (Christoph Maser) -2002-04-18 22:59 egalstad +2002-08-01 05:06 sghosh - * contrib/check_inodes.pl: add check_inodes contrib plugin by John - Jolet + * [r68] plugins/check_snmp.c: + re-patched exit state comparison -2002-04-18 05:38 egalstad +2002-08-01 04:54 sghosh - * configure.in: configure script patch for ping syntax + * [r67] plugins/check_snmp.c: + port option added, -c support net-snmpv5, complete response + string output -2002-04-07 06:13 sghosh +2002-08-01 04:46 egalstad - * contrib/: check_backup.pl, check_dl_size.pl: plugins from Patrick - Greenwell + * [r66] contrib/check_digitemp.pl: + Add Brian Lane's Digitemp (1-wire temp sensor) plugin -2002-04-05 23:22 sghosh +2002-07-16 04:13 egalstad - * acconfig.h: added HOST_COMMAND + * [r65] contrib/check_disk_snmp.pl: + Christoph Maser's plugin to check disk usage via SNMP3 -2002-04-05 23:19 sghosh +2002-07-16 00:04 stanleyhopcroft - * contrib/tarballs/check_spread.tar: plugin to check spread - messaging toolkit + * [r64] contrib/check_ms_spooler.pl: + Primitive and in need of refinement test of MS spooler (with + smbclient) -2002-04-03 03:58 sghosh +2002-07-04 22:02 sghosh - * contrib/check_oracle_instance.pl: from Sven Dolderer - check - oracle instance + * [r63] contrib/check_procl.sh: + Jerome Tytgat - accumulated/percentage CPU/MEM per process - bash + plugin -2002-04-03 03:56 sghosh +2002-07-04 04:05 sghosh - * plugins-scripts/check_nfs.pl: check_nfs functionality exists in - check_rpc + * [r62] INSTALL: + doc update + +2002-06-28 21:08 sghosh + + * [r61] INSTALL: + note about autoconf/automake version + +2002-06-25 21:32 sghosh + + * [r60] contrib/check_rbl.c: + Check if IP address is specified on RBL - Tim Bell + +2002-06-25 13:55 sghosh + + * [r59] contrib/check_lmmon.pl: + check motherboard/cpu temp via lmmon + +2002-06-24 21:29 sghosh + + * [r58] plugins/check_http.c: + ignore return status codes if user specified status line check + +2002-06-24 20:41 sghosh + + * [r57] plugins/check_snmp.c: + printf bug for large numbers - Jeff Murray + +2002-06-20 04:27 sghosh + + * [r56] plugins-scripts/check_disk_smb.pl: + logic fix for disk space thresholds + +2002-06-19 05:11 sghosh + + * [r55] plugins/check_dig.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_hpjd.c, + plugins/check_nagios.c, plugins/check_ping.c, + plugins/check_snmp.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h.in: + more POSIX return value comparison related code fixes + +2002-06-19 03:09 sghosh + + * [r54] plugins/check_disk.c, plugins/check_ping.c, + plugins/check_procs.c: + fixes for using POSIX return codes + +2002-06-18 01:06 sghosh + + * [r53] plugins/common.h.in: + updated to POSIX return codes + +2002-06-18 01:05 sghosh + + * [r52] contrib/check_cluster.c: + Ethan's check_cluster + +2002-06-13 20:49 sghosh + + * [r51] plugins/check_smtp.c: + conformance to RFC 821 + +2002-06-13 03:03 sghosh + + * [r50] configure.in: + use xntpdc on Solaris for check_ntp + +2002-06-10 03:24 sghosh + + * [r49] plugins/check_smtp.c: + patch to stop NOQUEUE syslog messages - Karl Ewald + +2002-06-08 00:33 sghosh + + * [r48] plugins-scripts/check_ntp.pl: + xntpdc/ntpdc patch - John Koyle + +2002-06-06 04:16 sghosh + + * [r47] plugins-scripts/subst.in, plugins-scripts/utils.sh.in: + corrected result codes - for sh; corrected substition for libexec + - Tom Bertelson + +2002-06-06 04:15 sghosh + + * [r46] plugins/check_disk.c: + added option for mount point - Tom Bertelson + +2002-06-06 04:15 sghosh + + * [r45] plugins-scripts/check_oracle.sh: + Add test for Oracle name server, can dynamicall determine + ORACLE_HOME - tom Bertelson + +2002-06-06 04:14 sghosh + + * [r44] plugins-scripts/check_flexlm.pl: + conditional on lmstat + +2002-06-06 04:13 sghosh + + * [r43] plugins-scripts/check_ntp.pl: + conditional on ntpdc + +2002-05-29 00:57 sghosh + + * [r42] command.cfg.in: + notes added + +2002-05-28 03:14 sghosh + + * [r41] command.cfg.in: + option updates, more examples + +2002-05-28 02:41 sghosh + + * [r40] command.cfg.in: + option updates, more examples + +2002-05-27 02:10 sghosh + + * [r39] plugins-scripts/check_ntp.pl: + checked in too quickly + +2002-05-27 02:05 sghosh + + * [r38] doc, doc/README, doc/developer-guidelines.html, + doc/developer-guidelines.sgml: + added developer guidelines. + +2002-05-27 02:03 sghosh + + * [r37] configure.in: + typo, AIX 4.3 ps, smbclient, Net::SNMP fixes + +2002-05-27 02:01 sghosh + + * [r36] acconfig.h, plugins-scripts/utils.pm.in: + new var - smbclient + +2002-05-27 01:56 sghosh + + * [r35] plugins-scripts/check_ntp.pl: + logic reorg, ePN fix and support for utils.pm + +2002-05-27 01:55 sghosh + + * [r34] plugins-scripts/check_disk_smb.pl: + ePN fix and support for utils.pm + +2002-05-23 16:39 sghosh + + * [r33] contrib/check_log2.pl, contrib/check_vcs.pl: + New plugins from Aaron Bostick - Veritas Cluster, logfile + +2002-05-10 03:51 sghosh + + * [r32] plugins-scripts/check_rpc.pl: + updates for ePN, patch for multiple version check + +2002-05-10 03:49 sghosh + + * [r31] configure.in, plugins-scripts/utils.pm.in: + added programs to autoconf + +2002-05-10 03:49 sghosh + + * [r30] acconfig.h: + This commit was generated by cvs2svn to compensate for changes in + r29, + which included commits to RCS files with non-trunk default + branches. + +2002-05-09 19:03 sghosh + + * [r28] plugins-scripts/Makefile.am, + plugins-scripts/check_ifoperstatus.pl: + migrated check_ifoperstatus to standard plugin + +2002-05-08 15:35 sghosh + + * [r27] plugins/check_ping.c: + patch for Suse 8.0 loss output + +2002-05-08 05:10 sghosh + + * [r26] plugins-scripts/utils.pm.in: + is_hostname added, update CODES to POSIX + +2002-05-08 05:07 sghosh + + * [r25] plugins/check_hpjd.c, plugins/check_ups.c: + updated notes + +2002-05-08 05:04 sghosh + + * [r24] configure.in: + updated messages and check for host command + +2002-05-08 04:58 sghosh + + * [r23] plugins-scripts/Makefile.am, + plugins-scripts/check_ifstatus.pl: + moved updated check_ifstatus to standard plugin + +2002-05-07 05:35 sghosh + + * [r22] plugins-scripts/check_breeze.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_wave.pl: + 2nd fix for ePN + +2002-05-02 16:43 sghosh + + * [r21] plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: + fix for embedded perl + +2002-05-02 16:22 sghosh + + * [r20] tools/README, tools/mini_epn.c, tools/p1.pl: + updated mini_epn and p1.pl added to plugins distribution + +2002-05-01 21:12 sghosh + + * [r19] contrib/tarballs/fetchlog-0.92.tar.gz: + remote log check (via snmp possible) by Alexander Haderer + +2002-04-29 02:58 kdebisschop + + * [r18] plugins/getopt.h: + failed to carry over from old plugins, listed in EXTRA_DIST, + needed for build + +2002-04-23 12:50 sghosh + + * [r17] plugins/check_ping.c: + corrected program name and added rtt patch for RH7.2+beta + +2002-04-18 21:59 egalstad + + * [r16] contrib/check_inodes.pl: + add check_inodes contrib plugin by John Jolet + +2002-04-18 04:38 egalstad + + * [r15] configure.in: + configure script patch for ping syntax + +2002-04-07 05:13 sghosh + + * [r14] contrib/check_backup.pl, contrib/check_dl_size.pl: + plugins from Patrick Greenwell + +2002-04-05 22:22 sghosh + + * [r13] acconfig.h: + This commit was generated by cvs2svn to compensate for changes in + r12, + which included commits to RCS files with non-trunk default + branches. + +2002-04-05 22:19 sghosh + + * [r11] contrib/tarballs/check_spread.tar: + plugin to check spread messaging toolkit + +2002-04-03 02:58 sghosh + + * [r10] contrib/check_oracle_instance.pl: + from Sven Dolderer - check oracle instance + +2002-04-03 02:56 sghosh + + * [r9] plugins-scripts/check_nfs.pl: + check_nfs functionality exists in check_rpc 2002-03-18 05:15 sghosh - * plugins-scripts/subst.in: function to update perl plugin scripts - to find utils.pm + * [r8] plugins-scripts/subst.in: + function to update perl plugin scripts to find utils.pm 2002-03-01 02:53 egalstad - * plugins/: .cvsignore, config.h.in: Fix for stupid me + * [r7] plugins, plugins/.cvsignore, plugins/config.h.in: + Fix for stupid me 2002-03-01 02:42 egalstad - * contrib/check_breeze.pl, contrib/check_dhcp.c, + * [r6] contrib/check_breeze.pl, contrib/check_dhcp.c, contrib/check_flexlm.pl, contrib/check_hltherm.c, contrib/check_hprsc.pl, contrib/check_ipxping.c, contrib/check_memory.tgz, contrib/check_mysql.c, @@ -8304,39 +10108,39 @@ contrib/tarballs/check_radius.tar.gz, contrib/tarballs/check_wave.tar.gz, contrib/tarballs/hopcroft-plugins.tar.gz, - contrib/tarballs/radius.tar.gz, plugins/.cvsignore, - plugins/config.h.in: Contrib plugin cleanup + contrib/tarballs/radius.tar.gz, plugins, plugins/.cvsignore, + plugins/config.h.in: + Contrib plugin cleanup 2002-02-28 06:42 egalstad - * .cvsignore, AUTHORS, CODING, COPYING, ChangeLog, FAQ, Helper.pm, - INSTALL, Makefile.am, NEWS, README, REQUIREMENTS, ROADMAP, - Requirements, acconfig.h, aclocal.m4, command.cfg.in, LEGAL, - configure.in, install-sh, make-tarball, missing, mkinstalldirs, - nagios-plugins.spec, opttest.pl, package.def, rpm, subst.in, - subst.sh, test.pl.in, contrib/check_apache.pl, - contrib/check_apc_ups.pl, contrib/check_bgpstate.pl, - contrib/check_dhcp.c, contrib/check_dlswcircuit.pl, - contrib/check_dns_random.pl, contrib/check_email_loop.pl, - contrib/check_fping_in.c, contrib/check_ftpget.pl, - contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl, - contrib/check_pop3.pl, contrib/check_qmailq.pl, - contrib/check_timeout.c, contrib/checkciscotemp.pl, - contrib/check_ipxping.c, contrib/check_joy.sh, - contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, - contrib/check_mem.pl, contrib/check_memory.tgz, - contrib/check_mysql.c, contrib/check_mysql.pl, + * [r2] ., .cvsignore, AUTHORS, CODING, COPYING, ChangeLog, FAQ, + Helper.pm, INSTALL, LEGAL, Makefile.am, NEWS, README, + REQUIREMENTS, ROADMAP, Requirements, acconfig.h, aclocal.m4, + command.cfg.in, configure.in, contrib, contrib/aix, + contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_failed, contrib/aix/check_io, + contrib/aix/check_kerberos, contrib/aix/check_ping, + contrib/aix/check_queue, contrib/aix/pg_stat, + contrib/check_apache.pl, contrib/check_apc_ups.pl, + contrib/check_bgpstate.pl, contrib/check_dhcp.c, + contrib/check_dlswcircuit.pl, contrib/check_dns_random.pl, + contrib/check_email_loop.pl, contrib/check_fping_in.c, + contrib/check_ftpget.pl, contrib/check_ifoperstatus.pl, + contrib/check_ifstatus.pl, contrib/check_ipxping.c, + contrib/check_joy.sh, contrib/check_maxchannels.pl, + contrib/check_maxwanstate.pl, contrib/check_mem.pl, + contrib/check_memory.tgz, contrib/check_mysql.c, + contrib/check_mysql.pl, contrib/check_nagios.pl, contrib/check_netapp.pl, contrib/check_nmap.py, contrib/check_nwstat.pl, contrib/check_ora_table_space.pl, + contrib/check_pop3.pl, contrib/check_qmailq.pl, contrib/check_rrd_data.pl, contrib/check_sap.sh, - contrib/check_sockets.pl, contrib/check_uptime.c, + contrib/check_sockets.pl, contrib/check_timeout.c, + contrib/check_uptime.c, contrib/checkciscotemp.pl, contrib/maser-oracle.pl, contrib/mrtgext.pl, contrib/readme.txt, - contrib/restrict.pl, contrib/utils.py, contrib/check_nagios.pl, - contrib/urlize.pl, contrib/aix/check_crit_dsk, - contrib/aix/check_dsk, contrib/aix/check_failed, - contrib/aix/check_io, contrib/aix/check_kerberos, - contrib/aix/check_ping, contrib/aix/check_queue, - contrib/aix/pg_stat, contrib/tarballs/berger-ping.tar.gz, + contrib/restrict.pl, contrib/tarballs, + contrib/tarballs/berger-ping.tar.gz, contrib/tarballs/bowen-langley_plugins.tar.gz, contrib/tarballs/check_bgp-1.0.tar.gz, contrib/tarballs/check_breeze.tar.gz, @@ -8346,7 +10150,20 @@ contrib/tarballs/check_radius.tar.gz, contrib/tarballs/check_wave.tar.gz, contrib/tarballs/hopcroft-plugins.tar.gz, - contrib/tarballs/radius.tar.gz, plugins/.cvsignore, + contrib/tarballs/radius.tar.gz, contrib/urlize.pl, + contrib/utils.py, install-sh, make-tarball, missing, + mkinstalldirs, nagios-plugins.spec, opttest.pl, package.def, + plugins, plugins-scripts, plugins-scripts/.cvsignore, + plugins-scripts/Makefile.am, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_netdns.pl, + plugins-scripts/check_nfs.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_oracle.sh, plugins-scripts/check_rpc.pl, + plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl, + plugins-scripts/subst.in, plugins-scripts/t, + plugins-scripts/t/check_rpc.t, plugins-scripts/utils.pm.in, + plugins-scripts/utils.sh.in, plugins/.cvsignore, plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, plugins/check_ftp.c, plugins/check_game.c, @@ -8354,18 +10171,17 @@ plugins/check_ide-smart.c, plugins/check_imap.c, plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, - plugins/check_nntp.c, plugins/check_nt.c, plugins/check_nwstat.c, - plugins/check_overcr.c, plugins/check_pgsql.c, - plugins/check_ping.c, plugins/check_pop.c, plugins/check_procs.c, - plugins/check_radius.c, plugins/check_real.c, - plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, - plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, - plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, - plugins/check_vsz.c, plugins/common.h.in, plugins/getopt.c, - plugins/getopt1.c, plugins/netutils.c, plugins/netutils.h.in, - plugins/popen.c, plugins/popen.h.in, plugins/snprintf.c, - plugins/urlize.c, plugins/check_nagios.c, plugins/utils.c, - plugins/utils.h.in, plugins/version.h.in, plugins/t/check_disk.t, + plugins/check_nagios.c, plugins/check_nntp.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_pop.c, + plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c, plugins/common.h.in, + plugins/getopt.c, plugins/getopt1.c, plugins/netutils.c, + plugins/netutils.h.in, plugins/popen.c, plugins/popen.h.in, + plugins/snprintf.c, plugins/t, plugins/t/check_disk.t, plugins/t/check_dns.t, plugins/t/check_fping.t, plugins/t/check_ftp.t, plugins/t/check_hpjd.t, plugins/t/check_http.t, plugins/t/check_imap.t, @@ -8375,107 +10191,19 @@ plugins/t/check_snmp.t, plugins/t/check_swap.t, plugins/t/check_tcp.t, plugins/t/check_time.t, plugins/t/check_udp.t, plugins/t/check_users.t, - plugins/t/check_vsz.t, plugins/tests/check_disk, + plugins/t/check_vsz.t, plugins/tests, plugins/tests/check_disk, plugins/tests/check_dns, plugins/tests/check_ftp, plugins/tests/check_hpjd, plugins/tests/check_http, plugins/tests/check_load, plugins/tests/check_ping, plugins/tests/check_procs, plugins/tests/check_swap, plugins/tests/check_users, plugins/tests/check_vsz, - plugins-scripts/.cvsignore, plugins-scripts/Makefile.am, - plugins-scripts/check_breeze.pl, - plugins-scripts/check_disk_smb.pl, - plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, - plugins-scripts/check_log.sh, plugins-scripts/check_netdns.pl, - plugins-scripts/check_nfs.pl, plugins-scripts/check_ntp.pl, - plugins-scripts/check_oracle.sh, plugins-scripts/check_rpc.pl, - plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl, - plugins-scripts/subst.in, plugins-scripts/utils.pm.in, - plugins-scripts/utils.sh.in, plugins-scripts/t/check_rpc.t, - tools/setup, tools/tango: Initial import of existing plugin code + plugins/urlize.c, plugins/utils.c, plugins/utils.h.in, + plugins/version.h.in, rpm, subst.in, subst.sh, test.pl.in, tools, + tools/setup, tools/tango: + Initial revision -2002-02-28 06:42 egalstad +2002-02-28 06:42 - * .cvsignore, AUTHORS, CODING, COPYING, ChangeLog, FAQ, Helper.pm, - INSTALL, Makefile.am, NEWS, README, REQUIREMENTS, ROADMAP, - Requirements, acconfig.h, aclocal.m4, command.cfg.in, LEGAL, - configure.in, install-sh, make-tarball, missing, mkinstalldirs, - nagios-plugins.spec, opttest.pl, package.def, rpm, subst.in, - subst.sh, test.pl.in, contrib/check_apache.pl, - contrib/check_apc_ups.pl, contrib/check_bgpstate.pl, - contrib/check_dhcp.c, contrib/check_dlswcircuit.pl, - contrib/check_dns_random.pl, contrib/check_email_loop.pl, - contrib/check_fping_in.c, contrib/check_ftpget.pl, - contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl, - contrib/check_pop3.pl, contrib/check_qmailq.pl, - contrib/check_timeout.c, contrib/checkciscotemp.pl, - contrib/check_ipxping.c, contrib/check_joy.sh, - contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, - contrib/check_mem.pl, contrib/check_memory.tgz, - contrib/check_mysql.c, contrib/check_mysql.pl, - contrib/check_netapp.pl, contrib/check_nmap.py, - contrib/check_nwstat.pl, contrib/check_ora_table_space.pl, - contrib/check_rrd_data.pl, contrib/check_sap.sh, - contrib/check_sockets.pl, contrib/check_uptime.c, - contrib/maser-oracle.pl, contrib/mrtgext.pl, contrib/readme.txt, - contrib/restrict.pl, contrib/utils.py, contrib/check_nagios.pl, - contrib/urlize.pl, contrib/aix/check_crit_dsk, - contrib/aix/check_dsk, contrib/aix/check_failed, - contrib/aix/check_io, contrib/aix/check_kerberos, - contrib/aix/check_ping, contrib/aix/check_queue, - contrib/aix/pg_stat, contrib/tarballs/berger-ping.tar.gz, - contrib/tarballs/bowen-langley_plugins.tar.gz, - contrib/tarballs/check_bgp-1.0.tar.gz, - contrib/tarballs/check_breeze.tar.gz, - contrib/tarballs/check_flexlm.tar.gz, - contrib/tarballs/check_hltherm.tar.gz, - contrib/tarballs/check_hprsc.tar.gz, - contrib/tarballs/check_radius.tar.gz, - contrib/tarballs/check_wave.tar.gz, - contrib/tarballs/hopcroft-plugins.tar.gz, - contrib/tarballs/radius.tar.gz, plugins/.cvsignore, - plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, - plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, - plugins/check_fping.c, plugins/check_ftp.c, plugins/check_game.c, - plugins/check_hpjd.c, plugins/check_http.c, - plugins/check_ide-smart.c, plugins/check_imap.c, - plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, - plugins/check_mrtgtraf.c, plugins/check_mysql.c, - plugins/check_nntp.c, plugins/check_nt.c, plugins/check_nwstat.c, - plugins/check_overcr.c, plugins/check_pgsql.c, - plugins/check_ping.c, plugins/check_pop.c, plugins/check_procs.c, - plugins/check_radius.c, plugins/check_real.c, - plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, - plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, - plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, - plugins/check_vsz.c, plugins/common.h.in, plugins/getopt.c, - plugins/getopt1.c, plugins/netutils.c, plugins/netutils.h.in, - plugins/popen.c, plugins/popen.h.in, plugins/snprintf.c, - plugins/urlize.c, plugins/check_nagios.c, plugins/utils.c, - plugins/utils.h.in, plugins/version.h.in, plugins/t/check_disk.t, - plugins/t/check_dns.t, plugins/t/check_fping.t, - plugins/t/check_ftp.t, plugins/t/check_hpjd.t, - plugins/t/check_http.t, plugins/t/check_imap.t, - plugins/t/check_load.t, plugins/t/check_mysql.t, - plugins/t/check_ping.t, plugins/t/check_pop.t, - plugins/t/check_procs.t, plugins/t/check_smtp.t, - plugins/t/check_snmp.t, plugins/t/check_swap.t, - plugins/t/check_tcp.t, plugins/t/check_time.t, - plugins/t/check_udp.t, plugins/t/check_users.t, - plugins/t/check_vsz.t, plugins/tests/check_disk, - plugins/tests/check_dns, plugins/tests/check_ftp, - plugins/tests/check_hpjd, plugins/tests/check_http, - plugins/tests/check_load, plugins/tests/check_ping, - plugins/tests/check_procs, plugins/tests/check_swap, - plugins/tests/check_users, plugins/tests/check_vsz, - plugins-scripts/.cvsignore, plugins-scripts/Makefile.am, - plugins-scripts/check_breeze.pl, - plugins-scripts/check_disk_smb.pl, - plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, - plugins-scripts/check_log.sh, plugins-scripts/check_netdns.pl, - plugins-scripts/check_nfs.pl, plugins-scripts/check_ntp.pl, - plugins-scripts/check_oracle.sh, plugins-scripts/check_rpc.pl, - plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl, - plugins-scripts/subst.in, plugins-scripts/utils.pm.in, - plugins-scripts/utils.sh.in, plugins-scripts/t/check_rpc.t, - tools/setup, tools/tango: Initial revision + * [r1] .: + New repository initialized by cvs2svn. diff --git a/INSTALL b/INSTALL index 23e5f25..56b077d 100644 --- a/INSTALL +++ b/INSTALL @@ -102,16 +102,16 @@ for another architecture. Installation Names ================== -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular @@ -159,7 +159,7 @@ where SYSTEM can have one of these forms: need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the `--target=TYPE' option to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a diff --git a/Makefile.am b/Makefile.am index b76bf76..701c56c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,13 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = gl lib plugins plugins-scripts plugins-root po +SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \ REQUIREMENTS SUPPORT THANKS \ NPTest.pm contrib pkg nagios-plugins.spec \ config_test/Makefile config_test/run_tests config_test/child_test.c \ + perlmods tools/build_perl_modules \ tools/tinderbox_build ACLOCAL_AMFLAGS = -I gl/m4 -I m4 @@ -23,8 +24,9 @@ install-root: test: cd lib && $(MAKE) test - cd plugins; $(MAKE) test - cd plugins-scripts; $(MAKE) test + if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi + cd plugins && $(MAKE) test + cd plugins-scripts && $(MAKE) test nagios-plugins.spec: nagios-plugins.spec.in sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@ diff --git a/Makefile.in b/Makefile.in index 6a72ca8..9672e6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -42,7 +42,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ build-aux/compile build-aux/config.guess \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ - config.rpath mkinstalldirs + build-aux/mkinstalldirs config.rpath mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -104,7 +104,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = command.cfg test.pl pkg/solaris/pkginfo SOURCES = @@ -263,6 +263,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ @@ -349,12 +350,13 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ with_trusted_path = @with_trusted_path@ -SUBDIRS = gl lib plugins plugins-scripts plugins-root po +SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@ EXTRA_DIST = config.rpath \ ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \ REQUIREMENTS SUPPORT THANKS \ NPTest.pm contrib pkg nagios-plugins.spec \ config_test/Makefile config_test/run_tests config_test/child_test.c \ + perlmods tools/build_perl_modules \ tools/tinderbox_build ACLOCAL_AMFLAGS = -I gl/m4 -I m4 @@ -817,8 +819,9 @@ install-root: test: cd lib && $(MAKE) test - cd plugins; $(MAKE) test - cd plugins-scripts; $(MAKE) test + if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi + cd plugins && $(MAKE) test + cd plugins-scripts && $(MAKE) test nagios-plugins.spec: nagios-plugins.spec.in sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@ diff --git a/NEWS b/NEWS index ed94cd3..1dabbb0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,53 @@ This file documents the major additions and syntax changes between releases. +1.4.10 28th September 2007 + Fix check_http buffer overflow vulnerability when following HTTP redirects + check_http now explicitly asks HTTP/1.1 servers to close the connection + after completion of the response + Check_ldaps' guessing which secure method to use (starttls vs. ssl on connect) + is now deprecated. See --help for further information. + Check_disk now calls stat() on all filesystems to check. (Old: only the ones selected using -p) + A meaningful error message (eg "Stale NFS Handle") is printed if stat fails. + New check_disk option -L: Only check local filesystems, but call stat() on remote ones, too. + Thus accessibility of remote filesystems can be checked without any threshold comparison. + Check_disk's --help now prints some examples for the new features introduced in 1.4.8 + New check_disk -i/-I option to ignore pathes/partitions based on regular expressions + New check_disk -A option to select all filesystems explicitly + WARNING: check_disk's -E option must now be passed before -p or -r/-R arguments + Passing -E after -p or -r results in UNKNOWN state, now + This is needed due to the new ignore feature + Fix check_disk bug when mixing case sensitive and case insensitive regex arguments + New check_dhcp -u/--unicast option for emulating a DHCP relay in order + to check DHCP servers on remote networks + New check_dhcp -m/--mac option which allows for specifying the MAC + address to use in the DHCP request + The check_dhcp -r and -s options now accept host names, too + Fix possible check_icmp bus errors on some (non-x86/AMD64) platforms + Fix check_smtp's handling of multiple-packet server responses + WARNING: Fix for negate which may break existing commands: + - stop evaluating command line options through shell twice + - enforce a full path for the command to run + The "negate" utility can now remap custom states + Check_radius now supports radiusclient-ng + The (undocumented) positional parameter parsing which check_radius used + instead of getopt(3) if 8 arguments were given is no longer available + Check_by_ssh now supports multiline output + IPv6 support can now be disabled using ./configure --without-ipv6 + Fix check_ntp now honor ntp flags + +1.4.9 4th June 2006 + Inclusion of contrib/check_cluster2 as check_cluster with some improvements + New/improved -E/--skip-stderr and -S/--skip-stdout options for check_by_ssh + check_snmp now supports Counter64 + Fix compilation of check_ldap, check_radius and check_pgsql + check_load can optionally divide by number of cpus + Fix check_time returning wrong OK when time is before the epoch on some arch + Make check_http output more consistent + Fix possible check_http segfaults when following HTTP redirects + check_snmp don't warn anymore if something is printed on stderr + Fix check_tcp segfault when multiple expect strings are given + New option for check_tcp: -A/--all to test if all given expect strings match + 1.4.8 11th April 2007 Respects --without-world-permissions for setuid plugins check_disk extra options for regex matching of filesystems and grouping of filesystems diff --git a/NPTest.pm b/NPTest.pm index c3dacea..ef49c64 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -21,7 +21,7 @@ use Data::Dumper; use Test; use vars qw($VERSION); -$VERSION = do { my @r = (q$Revision: 1.14 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker +$VERSION = do { my @r = (q$Revision: 1556 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker =head1 NAME diff --git a/REQUIREMENTS b/REQUIREMENTS index ebc495b..9fdf408 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -46,6 +46,8 @@ check_radius: - Requires the radiusclient library available from ftp://ftp.cityline.net/pub/radiusclient/ RPM (rpmfind): radiusclient 0.3.2, radiusclient-devel-0.3.2 + - Alternatively radiusclient-ng can be used: + http://developer.berlios.de/projects/radiusclient-ng/ check_snmp: - Requires the NET-SNMP package available from @@ -67,6 +69,9 @@ check_ups: - Requires Network UPS Tools (>= 1.4) to run on the server to monitor http://www.networkupstools.org/ +check_ide_smart: + - Uses the Linux specific SMART interface [http://smartlinux.sourceforge.net/smart/index.php]. + OS Specific Issues ------------------ diff --git a/THANKS b/THANKS index 68c1149..68ff7f1 100644 --- a/THANKS +++ b/THANKS @@ -27,9 +27,11 @@ Simon Bellwood Allan Bennett Guy Van Den Bergh Tom Bertelston +Daniel Bimschas Jeffery Blank Tom De Blende Eric Bollengier +Aurelien Bompard Richard Brodie Matthew Brown Dick van den Burg @@ -58,10 +60,12 @@ Rainer Duffner Ian Duggan Matthias Eble Edwin Eefting +Andrew Elwell Mike Emigh Hans Engelen Matthew Ericson Andreas Ericsson +Heiti Ernits Ragnar Hojland Espinosa O'Shaughnessy Evans Merijn Evertse @@ -74,6 +78,7 @@ Paulo Fessel Paulo Afonso Graner Fessel James Fidell Johan Fischer +Matthias Flacke Felix Frank Rick Frey Matt Garrett @@ -86,8 +91,10 @@ Steve Greenland Olaf Greis Chris Grim Steven Grimm +Sebastien Guay Jon Hallett Steve Hanselman +Ask Bjoern Hansen Michael Haro Gunnar Hellekson Johannes Herlitz @@ -104,6 +111,7 @@ Roy Sigurd Karlsbakk Jason Kau Bo Kersey Serhan Kiymaz +Denis Knauf John Koyle Steven Kreuzer Christoph Kron @@ -132,6 +140,7 @@ Mike McHenry Stefan Meier Jan-Piet Mens Sven Meyer +Emil Michles Christian Mies Russell Miller Janos Mohacsi @@ -174,6 +183,7 @@ Dietmar Ruzicka Ralph Rye Alen Salamun Sven Schaffranneck +Christoph Schell Thomas Schimpke Benjamin Schmid Henning Schmiedehausen @@ -199,6 +209,7 @@ Ibere Tizio Julien Touche Kyle Tucker Jerome Tytgat +MAtteo HCE Valsasna Jon Vandegrift Laurent Vaslin Carole Verdon diff --git a/acinclude.m4 b/acinclude.m4 index 788d68e..c1b4219 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -8,7 +8,7 @@ dnl e.g. 6 arguments (linux) dnl e.g. 5 arguments (solaris) dnl e.g. 3 arguments (osf/1) dnl -dnl @version $Id: acinclude.m4,v 1.5 2004/02/18 14:56:34 kdebisschop Exp $ +dnl @version $Id: acinclude.m4 805 2004-02-18 14:56:39Z kdebisschop $ dnl @author Brian Stafford dnl dnl based on version by Caolan McNamara diff --git a/aclocal.m4 b/aclocal.m4 index 8edca65..8649a3e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -6397,7 +6397,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) + [AM_AUTOMAKE_VERSION([1.9.5])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- diff --git a/build-aux/compile b/build-aux/compile index 1b1d232..ad57e2f 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2005-02-03.08 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . @@ -18,7 +18,7 @@ scriptversion=2005-05-14.22 # # 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a diff --git a/build-aux/depcomp b/build-aux/depcomp index 04701da..ffcd540 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2005-02-09.22 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -17,8 +17,8 @@ scriptversion=2005-07-09.11 # 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 Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -467,8 +467,7 @@ cpp) done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" diff --git a/build-aux/install-sh b/build-aux/install-sh index 4d4a951..1a83534 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2005-02-02.21 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the diff --git a/build-aux/missing b/build-aux/missing index 894e786..09edd88 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2005-02-08.22 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. @@ -19,8 +19,8 @@ scriptversion=2005-06-08.21 # 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 Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -297,9 +297,6 @@ WARNING: \`$1' is $msg. You should only need it if # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 touch $file ;; diff --git a/build-aux/mkinstalldirs b/build-aux/mkinstalldirs new file mode 100755 index 0000000..5d26a48 --- /dev/null +++ b/build-aux/mkinstalldirs @@ -0,0 +1,150 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2005-02-02.21 + +# Original author: Noah Friedman +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp="$pathcomp/" + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/command.cfg.in b/command.cfg.in index 3509380..6a9e151 100644 --- a/command.cfg.in +++ b/command.cfg.in @@ -1,7 +1,7 @@ ############################################################################### # COMMAND CONFIGURATION # -# $Id: command.cfg.in,v 1.13 2004/12/02 04:48:37 mattkent Exp $ +# $Id: command.cfg.in 973 2004-12-02 04:48:37Z mattkent $ # # SYNTAX: # command[]= diff --git a/config.h.in b/config.h.in index 2c237ef..0f41b43 100644 --- a/config.h.in +++ b/config.h.in @@ -318,6 +318,10 @@ /* Define to 1 if you have the `radiusclient' library (-lradiusclient). */ #undef HAVE_LIBRADIUSCLIENT +/* Define to 1 if you have the `radiusclient-ng' library (-lradiusclient-ng). + */ +#undef HAVE_LIBRADIUSCLIENT_NG + /* Define to 1 if you have the `listmntent' function. */ #undef HAVE_LISTMNTENT @@ -527,6 +531,9 @@ /* Define to 1 if the system has the type `swaptbl_t'. */ #undef HAVE_SWAPTBL_T +/* Define if sysconf returns number of cpus */ +#undef HAVE_SYSCONF__SC_NPROCESSORS_CONF + /* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H @@ -560,6 +567,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STATFS_H diff --git a/configure b/configure index 6771664..11347a7 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for nagios-plugins 1.4.8. +# Generated by GNU Autoconf 2.59 for nagios-plugins 1.4.10. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -422,8 +422,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='nagios-plugins' PACKAGE_TARNAME='nagios-plugins' -PACKAGE_VERSION='1.4.8' -PACKAGE_STRING='nagios-plugins 1.4.8' +PACKAGE_VERSION='1.4.10' +PACKAGE_STRING='nagios-plugins 1.4.10' PACKAGE_BUGREPORT='' ac_unique_file="NPTest.pm" @@ -468,7 +468,7 @@ ac_includes_default="\ gt_needs= gl_header_list= gl_func_list= -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os RELEASE INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PLUGIN_TEST SCRIPT_TEST WARRANTY SUPPORT with_trusted_path PKG_ARCH REV_DATESTAMP REV_TIMESTAMP PYTHON SH PERL LIBGNUTLS_CONFIG HOSTNAME BASENAME SOCKETLIBS MATHLIBS EXTRA_TEST PGLIBS PGINCLUDE RADIUSLIBS LDAPLIBS LDAPINCLUDE np_mysql_config MYSQLINCLUDE MYSQLLIBS MYSQLCFLAGS KRBINCLUDE SSLINCLUDE check_tcp_ssl SSLLIBS PATH_TO_PS PATH_TO_PING PATH_TO_PING6 PATH_TO_NSLOOKUP PATH_TO_UPTIME PATH_TO_RPCINFO PATH_TO_LMSTAT PATH_TO_SMBCLIENT PATH_TO_WHO PATH_TO_SNMPGET PATH_TO_SNMPGETNEXT PATH_TO_QUAKESTAT PATH_TO_QSTAT PATH_TO_FPING PATH_TO_SSH PATH_TO_MAILQ PATH_TO_QMAIL_QSTAT PATH_TO_SWAP PATH_TO_SWAPINFO PATH_TO_LSPS PATH_TO_DIG PATH_TO_APTGET EXTRAS EXTRAS_ROOT EXTRA_NETOBJS DEPLIBS USE_NLS MSGFMT GMSGFMT MSGFMT_015 GMSGFMT_015 XGETTEXT XGETTEXT_015 MSGMERGE localedir INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H ARPA_INET_H SYS_SOCKET_H NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H NETINET_IN_H STDBOOL_H HAVE__BOOL HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H ABSOLUTE_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H MKDIR_P UNISTD_H ABSOLUTE_UNISTD_H EOVERFLOW ABSOLUTE_WCHAR_H WCHAR_H HAVE_WINT_T ABSOLUTE_WCTYPE_H HAVE_WCTYPE_H WCTYPE_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os RELEASE INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PLUGIN_TEST SCRIPT_TEST WARRANTY SUPPORT with_trusted_path PKG_ARCH REV_DATESTAMP REV_TIMESTAMP PYTHON SH PERL LIBGNUTLS_CONFIG HOSTNAME BASENAME SOCKETLIBS MATHLIBS EXTRA_TEST PGLIBS PGINCLUDE RADIUSLIBS LDAPLIBS LDAPINCLUDE np_mysql_config MYSQLINCLUDE MYSQLLIBS MYSQLCFLAGS KRBINCLUDE SSLINCLUDE check_tcp_ssl SSLLIBS PATH_TO_PS PATH_TO_PING PATH_TO_PING6 PATH_TO_NSLOOKUP PATH_TO_UPTIME PATH_TO_RPCINFO PATH_TO_LMSTAT PATH_TO_SMBCLIENT PATH_TO_WHO PATH_TO_SNMPGET PATH_TO_SNMPGETNEXT PATH_TO_QUAKESTAT PATH_TO_QSTAT PATH_TO_FPING PATH_TO_SSH PATH_TO_MAILQ PATH_TO_QMAIL_QSTAT PATH_TO_SWAP PATH_TO_SWAPINFO PATH_TO_LSPS PATH_TO_DIG PATH_TO_APTGET EXTRAS EXTRAS_ROOT EXTRA_NETOBJS DEPLIBS USE_NLS MSGFMT GMSGFMT MSGFMT_015 GMSGFMT_015 XGETTEXT XGETTEXT_015 MSGMERGE localedir INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PERLMODS_DIR GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H ARPA_INET_H SYS_SOCKET_H NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H NETINET_IN_H STDBOOL_H HAVE__BOOL HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H ABSOLUTE_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H MKDIR_P UNISTD_H ABSOLUTE_UNISTD_H EOVERFLOW ABSOLUTE_WCHAR_H WCHAR_H HAVE_WINT_T ABSOLUTE_WCTYPE_H HAVE_WCTYPE_H WCTYPE_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -957,7 +957,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nagios-plugins 1.4.8 to adapt to many kinds of systems. +\`configure' configures nagios-plugins 1.4.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1023,7 +1023,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nagios-plugins 1.4.8:";; + short | recursive ) echo "Configuration of nagios-plugins 1.4.10:";; esac cat <<\_ACEOF @@ -1047,6 +1047,8 @@ Optional Features: --enable-redhat-pthread-workaround force Redhat patch to be applied (default: test system) + --enable-perl-modules Enables installation of Nagios::Plugin and its + dependencies (default: no) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1068,6 +1070,7 @@ Optional Packages: --with-mysql=DIR Locates mysql libraries. Expects DIR/bin/mysql_config. Default to search for mysql_config in PATH + --with-ipv6 support IPv6 [default=check] --with-ps-command=PATH Verbatim command to execute for ps --with-ps-format=FORMAT Format string for scanning ps output --with-ps-cols=NUM Number of columns in ps command @@ -1209,7 +1212,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -nagios-plugins configure 1.4.8 +nagios-plugins configure 1.4.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1223,7 +1226,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nagios-plugins $as_me 1.4.8, which was +It was created by nagios-plugins $as_me 1.4.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1891,7 +1894,7 @@ fi # Define the identity of the package. PACKAGE='nagios-plugins' - VERSION='1.4.8' + VERSION='1.4.10' cat >>confdefs.h <<_ACEOF @@ -4698,7 +4701,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4701 "configure"' > conftest.$ac_ext + echo '#line 4704 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5818,7 +5821,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5821:" \ +echo "$as_me:5824:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6879,11 +6882,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6882: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6885: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6886: \$? = $ac_status" >&5 + echo "$as_me:6889: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7147,11 +7150,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7150: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7153: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7154: \$? = $ac_status" >&5 + echo "$as_me:7157: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7251,11 +7254,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7254: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7257: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7258: \$? = $ac_status" >&5 + echo "$as_me:7261: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9576,7 +9579,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12020: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12021: \$? = $ac_status" >&5 + echo "$as_me:12024: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12118,11 +12121,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12124: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12125: \$? = $ac_status" >&5 + echo "$as_me:12128: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13679,11 +13682,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13685: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13686: \$? = $ac_status" >&5 + echo "$as_me:13689: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13783,11 +13786,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13786: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13789: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13790: \$? = $ac_status" >&5 + echo "$as_me:13793: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15973,11 +15976,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15976: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15979: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15980: \$? = $ac_status" >&5 + echo "$as_me:15983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16241,11 +16244,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16244: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16247: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16248: \$? = $ac_status" >&5 + echo "$as_me:16251: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16345,11 +16348,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16351: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16352: \$? = $ac_status" >&5 + echo "$as_me:16355: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20270,7 +20273,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_tap_plan_tests" >&5 echo "${ECHO_T}$ac_cv_lib_tap_plan_tests" >&6 if test $ac_cv_lib_tap_plan_tests = yes; then - EXTRA_TEST="test_utils test_disk" + EXTRA_TEST="test_utils test_disk test_tcp test_cmd" fi @@ -20996,10 +20999,89 @@ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then RADIUSLIBS="-lradiusclient" else - { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5 + +echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5 +echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6 +if test "${ac_cv_lib_radiusclient_ng_rc_read_config+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lradiusclient-ng $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char rc_read_config (); +int +main () +{ +rc_read_config (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_radiusclient_ng_rc_read_config=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_radiusclient_ng_rc_read_config=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 +echo "${ECHO_T}$ac_cv_lib_radiusclient_ng_rc_read_config" >&6 +if test $ac_cv_lib_radiusclient_ng_rc_read_config = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRADIUSCLIENT_NG 1 +_ACEOF + + LIBS="-lradiusclient-ng $LIBS" + +fi + + if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius" + RADIUSLIBS="-lradiusclient-ng" + + else + { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5 echo "$as_me: WARNING: Skipping radius plugin" >&2;} - { echo "$as_me:$LINENO: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 + { echo "$as_me:$LINENO: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5 echo "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;} + fi fi LIBS="$_SAVEDLIBS" @@ -21290,6 +21372,304 @@ echo "$as_me: WARNING: install LDAP libs to compile this plugin (see REQUIREMENT fi LIBS="$_SAVEDLIBS" +if test "${ac_cv_header_linux_hdreg_h+set}" = set; then + echo "$as_me:$LINENO: checking for linux/hdreg.h" >&5 +echo $ECHO_N "checking for linux/hdreg.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_hdreg_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_hdreg_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_hdreg_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking linux/hdreg.h usability" >&5 +echo $ECHO_N "checking linux/hdreg.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking linux/hdreg.h presence" >&5 +echo $ECHO_N "checking linux/hdreg.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/hdreg.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/hdreg.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/hdreg.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/hdreg.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/hdreg.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/hdreg.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/hdreg.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/hdreg.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/hdreg.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------------------- ## +## Report this to the nagios-plugins lists. ## +## ----------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for linux/hdreg.h" >&5 +echo $ECHO_N "checking for linux/hdreg.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_hdreg_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_linux_hdreg_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_hdreg_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_hdreg_h" >&6 + +fi +if test $ac_cv_header_linux_hdreg_h = yes; then + FOUNDINCLUDE=yes +else + FOUNDINCLUDE=no +fi + + +if test "$FOUNDINCLUDE" = "yes" ; then + if test "${ac_cv_header_linux_types_h+set}" = set; then + echo "$as_me:$LINENO: checking for linux/types.h" >&5 +echo $ECHO_N "checking for linux/types.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_types_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_types_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_types_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking linux/types.h usability" >&5 +echo $ECHO_N "checking linux/types.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking linux/types.h presence" >&5 +echo $ECHO_N "checking linux/types.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: linux/types.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/types.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: linux/types.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/types.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/types.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/types.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/types.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/types.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/types.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/types.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------------------- ## +## Report this to the nagios-plugins lists. ## +## ----------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for linux/types.h" >&5 +echo $ECHO_N "checking for linux/types.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_types_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_linux_types_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_types_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_types_h" >&6 + +fi +if test $ac_cv_header_linux_types_h = yes; then + FOUNDINCLUDE=yes +else + FOUNDINCLUDE=no +fi + + +fi + +if test "$FOUNDINCLUDE" = "yes" ; then + EXTRAS="$EXTRAS check_ide_smart" +else + { echo "$as_me:$LINENO: WARNING: Skipping check_ide_smart plugin." >&5 +echo "$as_me: WARNING: Skipping check_ide_smart plugin." >&2;} + { echo "$as_me:$LINENO: WARNING: check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h." >&5 +echo "$as_me: WARNING: check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h." >&2;} +fi + # Check whether --with-mysql or --without-mysql was given. @@ -21447,7 +21827,7 @@ echo "$as_me: WARNING: Skipping mysql plugin" >&2;} { echo "$as_me:$LINENO: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&5 echo "$as_me: WARNING: install mysql client libs to compile this plugin (see REQUIREMENTS)." >&2;} else - EXTRAS="$EXTRA check_mysql check_mysql_query" + EXTRAS="$EXTRAS check_mysql check_mysql_query" MYSQLINCLUDE="$np_mysql_include" MYSQLLIBS="$np_mysql_libs" MYSQLCFLAGS="$np_mysql_cflags" @@ -21456,13 +21836,23 @@ else fi -echo "$as_me:$LINENO: checking for IPv6 support" >&5 -echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6 + +# Check whether --with-ipv6 or --without-ipv6 was given. if test "${with_ipv6+set}" = set; then + withval="$with_ipv6" + +else + with_ipv6=check +fi; + +if test "$with_ipv6" != "no"; then + echo "$as_me:$LINENO: checking for IPv6 support" >&5 +echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6 +if test "${np_cv_sys_ipv6+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21507,25 +21897,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - with_ipv6=yes + np_cv_sys_ipv6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -with_ipv6=no +np_cv_sys_ipv6=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $with_ipv6" >&5 -echo "${ECHO_T}$with_ipv6" >&6 - -if test x"$with_ipv6" != xno ; then +echo "$as_me:$LINENO: result: $np_cv_sys_ipv6" >&5 +echo "${ECHO_T}$np_cv_sys_ipv6" >&6 + if test "$np_cv_sys_ipv6" = "no" -a "$with_ipv6" != "check"; then + { { echo "$as_me:$LINENO: error: --with-ipv6 was given, but test for IPv6 support failed +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-ipv6 was given, but test for IPv6 support failed +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + if test "$np_cv_sys_ipv6" = "yes"; then cat >>confdefs.h <<\_ACEOF #define USE_IPV6 1 _ACEOF + fi + with_ipv6="$np_cv_sys_ipv6" fi @@ -24722,6 +25120,61 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for number of cpus" >&5 +echo $ECHO_N "checking for number of cpus... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +sysconf(_SC_NPROCESSORS_CONF) > 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYSCONF__SC_NPROCESSORS_CONF 1 +_ACEOF + + echo "$as_me:$LINENO: result: sysconf(_SC_NPROCESSORS_CONF)" >&5 +echo "${ECHO_T}sysconf(_SC_NPROCESSORS_CONF)" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: cannot calculate" >&5 +echo "${ECHO_T}cannot calculate" >&6 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + # Extract the first word of "uptime", so it can be a program name with args. set dummy uptime; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -26504,6 +26957,156 @@ elif test -f ../plugins/check_nt.c ; then fi + +for ac_header in sys/sockio.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------------------- ## +## Report this to the nagios-plugins lists. ## +## ----------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + case $host in *bsd*) @@ -28577,6 +29180,18 @@ _ACEOF fi +# Check whether --enable-perl-modules or --disable-perl-modules was given. +if test "${enable_perl_modules+set}" = set; then + enableval="$enable_perl_modules" + enable_perl_modules=$enableval +else + enable_perl_modules=no +fi; +if test "$enable_perl_modules" = "yes" ; then + PERLMODS_DIR=perlmods + +fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo "$as_me:$LINENO: checking for working alloca.h" >&5 @@ -44274,7 +44889,7 @@ echo "$as_me: error: No ar found for Solaris - is /usr/ccs/bin in PATH?" >&2;} { (exit 1); exit 1; }; } fi - ac_config_files="$ac_config_files Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo po/Makefile.in" + ac_config_files="$ac_config_files Makefile lib/Makefile plugins/Makefile lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh perlmods/Makefile command.cfg test.pl pkg/solaris/pkginfo po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -44681,7 +45296,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by nagios-plugins $as_me 1.4.8, which was +This file was extended by nagios-plugins $as_me 1.4.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -44744,7 +45359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -nagios-plugins config.status 1.4.8 +nagios-plugins config.status 1.4.10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -44871,6 +45486,7 @@ do "plugins-scripts/subst" ) CONFIG_FILES="$CONFIG_FILES plugins-scripts/subst" ;; "plugins-scripts/utils.pm" ) CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.pm" ;; "plugins-scripts/utils.sh" ) CONFIG_FILES="$CONFIG_FILES plugins-scripts/utils.sh" ;; + "perlmods/Makefile" ) CONFIG_FILES="$CONFIG_FILES perlmods/Makefile" ;; "command.cfg" ) CONFIG_FILES="$CONFIG_FILES command.cfg" ;; "test.pl" ) CONFIG_FILES="$CONFIG_FILES test.pl" ;; "pkg/solaris/pkginfo" ) CONFIG_FILES="$CONFIG_FILES pkg/solaris/pkginfo" ;; @@ -45104,6 +45720,7 @@ s,@INTLLIBS@,$INTLLIBS,;t t s,@LIBINTL@,$LIBINTL,;t t s,@LTLIBINTL@,$LTLIBINTL,;t t s,@POSUB@,$POSUB,;t t +s,@PERLMODS_DIR@,$PERLMODS_DIR,;t t s,@GL_COND_LIBTOOL_TRUE@,$GL_COND_LIBTOOL_TRUE,;t t s,@GL_COND_LIBTOOL_FALSE@,$GL_COND_LIBTOOL_FALSE,;t t s,@ALLOCA@,$ALLOCA,;t t @@ -45995,6 +46612,7 @@ echo " --with-mysql: $with_mysql" echo " --with-openssl: $with_openssl" echo " --with-gnutls: $with_gnutls" echo " --with-perl: $with_perl" +echo " --enable-perl-modules: $enable_perl_modules" echo " --with-cgiurl: $with_cgiurl" echo " --with-trusted-path: $with_trusted_path" diff --git a/configure.in b/configure.in index f1fc68e..56f8332 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION ($Revision: 1.213 $) +AC_REVISION ($Revision: 1801 $) AC_PREREQ(2.59) -AC_INIT(nagios-plugins,1.4.8) +AC_INIT(nagios-plugins,1.4.10) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES(gl/Makefile) AC_CONFIG_AUX_DIR(build-aux) @@ -155,7 +155,7 @@ AC_SUBST(MATHLIBS) dnl Check for libtap, to run perl-like tests AC_CHECK_LIB(tap, plan_tests, - EXTRA_TEST="test_utils test_disk" + EXTRA_TEST="test_utils test_disk test_tcp test_cmd" AC_SUBST(EXTRA_TEST) ) @@ -218,8 +218,15 @@ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then RADIUSLIBS="-lradiusclient" AC_SUBST(RADIUSLIBS) else - AC_MSG_WARN([Skipping radius plugin]) - AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) + AC_CHECK_LIB(radiusclient-ng,rc_read_config) + if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then + EXTRAS="$EXTRAS check_radius" + RADIUSLIBS="-lradiusclient-ng" + AC_SUBST(RADIUSLIBS) + else + AC_MSG_WARN([Skipping radius plugin]) + AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) + fi fi LIBS="$_SAVEDLIBS" @@ -240,13 +247,26 @@ else fi LIBS="$_SAVEDLIBS" +dnl Check for headers used by check_ide_smart +AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no) +if test "$FOUNDINCLUDE" = "yes" ; then + AC_CHECK_HEADER(linux/types.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no) +fi + +if test "$FOUNDINCLUDE" = "yes" ; then + EXTRAS="$EXTRAS check_ide_smart" +else + AC_MSG_WARN([Skipping check_ide_smart plugin.]) + AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.]) +fi + dnl Check for mysql libraries np_mysqlclient if test $with_mysql = "no" ; then AC_MSG_WARN([Skipping mysql plugin]) AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) else - EXTRAS="$EXTRA check_mysql check_mysql_query" + EXTRAS="$EXTRAS check_mysql check_mysql_query" MYSQLINCLUDE="$np_mysql_include" MYSQLLIBS="$np_mysql_libs" MYSQLCFLAGS="$np_mysql_cflags" @@ -255,9 +275,15 @@ else AC_SUBST(MYSQLCFLAGS) fi +AC_ARG_WITH([ipv6], + [AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])], + [], [with_ipv6=check]) + dnl Check for AF_INET6 support - unistd.h required for Darwin -AC_CACHE_CHECK([for IPv6 support], with_ipv6, [ - AC_TRY_COMPILE([#ifdef HAVE_UNISTD_H +if test "$with_ipv6" != "no"; then + AC_CACHE_CHECK([for IPv6 support], np_cv_sys_ipv6, [ + AC_TRY_COMPILE( + [#ifdef HAVE_UNISTD_H #include #endif #include @@ -268,12 +294,16 @@ AC_CACHE_CHECK([for IPv6 support], with_ipv6, [ sin6.sin6_family = AF_INET6; sin6.sin6_port = 587; p = &sin6.sin6_addr;], - [with_ipv6=yes], - [with_ipv6=no]) - ]) - -if test x"$with_ipv6" != xno ; then - AC_DEFINE(USE_IPV6,1,[Enable IPv6 support]) + [np_cv_sys_ipv6=yes], + [np_cv_sys_ipv6=no]) + ]) + if test "$np_cv_sys_ipv6" = "no" -a "$with_ipv6" != "check"; then + AC_MSG_FAILURE([--with-ipv6 was given, but test for IPv6 support failed]) + fi + if test "$np_cv_sys_ipv6" = "yes"; then + AC_DEFINE(USE_IPV6,1,[Enable IPv6 support]) + fi + with_ipv6="$np_cv_sys_ipv6" fi @@ -1054,6 +1084,14 @@ if test -n "$ac_cv_nslookup_command"; then AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) fi +AC_MSG_CHECKING([for number of cpus]) +AC_TRY_COMPILE([#include ], + [sysconf(_SC_NPROCESSORS_CONF) > 0;], + AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus]) + AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]), + AC_MSG_RESULT([cannot calculate]) + ) + AC_PATH_PROG(PATH_TO_UPTIME,uptime) AC_ARG_WITH(uptime_command, ACX_HELP_STRING([--with-uptime-command=PATH], @@ -1429,6 +1467,9 @@ elif test -f ../plugins/check_nt.c ; then fi +dnl used in check_dhcp +AC_CHECK_HEADERS(sys/sockio.h) + case $host in *bsd*) AC_DEFINE(__bsd__,1,[bsd specific code in check_dhcp.c]) @@ -1450,7 +1491,7 @@ AC_SUBST(EXTRA_NETOBJS) AC_SUBST(DEPLIBS) AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.13.1) +AM_GNU_GETTEXT_VERSION(0.15) dnl Check for Redhat spopen problem dnl Wierd problem where ECHILD is returned from a wait call in error @@ -1479,6 +1520,16 @@ elif test "$ac_cv_enable_redhat_pthread_workaround" = "yes" ; then AC_DEFINE(REDHAT_SPOPEN_ERROR, 1, [Forced workaround on redhat in spopen]) fi +dnl Perl modules +AC_ARG_ENABLE(perl-modules, + AC_HELP_STRING([--enable-perl-modules], + [Enables installation of Nagios::Plugin and its dependencies (default: no)]), + [enable_perl_modules=$enableval], + [enable_perl_modules=no]) +if test "$enable_perl_modules" = "yes" ; then + AC_SUBST(PERLMODS_DIR,perlmods) +fi + dnl External libraries - see ACKNOWLEDGEMENTS gl_INIT @@ -1497,6 +1548,7 @@ AC_OUTPUT( plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh + perlmods/Makefile command.cfg test.pl pkg/solaris/pkginfo @@ -1534,6 +1586,7 @@ ACX_FEATURE([with],[mysql]) ACX_FEATURE([with],[openssl]) ACX_FEATURE([with],[gnutls]) ACX_FEATURE([with],[perl]) +ACX_FEATURE([enable],[perl-modules]) ACX_FEATURE([with],[cgiurl]) ACX_FEATURE([with],[trusted-path]) diff --git a/contrib/check_adptraid.sh b/contrib/check_adptraid.sh index 6409c56..e3c47be 100644 --- a/contrib/check_adptraid.sh +++ b/contrib/check_adptraid.sh @@ -13,7 +13,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.1 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh diff --git a/contrib/check_apc_ups.pl b/contrib/check_apc_ups.pl index f4c078e..6bf1766 100644 --- a/contrib/check_apc_ups.pl +++ b/contrib/check_apc_ups.pl @@ -13,7 +13,7 @@ use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R $opt_r $opt_L $opt_l $PROGNAME); -use lib utils.pm; +use lib "/usr/local/nagios/libexec"; use utils qw(%ERRORS &print_revision &support &usage); sub print_help (); @@ -38,7 +38,7 @@ GetOptions "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.2 $'); + print_revision($PROGNAME,'$Revision: 1771 $'); exit $ERRORS{'OK'}; } @@ -252,7 +252,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.2 $'); + print_revision($PROGNAME,'$Revision: 1771 $'); print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop This plugin reports the status of an APC UPS equipped with an SNMP management diff --git a/contrib/check_appletalk.pl b/contrib/check_appletalk.pl index b8fe16f..9277686 100644 --- a/contrib/check_appletalk.pl +++ b/contrib/check_appletalk.pl @@ -9,7 +9,7 @@ # using "aecho" # # initial version: 23 October 2002 by Stefan Beck, IT Software Solutions -# current status: $Revision: 1.1 $ +# current status: $Revision: 1771 $ # # Copyright Notice: GPL # @@ -22,7 +22,7 @@ BEGIN { } use strict; -use lib utils.pm; +use lib "/usr/local/nagios/libexec"; use utils qw($TIMEOUT %ERRORS &print_revision &support); use vars qw($PROGNAME); @@ -122,7 +122,7 @@ while () { } sub print_help() { - print_revision( $PROGNAME, '$Revision: 1.1 $ ' ); + print_revision( $PROGNAME, '$Revision: 1771 $ ' ); print "Copyright (c) 2002 Stefan Beck\n"; print "\n"; print "Check if an atalkhost responds to an atalk echo using\n"; @@ -159,7 +159,7 @@ sub print_usage () { } sub version () { - print_revision( $PROGNAME, '$Revision: 1.1 $ ' ); + print_revision( $PROGNAME, '$Revision: 1771 $ ' ); exit $ERRORS{'OK'}; } diff --git a/contrib/check_arping.pl b/contrib/check_arping.pl index 87f835b..c41c4a8 100644 --- a/contrib/check_arping.pl +++ b/contrib/check_arping.pl @@ -55,7 +55,7 @@ if ($status == 0) if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1112 $ '); exit $ERRORS{'OK'}; } @@ -115,6 +115,6 @@ sub print_help { print " -t (--timeout) Timeout in seconds.\n"; print " -V (--version) Plugin version\n"; print " -h (--help) usage help \n\n"; - print_revision($PROGNAME, '$Revision: 1.1 $'); + print_revision($PROGNAME, '$Revision: 1112 $'); } diff --git a/contrib/check_axis.sh b/contrib/check_axis.sh index 9514c4e..231d9da 100644 --- a/contrib/check_axis.sh +++ b/contrib/check_axis.sh @@ -29,9 +29,11 @@ lines=`cat $tempfile | grep -i $port` status=`echo $lines | awk '{ print $3 }'` if [ "$status" == "Printing" ]; then bytes=`echo $lines | awk '{ print $4 }'`; - comments=`echo $lines | tr -d " " | awk '{ print $5 " " $6 }'`; + comments=`echo $lines | tr -d " +" | awk '{ print $5 " " $6 }'`; else - comments=`echo $lines | tr -d " " | awk '{ print $4 " " $5 }'`; + comments=`echo $lines | tr -d " +" | awk '{ print $4 " " $5 }'`; fi comma=`echo $comments | grep , | wc -l` diff --git a/contrib/check_cluster2.README b/contrib/check_cluster2.README new file mode 100644 index 0000000..a014984 --- /dev/null +++ b/contrib/check_cluster2.README @@ -0,0 +1,5 @@ +check_cluster2 is now part of the core Nagios-Plugins distribution and has +been renamed check_cluster. It will be installed automatically. + +The threshold format has changed and is not backward-compatible; be sure to +understand it correctly. Use --help to print the full help. diff --git a/contrib/check_email_loop.pl b/contrib/check_email_loop.pl index 8c1df44..1b02ea3 100644 --- a/contrib/check_email_loop.pl +++ b/contrib/check_email_loop.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: check_email_loop.pl,v 1.5 2005/11/29 23:21:06 harpermann Exp $ +# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $ # # (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-) # Copyleft by GNU GPL diff --git a/contrib/check_fan_cpq_present b/contrib/check_fan_cpq_present index 7d905ff..0bd1390 100644 --- a/contrib/check_fan_cpq_present +++ b/contrib/check_fan_cpq_present @@ -111,7 +111,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $\n '); + print_revision($PROGNAME,'$Revision: 1113 $\n '); print "Copyright (c) 2003 Rainer Duffner\n "; print_usage(); print "\n"; @@ -122,7 +122,7 @@ sub print_help () { } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1113 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_fan_fsc_present b/contrib/check_fan_fsc_present index d7af0fe..19f8e7f 100644 --- a/contrib/check_fan_fsc_present +++ b/contrib/check_fan_fsc_present @@ -113,7 +113,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $\n '); + print_revision($PROGNAME,'$Revision: 1113 $\n '); print "Copyright (c) 2003 Rainer Duffner\n "; print_usage(); print "\n"; @@ -124,7 +124,7 @@ sub print_help () { } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1113 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_frontpage b/contrib/check_frontpage index 33a5829..21c5267 100644 --- a/contrib/check_frontpage +++ b/contrib/check_frontpage @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# $Id: check_frontpage,v 1.1 2005/01/27 04:45:00 stanleyhopcroft Exp $ +# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $ # # Check that FrontPage extensions appear to be working on a specified host. # Currently only checks that the hit counter is not returning an error. @@ -42,7 +42,7 @@ GetOptions "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.1 $'); #' + print_revision($PROGNAME,'$Revision: 1112 $'); #' exit $ERRORS{'OK'}; } @@ -139,7 +139,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $'); + print_revision($PROGNAME,'$Revision: 1112 $'); print "Copyright (c) 2003 Kev Green\n"; print "\n"; print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n"; diff --git a/contrib/check_http-with-client-certificate.c b/contrib/check_http-with-client-certificate.c index 8878378..60e1481 100644 --- a/contrib/check_http-with-client-certificate.c +++ b/contrib/check_http-with-client-certificate.c @@ -37,7 +37,7 @@ *****************************************************************************/ const char *progname = "check_http"; -#define REVISION "$Revision: 1.1 $" +#define REVISION "$Revision: 1117 $" #define CVSREVISION "1.24" #define COPYRIGHT "2003" #define AUTHORS "Fabian Pehla" diff --git a/contrib/check_hw.sh b/contrib/check_hw.sh index 3f3dc20..9d3b574 100644 --- a/contrib/check_hw.sh +++ b/contrib/check_hw.sh @@ -16,7 +16,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.1 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh diff --git a/contrib/check_ica_master_browser.pl b/contrib/check_ica_master_browser.pl index c2ee6bd..973c963 100755 --- a/contrib/check_ica_master_browser.pl +++ b/contrib/check_ica_master_browser.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# $Id: check_ica_master_browser.pl,v 1.1 2005/01/25 09:09:33 stanleyhopcroft Exp $ +# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $ -# $Log: check_ica_master_browser.pl,v $ +# $Log$ # Revision 1.1 2005/01/25 09:09:33 stanleyhopcroft # New plugin - checks that ICA master browser is what it should be (important for firewalled dialup) # @@ -170,7 +170,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1099 $ '); print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft Perl Check Citrix Master Browser plugin for Nagios. @@ -218,7 +218,7 @@ The ICA Client requests the address of the ICA master browser from the Citrix se } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1099 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_ica_metaframe_pub_apps.pl b/contrib/check_ica_metaframe_pub_apps.pl index d5585e3..17c5309 100755 --- a/contrib/check_ica_metaframe_pub_apps.pl +++ b/contrib/check_ica_metaframe_pub_apps.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# $Id: check_ica_metaframe_pub_apps.pl,v 1.1 2005/01/25 09:07:39 stanleyhopcroft Exp $ +# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $ -# $Log: check_ica_metaframe_pub_apps.pl,v $ +# $Log$ # Revision 1.1 2005/01/25 09:07:39 stanleyhopcroft # Replacement (structured name mainly) for check_citrix: check of ICA browse service # @@ -303,7 +303,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1098 $ '); print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft Perl Check Citrix plugin for Nagios. @@ -350,7 +350,7 @@ The plugin works by } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1098 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_ica_program_neigbourhood.pl b/contrib/check_ica_program_neigbourhood.pl index faaf7aa..ceb4c95 100755 --- a/contrib/check_ica_program_neigbourhood.pl +++ b/contrib/check_ica_program_neigbourhood.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# $Id: check_ica_program_neigbourhood.pl,v 1.1 2005/01/25 09:05:53 stanleyhopcroft Exp $ +# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $ -# $Log: check_ica_program_neigbourhood.pl,v $ +# $Log$ # Revision 1.1 2005/01/25 09:05:53 stanleyhopcroft # New plugin to check Citrix Metaframe XP "Program Neighbourhood" # @@ -290,7 +290,7 @@ sub print_help() { # 1 2 3 4 5 6 7 8 #12345678901234567890123456789012345678901234567890123456789012345678901234567890 - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1097 $ '); my $help = < # diff --git a/contrib/check_ms_spooler.pl b/contrib/check_ms_spooler.pl index a31e905..8c6e64e 100755 --- a/contrib/check_ms_spooler.pl +++ b/contrib/check_ms_spooler.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# $Id: check_ms_spooler.pl,v 1.1 2002/07/16 00:04:42 stanleyhopcroft Exp $ +# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $ -# $Log: check_ms_spooler.pl,v $ +# $Log$ # Revision 1.1 2002/07/16 00:04:42 stanleyhopcroft # Primitive and in need of refinement test of MS spooler (with smbclient) # @@ -268,7 +268,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 64 $ '); print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler. @@ -292,7 +292,7 @@ Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 64 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_ora_table_space.pl b/contrib/check_ora_table_space.pl index 981fb2e..9777250 100644 --- a/contrib/check_ora_table_space.pl +++ b/contrib/check_ora_table_space.pl @@ -4,8 +4,8 @@ # Written by: Erwan Arzur (erwan@netvalue.com) # License: GPL # -# Last Modified: $Date: 2002/02/28 06:42:54 $ -# Revisiin: $Revision: 1.1.1.1 $ +# Last Modified: $Date: 2002-02-28 06:42:51 +0000 (Thu, 28 Feb 2002) $ +# Revisiin: $Revision: 2 $ # # "check_ora_table_space.pl" plugin to check the state of Oracle # table spaces. Scarce documentation. diff --git a/contrib/check_oracle_instance.pl b/contrib/check_oracle_instance.pl index 388ba16..3ba8d57 100644 --- a/contrib/check_oracle_instance.pl +++ b/contrib/check_oracle_instance.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: check_oracle_instance.pl,v 1.1 2002/04/03 02:58:47 sghosh Exp $ +# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $ # Copyright (c) 2002 Sven Dolderer # some pieces of Code adopted from Adam vonNieda's oracletool.pl @@ -23,7 +23,7 @@ require DBD::Oracle || die "It appears that the DBD::Oracle module is not instal use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical); -'$Revision: 1.1 $' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS +'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS $VERSION = $1; $0 =~ m!^.*/([^/]+)$!; $PROGNAME = $1; diff --git a/contrib/check_oracle_tbs b/contrib/check_oracle_tbs index 3f44d8a..8281a4e 100644 --- a/contrib/check_oracle_tbs +++ b/contrib/check_oracle_tbs @@ -30,7 +30,7 @@ if (!$ENV{ORACLE_HOME}) { my $state = $ERRORS{'UNKNOWN'}; my $answer = undef; -my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/; +my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/; my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION); my $opt_debug; # -d|--debug diff --git a/contrib/check_pfstate b/contrib/check_pfstate index 3435b7b..57dde3f 100644 --- a/contrib/check_pfstate +++ b/contrib/check_pfstate @@ -27,7 +27,7 @@ GetOptions "c=s" => \$opt_c, "critical=s" => \$opt_c); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.1 $'); + print_revision($PROGNAME,'$Revision: 1112 $'); exit $ERRORS{'OK'}; } if ($opt_h) { @@ -67,7 +67,7 @@ exit $ERRORS{'OK'}; sub print_help { - print_revision($PROGNAME,'$Revision: 1.1 $'); + print_revision($PROGNAME,'$Revision: 1112 $'); print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n"; print "Usage:\t-H, --hostname= [-w, --warning=] [-c, --critical=]\n\n\tDefault warning is 50000 and critical is 60000.\n\n"; support(); diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c index 7312832..eec84ad 100644 --- a/contrib/check_rbl.c +++ b/contrib/check_rbl.c @@ -11,7 +11,7 @@ * * License: GPL * * Copyright (c) 2000 * * -* * $Id: check_rbl.c,v 1.3 2004/12/02 00:30:32 opensides Exp $ +* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $ * *****************************************************************************/ @@ -22,7 +22,7 @@ #include "string.h" const char progname = "check_rbl"; -const char *revision = "$Revision: 1.3 $"; +const char *revision = "$Revision: 970 $"; //const char *copyright = "2000-2003"; //const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -263,7 +263,7 @@ int call_getopt(int argc, char **argv) } break; case 'V': /* version */ - print_revision(progname,"$Revision: 1.3 $"); + print_revision(progname,"$Revision: 970 $"); exit(STATE_OK); case 'h': /* help */ print_help(); @@ -291,7 +291,7 @@ int validate_arguments(void) void print_help(void) { - print_revision(progname,"$Revision: 1.3 $"); + print_revision(progname,"$Revision: 970 $"); printf ("Copyright (c) 2000 Karl DeBisschop\n\n" "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n"); diff --git a/contrib/check_smb.sh b/contrib/check_smb.sh index ae5d82b..9d0da72 100644 --- a/contrib/check_smb.sh +++ b/contrib/check_smb.sh @@ -26,7 +26,7 @@ # PROGNAME=`basename $0` PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.1 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh diff --git a/contrib/check_snmp_disk_monitor.pl b/contrib/check_snmp_disk_monitor.pl index 8cd23ef..9a2edaa 100644 --- a/contrib/check_snmp_disk_monitor.pl +++ b/contrib/check_snmp_disk_monitor.pl @@ -52,7 +52,7 @@ sub process_options { } sub local_print_revision { - print_revision( $PROGNAME, '$Revision: 1.1 $ ' ) + print_revision( $PROGNAME, '$Revision: 82 $ ' ) } sub print_usage { diff --git a/contrib/check_snmp_printer.pl b/contrib/check_snmp_printer.pl index 740a094..cc7943b 100755 --- a/contrib/check_snmp_printer.pl +++ b/contrib/check_snmp_printer.pl @@ -116,7 +116,7 @@ GetOptions $PROGNAME = "check_snmp_printer"; if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.1 $'); + print_revision($PROGNAME,'$Revision: 795 $'); exit $ERRORS{'OK'}; } @@ -572,7 +572,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $'); + print_revision($PROGNAME,'$Revision: 795 $'); print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad. This plugin reports the status of an network printer with an SNMP management diff --git a/contrib/check_snmp_process_monitor.pl b/contrib/check_snmp_process_monitor.pl index 0f0ba2c..0f44597 100644 --- a/contrib/check_snmp_process_monitor.pl +++ b/contrib/check_snmp_process_monitor.pl @@ -91,7 +91,7 @@ sub process_options { } sub local_print_revision { - print_revision( $PROGNAME, '$Revision: 1.2 $ ' ) + print_revision( $PROGNAME, '$Revision: 84 $ ' ) } sub print_usage { diff --git a/contrib/check_snmp_procs.pl b/contrib/check_snmp_procs.pl index 9f146fb..4d19ff1 100644 --- a/contrib/check_snmp_procs.pl +++ b/contrib/check_snmp_procs.pl @@ -35,7 +35,7 @@ #use strict; use Getopt::Long; use Net::SNMP qw (oid_lex_sort oid_base_match SNMP_VERSION_1); -use lib utils.pm; +use lib "/usr/local/nagios/libexec"; use utils qw(%ERRORS &print_revision &support &usage); my $PROGNAME="check_snmp_procs"; @@ -109,7 +109,7 @@ if (GetOptions( } if ($opt_version) { - print_revision($PROGNAME, "\$Revision: 1.1 $REVISION \$"); + print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$"); exit $ERRORS{'OK'}; } @@ -529,7 +529,7 @@ sub print_usage { # sub print_help { - print_revision($PROGNAME, "\$Revision: 1.1 $REVISION \$"); + print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$"); print "Copyright (c) 2003 David Alden Check if processes are running on a host via snmp diff --git a/contrib/check_temp_cpq b/contrib/check_temp_cpq index efafe98..6edae6e 100644 --- a/contrib/check_temp_cpq +++ b/contrib/check_temp_cpq @@ -138,7 +138,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $\n '); + print_revision($PROGNAME,'$Revision: 1113 $\n '); print "Copyright (c) 2003 Rainer Duffner\n "; print_usage(); print "\n"; @@ -151,7 +151,7 @@ sub print_help () { } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1113 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_temp_fsc b/contrib/check_temp_fsc index b2f276c..33470ea 100644 --- a/contrib/check_temp_fsc +++ b/contrib/check_temp_fsc @@ -138,7 +138,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.1 $\n '); + print_revision($PROGNAME,'$Revision: 1113 $\n '); print "Copyright (c) 2003 Rainer Duffner\n "; print_usage(); print "\n"; @@ -149,7 +149,7 @@ sub print_help () { } sub version () { - print_revision($PROGNAME,'$Revision: 1.1 $ '); + print_revision($PROGNAME,'$Revision: 1113 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/check_traceroute.pl b/contrib/check_traceroute.pl index 35e9f0d..ae8d36c 100755 --- a/contrib/check_traceroute.pl +++ b/contrib/check_traceroute.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -# $Id: check_traceroute.pl,v 1.1 2005/01/27 10:34:16 stanleyhopcroft Exp $ +# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $ -# $Log: check_traceroute.pl,v $ +# $Log$ # Revision 1.1 2005/01/27 10:34:16 stanleyhopcroft # Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak # @@ -32,7 +32,7 @@ getopts('i:H:N:R:T:dhrvV'); do { print_help ; exit $ERRORS{OK}; } if $opt_h ; -do { print_revision($PROGNAME, '$Revision: 1.1 $'); exit $ERRORS{OK}; } +do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; } if $opt_V ; do { print_help; exit $ERRORS{OK}; } @@ -176,7 +176,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME, '$Revision: 1.1 $') ; + print_revision($PROGNAME, '$Revision: 1115 $') ; print "Copyright (c) 2004 J Meek/Karl DeBisschop This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers diff --git a/contrib/check_uptime.c b/contrib/check_uptime.c index fba7f12..2bef2bb 100644 --- a/contrib/check_uptime.c +++ b/contrib/check_uptime.c @@ -9,7 +9,7 @@ * Based on CHECK_LOAD.C * Copyright (c) 1999 Felipe Gustavo de Almeida * - * Last Modified: $Date: 2002/03/01 02:42:56 $ + * Last Modified: $Date: 2002-03-01 02:42:56 +0000 (Fri, 01 Mar 2002) $ * * Command line: CHECK_UPTIME * @@ -44,7 +44,7 @@ int main(int argc, char **argv) if(argc != 2){ printf("Incorrect number of arguments supplied\n"); printf("\n"); - print_revision(argv[0],"$Revision: 1.2 $"); + print_revision(argv[0],"$Revision: 6 $"); printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n"); printf("\n"); printf("Usage: %s \n",argv[0]); diff --git a/contrib/check_vcs.pl b/contrib/check_vcs.pl index 9cc816d..38afdae 100644 --- a/contrib/check_vcs.pl +++ b/contrib/check_vcs.pl @@ -71,7 +71,7 @@ sub print_help (); $vcs_negate = ''; $vcs_result = ''; $vcs_expected_result = 'ONLINE'; - $plugin_revision = '$Revision: 1.1 $ '; + $plugin_revision = '$Revision: 33 $ '; # Grab options from command line GetOptions diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl index 0cbaffd..a1b762a 100755 --- a/contrib/check_wins.pl +++ b/contrib/check_wins.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w -# $Id: check_wins.pl,v 1.3 2004/11/25 04:46:16 stanleyhopcroft Exp $ +# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $ -# $Log: check_wins.pl,v $ +# $Log$ # Revision 1.3 2004/11/25 04:46:16 stanleyhopcroft # Non functional tidy ups to check_wins # @@ -190,7 +190,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.3 $ '); + print_revision($PROGNAME,'$Revision: 940 $ '); print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft Perl Check WINS plugin for NetSaint. @@ -237,7 +237,7 @@ The plugin works by } sub version () { - print_revision($PROGNAME,'$Revision: 1.3 $ '); + print_revision($PROGNAME,'$Revision: 940 $ '); exit $ERRORS{'OK'}; } diff --git a/contrib/packet_utils.pm b/contrib/packet_utils.pm index 4d318a7..4c12656 100755 --- a/contrib/packet_utils.pm +++ b/contrib/packet_utils.pm @@ -1,8 +1,8 @@ package packet_utils; -# $Id: packet_utils.pm,v 1.1 2005/01/25 09:12:47 stanleyhopcroft Exp $ +# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $ -# $Log: packet_utils.pm,v $ +# $Log$ # Revision 1.1 2005/01/25 09:12:47 stanleyhopcroft # packet creation and dumping hacks used by check_ica* and check_lotus # diff --git a/contrib/utils.py b/contrib/utils.py index deb85f6..db0f1c9 100644 --- a/contrib/utils.py +++ b/contrib/utils.py @@ -8,7 +8,7 @@ #========================================================================== # -# Version: = '$Id: utils.py,v 1.1.1.1 2002/02/28 06:42:54 egalstad Exp $' +# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $' # # (C) Rob W.W. Hooft, Nonius BV, 1998 # diff --git a/gl/Makefile.in b/gl/Makefile.in index ad99ccb..9fdf874 100644 --- a/gl/Makefile.in +++ b/gl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -27,6 +27,8 @@ +SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -109,7 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -271,6 +273,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ diff --git a/lib/Makefile.am b/lib/Makefile.am index 3909bb9..9dd3a0c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,8 +5,8 @@ SUBDIRS = tests noinst_LIBRARIES = libnagiosplug.a -libnagiosplug_a_SOURCES = utils_base.c utils_disk.c -EXTRA_DIST = utils_base.h utils_disk.h +libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c +EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins diff --git a/lib/Makefile.in b/lib/Makefile.in index b4ca74d..0ec5f15 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libnagiosplug_a_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -95,14 +97,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libnagiosplug_a_AR = $(AR) $(ARFLAGS) libnagiosplug_a_LIBADD = -am_libnagiosplug_a_OBJECTS = utils_base.$(OBJEXT) utils_disk.$(OBJEXT) +am_libnagiosplug_a_OBJECTS = utils_base.$(OBJEXT) utils_disk.$(OBJEXT) \ + utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) libnagiosplug_a_OBJECTS = $(am_libnagiosplug_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -261,6 +264,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ @@ -349,8 +353,8 @@ target_alias = @target_alias@ with_trusted_path = @with_trusted_path@ SUBDIRS = tests noinst_LIBRARIES = libnagiosplug.a -libnagiosplug_a_SOURCES = utils_base.c utils_disk.c -EXTRA_DIST = utils_base.h utils_disk.h +libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c +EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins all: all-recursive @@ -400,7 +404,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_base.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_cmd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_disk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_tcp.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index cd9234e..9ca22d1 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -EXTRA_PROGRAMS = test_utils test_disk +EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd -EXTRA_DIST = test_utils.t test_disk.t +EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t LIBS = @LIBINTL@ @@ -23,6 +23,16 @@ test_disk_CFLAGS = -g -I.. test_disk_LDFLAGS = -L/usr/local/lib -ltap test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a +test_tcp_SOURCES = test_tcp.c +test_tcp_CFLAGS = -g -I.. +test_tcp_LDFLAGS = -L/usr/local/lib -ltap +test_tcp_LDADD = ../utils_tcp.o + +test_cmd_SOURCES = test_cmd.c +test_cmd_CFLAGS = -g -I.. +test_cmd_LDFLAGS = -L/usr/local/lib -ltap +test_cmd_LDADD = ../utils_cmd.o ../utils_base.o + test: ${noinst_PROGRAMS} perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 0a15b36..6d259ac 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(test_cmd_SOURCES) $(test_disk_SOURCES) $(test_tcp_SOURCES) $(test_utils_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -37,7 +39,8 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = @EXTRA_TEST@ check_PROGRAMS = @EXTRA_TEST@ -EXTRA_PROGRAMS = test_utils$(EXEEXT) test_disk$(EXEEXT) +EXTRA_PROGRAMS = test_utils$(EXEEXT) test_disk$(EXEEXT) \ + test_tcp$(EXEEXT) test_cmd$(EXEEXT) subdir = lib/tests DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -98,13 +101,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) +am_test_cmd_OBJECTS = test_cmd-test_cmd.$(OBJEXT) +test_cmd_OBJECTS = $(am_test_cmd_OBJECTS) +test_cmd_DEPENDENCIES = ../utils_cmd.o ../utils_base.o am_test_disk_OBJECTS = test_disk-test_disk.$(OBJEXT) test_disk_OBJECTS = $(am_test_disk_OBJECTS) test_disk_DEPENDENCIES = ../utils_disk.o $(top_srcdir)/gl/libgnu.a +am_test_tcp_OBJECTS = test_tcp-test_tcp.$(OBJEXT) +test_tcp_OBJECTS = $(am_test_tcp_OBJECTS) +test_tcp_DEPENDENCIES = ../utils_tcp.o am_test_utils_OBJECTS = test_utils-test_utils.$(OBJEXT) test_utils_OBJECTS = $(am_test_utils_OBJECTS) test_utils_DEPENDENCIES = ../utils_base.o @@ -119,8 +128,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(test_disk_SOURCES) $(test_utils_SOURCES) -DIST_SOURCES = $(test_disk_SOURCES) $(test_utils_SOURCES) +SOURCES = $(test_cmd_SOURCES) $(test_disk_SOURCES) $(test_tcp_SOURCES) \ + $(test_utils_SOURCES) +DIST_SOURCES = $(test_cmd_SOURCES) $(test_disk_SOURCES) \ + $(test_tcp_SOURCES) $(test_utils_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -258,6 +269,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ @@ -348,7 +360,7 @@ with_trusted_path = @with_trusted_path@ # These two lines support "make check", but we use "make test" TESTS = @EXTRA_TEST@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -EXTRA_DIST = test_utils.t test_disk.t +EXTRA_DIST = test_utils.t test_disk.t test_tcp.t test_cmd.t test_utils_SOURCES = test_utils.c test_utils_CFLAGS = -g -I.. test_utils_LDFLAGS = -L/usr/local/lib -ltap @@ -357,6 +369,14 @@ test_disk_SOURCES = test_disk.c test_disk_CFLAGS = -g -I.. test_disk_LDFLAGS = -L/usr/local/lib -ltap test_disk_LDADD = ../utils_disk.o $(top_srcdir)/gl/libgnu.a +test_tcp_SOURCES = test_tcp.c +test_tcp_CFLAGS = -g -I.. +test_tcp_LDFLAGS = -L/usr/local/lib -ltap +test_tcp_LDADD = ../utils_tcp.o +test_cmd_SOURCES = test_cmd.c +test_cmd_CFLAGS = -g -I.. +test_cmd_LDFLAGS = -L/usr/local/lib -ltap +test_cmd_LDADD = ../utils_cmd.o ../utils_base.o all: all-am .SUFFIXES: @@ -404,9 +424,15 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +test_cmd$(EXEEXT): $(test_cmd_OBJECTS) $(test_cmd_DEPENDENCIES) + @rm -f test_cmd$(EXEEXT) + $(LINK) $(test_cmd_LDFLAGS) $(test_cmd_OBJECTS) $(test_cmd_LDADD) $(LIBS) test_disk$(EXEEXT): $(test_disk_OBJECTS) $(test_disk_DEPENDENCIES) @rm -f test_disk$(EXEEXT) $(LINK) $(test_disk_LDFLAGS) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS) +test_tcp$(EXEEXT): $(test_tcp_OBJECTS) $(test_tcp_DEPENDENCIES) + @rm -f test_tcp$(EXEEXT) + $(LINK) $(test_tcp_LDFLAGS) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS) test_utils$(EXEEXT): $(test_utils_OBJECTS) $(test_utils_DEPENDENCIES) @rm -f test_utils$(EXEEXT) $(LINK) $(test_utils_LDFLAGS) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS) @@ -417,7 +443,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmd-test_cmd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_disk-test_disk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tcp-test_tcp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils-test_utils.Po@am__quote@ .c.o: @@ -441,6 +469,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +test_cmd-test_cmd.o: test_cmd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -MT test_cmd-test_cmd.o -MD -MP -MF "$(DEPDIR)/test_cmd-test_cmd.Tpo" -c -o test_cmd-test_cmd.o `test -f 'test_cmd.c' || echo '$(srcdir)/'`test_cmd.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_cmd-test_cmd.Tpo" "$(DEPDIR)/test_cmd-test_cmd.Po"; else rm -f "$(DEPDIR)/test_cmd-test_cmd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_cmd.c' object='test_cmd-test_cmd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -c -o test_cmd-test_cmd.o `test -f 'test_cmd.c' || echo '$(srcdir)/'`test_cmd.c + +test_cmd-test_cmd.obj: test_cmd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -MT test_cmd-test_cmd.obj -MD -MP -MF "$(DEPDIR)/test_cmd-test_cmd.Tpo" -c -o test_cmd-test_cmd.obj `if test -f 'test_cmd.c'; then $(CYGPATH_W) 'test_cmd.c'; else $(CYGPATH_W) '$(srcdir)/test_cmd.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_cmd-test_cmd.Tpo" "$(DEPDIR)/test_cmd-test_cmd.Po"; else rm -f "$(DEPDIR)/test_cmd-test_cmd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_cmd.c' object='test_cmd-test_cmd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_cmd_CFLAGS) $(CFLAGS) -c -o test_cmd-test_cmd.obj `if test -f 'test_cmd.c'; then $(CYGPATH_W) 'test_cmd.c'; else $(CYGPATH_W) '$(srcdir)/test_cmd.c'; fi` + test_disk-test_disk.o: test_disk.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -MT test_disk-test_disk.o -MD -MP -MF "$(DEPDIR)/test_disk-test_disk.Tpo" -c -o test_disk-test_disk.o `test -f 'test_disk.c' || echo '$(srcdir)/'`test_disk.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_disk-test_disk.Tpo" "$(DEPDIR)/test_disk-test_disk.Po"; else rm -f "$(DEPDIR)/test_disk-test_disk.Tpo"; exit 1; fi @@ -455,6 +497,20 @@ test_disk-test_disk.obj: test_disk.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_disk_CFLAGS) $(CFLAGS) -c -o test_disk-test_disk.obj `if test -f 'test_disk.c'; then $(CYGPATH_W) 'test_disk.c'; else $(CYGPATH_W) '$(srcdir)/test_disk.c'; fi` +test_tcp-test_tcp.o: test_tcp.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -MT test_tcp-test_tcp.o -MD -MP -MF "$(DEPDIR)/test_tcp-test_tcp.Tpo" -c -o test_tcp-test_tcp.o `test -f 'test_tcp.c' || echo '$(srcdir)/'`test_tcp.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_tcp-test_tcp.Tpo" "$(DEPDIR)/test_tcp-test_tcp.Po"; else rm -f "$(DEPDIR)/test_tcp-test_tcp.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_tcp.c' object='test_tcp-test_tcp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -c -o test_tcp-test_tcp.o `test -f 'test_tcp.c' || echo '$(srcdir)/'`test_tcp.c + +test_tcp-test_tcp.obj: test_tcp.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -MT test_tcp-test_tcp.obj -MD -MP -MF "$(DEPDIR)/test_tcp-test_tcp.Tpo" -c -o test_tcp-test_tcp.obj `if test -f 'test_tcp.c'; then $(CYGPATH_W) 'test_tcp.c'; else $(CYGPATH_W) '$(srcdir)/test_tcp.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_tcp-test_tcp.Tpo" "$(DEPDIR)/test_tcp-test_tcp.Po"; else rm -f "$(DEPDIR)/test_tcp-test_tcp.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_tcp.c' object='test_tcp-test_tcp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_tcp_CFLAGS) $(CFLAGS) -c -o test_tcp-test_tcp.obj `if test -f 'test_tcp.c'; then $(CYGPATH_W) 'test_tcp.c'; else $(CYGPATH_W) '$(srcdir)/test_tcp.c'; fi` + test_utils-test_utils.o: test_utils.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utils_CFLAGS) $(CFLAGS) -MT test_utils-test_utils.o -MD -MP -MF "$(DEPDIR)/test_utils-test_utils.Tpo" -c -o test_utils-test_utils.o `test -f 'test_utils.c' || echo '$(srcdir)/'`test_utils.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_utils-test_utils.Tpo" "$(DEPDIR)/test_utils-test_utils.Po"; else rm -f "$(DEPDIR)/test_utils-test_utils.Tpo"; exit 1; fi diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c new file mode 100644 index 0000000..4da76a9 --- /dev/null +++ b/lib/tests/test_cmd.c @@ -0,0 +1,210 @@ +/****************************************************************************** + + 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. + + 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. + + 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., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: test_cmd.c 1732 2007-06-03 15:58:22Z psychotrahe $ + +******************************************************************************/ + +#include "common.h" +#include "utils_cmd.h" +#include "utils_base.h" +#include "tap.h" + +#define COMMAND_LINE 1024 +#define UNSET 65530 + +char * +get_command (char *const *line) +{ + char *cmd; + int i = 0; + + asprintf (&cmd, " %s", line[i++]); + while (line[i] != NULL) { + asprintf (&cmd, "%s %s", cmd, line[i]); + i++; + } + + return cmd; +} + +int +main (int argc, char **argv) +{ + char **command_line = malloc (sizeof (char *) * COMMAND_LINE); + char *command = NULL; + char *perl; + output chld_out, chld_err; + int c; + int result = UNSET; + + plan_tests(47); + + diag ("Running plain echo command, set one"); + + /* ensure everything is empty before we begin */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + command_line[0] = strdup ("/bin/echo"); + command_line[1] = strdup ("this"); + command_line[2] = strdup ("is"); + command_line[3] = strdup ("test"); + command_line[4] = strdup ("one"); + + command = get_command (command_line); + + result = cmd_run_array (command_line, &chld_out, &chld_err, 0); + ok (chld_out.lines == 1, + "(array) Check for expected number of stdout lines"); + ok (chld_err.lines == 0, + "(array) Check for expected number of stderr lines"); + ok (strcmp (chld_out.line[0], "this is test one") == 0, + "(array) Check for expected stdout output"); + ok (result == 0, "(array) Checking exit code"); + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + result = cmd_run (command, &chld_out, &chld_err, 0); + + ok (chld_out.lines == 1, + "(string) Check for expected number of stdout lines"); + ok (chld_err.lines == 0, + "(string) Check for expected number of stderr lines"); + ok (strcmp (chld_out.line[0], "this is test one") == 0, + "(string) Check for expected stdout output"); + ok (result == 0, "(string) Checking exit code"); + + diag ("Running plain echo command, set two"); + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + command_line[0] = strdup ("/bin/echo"); + command_line[1] = strdup ("this is test two"); + command_line[2] = NULL; + command_line[3] = NULL; + command_line[4] = NULL; + + result = cmd_run_array (command_line, &chld_out, &chld_err, 0); + ok (chld_out.lines == 1, + "(array) Check for expected number of stdout lines"); + ok (chld_err.lines == 0, + "(array) Check for expected number of stderr lines"); + ok (strcmp (chld_out.line[0], "this is test two") == 0, + "(array) Check for expected stdout output"); + ok (result == 0, "(array) Checking exit code"); + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + result = cmd_run (command, &chld_out, &chld_err, 0); + + ok (chld_out.lines == 1, + "(string) Check for expected number of stdout lines"); + ok (chld_err.lines == 0, + "(string) Check for expected number of stderr lines"); + ok (strcmp (chld_out.line[0], "this is test one") == 0, + "(string) Check for expected stdout output"); + ok (result == 0, "(string) Checking exit code"); + + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + /* Pass linefeeds via parameters through - those should be evaluated by echo to give multi line output */ + command_line[0] = strdup("/bin/echo"); + command_line[1] = strdup("this is a test via echo\nline two\nit's line 3"); + command_line[2] = strdup("and (note space between '3' and 'and') $$ will not get evaluated"); + + result = cmd_run_array (command_line, &chld_out, &chld_err, 0); + ok (chld_out.lines == 3, + "(array) Check for expected number of stdout lines"); + ok (chld_err.lines == 0, + "(array) Check for expected number of stderr lines"); + ok (strcmp (chld_out.line[0], "this is a test via echo") == 0, + "(array) Check line 1 for expected stdout output"); + ok (strcmp (chld_out.line[1], "line two") == 0, + "(array) Check line 2 for expected stdout output"); + ok (strcmp (chld_out.line[2], "it's line 3 and (note space between '3' and 'and') $$ will not get evaluated") == 0, + "(array) Check line 3 for expected stdout output"); + ok (result == 0, "(array) Checking exit code"); + + + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + ok (chld_out.lines == 0, "(initialised) Checking stdout is reset"); + ok (chld_err.lines == 0, "(initialised) Checking stderr is reset"); + ok (result == UNSET, "(initialised) Checking exit code is reset"); + + command = (char *)malloc(COMMAND_LINE); + strcpy(command, "/bin/echo3456 non-existant command"); + result = cmd_run (command, &chld_out, &chld_err, 0); + + ok (chld_out.lines == 0, + "Non existant command, so no output"); + ok (chld_err.lines == 0, + "No stderr either"); + ok (result == 3, "Get return code 3 (?) for non-existant command"); + + + /* ensure everything is empty again */ + memset (&chld_out, 0, sizeof (output)); + memset (&chld_err, 0, sizeof (output)); + result = UNSET; + + command = (char *)malloc(COMMAND_LINE); + strcpy(command, "/bin/grep pattern non-existant-file"); + result = cmd_run (command, &chld_out, &chld_err, 0); + + ok (chld_out.lines == 0, + "Grep returns no stdout when file is missing..."); + ok (chld_err.lines == 1, + "...but does give an error line"); + ok (strstr(chld_err.line[0],"non-existant-file") != NULL, "And missing filename is in error message"); + ok (result == 2, "Get return code 2 from grep"); + + + + return exit_status (); +} diff --git a/lib/tests/test_cmd.t b/lib/tests/test_cmd.t new file mode 100644 index 0000000..4dd54ef --- /dev/null +++ b/lib/tests/test_cmd.t @@ -0,0 +1,6 @@ +#!/usr/bin/perl +use Test::More; +if (! -e "./test_cmd") { + plan skip_all => "./test_cmd not compiled - please install tap library to test"; +} +exec "./test_cmd"; diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c index 7ee0a44..200770d 100644 --- a/lib/tests/test_disk.c +++ b/lib/tests/test_disk.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: test_disk.c,v 1.3 2007/03/30 09:00:05 psychotrahe Exp $ + $Id: test_disk.c 1786 2007-09-22 17:40:35Z psychotrahe $ ******************************************************************************/ @@ -36,14 +36,15 @@ main (int argc, char **argv) struct name_list *dummy_mountlist = NULL; struct name_list *temp_name; struct parameter_list *paths = NULL; - struct parameter_list *p; + struct parameter_list *p, *prev, *last; struct mount_entry *dummy_mount_list; struct mount_entry *me; struct mount_entry **mtail = &dummy_mount_list; int cflags = REG_NOSUB | REG_EXTENDED; + int found = 0, count = 0; - plan_tests(29); + plan_tests(33); ok( np_find_name(exclude_filesystem, "/var/log") == FALSE, "/var/log not in list"); np_add_name(&exclude_filesystem, "/var/log"); @@ -160,6 +161,46 @@ main (int argc, char **argv) } } + /* test deleting first element in paths */ + paths = np_del_parameter(paths, NULL); + for (p = paths; p; p = p->name_next) { + if (! strcmp(p->name, "/home/groups")) + found = 1; + } + ok(found == 0, "first element successfully deleted"); + found = 0; + + p=paths; + while (p) { + if (! strcmp(p->name, "/tmp")) + p = np_del_parameter(p, prev); + else { + prev = p; + p = p->name_next; + } + } + + for (p = paths; p; p = p->name_next) { + if (! strcmp(p->name, "/tmp")) + found = 1; + if (p->name_next) + prev = p; + else + last = p; + } + ok(found == 0, "/tmp element successfully deleted"); + + p = np_del_parameter(last, prev); + for (p = paths; p; p = p->name_next) { + if (! strcmp(p->name, "/home")) + found = 1; + last = p; + count++; + } + ok(found == 0, "last (/home) element successfully deleted"); + ok(count == 2, "two elements remaining"); + + return exit_status(); } diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c new file mode 100644 index 0000000..5e22e29 --- /dev/null +++ b/lib/tests/test_tcp.c @@ -0,0 +1,58 @@ +/****************************************************************************** + + 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. + + 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. + + 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., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: test_tcp.c 1732 2007-06-03 15:58:22Z psychotrahe $ + +******************************************************************************/ + +#include "common.h" +#include "utils_tcp.h" +#include "tap.h" + +int +main (int argc, char **argv) +{ + char** server_expect; + int server_expect_count = 3; + plan_tests(8); + + server_expect = malloc(sizeof(char*) * server_expect_count); + + server_expect[0] = strdup("AA"); + server_expect[1] = strdup("bb"); + server_expect[2] = strdup("CC"); + + ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, FALSE, TRUE, FALSE) == TRUE, + "Test matching any string at the beginning (first expect string)"); + ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, FALSE, TRUE, FALSE) == TRUE, + "Test matching any string at the beginning (second expect string)"); + ok(np_expect_match("XX bb AA CC XX", server_expect, server_expect_count, FALSE, TRUE, FALSE) == FALSE, + "Test with strings not matching at the beginning"); + ok(np_expect_match("XX CC XX", server_expect, server_expect_count, FALSE, TRUE, FALSE) == FALSE, + "Test matching any string"); + ok(np_expect_match("XX", server_expect, server_expect_count, FALSE, FALSE, FALSE) == FALSE, + "Test not matching any string"); + ok(np_expect_match("XX AA bb CC XX", server_expect, server_expect_count, TRUE, FALSE, FALSE) == TRUE, + "Test matching all strings"); + ok(np_expect_match("XX bb CC XX", server_expect, server_expect_count, TRUE, FALSE, FALSE) == FALSE, + "Test not matching all strings"); + ok(np_expect_match("XX XX", server_expect, server_expect_count, TRUE, FALSE, FALSE) == FALSE, + "Test not matching any string (testing all)"); + + + return exit_status(); +} + diff --git a/lib/tests/test_tcp.t b/lib/tests/test_tcp.t new file mode 100755 index 0000000..8f34b67 --- /dev/null +++ b/lib/tests/test_tcp.t @@ -0,0 +1,6 @@ +#!/usr/bin/perl +use Test::More; +if (! -e "./test_tcp") { + plan skip_all => "./test_tcp not compiled - please install tap library to test"; +} +exec "./test_tcp"; diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c index 82f43ce..b03e536 100644 --- a/lib/tests/test_utils.c +++ b/lib/tests/test_utils.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: test_utils.c,v 1.2 2006/07/13 23:58:00 tonvoon Exp $ + $Id: test_utils.c 1452 2006-07-13 23:58:00Z tonvoon $ ******************************************************************************/ diff --git a/lib/utils_base.c b/lib/utils_base.c index 254248c..fbb3a1e 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -8,8 +8,8 @@ * Copyright (c) 2006 Nagios Plugin Development Team * License: GPL * - * $Revision: 1.4 $ - * $Date: 2007/01/27 17:49:08 $ + * $Revision: 1768 $ + * $Date: 2007-07-29 13:42:05 +0100 (Sun, 29 Jul 2007) $ ****************************************************************************/ #include @@ -228,3 +228,18 @@ char *np_escaped_string (const char *string) { data[j] = '\0'; return data; } + +int np_check_if_root(void) { return (geteuid() == 0); } + +int np_warn_if_not_root(void) { + int status = np_check_if_root(); + if(!status) { + printf(_("Warning: ")); + printf(_("This plugin must be either run as root or setuid root.\n")); + printf(_("To run as root, you can use a tool like sudo.\n")); + printf(_("To set the setuid permissions, use the command:\n")); + /* XXX could we use something like progname? */ + printf("\tchmod u+s yourpluginfile\n"); + } + return status; +} diff --git a/lib/utils_base.h b/lib/utils_base.h index 44ed0a3..bda7659 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -31,6 +31,7 @@ typedef struct thresholds_struct { range *parse_range_string (char *); int _set_thresholds(thresholds **, char *, char *); void set_thresholds(thresholds **, char *, char *); +void print_thresholds(const char *, thresholds *); int check_range(double, range *); int get_status(double, thresholds *); @@ -42,4 +43,11 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3))) #define NP_RANGE_UNPARSEABLE 1 #define NP_WARN_WITHIN_CRIT 2 +/* a simple check to see if we're running as root. + * returns zero on failure, nonzero on success */ +int np_check_if_root(void); +/* and a helpful wrapper around that. it returns the same status + * code from the above function, in case it's helpful for testing */ +int np_warn_if_not_root(void); + #endif /* _UTILS_BASE_ */ diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c new file mode 100644 index 0000000..c4ceb97 --- /dev/null +++ b/lib/utils_cmd.c @@ -0,0 +1,378 @@ +/**************************************************************************** + * Nagios run command utilities + * + * License: GPL + * Copyright (c) 2005 nagios-plugins team + * + * $Id: utils_cmd.c 1434 2006-06-18 19:36:48Z opensides $ + * + * Description : + * + * A simple interface to executing programs from other programs, using an + * optimized and safe popen()-like implementation. It is considered safe + * in that no shell needs to be spawned and the environment passed to the + * execve()'d program is essentially empty. + * + * + * The code in this file is a derivative of popen.c which in turn was taken + * from "Advanced Programming for the Unix Environment" by W. Richard Stevens. + * + * Care has been taken to make sure the functions are async-safe. The one + * function which isn't is cmd_init() which it doesn't make sense to + * call twice anyway, so the api as a whole should be considered async-safe. + * + * License Information: + * + * 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. + * + * 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. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#define NAGIOSPLUG_API_C 1 + +/** includes **/ +#include "common.h" +#include "utils_cmd.h" +#include "utils_base.h" + +#ifdef HAVE_SYS_WAIT_H +# include +#endif + +/** macros **/ +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif + +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif + +/* 4.3BSD Reno doesn't define SIG_ERR */ +#if defined(SIG_IGN) && !defined(SIG_ERR) +# define SIG_ERR ((Sigfunc *)-1) +#endif + +/* This variable must be global, since there's no way the caller + * can forcibly slay a dead or ungainly running program otherwise. + * Multithreading apps and plugins can initialize it (via CMD_INIT) + * in an async safe manner PRIOR to calling cmd_run() or cmd_run_array() + * for the first time. + * + * The check for initialized values is atomic and can + * occur in any number of threads simultaneously. */ +static pid_t *_cmd_pids = NULL; + +/* Try sysconf(_SC_OPEN_MAX) first, as it can be higher than OPEN_MAX. + * If that fails and the macro isn't defined, we fall back to an educated + * guess. There's no guarantee that our guess is adequate and the program + * will die with SIGSEGV if it isn't and the upper boundary is breached. */ +#ifdef _SC_OPEN_MAX +static long maxfd = 0; +#elif defined(OPEN_MAX) +# define maxfd OPEN_MAX +#else /* sysconf macro unavailable, so guess (may be wildly inaccurate) */ +# define maxfd 256 +#endif + + +/** prototypes **/ +static int _cmd_open (char *const *, int *, int *) + __attribute__ ((__nonnull__ (1, 2, 3))); + +static int _cmd_fetch_output (int, output *, int) + __attribute__ ((__nonnull__ (2))); + +static int _cmd_close (int); + +/* prototype imported from utils.h */ +extern void die (int, const char *, ...) + __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); + + +/* this function is NOT async-safe. It is exported so multithreaded + * plugins (or other apps) can call it prior to running any commands + * through this api and thus achieve async-safeness throughout the api */ +void +cmd_init (void) +{ +#ifndef maxfd + if (!maxfd && (maxfd = sysconf (_SC_OPEN_MAX)) < 0) { + /* possibly log or emit a warning here, since there's no + * guarantee that our guess at maxfd will be adequate */ + maxfd = 256; + } +#endif + + if (!_cmd_pids) + _cmd_pids = calloc (maxfd, sizeof (pid_t)); +} + + +/* Start running a command, array style */ +static int +_cmd_open (char *const *argv, int *pfd, int *pfderr) +{ + char *env[2]; + pid_t pid; +#ifdef RLIMIT_CORE + struct rlimit limit; +#endif + + int i = 0; + + /* if no command was passed, return with no error */ + if (argv == NULL) + return -1; + + if (!_cmd_pids) + CMD_INIT; + + env[0] = strdup ("LC_ALL=C"); + env[1] = '\0'; + + if (pipe (pfd) < 0 || pipe (pfderr) < 0 || (pid = fork ()) < 0) + return -1; /* errno set by the failing function */ + + /* child runs exceve() and _exit. */ + if (pid == 0) { +#ifdef RLIMIT_CORE + /* the program we execve shouldn't leave core files */ + getrlimit (RLIMIT_CORE, &limit); + limit.rlim_cur = 0; + setrlimit (RLIMIT_CORE, &limit); +#endif + close (pfd[0]); + if (pfd[1] != STDOUT_FILENO) { + dup2 (pfd[1], STDOUT_FILENO); + close (pfd[1]); + } + close (pfderr[0]); + if (pfderr[1] != STDERR_FILENO) { + dup2 (pfderr[1], STDERR_FILENO); + close (pfderr[1]); + } + + /* close all descriptors in _cmd_pids[] + * This is executed in a separate address space (pure child), + * so we don't have to worry about async safety */ + for (i = 0; i < maxfd; i++) + if (_cmd_pids[i] > 0) + close (i); + + execve (argv[0], argv, env); + _exit (STATE_UNKNOWN); + } + + /* parent picks up execution here */ + /* close childs descriptors in our address space */ + close (pfd[1]); + close (pfderr[1]); + + /* tag our file's entry in the pid-list and return it */ + _cmd_pids[pfd[0]] = pid; + + return pfd[0]; +} + +static int +_cmd_close (int fd) +{ + int status; + pid_t pid; + + /* make sure the provided fd was opened */ + if (fd < 0 || fd > maxfd || !_cmd_pids || (pid = _cmd_pids[fd]) == 0) + return -1; + + _cmd_pids[fd] = 0; + if (close (fd) == -1) + return -1; + + /* EINTR is ok (sort of), everything else is bad */ + while (waitpid (pid, &status, 0) < 0) + if (errno != EINTR) + return -1; + + /* return child's termination status */ + return (WIFEXITED (status)) ? WEXITSTATUS (status) : -1; +} + + +static int +_cmd_fetch_output (int fd, output * op, int flags) +{ + size_t len = 0, i = 0, lineno = 0; + size_t rsf = 6, ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */ + char *buf = NULL; + int ret; + char tmpbuf[4096]; + + op->buf = NULL; + op->buflen = 0; + while ((ret = read (fd, tmpbuf, sizeof (tmpbuf))) > 0) { + len = (size_t) ret; + op->buf = realloc (op->buf, op->buflen + len + 1); + memcpy (op->buf + op->buflen, tmpbuf, len); + op->buflen += len; + i++; + } + + if (ret < 0) { + printf ("read() returned %d: %s\n", ret, strerror (errno)); + return ret; + } + + /* some plugins may want to keep output unbroken, and some commands + * will yield no output, so return here for those */ + if (flags & CMD_NO_ARRAYS || !op->buf || !op->buflen) + return op->buflen; + + /* and some may want both */ + if (flags & CMD_NO_ASSOC) { + buf = malloc (op->buflen); + memcpy (buf, op->buf, op->buflen); + } + else + buf = op->buf; + + op->line = NULL; + op->lens = NULL; + i = 0; + while (i < op->buflen) { + /* make sure we have enough memory */ + if (lineno >= ary_size) { + /* ary_size must never be zero */ + do { + ary_size = op->buflen >> --rsf; + } while (!ary_size); + + op->line = realloc (op->line, ary_size * sizeof (char *)); + op->lens = realloc (op->lens, ary_size * sizeof (size_t)); + } + + /* set the pointer to the string */ + op->line[lineno] = &buf[i]; + + /* hop to next newline or end of buffer */ + while (buf[i] != '\n' && i < op->buflen) + i++; + buf[i] = '\0'; + + /* calculate the string length using pointer difference */ + op->lens[lineno] = (size_t) & buf[i] - (size_t) op->line[lineno]; + + lineno++; + i++; + } + + return lineno; +} + + +int +cmd_run (const char *cmdstring, output * out, output * err, int flags) +{ + int fd, pfd_out[2], pfd_err[2]; + int i = 0, argc; + size_t cmdlen; + char **argv = NULL; + char *cmd = NULL; + char *str = NULL; + + if (cmdstring == NULL) + return -1; + + /* initialize the structs */ + if (out) + memset (out, 0, sizeof (output)); + if (err) + memset (err, 0, sizeof (output)); + + /* make copy of command string so strtok() doesn't silently modify it */ + /* (the calling program may want to access it later) */ + cmdlen = strlen (cmdstring); + if ((cmd = malloc (cmdlen + 1)) == NULL) + return -1; + memcpy (cmd, cmdstring, cmdlen); + cmd[cmdlen] = '\0'; + + /* This is not a shell, so we don't handle "???" */ + if (strstr (cmdstring, "\"")) return -1; + + /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */ + if (strstr (cmdstring, " ' ") || strstr (cmdstring, "'''")) + return -1; + + /* each arg must be whitespace-separated, so args can be a maximum + * of (len / 2) + 1. We add 1 extra to the mix for NULL termination */ + argc = (cmdlen >> 1) + 2; + argv = calloc (sizeof (char *), argc); + + if (argv == NULL) { + printf ("%s\n", _("Could not malloc argv array in popen()")); + return -1; + } + + /* get command arguments (stupidly, but fairly quickly) */ + while (cmd) { + str = cmd; + str += strspn (str, " \t\r\n"); /* trim any leading whitespace */ + + if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */ + str++; + if (!strstr (str, "'")) + return -1; /* balanced? */ + cmd = 1 + strstr (str, "'"); + str[strcspn (str, "'")] = 0; + } + else { + if (strpbrk (str, " \t\r\n")) { + cmd = 1 + strpbrk (str, " \t\r\n"); + str[strcspn (str, " \t\r\n")] = 0; + } + else { + cmd = NULL; + } + } + + if (cmd && strlen (cmd) == strspn (cmd, " \t\r\n")) + cmd = NULL; + + argv[i++] = str; + } + + return cmd_run_array (argv, out, err, flags); +} + +int +cmd_run_array (char *const *argv, output * out, output * err, int flags) +{ + int fd, pfd_out[2], pfd_err[2]; + + /* initialize the structs */ + if (out) + memset (out, 0, sizeof (output)); + if (err) + memset (err, 0, sizeof (output)); + + if ((fd = _cmd_open (argv, pfd_out, pfd_err)) == -1) + die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]); + + if (out) + out->lines = _cmd_fetch_output (pfd_out[0], out, flags); + if (err) + err->lines = _cmd_fetch_output (pfd_err[0], err, flags); + + return _cmd_close (fd); +} diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h new file mode 100644 index 0000000..d54b2b4 --- /dev/null +++ b/lib/utils_cmd.h @@ -0,0 +1,34 @@ +#ifndef _UTILS_CMD_ +#define _UTILS_CMD_ + +/* + * Header file for nagios plugins utils_cmd.c + * + * + */ + +/** types **/ +struct output +{ + char *buf; /* output buffer */ + size_t buflen; /* output buffer content length */ + char **line; /* array of lines (points to buf) */ + size_t *lens; /* string lengths */ + size_t lines; /* lines of output */ +}; + +typedef struct output output; + +/** prototypes **/ +int cmd_run (const char *, output *, output *, int); +int cmd_run_array (char *const *, output *, output *, int); + +/* only multi-threaded plugins need to bother with this */ +void cmd_init (void); +#define CMD_INIT cmd_init() + +/* possible flags for cmd_run()'s fourth argument */ +#define CMD_NO_ARRAYS 0x01 /* don't populate arrays at all */ +#define CMD_NO_ASSOC 0x02 /* output.line won't point to buf */ + +#endif /* _UTILS_CMD_ */ diff --git a/lib/utils_disk.c b/lib/utils_disk.c index a0493e1..7b32e7b 100644 --- a/lib/utils_disk.c +++ b/lib/utils_disk.c @@ -4,7 +4,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/04/01 11:17:16 $ +* Last Modified: $Date: 2007-09-22 18:48:33 +0100 (Sat, 22 Sep 2007) $ * * Description: * @@ -26,7 +26,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: utils_disk.c,v 1.6 2007/04/01 11:17:16 psychotrahe Exp $ +* $Id: utils_disk.c 1787 2007-09-22 17:48:33Z psychotrahe $ * *****************************************************************************/ @@ -74,6 +74,26 @@ np_add_parameter(struct parameter_list **list, const char *name) return new_path; } +/* Delete a given parameter from list and return pointer to next element*/ +struct parameter_list * +np_del_parameter(struct parameter_list *item, struct parameter_list *prev) +{ + struct parameter_list *next; + if (item->name_next) + next = item->name_next; + else + next = NULL; + + + free(item); + if (prev) + prev->name_next = next; + + return next; + +} + + /* returns a pointer to the struct found in the list */ struct parameter_list * np_find_parameter(struct parameter_list *list, const char *name) @@ -161,8 +181,9 @@ np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) { if (regexec(re, me->me_devname, (size_t) 0, NULL, 0) == 0 || regexec(re, me->me_mountdir, (size_t) 0, NULL, 0) == 0 ) { - return true; + return TRUE; } else { - return false; + return FALSE; } } + diff --git a/lib/utils_disk.h b/lib/utils_disk.h index 6263339..f99b905 100644 --- a/lib/utils_disk.h +++ b/lib/utils_disk.h @@ -31,6 +31,8 @@ int np_find_name (struct name_list *list, const char *name); int np_seen_name (struct name_list *list, const char *name); struct parameter_list *np_add_parameter(struct parameter_list **list, const char *name); struct parameter_list *np_find_parameter(struct parameter_list *list, const char *name); +struct parameter_list *np_del_parameter(struct parameter_list *item, struct parameter_list *prev); + int search_parameter_list (struct parameter_list *list, const char *name); void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact); int np_regex_match_mount_entry (struct mount_entry* me, regex_t* re); diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c new file mode 100644 index 0000000..c6d710b --- /dev/null +++ b/lib/utils_tcp.c @@ -0,0 +1,60 @@ +/**************************************************************************** +* Utils for check_tcp +* +* License: GPL +* Copyright (c) 1999-2007 nagios-plugins team +* +* Last Modified: $Date: 2007-09-22 18:48:33 +0100 (Sat, 22 Sep 2007) $ +* +* Description: +* +* This file contains utilities for check_tcp. These are tested by libtap +* +* License Information: +* +* 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. +* +* 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. +* +* 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., 675 Mass Ave, Cambridge, MA 02139, USA. +* +* $Id: utils_tcp.c 1787 2007-09-22 17:48:33Z psychotrahe $ +* +*****************************************************************************/ + +#include "common.h" +#include "utils_tcp.h" + +int +np_expect_match(char* status, char** server_expect, int expect_count, int all, int exact_match, int verbose) +{ + int match = 0; + int i; + for (i = 0; i < expect_count; i++) { + if (verbose) + printf ("looking for [%s] %s [%s]\n", server_expect[i], + (exact_match) ? "in beginning of" : "anywhere in", + status); + + if ((exact_match && !strncmp(status, server_expect[i], strlen(server_expect[i]))) || + (! exact_match && strstr(status, server_expect[i]))) + { + if(verbose) puts("found it"); + match += 1; + } else + if(verbose) puts("couldn't find it"); + } + if ((all == TRUE && match == expect_count) || + (! all && match >= 1)) { + return TRUE; + } else + return FALSE; +} diff --git a/lib/utils_tcp.h b/lib/utils_tcp.h new file mode 100644 index 0000000..06506f3 --- /dev/null +++ b/lib/utils_tcp.h @@ -0,0 +1,4 @@ +/* Header file for utils_disk */ + +int np_expect_match(char* status, char** server_expect, int server_expect_count, + int all, int exact_match, int verbose); diff --git a/nagios-plugins.spec b/nagios-plugins.spec index 4175383..598ec56 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -1,5 +1,5 @@ Name: nagios-plugins -Version: 1.4.8 +Version: 1.4.10 Release: 1 Summary: Host/service/network monitoring program plugins for Nagios diff --git a/perlmods/Class-Accessor-0.31.tar.gz b/perlmods/Class-Accessor-0.31.tar.gz new file mode 100644 index 0000000..21ed674 Binary files /dev/null and b/perlmods/Class-Accessor-0.31.tar.gz differ diff --git a/perlmods/Config-Tiny-2.10.tar.gz b/perlmods/Config-Tiny-2.10.tar.gz new file mode 100644 index 0000000..389c406 Binary files /dev/null and b/perlmods/Config-Tiny-2.10.tar.gz differ diff --git a/perlmods/Makefile b/perlmods/Makefile new file mode 100644 index 0000000..fb18773 --- /dev/null +++ b/perlmods/Makefile @@ -0,0 +1,500 @@ +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# perlmods/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +srcdir = . +top_srcdir = .. + +pkgdatadir = $(datadir)/nagios-plugins +pkglibdir = $(libdir)/nagios-plugins +pkgincludedir = $(includedir)/nagios-plugins +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu +subdir = perlmods +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ + $(top_srcdir)/gl/m4/absolute-header.m4 \ + $(top_srcdir)/gl/m4/alloca.m4 \ + $(top_srcdir)/gl/m4/arpa_inet_h.m4 \ + $(top_srcdir)/gl/m4/c-strtod.m4 $(top_srcdir)/gl/m4/cloexec.m4 \ + $(top_srcdir)/gl/m4/codeset.m4 $(top_srcdir)/gl/m4/dirname.m4 \ + $(top_srcdir)/gl/m4/dos.m4 \ + $(top_srcdir)/gl/m4/double-slash-root.m4 \ + $(top_srcdir)/gl/m4/eoverflow.m4 $(top_srcdir)/gl/m4/error.m4 \ + $(top_srcdir)/gl/m4/exitfail.m4 \ + $(top_srcdir)/gl/m4/extensions.m4 \ + $(top_srcdir)/gl/m4/fcntl-safer.m4 \ + $(top_srcdir)/gl/m4/fstypename.m4 \ + $(top_srcdir)/gl/m4/fsusage.m4 \ + $(top_srcdir)/gl/m4/getaddrinfo.m4 \ + $(top_srcdir)/gl/m4/gethostname.m4 \ + $(top_srcdir)/gl/m4/getloadavg.m4 \ + $(top_srcdir)/gl/m4/getopt.m4 $(top_srcdir)/gl/m4/gettext.m4 \ + $(top_srcdir)/gl/m4/gnulib-common.m4 \ + $(top_srcdir)/gl/m4/gnulib-comp.m4 \ + $(top_srcdir)/gl/m4/iconv.m4 $(top_srcdir)/gl/m4/inet_ntop.m4 \ + $(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/intmax_t.m4 \ + $(top_srcdir)/gl/m4/inttypes_h.m4 \ + $(top_srcdir)/gl/m4/lib-ld.m4 $(top_srcdir)/gl/m4/lib-link.m4 \ + $(top_srcdir)/gl/m4/lib-prefix.m4 $(top_srcdir)/gl/m4/lock.m4 \ + $(top_srcdir)/gl/m4/longdouble.m4 \ + $(top_srcdir)/gl/m4/longlong.m4 \ + $(top_srcdir)/gl/m4/ls-mntd-fs.m4 \ + $(top_srcdir)/gl/m4/mbchar.m4 $(top_srcdir)/gl/m4/mbiter.m4 \ + $(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/memchr.m4 \ + $(top_srcdir)/gl/m4/minmax.m4 $(top_srcdir)/gl/m4/mountlist.m4 \ + $(top_srcdir)/gl/m4/netinet_in_h.m4 $(top_srcdir)/gl/m4/nls.m4 \ + $(top_srcdir)/gl/m4/onceonly_2_57.m4 $(top_srcdir)/gl/m4/po.m4 \ + $(top_srcdir)/gl/m4/progtest.m4 $(top_srcdir)/gl/m4/regex.m4 \ + $(top_srcdir)/gl/m4/safe-read.m4 \ + $(top_srcdir)/gl/m4/safe-write.m4 \ + $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/snprintf.m4 $(top_srcdir)/gl/m4/socklen.m4 \ + $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ + $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stdint.m4 \ + $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/strdup.m4 $(top_srcdir)/gl/m4/strndup.m4 \ + $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/sys_socket_h.m4 \ + $(top_srcdir)/gl/m4/ulonglong.m4 \ + $(top_srcdir)/gl/m4/unistd-safer.m4 \ + $(top_srcdir)/gl/m4/unistd_h.m4 \ + $(top_srcdir)/gl/m4/vasnprintf.m4 \ + $(top_srcdir)/gl/m4/vasprintf.m4 \ + $(top_srcdir)/gl/m4/vsnprintf.m4 $(top_srcdir)/gl/m4/wchar.m4 \ + $(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wctype.m4 \ + $(top_srcdir)/gl/m4/wcwidth.m4 $(top_srcdir)/gl/m4/wint_t.m4 \ + $(top_srcdir)/gl/m4/xalloc.m4 $(top_srcdir)/gl/m4/xsize.m4 \ + $(top_srcdir)/gl/m4/xstrndup.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +INSTALL = /usr/bin/install -c +ABSOLUTE_STDINT_H = "///usr/include/stdint.h" +ABSOLUTE_UNISTD_H = "///usr/include/unistd.h" +ABSOLUTE_WCHAR_H = +ABSOLUTE_WCTYPE_H = "///usr/include/wctype.h" +ACLOCAL = ${SHELL} /tmp/nagiosplug/build-aux/missing --run aclocal-1.9 +ALLOCA = +ALLOCA_H = alloca.h +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /tmp/nagiosplug/build-aux/missing --run tar +AR = ar +ARPA_INET_H = +AUTOCONF = ${SHELL} /tmp/nagiosplug/build-aux/missing --run autoconf +AUTOHEADER = ${SHELL} /tmp/nagiosplug/build-aux/missing --run autoheader +AUTOMAKE = ${SHELL} /tmp/nagiosplug/build-aux/missing --run automake-1.9 +AWK = mawk +BASENAME = /usr/bin/basename +BITSIZEOF_PTRDIFF_T = 32 +BITSIZEOF_SIG_ATOMIC_T = 32 +BITSIZEOF_SIZE_T = 32 +BITSIZEOF_WCHAR_T = 32 +BITSIZEOF_WINT_T = 32 +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DEPLIBS = +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EOVERFLOW = +EXEEXT = +EXTRAS = check_ldap check_ide_smart check_mysql check_mysql_query check_procs check_nagios check_dns check_by_ssh check_swap check_dig check_apt check_nt +EXTRAS_ROOT = +EXTRA_NETOBJS = +EXTRA_TEST = +F77 = +FFLAGS = +GETLOADAVG_LIBS = +GETOPT_H = +GL_COND_LIBTOOL_FALSE = +GL_COND_LIBTOOL_TRUE = # +GMSGFMT = /usr/bin/msgfmt +GMSGFMT_015 = : +HAVE_INTTYPES_H = 1 +HAVE_LONG_LONG_INT = 1 +HAVE_SIGNED_SIG_ATOMIC_T = 1 +HAVE_SIGNED_WCHAR_T = 1 +HAVE_SIGNED_WINT_T = 0 +HAVE_STDINT_H = 1 +HAVE_SYS_BITYPES_H = 1 +HAVE_SYS_INTTYPES_H = 0 +HAVE_SYS_TYPES_H = 1 +HAVE_UNSIGNED_LONG_LONG_INT = 1 +HAVE_WCTYPE_H = 1 +HAVE_WINT_T = 1 +HAVE__BOOL = 1 +HOSTNAME = /bin/hostname +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +INTLLIBS = +INTL_MACOSX_LIBS = +KMEM_GROUP = +KRBINCLUDE = +LDAPINCLUDE = -I/usr/include/ldap +LDAPLIBS = -lldap -llber +LDFLAGS = -L. +LIBGNUTLS_CONFIG = +LIBGNU_LIBDEPS = +LIBGNU_LTLIBDEPS = +LIBICONV = -liconv +LIBINTL = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBICONV = -liconv +LTLIBINTL = +LTLIBOBJS = +MAKEINFO = ${SHELL} /tmp/nagiosplug/build-aux/missing --run makeinfo +MATHLIBS = -lm +MKDIR_P = $(mkdir_p) +MSGFMT = /usr/bin/msgfmt +MSGFMT_015 = : +MSGMERGE = /usr/bin/msgmerge +MYSQLCFLAGS = -I/usr/include/mysql -DBIG_JOINS=1 +MYSQLINCLUDE = -I/usr/include/mysql +MYSQLLIBS = -L/usr/lib -lmysqlclient -lz -lcrypt -lnsl -lm +NEED_SETGID = false +NETINET_IN_H = +OBJEXT = o +PACKAGE = nagios-plugins +PACKAGE_BUGREPORT = +PACKAGE_NAME = nagios-plugins +PACKAGE_STRING = nagios-plugins 1.4.10 +PACKAGE_TARNAME = nagios-plugins +PACKAGE_VERSION = 1.4.10 +PATH_SEPARATOR = : +PATH_TO_APTGET = /usr/bin/apt-get +PATH_TO_DIG = /usr/bin/dig +PATH_TO_FPING = +PATH_TO_LMSTAT = +PATH_TO_LSPS = +PATH_TO_MAILQ = /usr/bin/mailq +PATH_TO_NSLOOKUP = /usr/bin/nslookup +PATH_TO_PING = /bin/ping +PATH_TO_PING6 = /bin/ping6 +PATH_TO_PS = /bin/ps +PATH_TO_QMAIL_QSTAT = +PATH_TO_QSTAT = +PATH_TO_QUAKESTAT = +PATH_TO_RPCINFO = /usr/bin/rpcinfo +PATH_TO_SMBCLIENT = +PATH_TO_SNMPGET = +PATH_TO_SNMPGETNEXT = +PATH_TO_SSH = /usr/bin/ssh +PATH_TO_SWAP = +PATH_TO_SWAPINFO = +PATH_TO_UPTIME = /usr/bin/uptime +PATH_TO_WHO = /usr/bin/who +PERL = /usr/bin/perl +PERLMODS_DIR = +PGINCLUDE = +PGLIBS = +PKG_ARCH = +PLUGIN_TEST = t/check_cluster.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t +POSUB = po +POW_LIB = +PTRDIFF_T_SUFFIX = +PYTHON = /usr/bin/python +RADIUSLIBS = +RANLIB = ranlib +RELEASE = 1 +REV_DATESTAMP = 2007.09.29.02.03 +REV_TIMESTAMP = 20070929020318 +SCRIPT_TEST = t/check_file_age.t t/check_rpc.t t/utils.t +SET_MAKE = +SH = /bin/sh +SHELL = /bin/sh +SIG_ATOMIC_T_SUFFIX = +SIZE_T_SUFFIX = u +SOCKETLIBS = -lnsl -lresolv +SSLINCLUDE = -I/usr/include +SSLLIBS = -lssl -lcrypto +STDBOOL_H = +STDINT_H = stdint.h +STRIP = strip +SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n +SYS_SOCKET_H = +UNISTD_H = +USE_NLS = yes +VERSION = 1.4.10 +WARRANTY = The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n +WCHAR_H = +WCHAR_T_SUFFIX = l +WCTYPE_H = +WINT_T_SUFFIX = u +XGETTEXT = /usr/bin/xgettext +XGETTEXT_015 = : +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = i686-pc-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = pc +check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp +datadir = ${prefix}/share +exec_prefix = ${prefix} +gl_LIBOBJS = asnprintf.o basename.o c-strtod.o cloexec.o creat-safer.o dirname.o dup-safer.o exitfail.o fd-safer.o fsusage.o mbchar.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o strcasecmp.o stripslash.o vasnprintf.o xmalloc.o +gl_LTLIBOBJS = asnprintf.lo basename.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dup-safer.lo exitfail.lo fd-safer.lo fsusage.lo mbchar.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo strcasecmp.lo stripslash.lo vasnprintf.lo xmalloc.lo +host = i686-pc-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = pc +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /tmp/nagiosplug/build-aux/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${datadir}/locale +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +np_mysql_config = /usr/bin/mysql_config +oldincludedir = /usr/include +prefix = /usr/local/nagios +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = +with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin +perlmoduledir = $(exec_prefix)/perl +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perlmods/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu perlmods/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-exec-local + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-exec-local install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +all-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -m . + +install-exec-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i . + +test: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t . + +clean-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -c . +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/perlmods/Makefile.am b/perlmods/Makefile.am new file mode 100644 index 0000000..ebed523 --- /dev/null +++ b/perlmods/Makefile.am @@ -0,0 +1,13 @@ +perlmoduledir = $(exec_prefix)/perl + +all-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -m . + +install-exec-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i . + +test: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t . + +clean-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -c . diff --git a/perlmods/Makefile.in b/perlmods/Makefile.in new file mode 100644 index 0000000..f633976 --- /dev/null +++ b/perlmods/Makefile.in @@ -0,0 +1,500 @@ +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = perlmods +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ + $(top_srcdir)/gl/m4/absolute-header.m4 \ + $(top_srcdir)/gl/m4/alloca.m4 \ + $(top_srcdir)/gl/m4/arpa_inet_h.m4 \ + $(top_srcdir)/gl/m4/c-strtod.m4 $(top_srcdir)/gl/m4/cloexec.m4 \ + $(top_srcdir)/gl/m4/codeset.m4 $(top_srcdir)/gl/m4/dirname.m4 \ + $(top_srcdir)/gl/m4/dos.m4 \ + $(top_srcdir)/gl/m4/double-slash-root.m4 \ + $(top_srcdir)/gl/m4/eoverflow.m4 $(top_srcdir)/gl/m4/error.m4 \ + $(top_srcdir)/gl/m4/exitfail.m4 \ + $(top_srcdir)/gl/m4/extensions.m4 \ + $(top_srcdir)/gl/m4/fcntl-safer.m4 \ + $(top_srcdir)/gl/m4/fstypename.m4 \ + $(top_srcdir)/gl/m4/fsusage.m4 \ + $(top_srcdir)/gl/m4/getaddrinfo.m4 \ + $(top_srcdir)/gl/m4/gethostname.m4 \ + $(top_srcdir)/gl/m4/getloadavg.m4 \ + $(top_srcdir)/gl/m4/getopt.m4 $(top_srcdir)/gl/m4/gettext.m4 \ + $(top_srcdir)/gl/m4/gnulib-common.m4 \ + $(top_srcdir)/gl/m4/gnulib-comp.m4 \ + $(top_srcdir)/gl/m4/iconv.m4 $(top_srcdir)/gl/m4/inet_ntop.m4 \ + $(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/intmax_t.m4 \ + $(top_srcdir)/gl/m4/inttypes_h.m4 \ + $(top_srcdir)/gl/m4/lib-ld.m4 $(top_srcdir)/gl/m4/lib-link.m4 \ + $(top_srcdir)/gl/m4/lib-prefix.m4 $(top_srcdir)/gl/m4/lock.m4 \ + $(top_srcdir)/gl/m4/longdouble.m4 \ + $(top_srcdir)/gl/m4/longlong.m4 \ + $(top_srcdir)/gl/m4/ls-mntd-fs.m4 \ + $(top_srcdir)/gl/m4/mbchar.m4 $(top_srcdir)/gl/m4/mbiter.m4 \ + $(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/memchr.m4 \ + $(top_srcdir)/gl/m4/minmax.m4 $(top_srcdir)/gl/m4/mountlist.m4 \ + $(top_srcdir)/gl/m4/netinet_in_h.m4 $(top_srcdir)/gl/m4/nls.m4 \ + $(top_srcdir)/gl/m4/onceonly_2_57.m4 $(top_srcdir)/gl/m4/po.m4 \ + $(top_srcdir)/gl/m4/progtest.m4 $(top_srcdir)/gl/m4/regex.m4 \ + $(top_srcdir)/gl/m4/safe-read.m4 \ + $(top_srcdir)/gl/m4/safe-write.m4 \ + $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/snprintf.m4 $(top_srcdir)/gl/m4/socklen.m4 \ + $(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \ + $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stdint.m4 \ + $(top_srcdir)/gl/m4/stdint_h.m4 $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/strdup.m4 $(top_srcdir)/gl/m4/strndup.m4 \ + $(top_srcdir)/gl/m4/strnlen.m4 \ + $(top_srcdir)/gl/m4/sys_socket_h.m4 \ + $(top_srcdir)/gl/m4/ulonglong.m4 \ + $(top_srcdir)/gl/m4/unistd-safer.m4 \ + $(top_srcdir)/gl/m4/unistd_h.m4 \ + $(top_srcdir)/gl/m4/vasnprintf.m4 \ + $(top_srcdir)/gl/m4/vasprintf.m4 \ + $(top_srcdir)/gl/m4/vsnprintf.m4 $(top_srcdir)/gl/m4/wchar.m4 \ + $(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wctype.m4 \ + $(top_srcdir)/gl/m4/wcwidth.m4 $(top_srcdir)/gl/m4/wint_t.m4 \ + $(top_srcdir)/gl/m4/xalloc.m4 $(top_srcdir)/gl/m4/xsize.m4 \ + $(top_srcdir)/gl/m4/xstrndup.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +INSTALL = @INSTALL@ +ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@ +ABSOLUTE_UNISTD_H = @ABSOLUTE_UNISTD_H@ +ABSOLUTE_WCHAR_H = @ABSOLUTE_WCHAR_H@ +ABSOLUTE_WCTYPE_H = @ABSOLUTE_WCTYPE_H@ +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +ALLOCA_H = @ALLOCA_H@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARPA_INET_H = @ARPA_INET_H@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASENAME = @BASENAME@ +BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ +BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ +BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ +BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ +BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEPLIBS = @DEPLIBS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EOVERFLOW = @EOVERFLOW@ +EXEEXT = @EXEEXT@ +EXTRAS = @EXTRAS@ +EXTRAS_ROOT = @EXTRAS_ROOT@ +EXTRA_NETOBJS = @EXTRA_NETOBJS@ +EXTRA_TEST = @EXTRA_TEST@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ +GETOPT_H = @GETOPT_H@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ +HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ +HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ +HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ +HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ +HAVE_STDINT_H = @HAVE_STDINT_H@ +HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ +HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ +HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WINT_T = @HAVE_WINT_T@ +HAVE__BOOL = @HAVE__BOOL@ +HOSTNAME = @HOSTNAME@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +KMEM_GROUP = @KMEM_GROUP@ +KRBINCLUDE = @KRBINCLUDE@ +LDAPINCLUDE = @LDAPINCLUDE@ +LDAPLIBS = @LDAPLIBS@ +LDFLAGS = @LDFLAGS@ +LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ +LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ +LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MATHLIBS = @MATHLIBS@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +MYSQLCFLAGS = @MYSQLCFLAGS@ +MYSQLINCLUDE = @MYSQLINCLUDE@ +MYSQLLIBS = @MYSQLLIBS@ +NEED_SETGID = @NEED_SETGID@ +NETINET_IN_H = @NETINET_IN_H@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PATH_TO_APTGET = @PATH_TO_APTGET@ +PATH_TO_DIG = @PATH_TO_DIG@ +PATH_TO_FPING = @PATH_TO_FPING@ +PATH_TO_LMSTAT = @PATH_TO_LMSTAT@ +PATH_TO_LSPS = @PATH_TO_LSPS@ +PATH_TO_MAILQ = @PATH_TO_MAILQ@ +PATH_TO_NSLOOKUP = @PATH_TO_NSLOOKUP@ +PATH_TO_PING = @PATH_TO_PING@ +PATH_TO_PING6 = @PATH_TO_PING6@ +PATH_TO_PS = @PATH_TO_PS@ +PATH_TO_QMAIL_QSTAT = @PATH_TO_QMAIL_QSTAT@ +PATH_TO_QSTAT = @PATH_TO_QSTAT@ +PATH_TO_QUAKESTAT = @PATH_TO_QUAKESTAT@ +PATH_TO_RPCINFO = @PATH_TO_RPCINFO@ +PATH_TO_SMBCLIENT = @PATH_TO_SMBCLIENT@ +PATH_TO_SNMPGET = @PATH_TO_SNMPGET@ +PATH_TO_SNMPGETNEXT = @PATH_TO_SNMPGETNEXT@ +PATH_TO_SSH = @PATH_TO_SSH@ +PATH_TO_SWAP = @PATH_TO_SWAP@ +PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ +PATH_TO_UPTIME = @PATH_TO_UPTIME@ +PATH_TO_WHO = @PATH_TO_WHO@ +PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ +PGINCLUDE = @PGINCLUDE@ +PGLIBS = @PGLIBS@ +PKG_ARCH = @PKG_ARCH@ +PLUGIN_TEST = @PLUGIN_TEST@ +POSUB = @POSUB@ +POW_LIB = @POW_LIB@ +PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ +PYTHON = @PYTHON@ +RADIUSLIBS = @RADIUSLIBS@ +RANLIB = @RANLIB@ +RELEASE = @RELEASE@ +REV_DATESTAMP = @REV_DATESTAMP@ +REV_TIMESTAMP = @REV_TIMESTAMP@ +SCRIPT_TEST = @SCRIPT_TEST@ +SET_MAKE = @SET_MAKE@ +SH = @SH@ +SHELL = @SHELL@ +SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ +SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +SOCKETLIBS = @SOCKETLIBS@ +SSLINCLUDE = @SSLINCLUDE@ +SSLLIBS = @SSLLIBS@ +STDBOOL_H = @STDBOOL_H@ +STDINT_H = @STDINT_H@ +STRIP = @STRIP@ +SUPPORT = @SUPPORT@ +SYS_SOCKET_H = @SYS_SOCKET_H@ +UNISTD_H = @UNISTD_H@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARRANTY = @WARRANTY@ +WCHAR_H = @WCHAR_H@ +WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ +WCTYPE_H = @WCTYPE_H@ +WINT_T_SUFFIX = @WINT_T_SUFFIX@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +check_tcp_ssl = @check_tcp_ssl@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +gl_LIBOBJS = @gl_LIBOBJS@ +gl_LTLIBOBJS = @gl_LTLIBOBJS@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +np_mysql_config = @np_mysql_config@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +with_trusted_path = @with_trusted_path@ +perlmoduledir = $(exec_prefix)/perl +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perlmods/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu perlmods/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-exec-local + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-exec-local install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +all-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -m . + +install-exec-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i . + +test: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -t . + +clean-local: + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -c . +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/perlmods/Math-Calc-Units-1.06.tar.gz b/perlmods/Math-Calc-Units-1.06.tar.gz new file mode 100644 index 0000000..a5d2360 Binary files /dev/null and b/perlmods/Math-Calc-Units-1.06.tar.gz differ diff --git a/perlmods/Nagios-Plugin-0.21.tar.gz b/perlmods/Nagios-Plugin-0.21.tar.gz new file mode 100644 index 0000000..03d2b6f Binary files /dev/null and b/perlmods/Nagios-Plugin-0.21.tar.gz differ diff --git a/perlmods/Params-Validate-0.88.tar.gz b/perlmods/Params-Validate-0.88.tar.gz new file mode 100644 index 0000000..05a0167 Binary files /dev/null and b/perlmods/Params-Validate-0.88.tar.gz differ diff --git a/perlmods/Test-Simple-0.70.tar.gz b/perlmods/Test-Simple-0.70.tar.gz new file mode 100644 index 0000000..44f1b54 Binary files /dev/null and b/perlmods/Test-Simple-0.70.tar.gz differ diff --git a/perlmods/install_order b/perlmods/install_order new file mode 100644 index 0000000..591a009 --- /dev/null +++ b/perlmods/install_order @@ -0,0 +1,7 @@ +# Modules installed in this order +Test-Simple +Params-Validate +Math-Calc-Units +Class-Accessor +Config-Tiny +Nagios-Plugin diff --git a/pkg/solaris/.cvsignore b/pkg/solaris/.cvsignore deleted file mode 100644 index a6bb7e4..0000000 --- a/pkg/solaris/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.cvsignore -pkginfo diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo index 8d26463..09f22c9 100644 --- a/pkg/solaris/pkginfo +++ b/pkg/solaris/pkginfo @@ -2,11 +2,11 @@ PKG="NAGplugin" NAME="nagios-plugins" DESC="Nagios network monitoring plugins" ARCH="" -VERSION="1.4.8,REV=2007.04.11.13.13" +VERSION="1.4.10,REV=2007.09.29.02.03" CATEGORY="application" VENDOR="Nagios Plugin Development Team" EMAIL="nagiosplug-devel@lists.sourceforge.net" -PSTAMP="nag20070411131329" +PSTAMP="nag20070929020318" BASEDIR="/" CLASSES="none" diff --git a/plugins-root/Makefile.in b/plugins-root/Makefile.in index 7f1ddf9..fcbfa5e 100644 --- a/plugins-root/Makefile.in +++ b/plugins-root/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = check_dhcp.c check_icmp.c pst3.c + srcdir = @srcdir@ top_srcdir = @top_srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -97,7 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -265,6 +267,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index e1cf108..453f666 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -6,7 +6,7 @@ * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) * Copyright (c) 2001-2006 Nagios Plugin Development Team * -* Last Modified: $Date: 2007/01/28 21:46:41 $ +* Last Modified: $Date: 2007-07-26 18:32:37 +0100 (Thu, 26 Jul 2007) $ * * Description: * @@ -31,12 +31,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_dhcp.c,v 1.8 2007/01/28 21:46:41 hweiss Exp $ +* $Id: check_dhcp.c 1766 2007-07-26 17:32:37Z hweiss $ +* +* ------------------------------------------------------------------------ +* Unicast mode was originally implemented by Heiti of Boras Kommun with +* general improvements as well as usability fixes and "forward"-porting by +* Andreas Ericsson of OP5 AB. +* ------------------------------------------------------------------------ * *****************************************************************************/ const char *progname = "check_dhcp"; -const char *revision = "$Revision: 1.8 $"; +const char *revision = "$Revision: 1766 $"; const char *copyright = "2001-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -44,6 +50,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "netutils.h" #include "utils.h" +#include #include #include #include @@ -59,6 +66,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include #include #include +#if HAVE_SYS_SOCKIO_H +#include +#endif #if defined( __linux__ ) @@ -182,12 +192,15 @@ typedef struct requested_server_struct{ #define DHCP_OPTION_BROADCAST_ADDRESS 28 #define DHCP_OPTION_REQUESTED_ADDRESS 50 #define DHCP_OPTION_LEASE_TIME 51 +#define DHCP_OPTION_SERVER_IDENTIFIER 54 #define DHCP_OPTION_RENEWAL_TIME 58 #define DHCP_OPTION_REBINDING_TIME 59 +#define DHCP_OPTION_END 255 #define DHCP_INFINITE_TIME 0xFFFFFFFF #define DHCP_BROADCAST_FLAG 32768 +#define DHCP_UNICAST_FLAG 0 #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68 @@ -195,7 +208,11 @@ typedef struct requested_server_struct{ #define ETHERNET_HARDWARE_ADDRESS 1 /* used in htype field of dhcp packet */ #define ETHERNET_HARDWARE_ADDRESS_LENGTH 6 /* length of Ethernet hardware addresses */ +u_int8_t unicast = 0; /* unicast mode: mimic a DHCP relay */ +struct in_addr my_ip; /* our address (required for relay) */ +struct in_addr dhcp_ip; /* server to query (if in unicast mode) */ unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]=""; +unsigned char *user_specified_mac=NULL; char network_interface_name[IFNAMSIZ]="eth0"; @@ -226,7 +243,11 @@ int validate_arguments(void); void print_usage(void); void print_help(void); +void resolve_host(const char *in,struct in_addr *out); +unsigned char *mac_aton(const char *); +void print_hardware_address(const unsigned char *); int get_hardware_address(int,char *); +int get_ip_address(int,char *); int send_dhcp_discover(int); int get_dhcp_offer(int); @@ -248,10 +269,13 @@ int main(int argc, char **argv){ int dhcp_socket; int result = STATE_UNKNOWN; + /* this plugin almost certainly needs root permissions. */ + np_warn_if_not_root(); + setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - + if(process_arguments(argc,argv)!=OK){ usage4 (_("Could not parse arguments")); } @@ -260,7 +284,13 @@ int main(int argc, char **argv){ dhcp_socket=create_dhcp_socket(); /* get hardware address of client machine */ - get_hardware_address(dhcp_socket,network_interface_name); + if(user_specified_mac!=NULL) + memcpy(client_hardware_address,user_specified_mac,6); + else + get_hardware_address(dhcp_socket,network_interface_name); + + if(unicast) /* get IP address of client machine */ + get_ip_address(dhcp_socket,network_interface_name); /* send DHCPDISCOVER packet */ send_dhcp_discover(dhcp_socket); @@ -286,12 +316,11 @@ int main(int argc, char **argv){ /* determines hardware address on client machine */ int get_hardware_address(int sock,char *interface_name){ - int i; - #if defined(__linux__) struct ifreq ifr; - strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)); + strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1); + ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0'; /* try and grab hardware address of requested interface */ if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){ @@ -381,25 +410,48 @@ int get_hardware_address(int sock,char *interface_name){ /* Kompf 2000-2003 */ #else - printf(_("Error: can't get MAC address for this architecture.\n")); + printf(_("Error: can't get MAC address for this architecture. Use the --mac option.\n")); exit(STATE_UNKNOWN); #endif - if(verbose){ - printf(_("Hardware address: ")); - for (i=0; i<6; ++i) - printf("%2.2x", client_hardware_address[i]); - printf( "\n"); - } + if(verbose) + print_hardware_address(client_hardware_address); return OK; } +/* determines IP address of the client interface */ +int get_ip_address(int sock,char *interface_name){ +#if defined(SIOCGIFADDR) + struct ifreq ifr; + + strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1); + ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0'; + + if(ioctl(sock,SIOCGIFADDR,&ifr)<0){ + printf(_("Error: Cannot determine IP address of interface %s\n"), + interface_name); + exit(STATE_UNKNOWN); + } + + my_ip=((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr; + +#else + printf(_("Error: Cannot get interface IP address on this platform.\n")); + exit(STATE_UNKNOWN); +#endif + + if(verbose) + printf(_("Pretending to be relay client %s\n"),inet_ntoa(my_ip)); + + return OK; + } /* sends a DHCPDISCOVER broadcast message in an attempt to find DHCP servers */ int send_dhcp_discover(int sock){ dhcp_packet discover_packet; struct sockaddr_in sockaddr_broadcast; + unsigned short opts; /* clear the packet data structure */ @@ -415,9 +467,10 @@ int send_dhcp_discover(int sock){ /* length of our hardware address */ discover_packet.hlen=ETHERNET_HARDWARE_ADDRESS_LENGTH; - discover_packet.hops=0; - - /* transaction id is supposed to be random */ + /* + * transaction ID is supposed to be random. We won't use the address so + * we don't care about high entropy here. time(2) is good enough. + */ srand(time(NULL)); packet_xid=random(); discover_packet.xid=htonl(packet_xid); @@ -429,8 +482,11 @@ int send_dhcp_discover(int sock){ /*discover_packet.secs=htons(65535);*/ discover_packet.secs=0xFF; - /* tell server it should broadcast its response */ - discover_packet.flags=htons(DHCP_BROADCAST_FLAG); + /* + * server needs to know if it should broadcast or unicast its response: + * 0x8000L == 32768 == 1 << 15 == broadcast, 0 == unicast + */ + discover_packet.flags = unicast ? 0 : htons(DHCP_BROADCAST_FLAG); /* our hardware address */ memcpy(discover_packet.chaddr,client_hardware_address,ETHERNET_HARDWARE_ADDRESS_LENGTH); @@ -441,28 +497,38 @@ int send_dhcp_discover(int sock){ discover_packet.options[2]='\x53'; discover_packet.options[3]='\x63'; + opts = 4; /* DHCP message type is embedded in options field */ - discover_packet.options[4]=DHCP_OPTION_MESSAGE_TYPE; /* DHCP message type option identifier */ - discover_packet.options[5]='\x01'; /* DHCP message option length in bytes */ - discover_packet.options[6]=DHCPDISCOVER; + discover_packet.options[opts++]=DHCP_OPTION_MESSAGE_TYPE; /* DHCP message type option identifier */ + discover_packet.options[opts++]='\x01'; /* DHCP message option length in bytes */ + discover_packet.options[opts++]=DHCPDISCOVER; /* the IP address we're requesting */ if(request_specific_address==TRUE){ - discover_packet.options[7]=DHCP_OPTION_REQUESTED_ADDRESS; - discover_packet.options[8]='\x04'; - memcpy(&discover_packet.options[9],&requested_address,sizeof(requested_address)); + discover_packet.options[opts++]=DHCP_OPTION_REQUESTED_ADDRESS; + discover_packet.options[opts++]='\x04'; + memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address)); + opts += sizeof(requested_address); } + discover_packet.options[opts++]=DHCP_OPTION_END; + /* unicast fields */ + if(unicast) + discover_packet.giaddr.s_addr = my_ip.s_addr; + + /* see RFC 1542, 4.1.1 */ + discover_packet.hops = unicast ? 1 : 0; + /* send the DHCPDISCOVER packet to broadcast address */ sockaddr_broadcast.sin_family=AF_INET; sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT); - sockaddr_broadcast.sin_addr.s_addr=INADDR_BROADCAST; + sockaddr_broadcast.sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST; bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero)); if(verbose){ printf(_("DHCPDISCOVER to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port)); - printf("DHCPDISCOVER XID: %lu (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid)); + printf("DHCPDISCOVER XID: %u (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid)); printf("DHCDISCOVER ciaddr: %s\n",inet_ntoa(discover_packet.ciaddr)); printf("DHCDISCOVER yiaddr: %s\n",inet_ntoa(discover_packet.yiaddr)); printf("DHCDISCOVER siaddr: %s\n",inet_ntoa(discover_packet.siaddr)); @@ -487,7 +553,6 @@ int get_dhcp_offer(int sock){ struct sockaddr_in source; struct sockaddr_in via; int result=OK; - int timeout=1; int responses=0; int x; time_t start_time; @@ -537,13 +602,13 @@ int get_dhcp_offer(int sock){ if(verbose){ printf(_("DHCPOFFER from IP address %s"),inet_ntoa(source.sin_addr)); printf(_(" via %s\n"),inet_ntoa(via.sin_addr)); - printf("DHCPOFFER XID: %lu (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid)); + printf("DHCPOFFER XID: %u (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid)); } /* check packet xid to see if its the same as the one we used in the discover packet */ if(ntohl(offer_packet.xid)!=packet_xid){ if(verbose) - printf(_("DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid); + printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid); continue; } @@ -594,7 +659,6 @@ int get_dhcp_offer(int sock){ /* sends a DHCP packet */ int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest){ - struct sockaddr_in myname; int result; result=sendto(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)dest,sizeof(*dest)); @@ -614,22 +678,26 @@ int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, struct sockaddr_in *address){ struct timeval tv; fd_set readfds; + fd_set oobfds; int recv_result; socklen_t address_size; struct sockaddr_in source_address; + int nfound; /* wait for data to arrive (up time timeout) */ tv.tv_sec=timeout; tv.tv_usec=0; FD_ZERO(&readfds); + FD_ZERO(&oobfds); FD_SET(sock,&readfds); - select(sock+1,&readfds,NULL,NULL,&tv); + FD_SET(sock,&oobfds); + nfound = select(sock+1,&readfds,NULL,&oobfds,&tv); /* make sure some data has arrived */ if(!FD_ISSET(sock,&readfds)){ if(verbose) - printf(_("No (more) data received\n")); + printf(_("No (more) data received (nfound: %d)\n"), nfound); return ERROR; } @@ -678,8 +746,9 @@ int create_dhcp_socket(void){ /* Set up the address we're going to bind to. */ bzero(&myname,sizeof(myname)); myname.sin_family=AF_INET; - myname.sin_port=htons(DHCP_CLIENT_PORT); - myname.sin_addr.s_addr=INADDR_ANY; /* listen on any address */ + /* listen to DHCP server port if we're in unicast mode */ + myname.sin_port = htons(unicast ? DHCP_SERVER_PORT : DHCP_CLIENT_PORT); + myname.sin_addr.s_addr = unicast ? my_ip.s_addr : INADDR_ANY; bzero(&myname.sin_zero,sizeof(myname.sin_zero)); /* create a socket for DHCP communications */ @@ -707,14 +776,16 @@ int create_dhcp_socket(void){ /* bind socket to interface */ #if defined(__linux__) - strncpy(interface.ifr_ifrn.ifrn_name,network_interface_name,IFNAMSIZ); + strncpy(interface.ifr_ifrn.ifrn_name,network_interface_name,IFNAMSIZ-1); + interface.ifr_ifrn.ifrn_name[IFNAMSIZ-1]='\0'; if(setsockopt(sock,SOL_SOCKET,SO_BINDTODEVICE,(char *)&interface,sizeof(interface))<0){ printf(_("Error: Could not bind socket to interface %s. Check your privileges...\n"),network_interface_name); exit(STATE_UNKNOWN); } #else - strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ); + strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ-1); + interface.ifr_name[IFNAMSIZ-1]='\0'; #endif /* bind the socket */ @@ -765,9 +836,9 @@ int add_requested_server(struct in_addr server_address){ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){ dhcp_offer *new_offer; int x; - int y; unsigned option_type; unsigned option_length; + struct in_addr serv_ident = {0}; if(offer_packet==NULL) return ERROR; @@ -789,23 +860,28 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){ printf("Option: %d (0x%02X)\n",option_type,option_length); /* get option data */ - if(option_type==DHCP_OPTION_LEASE_TIME){ + switch(option_type){ + case DHCP_OPTION_LEASE_TIME: memcpy(&dhcp_lease_time, &offer_packet->options[x],sizeof(dhcp_lease_time)); dhcp_lease_time = ntohl(dhcp_lease_time); - } - if(option_type==DHCP_OPTION_RENEWAL_TIME){ + break; + case DHCP_OPTION_RENEWAL_TIME: memcpy(&dhcp_renewal_time, &offer_packet->options[x],sizeof(dhcp_renewal_time)); dhcp_renewal_time = ntohl(dhcp_renewal_time); - } - if(option_type==DHCP_OPTION_REBINDING_TIME){ + break; + case DHCP_OPTION_REBINDING_TIME: memcpy(&dhcp_rebinding_time, &offer_packet->options[x],sizeof(dhcp_rebinding_time)); dhcp_rebinding_time = ntohl(dhcp_rebinding_time); + break; + case DHCP_OPTION_SERVER_IDENTIFIER: + memcpy(&serv_ident.s_addr, &offer_packet->options[x],sizeof(serv_ident.s_addr)); + break; } /* skip option data we're ignoring */ - else - for(y=0;yserver_address=source; + /* + * RFC 2131 (2.) says: "DHCP clarifies the interpretation of the + * 'siaddr' field as the address of the server to use in the next step + * of the client's bootstrap process. A DHCP server may return its own + * address in the 'siaddr' field, if the server is prepared to supply + * the next bootstrap service (e.g., delivery of an operating system + * executable image). A DHCP server always returns its own address in + * the 'server identifier' option." 'serv_ident' is the 'server + * identifier' option, 'source' is the 'siaddr' field or (if 'siaddr' + * wasn't available) the IP address we received the DHCPOFFER from. If + * 'serv_ident' isn't available for some reason, we use 'source'. + */ + new_offer->server_address=serv_ident.s_addr?serv_ident:source; new_offer->offered_address=offer_packet->yiaddr; new_offer->lease_time=dhcp_lease_time; new_offer->renewal_time=dhcp_renewal_time; @@ -1002,7 +1090,6 @@ int process_arguments(int argc, char **argv){ int call_getopt(int argc, char **argv){ int c=0; int i=0; - struct in_addr ipaddress; int option_index = 0; static struct option long_options[] = @@ -1011,6 +1098,8 @@ int call_getopt(int argc, char **argv){ {"requestedip", required_argument,0,'r'}, {"timeout", required_argument,0,'t'}, {"interface", required_argument,0,'i'}, + {"mac", required_argument,0,'m'}, + {"unicast", no_argument, 0,'u'}, {"verbose", no_argument, 0,'v'}, {"version", no_argument, 0,'V'}, {"help", no_argument, 0,'h'}, @@ -1018,7 +1107,7 @@ int call_getopt(int argc, char **argv){ }; while(1){ - c=getopt_long(argc,argv,"+hVvt:s:r:t:i:",long_options,&option_index); + c=getopt_long(argc,argv,"+hVvt:s:r:t:i:m:u",long_options,&option_index); i++; @@ -1039,23 +1128,13 @@ int call_getopt(int argc, char **argv){ switch(c){ case 's': /* DHCP server address */ - if(inet_aton(optarg,&ipaddress)) - add_requested_server(ipaddress); - /* - else - usage("Invalid server IP address\n"); - */ + resolve_host(optarg,&dhcp_ip); + add_requested_server(dhcp_ip); break; case 'r': /* address we are requested from DHCP servers */ - if(inet_aton(optarg,&ipaddress)){ - requested_address=ipaddress; - request_specific_address=TRUE; - } - /* - else - usage("Invalid requested IP address\n"); - */ + resolve_host(optarg,&requested_address); + request_specific_address=TRUE; break; case 't': /* timeout */ @@ -1071,6 +1150,15 @@ int call_getopt(int argc, char **argv){ */ break; + case 'm': /* MAC address */ + + if((user_specified_mac=mac_aton(optarg)) == NULL) + usage("Cannot parse MAC address.\n"); + if(verbose) + print_hardware_address(user_specified_mac); + + break; + case 'i': /* interface name */ strncpy(network_interface_name,optarg,sizeof(network_interface_name)-1); @@ -1078,6 +1166,10 @@ int call_getopt(int argc, char **argv){ break; + case 'u': /* unicast testing */ + unicast=1; + break; + case 'V': /* version */ print_revision(progname,revision); exit(STATE_OK); @@ -1246,6 +1338,53 @@ long mac_addr_dlpi( const char *dev, int unit, u_char *addr){ #endif +/* resolve host name or die (TODO: move this to netutils.c!) */ +void resolve_host(const char *in,struct in_addr *out){ + struct addrinfo hints, *ai; + + memset(&hints,0,sizeof(hints)); + hints.ai_family=PF_INET; + if (getaddrinfo(in,NULL,&hints,&ai) != 0) + usage_va(_("Invalid hostname/address - %s"),optarg); + + memcpy(out,&((struct sockaddr_in *)ai->ai_addr)->sin_addr,sizeof(*out)); + freeaddrinfo(ai); + } + + +/* parse MAC address string, return 6 bytes (unterminated) or NULL */ +unsigned char *mac_aton(const char *string){ + static unsigned char result[6]; + char tmp[3]; + unsigned i, j; + + for(i=0, j=0; string[i] != '\0' && j < sizeof(result); i++){ + /* ignore ':' and any other non-hex character */ + if(!isxdigit(string[i]) || !isxdigit(string[i+1])) + continue; + tmp[0]=string[i]; + tmp[1]=string[i+1]; + tmp[2]='\0'; + result[j]=strtol(tmp,(char **)NULL,16); + i++; + j++; + } + + return (j==6) ? result : NULL; + } + + +void print_hardware_address(const unsigned char *address){ + int i; + + printf(_("Hardware address: ")); + for (i=0; i<5; i++) + printf("%2.2x:", address[i]); + printf("%2.2x", address[i]); + putchar('\n'); + } + + /* print usage help */ void print_help(void){ @@ -1272,6 +1411,10 @@ void print_help(void){ printf (" %s\n", _("Seconds to wait for DHCPOFFER before timeout occurs")); printf (" %s\n", "-i, --interface=STRING"); printf (" %s\n", _("Interface to to use for listening (i.e. eth0)")); + printf (" %s\n", "-m, --mac=STRING"); + printf (" %s\n", _("MAC address to use in the DHCP request")); + printf (" %s\n", "-u, --unicast"); + printf (" %s\n", _("Unicast testing: mimic a DHCP relay, requires -s")); return; } @@ -1281,7 +1424,8 @@ void print_usage(void){ printf (_("Usage:")); - printf ("%s [-s serverip] [-r requestedip] [-t timeout] [-i interface] [-v]\n",progname); + printf (" %s [-v] [-u] [-s serverip] [-r requestedip] [-t timeout]\n",progname); + printf (" [-i interface] [-m mac]\n"); return; } diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 9259951..fdc0464 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -7,7 +7,7 @@ * * Original Author : Andreas Ericsson * -* Last Modified: $Date: 2007/03/27 06:53:57 $ +* Last Modified: $Date: 2007-09-15 12:55:12 +0100 (Sat, 15 Sep 2007) $ * * Description: * @@ -38,14 +38,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_icmp.c,v 1.12 2007/03/27 06:53:57 dermoth Exp $ +* $Id: check_icmp.c 1779 2007-09-15 11:55:12Z hweiss $ * *****************************************************************************/ /* progname may change */ /* char *progname = "check_icmp"; */ char *progname; -const char *revision = "$Revision: 1.12 $"; +const char *revision = "$Revision: 1779 $"; const char *copyright = "2005-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -294,7 +294,7 @@ get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code) static int handle_random_icmp(struct icmp *p, struct sockaddr_in *addr) { - struct icmp *sent_icmp = NULL; + struct icmp sent_icmp; struct rta_host *host = NULL; unsigned char *ptr; @@ -324,16 +324,16 @@ handle_random_icmp(struct icmp *p, struct sockaddr_in *addr) /* might be for us. At least it holds the original package (according * to RFC 792). If it isn't, just ignore it */ - sent_icmp = (struct icmp *)(ptr + 28); - if(sent_icmp->icmp_type != ICMP_ECHO || sent_icmp->icmp_id != pid || - sent_icmp->icmp_seq >= targets) + memcpy(&sent_icmp, ptr + 28, sizeof(sent_icmp)); + if(sent_icmp.icmp_type != ICMP_ECHO || sent_icmp.icmp_id != pid || + sent_icmp.icmp_seq >= targets) { if(debug) printf("Packet is no response to a packet we sent\n"); return 0; } /* it is indeed a response for us */ - host = table[sent_icmp->icmp_seq]; + host = table[sent_icmp.icmp_seq]; if(debug) { printf("Received \"%s\" from %s for ICMP ECHO sent to %s.\n", get_icmp_error_msg(p->icmp_type, p->icmp_code), @@ -372,6 +372,9 @@ main(int argc, char **argv) int result; struct rta_host *host; + /* print a helpful error message if geteuid != 0 */ + np_warn_if_not_root(); + /* we only need to be setsuid when we get the sockets, so do * that before pointer magic (esp. on network data) */ icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0; @@ -674,9 +677,9 @@ wait_for_reply(int sock, u_int t) static char buf[4096]; struct sockaddr_in resp_addr; struct ip *ip; - struct icmp *icp, *sent_icmp; + struct icmp icp; struct rta_host *host; - struct icmp_ping_data *data; + struct icmp_ping_data data; struct timeval wait_start, now; u_int tdiff, i, per_pkt_wait; @@ -738,32 +741,25 @@ wait_for_reply(int sock, u_int t) /* } */ /* check the response */ - icp = (struct icmp *)(buf + hlen); - sent_icmp = (struct icmp *)(buf + hlen + ICMP_MINLEN); - /* printf("buf: %p, icp: %p, distance: %u (expected %u)\n", */ - /* buf, icp, */ - /* (u_int)icp - (u_int)buf, hlen); */ - /* printf("buf: %p, sent_icmp: %p, distance: %u (expected %u)\n", */ - /* buf, sent_icmp, */ - /* (u_int)sent_icmp - (u_int)buf, hlen + ICMP_MINLEN); */ + memcpy(&icp, buf + hlen, sizeof(icp)); - if(icp->icmp_id != pid) { - handle_random_icmp(icp, &resp_addr); + if(icp.icmp_id != pid) { + handle_random_icmp(&icp, &resp_addr); continue; } - if(icp->icmp_type != ICMP_ECHOREPLY || icp->icmp_seq >= targets) { + if(icp.icmp_type != ICMP_ECHOREPLY || icp.icmp_seq >= targets) { if(debug > 2) printf("not a proper ICMP_ECHOREPLY\n"); - handle_random_icmp(icp, &resp_addr); + handle_random_icmp(&icp, &resp_addr); continue; } /* this is indeed a valid response */ - data = (struct icmp_ping_data *)(icp->icmp_data); + memcpy(&data, icp.icmp_data, sizeof(data)); - host = table[icp->icmp_seq]; + host = table[icp.icmp_seq]; gettimeofday(&now, &tz); - tdiff = get_timevaldiff(&data->stime, &now); + tdiff = get_timevaldiff(&data.stime, &now); host->time_waited += tdiff; host->icmp_recv++; @@ -793,14 +789,16 @@ wait_for_reply(int sock, u_int t) static int send_icmp_ping(int sock, struct rta_host *host) { - static char *buf = NULL; /* re-use so we prevent leaks */ + static union { + char *buf; /* re-use so we prevent leaks */ + struct icmp *icp; + u_short *cksum_in; + } packet = { NULL }; long int len; - struct icmp *icp; - struct icmp_ping_data *data; + struct icmp_ping_data data; struct timeval tv; struct sockaddr *addr; - if(sock == -1) { errno = 0; crash("Attempt to send on bogus socket"); @@ -808,30 +806,28 @@ send_icmp_ping(int sock, struct rta_host *host) } addr = (struct sockaddr *)&host->saddr_in; - if(!buf) { - buf = (char *)malloc(icmp_pkt_size + sizeof(struct ip)); - if(!buf) { + if(!packet.buf) { + if (!(packet.buf = malloc(icmp_pkt_size))) { crash("send_icmp_ping(): failed to malloc %d bytes for send buffer", icmp_pkt_size); return -1; /* might be reached if we're in debug mode */ } } - memset(buf, 0, icmp_pkt_size + sizeof(struct ip)); + memset(packet.buf, 0, icmp_pkt_size); if((gettimeofday(&tv, &tz)) == -1) return -1; - icp = (struct icmp *)buf; - icp->icmp_type = ICMP_ECHO; - icp->icmp_code = 0; - icp->icmp_cksum = 0; - icp->icmp_id = pid; - icp->icmp_seq = host->id; - data = (struct icmp_ping_data *)icp->icmp_data; - data->ping_id = 10; /* host->icmp.icmp_sent; */ - memcpy(&data->stime, &tv, sizeof(struct timeval)); - icp->icmp_cksum = icmp_checksum((u_short *)icp, icmp_pkt_size); + data.ping_id = 10; /* host->icmp.icmp_sent; */ + memcpy(&data.stime, &tv, sizeof(tv)); + memcpy(&packet.icp->icmp_data, &data, sizeof(data)); + packet.icp->icmp_type = ICMP_ECHO; + packet.icp->icmp_code = 0; + packet.icp->icmp_cksum = 0; + packet.icp->icmp_id = pid; + packet.icp->icmp_seq = host->id; + packet.icp->icmp_cksum = icmp_checksum(packet.cksum_in, icmp_pkt_size); - len = sendto(sock, buf, icmp_pkt_size, 0, (struct sockaddr *)addr, + len = sendto(sock, packet.buf, icmp_pkt_size, 0, (struct sockaddr *)addr, sizeof(struct sockaddr)); if(len < 0 || (unsigned int)len != icmp_pkt_size) { diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c index 3817819..ace3113 100644 --- a/plugins-root/pst3.c +++ b/plugins-root/pst3.c @@ -1,252 +1,252 @@ -/* pst3.c - * - * Third version to get process arg info; this time by using - * a combination of reading the /proc//psinfo structures - * and reading the complete arg vector from kernel memory structures. - * - * Developed and tested under Solaris 5.8 (both 32 and 64 bit modes). - * - * NOTE: This program must be setuid-root (or run by root) to work! - * - * Written: 2005-04-28 R.W.Ingraham - */ - - -#define _KMEMUSER 1 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -/* - * Constants - */ - -#define PROC_DIR "/proc" -#define MAX_PATH 1024 - - -/* - * Structures - */ - - -/* - * Globals - */ - -static char * szProg; -static kvm_t * kd; -static struct proc * pProc; -static struct user * pUser; -static char ** myArgv; - - -/* - * Prototypes - */ - -static int HandleFile (struct dirent *pDent); -static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo); -static int GetArgVectors (pid_t pid); -static void ShowArgVectors (void); -static void ReleaseArgVectors(); - - -/*----------------------------------------------------------------------------*/ - -int main (int argc, char **argv) -{ - DIR *pDir; - struct dirent *pDent; - int retcode = 0; - - - /* Set our program name global */ - if ((szProg = strrchr(argv[0], '/')) != NULL) - szProg++; - else - szProg = argv[0]; - - /* Make sure that our euid is root */ - if (geteuid() != 0) - { - fprintf(stderr, "%s: This program can only be run by the root user!\n", szProg); - exit(1); - } - - /* Get a handle to the running kernel image */ - if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, argv[0])) == NULL) - { - fprintf(stderr, "%s: Failed to open kernel memory: %s\n", szProg, strerror(errno)); - exit(2); - } - - /* Open the /proc directory */ - if ((pDir = opendir(PROC_DIR)) != NULL) - { - /* Display column headings */ - printf("S UID PPID VSZ RSS %%CPU COMMAND ARGS\n"); - - /* Zip through all of the process entries */ - while ((pDent = readdir(pDir)) != NULL) - { - /* Handle each pid sub-directory */ - HandleFile(pDent); - } - - /* Close the directory */ - closedir(pDir); - } - else /* ERROR: Failure to open PROC_DIR */ - { - fprintf(stderr, "%s: Failed to open \"%s\": %s\n", szProg, PROC_DIR, strerror(errno)); - retcode = 3; - } - - /* Close the handle to the running kernel image */ - kvm_close(kd); - - return retcode; -} - -/*----------------------------------------------------------------------------*/ - -static int HandleFile (struct dirent *pDent) -{ - char szPath[MAX_PATH]; - psinfo_t sPsInfo; - int fd, len; - int rc = 0; - - /* Skip files beginning with a "." */ - if (pDent->d_name[0] == '.') - return 0; - - /* Cosntruct the path to the psinfo file */ - len = sprintf(szPath, "%s/%s/psinfo", PROC_DIR, pDent->d_name); - - /* Open the psinfo file for this pid and print out its arg vectors */ - if ((fd = open(szPath, O_RDONLY)) >= 0) - { - /* Read the psinfo struct */ - if ((len = read(fd, &sPsInfo, sizeof(sPsInfo))) != sizeof(sPsInfo)) - { - rc = errno; - fprintf(stderr, "%s: Read error of psinfo structure (%d)\n", szPath, len); - return rc; - } - - /* Close the psinfo file */ - close(fd); - - /* Pass psinfo struct to reporting function */ - HandlePsInfo(szPath, &sPsInfo); - } - else if (errno != ENOENT) - { - rc = errno; - fprintf(stderr, "%s: %s\n", szPath, strerror(errno)); - } - - return 0; -} - -/*----------------------------------------------------------------------------*/ - -static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo) -{ - int retcode; - char *thisProg; - - /* Make sure that the process is still there */ - if ((retcode = GetArgVectors(pPsInfo->pr_pid)) == 0) - { - /* We use the program name from the kvm argv[0] instead - * of pr_fname from the psinfo struct because pr_fname - * may be truncated. - * - * Also, strip-off leading path information. - */ - if ((thisProg = strrchr(myArgv[0], '/')) != NULL) - thisProg++; - else - thisProg = myArgv[0]; - - /* Display the ps columns (except for argv) */ - printf("%c %5d %5d %6lu %6lu %4.1f %s ", - pPsInfo->pr_lwp.pr_sname, - (int)(pPsInfo->pr_euid), - (int)(pPsInfo->pr_ppid), - (unsigned long)(pPsInfo->pr_size), - (unsigned long)(pPsInfo->pr_rssize), - ((float)(pPsInfo->pr_pctcpu) / 0x8000 * 100.0), - thisProg); - - /* Display the arg vectors associated with this pid */ - ShowArgVectors(); - - /* Release the arg vector buffer memory */ - ReleaseArgVectors(); - } - - return retcode; -} - -/*----------------------------------------------------------------------------*/ - -static int GetArgVectors (pid_t pid) -{ - int retcode = 1; - - /* Get the proc structure for the specified PID */ - if ((pProc = kvm_getproc(kd, pid)) != NULL) - { - /* Save a copy of the process' u-area */ - if ((pUser = kvm_getu(kd, pProc)) != NULL) - { - /* Reconstruct the process' argv vector array */ - if (kvm_getcmd(kd, pProc, pUser, &myArgv, NULL) == 0) - { - retcode = 0; - } - } - } - - return retcode; -} - -/*----------------------------------------------------------------------------*/ - -static void ShowArgVectors (void) -{ - int i; - - for (i=0; myArgv[i]; i++) - { - printf(" %s", myArgv[i]); - } - printf("\n"); -} - -/*----------------------------------------------------------------------------*/ - -static void ReleaseArgVectors() -{ - /* NOOP */ -} - -/*----------------------------------------------------------------------------*/ +/* pst3.c + * + * Third version to get process arg info; this time by using + * a combination of reading the /proc//psinfo structures + * and reading the complete arg vector from kernel memory structures. + * + * Developed and tested under Solaris 5.8 (both 32 and 64 bit modes). + * + * NOTE: This program must be setuid-root (or run by root) to work! + * + * Written: 2005-04-28 R.W.Ingraham + */ + + +#define _KMEMUSER 1 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* + * Constants + */ + +#define PROC_DIR "/proc" +#define MAX_PATH 1024 + + +/* + * Structures + */ + + +/* + * Globals + */ + +static char * szProg; +static kvm_t * kd; +static struct proc * pProc; +static struct user * pUser; +static char ** myArgv; + + +/* + * Prototypes + */ + +static int HandleFile (struct dirent *pDent); +static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo); +static int GetArgVectors (pid_t pid); +static void ShowArgVectors (void); +static void ReleaseArgVectors(); + + +/*----------------------------------------------------------------------------*/ + +int main (int argc, char **argv) +{ + DIR *pDir; + struct dirent *pDent; + int retcode = 0; + + + /* Set our program name global */ + if ((szProg = strrchr(argv[0], '/')) != NULL) + szProg++; + else + szProg = argv[0]; + + /* Make sure that our euid is root */ + if (geteuid() != 0) + { + fprintf(stderr, "%s: This program can only be run by the root user!\n", szProg); + exit(1); + } + + /* Get a handle to the running kernel image */ + if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, argv[0])) == NULL) + { + fprintf(stderr, "%s: Failed to open kernel memory: %s\n", szProg, strerror(errno)); + exit(2); + } + + /* Open the /proc directory */ + if ((pDir = opendir(PROC_DIR)) != NULL) + { + /* Display column headings */ + printf("S UID PPID VSZ RSS %%CPU COMMAND ARGS\n"); + + /* Zip through all of the process entries */ + while ((pDent = readdir(pDir)) != NULL) + { + /* Handle each pid sub-directory */ + HandleFile(pDent); + } + + /* Close the directory */ + closedir(pDir); + } + else /* ERROR: Failure to open PROC_DIR */ + { + fprintf(stderr, "%s: Failed to open \"%s\": %s\n", szProg, PROC_DIR, strerror(errno)); + retcode = 3; + } + + /* Close the handle to the running kernel image */ + kvm_close(kd); + + return retcode; +} + +/*----------------------------------------------------------------------------*/ + +static int HandleFile (struct dirent *pDent) +{ + char szPath[MAX_PATH]; + psinfo_t sPsInfo; + int fd, len; + int rc = 0; + + /* Skip files beginning with a "." */ + if (pDent->d_name[0] == '.') + return 0; + + /* Cosntruct the path to the psinfo file */ + len = sprintf(szPath, "%s/%s/psinfo", PROC_DIR, pDent->d_name); + + /* Open the psinfo file for this pid and print out its arg vectors */ + if ((fd = open(szPath, O_RDONLY)) >= 0) + { + /* Read the psinfo struct */ + if ((len = read(fd, &sPsInfo, sizeof(sPsInfo))) != sizeof(sPsInfo)) + { + rc = errno; + fprintf(stderr, "%s: Read error of psinfo structure (%d)\n", szPath, len); + return rc; + } + + /* Close the psinfo file */ + close(fd); + + /* Pass psinfo struct to reporting function */ + HandlePsInfo(szPath, &sPsInfo); + } + else if (errno != ENOENT) + { + rc = errno; + fprintf(stderr, "%s: %s\n", szPath, strerror(errno)); + } + + return 0; +} + +/*----------------------------------------------------------------------------*/ + +static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo) +{ + int retcode; + char *thisProg; + + /* Make sure that the process is still there */ + if ((retcode = GetArgVectors(pPsInfo->pr_pid)) == 0) + { + /* We use the program name from the kvm argv[0] instead + * of pr_fname from the psinfo struct because pr_fname + * may be truncated. + * + * Also, strip-off leading path information. + */ + if ((thisProg = strrchr(myArgv[0], '/')) != NULL) + thisProg++; + else + thisProg = myArgv[0]; + + /* Display the ps columns (except for argv) */ + printf("%c %5d %5d %6lu %6lu %4.1f %s ", + pPsInfo->pr_lwp.pr_sname, + (int)(pPsInfo->pr_euid), + (int)(pPsInfo->pr_ppid), + (unsigned long)(pPsInfo->pr_size), + (unsigned long)(pPsInfo->pr_rssize), + ((float)(pPsInfo->pr_pctcpu) / 0x8000 * 100.0), + thisProg); + + /* Display the arg vectors associated with this pid */ + ShowArgVectors(); + + /* Release the arg vector buffer memory */ + ReleaseArgVectors(); + } + + return retcode; +} + +/*----------------------------------------------------------------------------*/ + +static int GetArgVectors (pid_t pid) +{ + int retcode = 1; + + /* Get the proc structure for the specified PID */ + if ((pProc = kvm_getproc(kd, pid)) != NULL) + { + /* Save a copy of the process' u-area */ + if ((pUser = kvm_getu(kd, pProc)) != NULL) + { + /* Reconstruct the process' argv vector array */ + if (kvm_getcmd(kd, pProc, pUser, &myArgv, NULL) == 0) + { + retcode = 0; + } + } + } + + return retcode; +} + +/*----------------------------------------------------------------------------*/ + +static void ShowArgVectors (void) +{ + int i; + + for (i=0; myArgv[i]; i++) + { + printf(" %s", myArgv[i]); + } + printf("\n"); +} + +/*----------------------------------------------------------------------------*/ + +static void ReleaseArgVectors() +{ + /* NOOP */ +} + +/*----------------------------------------------------------------------------*/ diff --git a/plugins-scripts/Makefile.in b/plugins-scripts/Makefile.in index 68e2823..df642db 100644 --- a/plugins-scripts/Makefile.in +++ b/plugins-scripts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -95,7 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = subst utils.pm utils.sh am__installdirs = "$(DESTDIR)$(libexecdir)" @@ -239,6 +239,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index b5c9efa..cb35976 100755 --- a/plugins-scripts/check_breeze.pl +++ b/plugins-scripts/check_breeze.pl @@ -26,7 +26,7 @@ GetOptions "C=s" => \$opt_C, "community=s" => \$opt_C); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.5 $'); + print_revision($PROGNAME,'$Revision: 820 $'); exit $ERRORS{'OK'}; } @@ -65,7 +65,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.5 $'); + print_revision($PROGNAME,'$Revision: 820 $'); print "Copyright (c) 2000 Jeffrey Blank/Karl DeBisschop This plugin reports the signal strength of a Breezecom wireless equipment diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index fdd97f2..60d634b 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -16,7 +16,7 @@ # drives is a pain in the butt # 2-May-2002 - SGhosh fix for embedded perl # -# $Id: check_disk_smb.pl,v 1.13 2005/10/13 10:14:33 seanius Exp $ +# $Id: check_disk_smb.pl 1247 2005-10-13 10:14:33Z seanius $ # require 5.004; @@ -52,7 +52,7 @@ GetOptions "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.13 $'); #' + print_revision($PROGNAME,'$Revision: 1247 $'); #' exit $ERRORS{'OK'}; } @@ -243,7 +243,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.13 $'); + print_revision($PROGNAME,'$Revision: 1247 $'); print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop Perl Check SMB Disk plugin for Nagios diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl index e75643b..2dd6461 100755 --- a/plugins-scripts/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl @@ -1,5 +1,5 @@ #!/bin/perl -w -# $Id: check_file_age.pl,v 1.3 2005/12/15 15:17:49 tonvoon Exp $ +# $Id: check_file_age.pl 1750 2007-07-07 11:54:29Z psychotrahe $ # check_file_age.pl Copyright (C) 2003 Steven Grimm # @@ -55,7 +55,7 @@ GetOptions( "C=f" => \$opt_C, "critical-size=f" => \$opt_C); if ($opt_V) { - print_revision($PROGNAME, '$Id: check_file_age.pl,v 1.3 2005/12/15 15:17:49 tonvoon Exp $'); + print_revision($PROGNAME, '$Revision: 1750 $'); exit $ERRORS{'OK'}; } @@ -102,7 +102,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME, '$Id: check_file_age.pl,v 1.3 2005/12/15 15:17:49 tonvoon Exp $'); + print_revision($PROGNAME, '$Revision: 1750 $'); print "Copyright (c) 2003 Steven Grimm\n\n"; print_usage(); print "\n"; diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl index 68e9821..0c90ab9 100755 --- a/plugins-scripts/check_flexlm.pl +++ b/plugins-scripts/check_flexlm.pl @@ -26,7 +26,7 @@ # initial version: 9-10-99 Ernst-Dieter Martin edmt@infineon.com # # License: GPL -# $Id: check_flexlm.pl,v 1.6 2003/02/04 06:16:16 sghosh Exp $ +# $Id: check_flexlm.pl 287 2003-02-04 06:16:16Z sghosh $ # # lmstat output patches from Steve Rigler/Cliff Rice 13-Apr-2002 # srigler@marathonoil.com,cerice@marathonoil.com @@ -57,7 +57,7 @@ GetOptions "t=i" => \$opt_t, "timeout=i" => \$opt_t); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.6 $'); + print_revision($PROGNAME,'$Revision: 287 $'); exit $ERRORS{'OK'}; } @@ -217,7 +217,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.6 $'); + print_revision($PROGNAME,'$Revision: 287 $'); print "Copyright (c) 2000 Ernst-Dieter Martin/Karl DeBisschop Check available flexlm license managers diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index 09775f2..cd48a7a 100644 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl @@ -25,7 +25,7 @@ # Report bugs to: nagiosplug-help@lists.sourceforge.net # # 11.01.2000 Version 1.0 -# $Id: check_ifoperstatus.pl,v 1.7 2007/03/16 12:11:46 gonzai Exp $ +# $Id: check_ifoperstatus.pl 1642 2007-03-16 12:11:46Z gonzai $ # # Patches from Guy Van Den Bergh to warn on ifadminstatus down interfaces # instead of critical. @@ -304,7 +304,7 @@ sub print_help() { printf "intensive. Use it sparingly or not at all. -n is used to match against\n"; printf "a much more descriptive ifName value in the IfXTable to verify that the\n"; printf "snmpkey has not changed to some other network interface after a reboot.\n\n"; - print_revision($PROGNAME, '$Revision: 1.7 $'); + print_revision($PROGNAME, '$Revision: 1642 $'); } @@ -341,7 +341,7 @@ sub process_arguments() { } if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.7 $ '); + print_revision($PROGNAME,'$Revision: 1642 $ '); exit $ERRORS{'OK'}; } diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index 4271015..477c3b8 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl @@ -29,7 +29,7 @@ # # 11.01.2000 Version 1.0 # -# $Id: check_ifstatus.pl,v 1.9 2004/08/18 19:51:35 tonvoon Exp $ +# $Id: check_ifstatus.pl 884 2004-08-18 19:51:35Z tonvoon $ use POSIX; use strict; @@ -255,7 +255,7 @@ sub print_help (){ printf " -t (--timeout) seconds before the plugin times out (default=$TIMEOUT)\n"; printf " -V (--version) Plugin version\n"; printf " -h (--help) usage help \n\n"; - print_revision($PROGNAME, '$Revision: 1.9 $'); + print_revision($PROGNAME, '$Revision: 884 $'); } @@ -285,7 +285,7 @@ sub process_arguments() { exit $ERRORS{'OK'}; } if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.9 $ '); + print_revision($PROGNAME,'$Revision: 884 $ '); exit $ERRORS{'OK'}; } diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 8d94920..7278391 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -7,7 +7,7 @@ # # Date: 1999/09/20 # -# $Id: check_ircd.pl,v 1.3 2002/05/07 05:35:49 sghosh Exp $ +# $Id: check_ircd.pl 22 2002-05-07 05:35:49Z sghosh $ # # Description: This script will check to see if an IRCD is running # about how many users it has @@ -119,7 +119,7 @@ sub print_usage () { sub print_help () { - print_revision($PROGNAME,'$Revision: 1.3 $ '); + print_revision($PROGNAME,'$Revision: 22 $ '); print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop Perl Check IRCD plugin for Nagios @@ -190,7 +190,7 @@ MAIN: "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.3 $ '); + print_revision($PROGNAME,'$Revision: 22 $ '); exit $ERRORS{'OK'}; } diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index bca7afd..3e051e6 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh @@ -71,7 +71,7 @@ TOUCH="/bin/touch" PROGNAME=`/bin/basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.8 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 1749 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh @@ -116,11 +116,11 @@ while test -n "$1"; do exit $STATE_OK ;; --version) - print_revision $PROGNAME $VERSION + print_revision $PROGNAME $REVISION exit $STATE_OK ;; -V) - print_revision $PROGNAME $VERSION + print_revision $PROGNAME $REVISION exit $STATE_OK ;; --filename) diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index e9dd6b7..8815aaf 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -22,7 +22,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# $Id: check_mailq.pl,v 1.7 2006/07/05 13:45:57 tonvoon Exp $ +# $Id: check_mailq.pl 1443 2006-07-05 13:45:57Z tonvoon $ # ############################################################################ @@ -522,7 +522,7 @@ sub process_arguments(){ ); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.7 $ '); + print_revision($PROGNAME,'$Revision: 1443 $ '); exit $ERRORS{'OK'}; } @@ -580,7 +580,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.7 $'); + print_revision($PROGNAME,'$Revision: 1443 $'); print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n"; print "\n"; print_usage(); diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl index e363ec6..6fdceb7 100755 --- a/plugins-scripts/check_ntp.pl +++ b/plugins-scripts/check_ntp.pl @@ -7,7 +7,7 @@ # be installed on the system, however since it's part of the ntp suite, you # should already have it installed. # -# $Id: check_ntp.pl,v 1.31 2005/11/30 00:49:47 harpermann Exp $ +# $Id: check_ntp.pl 1291 2005-11-30 00:49:47Z harpermann $ # # Nothing clever done in this program - its a very simple bare basics hack to # get the job done. @@ -97,7 +97,7 @@ GetOptions "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.31 $ '); + print_revision($PROGNAME,'$Revision: 1291 $ '); exit $ERRORS{'OK'}; } @@ -443,7 +443,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.31 $'); + print_revision($PROGNAME,'$Revision: 1291 $'); print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n"; print "\n"; print_usage(); diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index f60c612..bab2daa 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh @@ -8,7 +8,7 @@ PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.15 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 1749 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh @@ -89,11 +89,11 @@ case "$cmd" in exit $STATE_OK ;; --version) - print_revision $PLUGIN $REVISION + print_revision $PROGNAME $REVISION exit $STATE_OK ;; -V) - print_revision $PLUGIN $REVISION + print_revision $PROGNAME $REVISION exit $STATE_OK ;; esac @@ -118,9 +118,11 @@ fi # Last resort [ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle -if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then - echo "Cannot determine ORACLE_HOME for sid $2" - exit $STATE_UNKNOWN +if [ "$cmd" != "--db" ]; then + if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then + echo "Cannot determine ORACLE_HOME for sid $2" + exit $STATE_UNKNOWN + fi fi PATH=$PATH:$ORACLE_HOME/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index 3d76661..192c8b6 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl @@ -15,10 +15,10 @@ # # initial version: 3 May 2000 by Truongchinh Nguyen and Karl DeBisschop # Modified May 2002 Subhendu Ghosh - support for ePN and patches -# current status: $Revision: 1.8 $ +# current status: $Revision: 677 $ # # Copyright Notice: GPL -# $Id: check_rpc.pl,v 1.8 2003/08/10 12:11:49 kdebisschop Exp $ +# $Id: check_rpc.pl 677 2003-08-10 12:11:49Z kdebisschop $ # use strict; @@ -68,7 +68,7 @@ if ($opt_h) { print_help(); exit $ERRORS{'OK'}; } # -V means display version number if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.8 $ '); + print_revision($PROGNAME,'$Revision: 677 $ '); exit $ERRORS{'OK'}; } @@ -336,7 +336,7 @@ sub get_rpcinfo { sub print_help() { - print_revision($PROGNAME,'$Revision: 1.8 $ '); + print_revision($PROGNAME,'$Revision: 677 $ '); print "Copyright (c) 2002 Karl DeBisschop/Truongchinh Nguyen/Subhendu Ghosh\n"; print "\n"; print "Check if a rpc service is registered and running using\n"; diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh index 8842ba1..8df3ed9 100755 --- a/plugins-scripts/check_sensors.sh +++ b/plugins-scripts/check_sensors.sh @@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION=`echo '$Revision: 1.2 $' | sed -e 's/[^0-9.]//g'` +REVISION=`echo '$Revision: 162 $' | sed -e 's/[^0-9.]//g'` . $PROGPATH/utils.sh diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl index 6b164c1..7aeef72 100755 --- a/plugins-scripts/check_wave.pl +++ b/plugins-scripts/check_wave.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -wT # -# $Id: check_wave.pl,v 1.4 2002/10/28 13:05:08 kdebisschop Exp $ +# $Id: check_wave.pl 162 2002-10-28 13:05:08Z kdebisschop $ use strict; @@ -30,7 +30,7 @@ GetOptions "H=s" => \$opt_H, "hostname=s" => \$opt_H); if ($opt_V) { - print_revision($PROGNAME,'$Revision: 1.4 $'); #' + print_revision($PROGNAME,'$Revision: 162 $'); #' exit $ERRORS{'OK'}; } @@ -112,7 +112,7 @@ sub print_usage () { } sub print_help () { - print_revision($PROGNAME,'$Revision: 1.4 $'); + print_revision($PROGNAME,'$Revision: 162 $'); print "Copyright (c) 2000 Jeffery Blank/Karl DeBisschop\n"; print "\n"; print_usage(); diff --git a/plugins-scripts/t/check_file_age.t b/plugins-scripts/t/check_file_age.t index 6730ce8..afa20af 100644 --- a/plugins-scripts/t/check_file_age.t +++ b/plugins-scripts/t/check_file_age.t @@ -2,7 +2,7 @@ # # check_file_age tests # -# $Id: check_file_age.t,v 1.1 2005/12/15 15:17:49 tonvoon Exp $ +# $Id: check_file_age.t 1297 2005-12-15 15:17:49Z tonvoon $ # use strict; diff --git a/plugins-scripts/t/check_rpc.t b/plugins-scripts/t/check_rpc.t index 1796383..35bfe56 100644 --- a/plugins-scripts/t/check_rpc.t +++ b/plugins-scripts/t/check_rpc.t @@ -2,7 +2,7 @@ # # Remote Procedure Call (RPC) Tests via check_rpc # -# $Id: check_rpc.t,v 1.2 2005/07/25 01:47:15 illumino Exp $ +# $Id: check_rpc.t 1207 2005-07-25 01:47:15Z illumino $ # use strict; diff --git a/plugins-scripts/t/utils.t b/plugins-scripts/t/utils.t index 09f3d0f..2e1fd48 100644 --- a/plugins-scripts/t/utils.t +++ b/plugins-scripts/t/utils.t @@ -2,7 +2,7 @@ # # utils.pm tests # -# $Id: utils.t,v 1.3 2006/12/12 12:59:06 tonvoon Exp $ +# $Id: utils.t 1549 2006-12-12 12:59:06Z tonvoon $ # # Run with perl t/utils.t diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in index e0aae46..b8bab62 100644 --- a/plugins-scripts/utils.pm.in +++ b/plugins-scripts/utils.pm.in @@ -1,5 +1,5 @@ # Utility drawer for Nagios plugins. -# $Id: utils.pm.in,v 1.12 2006/12/12 08:56:01 tonvoon Exp $ +# $Id: utils.pm.in 1751 2007-07-07 11:55:48Z psychotrahe $ # # This will be deprecated soon. Please use Nagios::Plugin from CPAN # for new plugins @@ -34,7 +34,7 @@ sub print_revision ($$) { my $pluginRevision = shift; $pluginRevision =~ s/^\$Revision: //; $pluginRevision =~ s/ \$\s*$//; - print "$commandName (@PACKAGE@ @VERSION@) $pluginRevision\n"; + print "$commandName v$pluginRevision (@PACKAGE@ @VERSION@)\n"; print "@WARRANTY@"; } diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in index 7750716..b30b908 100644 --- a/plugins-scripts/utils.sh.in +++ b/plugins-scripts/utils.sh.in @@ -13,7 +13,7 @@ else fi print_revision() { - echo "$1 (@PACKAGE@ @VERSION@) $2" + echo "$1 v$2 (@PACKAGE@ @VERSION@)" $ECHO "@WARRANTY@" | sed -e 's/\n/ /g' } diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 7ee2910..c0486bc 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -13,7 +13,7 @@ MATHLIBS = @MATHLIBS@ # This is not portable. Run ". tools/devmode" to get development compile flags #AM_CFLAGS = -Wall -libexec_PROGRAMS = check_apt check_disk check_dummy check_http check_load \ +libexec_PROGRAMS = check_apt check_cluster check_disk check_dummy check_http check_load \ check_mrtg check_mrtgtraf check_ntp check_nwstat check_overcr check_ping \ check_real check_smtp check_ssh check_tcp check_time \ check_ups check_users negate \ @@ -48,6 +48,7 @@ test: # the actual targets check_apt_LDADD = $(BASEOBJS) runcmd.o +check_cluster_LDADD = $(BASEOBJS) check_dig_LDADD = $(NETLIBS) runcmd.o check_disk_LDADD = $(BASEOBJS) popen.o check_dns_LDADD = $(NETLIBS) runcmd.o @@ -86,10 +87,11 @@ check_ups_LDADD = $(NETLIBS) check_users_LDADD = $(BASEOBJS) popen.o check_by_ssh_LDADD = $(NETLIBS) runcmd.o check_ide_smart_LDADD = $(BASEOBJS) -negate_LDADD = $(BASEOBJS) popen.o +negate_LDADD = $(BASEOBJS) urlize_LDADD = $(BASEOBJS) popen.o check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS) +check_cluster_DEPENDENCIES = check_cluster.c $(BASEOBJS) $(DEPLIBS) check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS) check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS) @@ -124,7 +126,7 @@ check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS) check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS) check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS) check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS) -negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS) +negate_DEPENDENCIES = negate.c $(BASEOBJS) $(DEPLIBS) urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS) ############################################################################## diff --git a/plugins/Makefile.in b/plugins/Makefile.in index b264008..5e4f3e6 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = check_apt.c check_by_ssh.c check_cluster.c check_dig.c check_disk.c check_dns.c check_dummy.c check_fping.c check_game.c check_hpjd.c check_http.c check_ide_smart.c check_ldap.c check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c check_mysql_query.c check_nagios.c check_nt.c check_ntp.c check_nwstat.c check_overcr.c check_pgsql.c check_ping.c check_procs.c check_radius.c check_real.c check_smtp.c check_snmp.c check_ssh.c check_swap.c check_tcp.c check_time.c check_ups.c check_users.c negate.c urlize.c + srcdir = @srcdir@ top_srcdir = @top_srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -34,9 +36,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -libexec_PROGRAMS = check_apt$(EXEEXT) check_disk$(EXEEXT) \ - check_dummy$(EXEEXT) check_http$(EXEEXT) check_load$(EXEEXT) \ - check_mrtg$(EXEEXT) check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ +libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ + check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ + check_load$(EXEEXT) check_mrtg$(EXEEXT) \ + check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ check_nwstat$(EXEEXT) check_overcr$(EXEEXT) \ check_ping$(EXEEXT) check_real$(EXEEXT) check_smtp$(EXEEXT) \ check_ssh$(EXEEXT) check_tcp$(EXEEXT) check_time$(EXEEXT) \ @@ -109,7 +112,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(libexecdir)" @@ -124,6 +127,8 @@ am__DEPENDENCIES_2 = am__DEPENDENCIES_3 = netutils.o $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) +check_cluster_SOURCES = check_cluster.c +check_cluster_OBJECTS = check_cluster.$(OBJEXT) check_dig_SOURCES = check_dig.c check_dig_OBJECTS = check_dig.$(OBJEXT) check_disk_SOURCES = check_disk.c @@ -207,24 +212,24 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = check_apt.c check_by_ssh.c check_dig.c check_disk.c \ - check_dns.c check_dummy.c check_fping.c check_game.c \ - check_hpjd.c check_http.c check_ide_smart.c check_ldap.c \ - check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c \ - check_mysql_query.c check_nagios.c check_nt.c check_ntp.c \ - check_nwstat.c check_overcr.c check_pgsql.c check_ping.c \ - check_procs.c check_radius.c check_real.c check_smtp.c \ - check_snmp.c check_ssh.c check_swap.c check_tcp.c check_time.c \ - check_ups.c check_users.c negate.c urlize.c -DIST_SOURCES = check_apt.c check_by_ssh.c check_dig.c check_disk.c \ - check_dns.c check_dummy.c check_fping.c check_game.c \ - check_hpjd.c check_http.c check_ide_smart.c check_ldap.c \ - check_load.c check_mrtg.c check_mrtgtraf.c check_mysql.c \ - check_mysql_query.c check_nagios.c check_nt.c check_ntp.c \ - check_nwstat.c check_overcr.c check_pgsql.c check_ping.c \ - check_procs.c check_radius.c check_real.c check_smtp.c \ - check_snmp.c check_ssh.c check_swap.c check_tcp.c check_time.c \ - check_ups.c check_users.c negate.c urlize.c +SOURCES = check_apt.c check_by_ssh.c check_cluster.c check_dig.c \ + check_disk.c check_dns.c check_dummy.c check_fping.c \ + check_game.c check_hpjd.c check_http.c check_ide_smart.c \ + check_ldap.c check_load.c check_mrtg.c check_mrtgtraf.c \ + check_mysql.c check_mysql_query.c check_nagios.c check_nt.c \ + check_ntp.c check_nwstat.c check_overcr.c check_pgsql.c \ + check_ping.c check_procs.c check_radius.c check_real.c \ + check_smtp.c check_snmp.c check_ssh.c check_swap.c check_tcp.c \ + check_time.c check_ups.c check_users.c negate.c urlize.c +DIST_SOURCES = check_apt.c check_by_ssh.c check_cluster.c check_dig.c \ + check_disk.c check_dns.c check_dummy.c check_fping.c \ + check_game.c check_hpjd.c check_http.c check_ide_smart.c \ + check_ldap.c check_load.c check_mrtg.c check_mrtgtraf.c \ + check_mysql.c check_mysql_query.c check_nagios.c check_nt.c \ + check_ntp.c check_nwstat.c check_overcr.c check_pgsql.c \ + check_ping.c check_procs.c check_radius.c check_real.c \ + check_smtp.c check_snmp.c check_ssh.c check_swap.c check_tcp.c \ + check_time.c check_ups.c check_users.c negate.c urlize.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -363,6 +368,7 @@ PATH_TO_SWAPINFO = @PATH_TO_SWAPINFO@ PATH_TO_UPTIME = @PATH_TO_UPTIME@ PATH_TO_WHO = @PATH_TO_WHO@ PERL = @PERL@ +PERLMODS_DIR = @PERLMODS_DIR@ PGINCLUDE = @PGINCLUDE@ PGLIBS = @PGLIBS@ PKG_ARCH = @PKG_ARCH@ @@ -467,6 +473,7 @@ TESTS = @PLUGIN_TEST@ ############################################################################## # the actual targets check_apt_LDADD = $(BASEOBJS) runcmd.o +check_cluster_LDADD = $(BASEOBJS) check_dig_LDADD = $(NETLIBS) runcmd.o check_disk_LDADD = $(BASEOBJS) popen.o check_dns_LDADD = $(NETLIBS) runcmd.o @@ -505,9 +512,10 @@ check_ups_LDADD = $(NETLIBS) check_users_LDADD = $(BASEOBJS) popen.o check_by_ssh_LDADD = $(NETLIBS) runcmd.o check_ide_smart_LDADD = $(BASEOBJS) -negate_LDADD = $(BASEOBJS) popen.o +negate_LDADD = $(BASEOBJS) urlize_LDADD = $(BASEOBJS) popen.o check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS) +check_cluster_DEPENDENCIES = check_cluster.c $(BASEOBJS) $(DEPLIBS) check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS) check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS) @@ -542,7 +550,7 @@ check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS) check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS) check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS) check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS) -negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS) +negate_DEPENDENCIES = negate.c $(BASEOBJS) $(DEPLIBS) urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS) all: all-am @@ -611,6 +619,9 @@ check_apt$(EXEEXT): $(check_apt_OBJECTS) $(check_apt_DEPENDENCIES) check_by_ssh$(EXEEXT): $(check_by_ssh_OBJECTS) $(check_by_ssh_DEPENDENCIES) @rm -f check_by_ssh$(EXEEXT) $(LINK) $(check_by_ssh_LDFLAGS) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS) +check_cluster$(EXEEXT): $(check_cluster_OBJECTS) $(check_cluster_DEPENDENCIES) + @rm -f check_cluster$(EXEEXT) + $(LINK) $(check_cluster_LDFLAGS) $(check_cluster_OBJECTS) $(check_cluster_LDADD) $(LIBS) check_dig$(EXEEXT): $(check_dig_OBJECTS) $(check_dig_DEPENDENCIES) @rm -f check_dig$(EXEEXT) $(LINK) $(check_dig_LDFLAGS) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS) @@ -725,6 +736,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_apt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_by_ssh.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_cluster.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_disk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dns.Po@am__quote@ diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 22ab91d..2a1a587 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -7,7 +7,7 @@ * * Original author: sean finney * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -31,12 +31,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_apt.c,v 1.10 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_apt.c 1590 2007-01-28 21:46:41Z hweiss $ * ******************************************************************************/ const char *progname = "check_apt"; -const char *revision = "$Revision: 1.10 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index ecb5e04..9073884 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-09-23 13:26:03 +0100 (Sun, 23 Sep 2007) $ * * Description: * @@ -27,12 +27,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_by_ssh.c,v 1.41 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_by_ssh.c 1792 2007-09-23 12:26:03Z psychotrahe $ * ******************************************************************************/ const char *progname = "check_by_ssh"; -const char *revision = "$Revision: 1.41 $"; +const char *revision = "$Revision: 1792 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -46,9 +46,10 @@ int validate_arguments (void); void print_help (void); void print_usage (void); -int commands = 0; -int services = 0; -int skip = 0; +unsigned int commands = 0; +unsigned int services = 0; +int skip_stdout = 0; +int skip_stderr = 0; char *remotecmd = NULL; char *comm = NULL; char *hostname = NULL; @@ -92,17 +93,28 @@ main (int argc, char **argv) printf ("%s\n", comm); result = np_runcmd(comm, &chld_out, &chld_err, 0); - /* UNKNOWN if output found on stderr */ - if(chld_err.buflen) { - printf(_("Remote command execution failed: %s\n"), - chld_err.buflen ? chld_err.buf : _("Unknown error")); + + if (skip_stdout == -1) /* --skip-stdout specified without argument */ + skip_stdout = chld_out.lines; + if (skip_stderr == -1) /* --skip-stderr specified without argument */ + skip_stderr = chld_err.lines; + + /* UNKNOWN if (non-skipped) output found on stderr */ + if(chld_err.lines > skip_stderr) { + printf (_("Remote command execution failed: %s\n"), + chld_err.line[skip_stderr]); return STATE_UNKNOWN; } /* this is simple if we're not supposed to be passive. * Wrap up quickly and keep the tricks below */ if(!passive) { - printf ("%s\n", skip < chld_out.lines ? chld_out.line[skip] : chld_out.buf); + if (chld_out.lines > skip_stdout) + for (i = skip_stdout; i < chld_out.lines; i++) + puts (chld_out.line[i]); + else + printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), + state_text(result), remotecmd, result); return result; /* return error status from remote command */ } @@ -119,7 +131,7 @@ main (int argc, char **argv) local_time = time (NULL); commands = 0; - for(i = skip; chld_out.line[i]; i++) { + for(i = skip_stdout; i < chld_out.lines; i++) { status_text = strstr (chld_out.line[i], "STATUS CODE: "); if (status_text == NULL) { printf ("%s", chld_out.line[i]); @@ -161,7 +173,9 @@ process_arguments (int argc, char **argv) {"user", required_argument, 0, 'u'}, {"logname", required_argument, 0, 'l'}, {"command", required_argument, 0, 'C'}, - {"skip", required_argument, 0, 'S'}, + {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */ + {"skip-stdout", optional_argument, 0, 'S'}, + {"skip-stderr", optional_argument, 0, 'E'}, {"proto1", no_argument, 0, '1'}, {"proto2", no_argument, 0, '2'}, {"use-ipv4", no_argument, 0, '4'}, @@ -179,7 +193,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S:n:s:o:", longopts, + c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:", longopts, &option); if (c == -1 || c == EOF) @@ -249,11 +263,21 @@ process_arguments (int argc, char **argv) asprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd); asprintf (&remotecmd, "%s%s", remotecmd, optarg); break; - case 'S': /* Skip n lines in the output to ignore system banner */ - if (!is_integer (optarg)) - usage_va(_("skip lines must be an integer")); + case 'S': /* skip n (or all) lines on stdout */ + if (optarg == NULL) + skip_stdout = -1; /* skip all output on stdout */ + else if (!is_integer (optarg)) + usage_va(_("skip-stdout argument must be an integer")); else - skip = atoi (optarg); + skip_stdout = atoi (optarg); + break; + case 'E': /* skip n (or all) lines on stderr */ + if (optarg == NULL) + skip_stderr = -1; /* skip all output on stderr */ + else if (!is_integer (optarg)) + usage_va(_("skip-stderr argument must be an integer")); + else + skip_stderr = atoi (optarg); break; case 'o': /* Extra options for the ssh command */ asprintf (&comm, "%s -%c '%s'", comm, c, optarg); @@ -333,13 +357,15 @@ print_help (void) printf (_(UT_IPv46)); printf (" %s\n", "-1, --proto1"); - printf (" %s\n", _("tell ssh to use Protocol 1")); + printf (" %s\n", _("tell ssh to use Protocol 1 [optional]")); printf (" %s\n", "-2, --proto2"); - printf (" %s\n", _("tell ssh to use Protocol 2")); - printf (" %s\n", "-S, --skiplines=n"); - printf (" %s\n", _("Ignore first n lines on STDERR (to suppress a logon banner)")); + printf (" %s\n", _("tell ssh to use Protocol 2 [optional]")); + printf (" %s\n", "-S, --skip-stdout[=n]"); + printf (" %s\n", _("Ignore all or (if specified) first n lines on STDOUT [optional]")); + printf (" %s\n", "-E, --skip-stderr[=n]"); + printf (" %s\n", _("Ignore all or (if specified) first n lines on STDERR [optional]")); printf (" %s\n", "-f"); - printf (" %s\n", _("tells ssh to fork rather than create a tty")); + printf (" %s\n", _("tells ssh to fork rather than create a tty [optional]")); printf (" %s\n","-C, --command='COMMAND STRING'"); printf (" %s\n", _("command to execute on the remote machine")); printf (" %s\n","-l, --logname=USERNAME"); @@ -374,6 +400,7 @@ print_help (void) printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days"); printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days"); printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days"); + printf (_(UT_VERBOSE)); printf (_(UT_SUPPORT)); } @@ -383,6 +410,9 @@ void print_usage (void) { printf (_("Usage:")); - printf(" %s [-fq46] [-t timeout] [-i identity] [-l user] -H -C ",progname); - printf(" [-n name] [-s servicelist] [-O outputfile] [-p port] [-o ssh-option]\n"); + printf (" %s -H -C [-fqv] [-1|-2] [-4|-6]\n" + " [-S [lines]] [-E [lines]] [-t timeout] [-i identity]\n" + " [-l user] [-n name] [-s servicelist] [-O outputfile]\n" + " [-p port] [-o ssh-option]\n", + progname); } diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c new file mode 100644 index 0000000..32bb892 --- /dev/null +++ b/plugins/check_cluster.c @@ -0,0 +1,278 @@ +/***************************************************************************** + * + * CHECK_CLUSTER2.C - Host and Service Cluster Plugin for Nagios 2.x + * + * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) + * Copyright (c) 2007 nagios-plugins team + * License: GPL + * Last Modified: $Date: 2007-06-20 10:01:07 +0100 (Wed, 20 Jun 2007) $ + * + * License Information: + * + * 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. + * + * 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. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id: check_cluster.c 1745 2007-06-20 09:01:07Z psychotrahe $ + * +******************************************************************************/ + +const char *progname = "check_cluster"; +const char *revision = "$Revision: 1745 $"; +const char *copyright = "2007"; +const char *email = "nagiosplug-devel@lists.sourceforge.net"; + +#include "common.h" +#include "utils.h" +#include "utils_base.h" + +#define CHECK_SERVICES 1 +#define CHECK_HOSTS 2 + +void print_help (void); +void print_usage (void); + +int total_services_ok=0; +int total_services_warning=0; +int total_services_unknown=0; +int total_services_critical=0; + +int total_hosts_up=0; +int total_hosts_down=0; +int total_hosts_unreachable=0; + +char *warn_threshold; +char *crit_threshold; + +int check_type=CHECK_SERVICES; + +char *data_vals=NULL; +char *label=NULL; + +int verbose=0; + +int process_arguments(int,char **); + + + +int main(int argc, char **argv){ + char *ptr; + int data_val; + int return_code=STATE_OK; + thresholds *thresholds = NULL; + + if(process_arguments(argc,argv)==ERROR) + usage(_("Could not parse arguments")); + + /* Initialize the thresholds */ + set_thresholds(&thresholds, warn_threshold, crit_threshold); + if(verbose) + print_thresholds("check_cluster", thresholds); + + /* check the data values */ + for(ptr=strtok(data_vals,",");ptr!=NULL;ptr=strtok(NULL,",")){ + + data_val=atoi(ptr); + + if(check_type==CHECK_SERVICES){ + switch(data_val){ + case 0: + total_services_ok++; + break; + case 1: + total_services_warning++; + break; + case 2: + total_services_critical++; + break; + case 3: + total_services_unknown++; + break; + default: + break; + } + } + else{ + switch(data_val){ + case 0: + total_hosts_up++; + break; + case 1: + total_hosts_down++; + break; + case 2: + total_hosts_unreachable++; + break; + default: + break; + } + } + } + + + /* return the status of the cluster */ + if(check_type==CHECK_SERVICES){ + return_code=get_status(total_services_warning+total_services_unknown+total_services_critical, thresholds); + printf("CLUSTER %s: %s: %d ok, %d warning, %d unknown, %d critical\n", + state_text(return_code), (label==NULL)?"Service cluster":label, + total_services_ok,total_services_warning, + total_services_unknown,total_services_critical); + } + else{ + return_code=get_status(total_hosts_down+total_hosts_unreachable, thresholds); + printf("CLUSTER %s: %s: %d up, %d down, %d unreachable\n", + state_text(return_code), (label==NULL)?"Host cluster":label, + total_hosts_up,total_hosts_down,total_hosts_unreachable); + } + + return return_code; +} + + + +int process_arguments(int argc, char **argv){ + int c; + int option=0; + static struct option longopts[]={ + {"data", required_argument,0,'d'}, + {"warning", required_argument,0,'w'}, + {"critical", required_argument,0,'c'}, + {"label", required_argument,0,'l'}, + {"host", no_argument, 0,'h'}, + {"service", no_argument, 0,'s'}, + {"verbose", no_argument, 0,'v'}, + {"version", no_argument, 0,'V'}, + {"help", no_argument, 0,'H'}, + {0,0,0,0} + }; + + /* no options were supplied */ + if(argc<2) + return ERROR; + + while(1){ + + c=getopt_long(argc,argv,"hHsvVw:c:d:l:",longopts,&option); + + if(c==-1 || c==EOF || c==1) + break; + + switch(c){ + + case 'h': /* host cluster */ + check_type=CHECK_HOSTS; + break; + + case 's': /* service cluster */ + check_type=CHECK_SERVICES; + break; + + case 'w': /* warning threshold */ + if (strspn (optarg, "0123456789:,") < strlen (optarg)) + usage2 (_("Invalid warning threshold: %s\n"), optarg); + warn_threshold = strdup(optarg); + break; + + case 'c': /* warning threshold */ + if (strspn (optarg, "0123456789:,") < strlen (optarg)) + usage2 (_("Invalid critical threshold: %s\n"), optarg); + crit_threshold = strdup(optarg); + break; + + case 'd': /* data values */ + data_vals=(char *)strdup(optarg); + break; + + case 'l': /* text label */ + label=(char *)strdup(optarg); + break; + + case 'v': /* verbose */ + verbose++; + break; + + case 'V': /* version */ + print_revision (progname, revision); + exit (STATE_OK); + break; + + case 'H': /* help */ + print_help(); + exit(STATE_UNKNOWN); + break; + + default: + return ERROR; + break; + } + } + + if(data_vals==NULL) + return ERROR; + + return OK; +} + +void +print_help(void) +{ + print_revision(progname, revision); + printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); + printf(COPYRIGHT, copyright, email); + + printf(_("Host/Service Cluster Plugin for Nagios 2")); + printf("\n\n"); + + print_usage(); + + printf("\n"); + printf("%s\n", _("Options:")); + printf (" %s\n", "-s, --service"); + printf (" %s\n", _("Check service cluster status")); + printf (" %s\n", "-h, --host"); + printf (" %s\n", _("Check host cluster status")); + printf (" %s\n", "-l, --label=STRING"); + printf (" %s\n", _("Optional prepended text output (i.e. \"Host cluster\")")); + printf (" %s\n", "-w, --warning=THRESHOLD"); + printf (" %s\n", _("Specifies the range of hosts or services in cluster that must be in a")); + printf (" %s\n", _("non-OK state in order to return a WARNING status level")); + printf (" %s\n", "-c, --critical=THRESHOLD"); + printf (" %s\n", _("Specifies the range of hosts or services in cluster that must be in a")); + printf (" %s\n", _(" non-OK state in order to return a CRITICAL status level")); + printf (" %s\n", "-d, --data=LIST"); + printf (" %s\n", _("The status codes of the hosts or services in the cluster, separated by")); + printf (" %s\n", _("commas")); + + printf(_(UT_VERBOSE)); + + printf("\n"); + printf("%s\n", _("Notes:")); + printf(" %s\n", _("See:")); + printf(" %s\n", ("http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT")); + printf(" %s\n", _("for THRESHOLD format and examples.")); + + printf(_(UT_SUPPORT)); + printf("\n"); +} + + +void +print_usage(void) +{ + + printf(_("Usage:")); + printf(" %s (-s | -h) -d val1[,val2,...,valn] [-l label]\n", progname); + printf("[-w threshold] [-c threshold] [-v] [--help]\n"); + +} + diff --git a/plugins/check_dig.c b/plugins/check_dig.c index deee7d1..969e2a5 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -27,7 +27,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_dig.c,v 1.46 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_dig.c 1590 2007-01-28 21:46:41Z hweiss $ * *****************************************************************************/ @@ -38,7 +38,7 @@ * because on some architectures those strings are in non-writable memory */ const char *progname = "check_dig"; -const char *revision = "$Revision: 1.46 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2002-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 219ea91..01c8bad 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/03/30 08:56:47 $ +* Last Modified: $Date: 2007-09-23 13:29:36 +0100 (Sun, 23 Sep 2007) $ * * Description: * @@ -27,13 +27,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_disk.c,v 1.90 2007/03/30 08:56:47 psychotrahe Exp $ +* $Id: check_disk.c 1793 2007-09-23 12:29:36Z psychotrahe $ * *****************************************************************************/ const char *progname = "check_disk"; const char *program_name = "check_disk"; /* Required for coreutils libs */ -const char *revision = "$Revision: 1.90 $"; +const char *revision = "$Revision: 1793 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -69,6 +69,9 @@ static int show_all_fs = 1; /* If nonzero, show only local filesystems. */ static int show_local_fs = 0; +/* If nonzero, show only local filesystems but call stat() on remote ones. */ +static int stat_remote_fs = 0; + /* If positive, the units to use when printing sizes; if negative, the human-readable base. */ /* static int output_block_size; */ @@ -127,6 +130,7 @@ int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, ch void print_help (void); void print_usage (void); double calculate_percent(uintmax_t, uintmax_t); +void stat_path (struct parameter_list *p); double w_dfp = -1.0; double c_dfp = -1.0; @@ -150,8 +154,9 @@ char *warn_usedinodes_percent = NULL; char *crit_usedinodes_percent = NULL; char *warn_freeinodes_percent = NULL; char *crit_freeinodes_percent = NULL; -bool path_selected = false; +int path_selected = FALSE; char *group = NULL; +struct stat *stat_buf; int @@ -181,6 +186,7 @@ main (int argc, char **argv) output = strdup (""); details = strdup (""); perf = strdup (""); + stat_buf = malloc(sizeof *stat_buf); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -194,7 +200,7 @@ main (int argc, char **argv) /* If a list of paths has not been selected, find entire mount list and create list of paths */ - if (path_selected == false) { + if (path_selected == FALSE) { for (me = mount_list; me; me = me->me_next) { if (! (path = np_find_parameter(path_select_list, me->me_mountdir))) { path = np_add_parameter(&path_select_list, me->me_mountdir); @@ -208,14 +214,15 @@ main (int argc, char **argv) /* Error if no match found for specified paths */ temp_list = path_select_list; + while (temp_list) { if (! temp_list->best_match) { die (STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), temp_list->name); } + temp_list = temp_list->name_next; } - /* Process for every path in list */ for (path = path_select_list; path; path=path->name_next) { @@ -250,6 +257,7 @@ main (int argc, char **argv) for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next) { if (temp_list->group && ! (strcmp(temp_list->group, path->group))) { + stat_path(path); get_fs_usage (temp_list->best_match->me_mountdir, temp_list->best_match->me_devname, &tmpfsp); /* possibly differing blocksizes if disks are grouped. Calculating average */ @@ -263,7 +271,7 @@ main (int argc, char **argv) if (verbose > 3) printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name); - // printf("Group %s: add %u blocks (%s)\n", temp_list->name); // path->group, tmpfsp.fsu_bavail, temp_list->name); + /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */ np_add_name(&seen, temp_list->best_match->me_mountdir); } @@ -277,6 +285,8 @@ main (int argc, char **argv) if (path->group == NULL) { /* Skip remote filesystems if we're not interested in them */ if (me->me_remote && show_local_fs) { + if (stat_remote_fs) + stat_path(path); continue; /* Skip pseudo fs's if we haven't asked for all fs's */ } else if (me->me_dummy && !show_all_fs) { @@ -291,6 +301,7 @@ main (int argc, char **argv) continue; } + stat_path(path); get_fs_usage (me->me_mountdir, me->me_devname, &fsp); } @@ -310,8 +321,8 @@ main (int argc, char **argv) dfree_inodes_percent = 100 - dused_inodes_percent; if (verbose >= 3) { - printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g\n", - me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent, dfree_inodes_percent); + printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n", + me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent, dfree_inodes_percent, fsp.fsu_blocksize, mult); } /* Threshold comparisons */ @@ -364,6 +375,7 @@ main (int argc, char **argv) critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units )); } + /* Nb: *_high_tide are unset when == UINT_MAX */ asprintf (&perf, "%s %s", perf, perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, dused_units, units, @@ -375,18 +387,16 @@ main (int argc, char **argv) if (disk_result==STATE_OK && erronly && !verbose) continue; - if (disk_result!=STATE_OK || verbose>=0) { - asprintf (&output, "%s %s %.0f %s (%.0f%%", - output, - (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, - dfree_units, - units, - dfree_pct); - if (dused_inodes_percent < 0) { - asprintf(&output, "%s inode=-);", output); - } else { - asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent ); - } + asprintf (&output, "%s %s %.0f %s (%.0f%%", + output, + (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, + dfree_units, + units, + dfree_pct); + if (dused_inodes_percent < 0) { + asprintf(&output, "%s inode=-);", output); + } else { + asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent ); } /* TODO: Need to do a similar debug line @@ -439,16 +449,16 @@ int process_arguments (int argc, char **argv) { int c, err; - struct parameter_list *se, *se2; - struct parameter_list *temp_list; + struct parameter_list *se; + struct parameter_list *temp_list = NULL, *previous = NULL; struct parameter_list *temp_path_select_list = NULL; - struct mount_entry *me; + struct mount_entry *me, *temp_me; int result = OK; - struct stat *stat_buf; regex_t re; int cflags = REG_NOSUB | REG_EXTENDED; + int default_cflags = cflags; char errbuf[MAX_INPUT_BUFFER]; - bool fnd = false; + int fnd = 0; int option = 0; static struct option longopts[] = { @@ -459,6 +469,7 @@ process_arguments (int argc, char **argv) /* Dang, -C is taken. We might want to reshuffle this. */ {"icritical", required_argument, 0, 'K'}, {"local", required_argument, 0, 'l'}, + {"stat-remote-fs", required_argument, 0, 'L'}, {"kilobytes", required_argument, 0, 'k'}, {"megabytes", required_argument, 0, 'm'}, {"units", required_argument, 0, 'u'}, @@ -471,9 +482,14 @@ process_arguments (int argc, char **argv) {"eregi-partition", required_argument, 0, 'R'}, {"ereg-path", required_argument, 0, 'r'}, {"ereg-partition", required_argument, 0, 'r'}, + {"ignore-ereg-path", required_argument, 0, 'i'}, + {"ignore-ereg-partition", required_argument, 0, 'i'}, + {"ignore-eregi-path", required_argument, 0, 'I'}, + {"ignore-eregi-partition", required_argument, 0, 'I'}, {"mountpoint", no_argument, 0, 'M'}, {"errors-only", no_argument, 0, 'e'}, {"exact-match", no_argument, 0, 'E'}, + {"all", no_argument, 0, 'A'}, {"verbose", no_argument, 0, 'v'}, {"quiet", no_argument, 0, 'q'}, {"clear", no_argument, 0, 'C'}, @@ -492,7 +508,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklg:R:r:ME", longopts, &option); + c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklLg:R:r:i:I:MEA", longopts, &option); if (c == -1 || c == EOF) break; @@ -595,6 +611,8 @@ process_arguments (int argc, char **argv) free(units); units = strdup ("MB"); break; + case 'L': + stat_remote_fs = 1; case 'l': show_local_fs = 1; break; @@ -606,19 +624,15 @@ process_arguments (int argc, char **argv) die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -p\n")); } - /* get the real mountdir of the specified path. np_find_parameter won't find an entry if -p is not - * exactly the same string as the mountdir */ - se2 = np_add_parameter(&temp_path_select_list, optarg); - np_set_best_match(se2, mount_list, FALSE); - - /* add parameter if not found. overwrite thresholds if path has already been added */ if (! (se = np_find_parameter(path_select_list, optarg))) { se = np_add_parameter(&path_select_list, optarg); } se->group = group; set_all_thresholds(se); - path_selected = true; + np_set_best_match(se, mount_list, exact_match); + stat_path(se); + path_selected = TRUE; break; case 'x': /* exclude path or partition */ np_add_name(&dp_exclude_list, optarg); @@ -629,20 +643,64 @@ process_arguments (int argc, char **argv) case 'v': /* verbose */ verbose++; break; - case 'q': /* verbose */ - verbose--; + case 'q': /* TODO: this function should eventually go away (removed 2007-09-20) */ + /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */ + erronly = TRUE; break; case 'e': erronly = TRUE; break; case 'E': + if (path_selected) + die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting pathes\n")); exact_match = TRUE; break; case 'g': if (path_selected) - die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before using -p\n")); + die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before selecting pathes \n")); group = optarg; break; + case 'I': + cflags |= REG_ICASE; + case 'i': + if (!path_selected) + die (STATE_UNKNOWN, "DISK %s: %s\n", _("UNKNOWN"), _("Pathes need to be selected before using -i/-I. Use -A to select all pathes explicitly")); + err = regcomp(&re, optarg, cflags); + if (err != 0) { + regerror (err, &re, errbuf, MAX_INPUT_BUFFER); + die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf); + } + + temp_list = path_select_list; + + previous = NULL; + while (temp_list) { + if (temp_list->best_match) { + if (np_regex_match_mount_entry(temp_list->best_match, &re)) { + + if (verbose >=3) + printf("ignoring %s matching regex\n", temp_list->name); + + temp_list = np_del_parameter(temp_list, previous); + /* pointer to first element needs to be uüdated if first item gets deleted */ + if (previous == NULL) + path_select_list = temp_list; + } else { + previous = temp_list; + temp_list = temp_list->name_next; + } + } else { + previous = temp_list; + temp_list = temp_list->name_next; + } + } + + + cflags = default_cflags; + break; + + case 'A': + optarg = strdup(".*"); case 'R': cflags |= REG_ICASE; case 'r': @@ -661,9 +719,9 @@ process_arguments (int argc, char **argv) for (me = mount_list; me; me = me->me_next) { if (np_regex_match_mount_entry(me, &re)) { - fnd = true; + fnd = TRUE; if (verbose > 3) - printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg); + printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg); /* add parameter if not found. overwrite thresholds if path has already been added */ if (! (se = np_find_parameter(path_select_list, me->me_mountdir))) { @@ -678,15 +736,18 @@ process_arguments (int argc, char **argv) die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Regular expression did not match any path or disk"), optarg); - fnd = false; - path_selected = true; + fnd = FALSE; + path_selected = TRUE; + np_set_best_match(path_select_list, mount_list, exact_match); + cflags = default_cflags; + break; case 'M': /* display mountpoint */ display_mntp = TRUE; break; case 'C': /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */ - if (path_selected == false) { + if (path_selected == FALSE) { struct mount_entry *me; struct parameter_list *path; for (me = mount_list; me; me = me->me_next) { @@ -710,7 +771,7 @@ process_arguments (int argc, char **argv) warn_freeinodes_percent = NULL; crit_freeinodes_percent = NULL; - path_selected = false; + path_selected = FALSE; group = NULL; break; case 'V': /* version */ @@ -734,6 +795,7 @@ process_arguments (int argc, char **argv) if (argc > c && path == NULL) { se = np_add_parameter(&path_select_list, strdup(argv[c++])); + path_selected = TRUE; set_all_thresholds(se); } @@ -742,32 +804,7 @@ process_arguments (int argc, char **argv) mult = (uintmax_t)1024 * 1024; } - if (path_select_list) { - temp_list = path_select_list; - stat_buf = malloc(sizeof *stat_buf); - while (temp_list) { - /* Stat each entry to check that dir exists */ - if (stat (temp_list->name, &stat_buf[0])) { - printf("DISK %s - ", _("CRITICAL")); - die (STATE_CRITICAL, _("%s does not exist\n"), temp_list->name); - } - /* if (validate_arguments (temp_list->w_df, - temp_list->c_df, - temp_list->w_dfp, - temp_list->c_dfp, - temp_list->w_idfp, - temp_list->c_idfp, - temp_list->name) == ERROR) - result = ERROR; - */ - temp_list = temp_list->name_next; - } - free(stat_buf); - return result; - } else { - return TRUE; - /* return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL); */ - } + return TRUE; } @@ -859,48 +896,62 @@ print_help (void) printf (" %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free")); printf (" %s\n", "-w, --warning=PERCENT%"); printf (" %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free")); - printf (" %s\n", "-W, --iwarning=PERCENT%"); - printf (" %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free")); - printf (" %s\n", "-K, --icritical=PERCENT%"); - printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free")); printf (" %s\n", "-c, --critical=INTEGER"); printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free")); printf (" %s\n", "-c, --critical=PERCENT%"); printf (" %s\n", _("Exit with CRITCAL status if less than PERCENT of disk space is free")); - printf (" %s\n", "-C, --clear"); - printf (" %s\n", _("Clear thresholds")); - printf (" %s\n", "-u, --units=STRING"); - printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); - printf (" %s\n", "-k, --kilobytes"); - printf (" %s\n", _("Same as '--units kB'")); - printf (" %s\n", "-m, --megabytes"); - printf (" %s\n", _("Same as '--units MB'")); - printf (" %s\n", "-l, --local"); - printf (" %s\n", _("Only check local filesystems")); + printf (" %s\n", "-W, --iwarning=PERCENT%"); + printf (" %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free")); + printf (" %s\n", "-K, --icritical=PERCENT%"); + printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free")); printf (" %s\n", "-p, --path=PATH, --partition=PARTITION"); printf (" %s\n", _("Path or partition (may be repeated)")); - printf (" %s\n", "-r, --ereg-path=PATH, --ereg-partition=PARTITION"); - printf (" %s\n", _("Regular expression for path or partition (may be repeated)")); - printf (" %s\n", "-R, --eregi-path=PATH, --eregi-partition=PARTITION"); - printf (" %s\n", _("Case insensitive regular expression for path/partition (may be repeated)")); - printf (" %s\n", "-g, --group=NAME"); - printf (" %s\n", _("Group pathes. Thresholds apply to (free-)space of all partitions together")); printf (" %s\n", "-x, --exclude_device=PATH "); printf (" %s\n", _("Ignore device (only works if -p unspecified)")); - printf (" %s\n", "-X, --exclude-type=TYPE "); - printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); - printf (" %s\n", "-M, --mountpoint"); - printf (" %s\n", _("Display the mountpoint instead of the partition")); + printf (" %s\n", "-C, --clear"); + printf (" %s\n", _("Clear thresholds")); printf (" %s\n", "-E, --exact-match"); printf (" %s\n", _("For paths or partitions specified with -p, only check for exact paths")); printf (" %s\n", "-e, --errors-only"); printf (" %s\n", _("Display only devices/mountpoints with errors")); + printf (" %s\n", "-g, --group=NAME"); + printf (" %s\n", _("Group pathes. Thresholds apply to (free-)space of all partitions together")); + printf (" %s\n", "-k, --kilobytes"); + printf (" %s\n", _("Same as '--units kB'")); + printf (" %s\n", "-l, --local"); + printf (" %s\n", _("Only check local filesystems")); + printf (" %s\n", "-L, --stat-remote-fs"); + printf (" %s\n", _("Only check local filesystems against thresholds. Yet call stat on remote filesystems")); + printf (" %s\n", _("to test if they are accessible (e.g. to detect Stale NFS Handles)")); + printf (" %s\n", "-M, --mountpoint"); + printf (" %s\n", _("Display the mountpoint instead of the partition")); + printf (" %s\n", "-m, --megabytes"); + printf (" %s\n", _("Same as '--units MB'")); + printf (" %s\n", "-A, --all"); + printf (" %s\n", _("Explicitly select all pathes. This is equivalent to -R '.*'")); + printf (" %s\n", "-R, --eregi-path=PATH, --eregi-partition=PARTITION"); + printf (" %s\n", _("Case insensitive regular expression for path/partition (may be repeated)")); + printf (" %s\n", "-r, --ereg-path=PATH, --ereg-partition=PARTITION"); + printf (" %s\n", _("Regular expression for path or partition (may be repeated)")); + printf (" %s\n", "-I, --ignore-eregi-path=PATH, --ignore-eregi-partition=PARTITION"); + printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); + printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); + printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); + printf (" %s\n", "-u, --units=STRING"); + printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); printf (_(UT_VERBOSE)); + printf (" %s\n", "-X, --exclude-type=TYPE"); + printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); printf ("\n"); printf ("%s\n", _("Examples:")); printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); printf (" %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB")); + printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -g sidDATA -r '^/oracle/SID/data.*$'"); + printf (" %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex")); + printf (" %s\n", _("are grouped which means the freespace thresholds are applied to all disks together")); + printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar"); + printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M")); printf (_(UT_SUPPORT)); } @@ -910,6 +961,21 @@ void print_usage (void) { printf (_("Usage:")); - printf (" %s -w limit -c limit [-p path | -x device] [-t timeout]", progname); - printf ("[-m] [-e] [-W limit] [-K limit] [-v] [-q] [-E]\n"); + printf (" %s -w limit -c limit [-W limit] [-K limit] {-p path | -x device}\n", progname); + printf ("[-C] [-E] [-e] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n"); + printf ("[-t timeout] [-u unit] [-v] [-X type]\n"); +} + +void +stat_path (struct parameter_list *p) +{ + /* Stat entry to check that dir exists and is accessible */ + if (verbose > 3) + printf("calling stat on %s\n", p->name); + if (stat (p->name, &stat_buf[0])) { + if (verbose > 3) + printf("stat failed on %s\n", p->name); + printf("DISK %s - ", _("CRITICAL")); + die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno)); + } } diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 8bdf46c..b0ed6de 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -31,12 +31,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * -* $Id: check_dns.c,v 1.55 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_dns.c 1590 2007-01-28 21:46:41Z hweiss $ * ******************************************************************************/ const char *progname = "check_dns"; -const char *revision = "$Revision: 1.55 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index 7c8b24d..f746c2b 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2006/10/19 00:25:16 $ +* Last Modified: $Date: 2007-05-24 09:35:53 +0100 (Thu, 24 May 2007) $ * * Description: * @@ -30,12 +30,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_dummy.c,v 1.17 2006/10/19 00:25:16 opensides Exp $ + $Id: check_dummy.c 1716 2007-05-24 08:35:53Z tonvoon $ ******************************************************************************/ const char *progname = "check_dummy"; -const char *revision = "$Revision: 1.17 $"; +const char *revision = "$Revision: 1716 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -84,8 +84,10 @@ main (int argc, char **argv) printf (_("UNKNOWN")); break; default: + printf (_("UNKNOWN")); + printf (": "); printf (_("Status %d is not a supported error state\n"), result); - break; + return STATE_UNKNOWN; } if (argc >= 3) diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 0dc3e8b..819a1ec 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -30,12 +30,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_fping.c,v 1.28 2007/01/28 21:46:40 hweiss Exp $ + $Id: check_fping.c 1590 2007-01-28 21:46:41Z hweiss $ ******************************************************************************/ const char *progname = "check_fping"; -const char *revision = "$Revision: 1.28 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_game.c b/plugins/check_game.c index fe76de9..535c6e0 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -30,11 +30,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_game.c,v 1.29 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_game.c 1590 2007-01-28 21:46:41Z hweiss $ *****************************************************************************/ const char *progname = "check_game"; -const char *revision = "$Revision: 1.29 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2002-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index f181cce..c20883a 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -31,11 +31,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_hpjd.c,v 1.35 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_hpjd.c 1590 2007-01-28 21:46:41Z hweiss $ *****************************************************************************/ const char *progname = "check_hpjd"; -const char *revision = "$Revision: 1.35 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_http.c b/plugins/check_http.c index b983e49..dc11505 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/03/06 22:45:57 $ +* Last Modified: $Date: 2007-07-21 17:29:01 +0100 (Sat, 21 Jul 2007) $ * * Description: * @@ -33,16 +33,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_http.c,v 1.101 2007/03/06 22:45:57 tonvoon Exp $ + $Id: check_http.c 1759 2007-07-21 16:29:01Z hweiss $ ******************************************************************************/ /* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */ const char *progname = "check_http"; -const char *revision = "$Revision: 1.101 $"; +const char *revision = "$Revision: 1759 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; +#include + #include "common.h" #include "netutils.h" #include "utils.h" @@ -53,7 +55,8 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; enum { MAX_IPV4_HOSTLENGTH = 255, HTTP_PORT = 80, - HTTPS_PORT = 443 + HTTPS_PORT = 443, + MAX_PORT = 65535 }; #ifdef HAVE_SSL @@ -148,7 +151,7 @@ main (int argc, char **argv) if (display_html == TRUE) printf ("", - use_ssl ? "https" : "http", host_name, + use_ssl ? "https" : "http", server_address, server_port, server_url); /* initialize alarm signal handling, set socket timeout, start timer */ @@ -662,28 +665,28 @@ check_document_dates (const char *headers) /* Done parsing the body. Now check the dates we (hopefully) parsed. */ if (!server_date || !*server_date) { - die (STATE_UNKNOWN, _("Server date unknown\n")); + die (STATE_UNKNOWN, _("HTTP UNKNOWN - Server date unknown\n")); } else if (!document_date || !*document_date) { - die (STATE_CRITICAL, _("Document modification date unknown\n")); + die (STATE_CRITICAL, _("HTTP CRITICAL - Document modification date unknown\n")); } else { time_t srv_data = parse_time_string (server_date); time_t doc_data = parse_time_string (document_date); if (srv_data <= 0) { - die (STATE_CRITICAL, _("CRITICAL - Server date \"%100s\" unparsable"), server_date); + die (STATE_CRITICAL, _("HTTP CRITICAL - Server date \"%100s\" unparsable"), server_date); } else if (doc_data <= 0) { - die (STATE_CRITICAL, _("CRITICAL - Document date \"%100s\" unparsable"), document_date); + die (STATE_CRITICAL, _("HTTP CRITICAL - Document date \"%100s\" unparsable"), document_date); } else if (doc_data > srv_data + 30) { - die (STATE_CRITICAL, _("CRITICAL - Document is %d seconds in the future\n"), (int)doc_data - (int)srv_data); + die (STATE_CRITICAL, _("HTTP CRITICAL - Document is %d seconds in the future\n"), (int)doc_data - (int)srv_data); } else if (doc_data < srv_data - maximum_age) { int n = (srv_data - doc_data); if (n > (60 * 60 * 24 * 2)) die (STATE_CRITICAL, - _("CRITICAL - Last modified %.1f days ago\n"), + _("HTTP CRITICAL - Last modified %.1f days ago\n"), ((float) n) / (60 * 60 * 24)); else die (STATE_CRITICAL, - _("CRITICAL - Last modified %d:%02d:%02d ago\n"), + _("HTTP CRITICAL - Last modified %d:%02d:%02d ago\n"), n / (60 * 60), (n / 60) % 60, n % 60); } @@ -764,7 +767,7 @@ check_http (void) /* try to connect to the host at the given port number */ if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK) - die (STATE_CRITICAL, _("Unable to open TCP socket\n")); + die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n")); #ifdef HAVE_SSL if (use_ssl == TRUE) { np_net_ssl_init(sd); @@ -779,6 +782,9 @@ check_http (void) asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); + /* tell HTTP/1.1 servers not to keep the connection alive */ + asprintf (&buf, "%sConnection: close\r\n", buf); + /* optionally send the host header info */ if (host_name) asprintf (&buf, "%sHost: %s\r\n", buf, host_name); @@ -836,15 +842,15 @@ check_http (void) if (use_ssl) { sslerr=SSL_get_error(ssl, i); if ( sslerr == SSL_ERROR_SSL ) { - die (STATE_WARNING, _("Client Certificate Required\n")); + die (STATE_WARNING, _("HTTP WARNING - Client Certificate Required\n")); } else { - die (STATE_CRITICAL, _("Error on receive\n")); + die (STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n")); } } else { */ #endif - die (STATE_CRITICAL, _("Error on receive\n")); + die (STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n")); #ifdef HAVE_SSL /* XXX } @@ -854,7 +860,7 @@ check_http (void) /* return a CRITICAL status if we couldn't read any data */ if (pagesize == (size_t) 0) - die (STATE_CRITICAL, _("No data received from host\n")); + die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n")); /* close the connection */ #ifdef HAVE_SSL @@ -909,7 +915,7 @@ check_http (void) asprintf (&msg, _("Invalid HTTP response received from host on port %d\n"), server_port); - die (STATE_CRITICAL, "%s", msg); + die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg); } /* Exit here if server_expect was set by user and not default */ @@ -950,13 +956,13 @@ check_http (void) if (onredirect == STATE_DEPENDENT) redir (header, status_line); else if (onredirect == STATE_UNKNOWN) - printf (_("UNKNOWN")); + printf (_("HTTP UNKNOWN")); else if (onredirect == STATE_OK) - printf (_("OK")); + printf (_("HTTP OK")); else if (onredirect == STATE_WARNING) - printf (_("WARNING")); + printf (_("HTTP WARNING")); else if (onredirect == STATE_CRITICAL) - printf (_("CRITICAL")); + printf (_("HTTP CRITICAL")); microsec = deltime (tv); elapsed_time = (double)microsec / 1.0e6; die (onredirect, @@ -997,7 +1003,7 @@ check_http (void) exit (STATE_OK); } else { - printf (_("CRITICAL - string not found%s|%s %s\n"), + printf (_("HTTP CRITICAL - string not found%s|%s %s\n"), (display_html ? "" : ""), perfd_time (elapsed_time), perfd_size (pagesize)); exit (STATE_CRITICAL); @@ -1019,7 +1025,7 @@ check_http (void) else msg = strdup(_("pattern found")); printf (("%s - %s%s|%s %s\n"), - _("CRITICAL"), + _("HTTP CRITICAL"), msg, (display_html ? "" : ""), perfd_time (elapsed_time), perfd_size (pagesize)); @@ -1027,7 +1033,7 @@ check_http (void) } else { regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER); - printf (_("CRITICAL - Execute Error: %s\n"), errbuf); + printf (_("HTTP CRITICAL - Execute Error: %s\n"), errbuf); exit (STATE_CRITICAL); } } @@ -1057,14 +1063,14 @@ check_http (void) /* per RFC 2396 */ #define HDR_LOCATION "%*[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]: " -#define URI_HTTP "%[HTPShtps]://" -#define URI_HOST "%[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" -#define URI_PORT ":%[0123456789]" +#define URI_HTTP "%5[HTPShtps]" +#define URI_HOST "%255[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" +#define URI_PORT "%6d" /* MAX_PORT's width is 5 chars, 6 to detect overflow */ #define URI_PATH "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" -#define HD1 URI_HTTP URI_HOST URI_PORT URI_PATH -#define HD2 URI_HTTP URI_HOST URI_PATH -#define HD3 URI_HTTP URI_HOST URI_PORT -#define HD4 URI_HTTP URI_HOST +#define HD1 URI_HTTP "://" URI_HOST ":" URI_PORT "/" URI_PATH +#define HD2 URI_HTTP "://" URI_HOST "/" URI_PATH +#define HD3 URI_HTTP "://" URI_HOST ":" URI_PORT +#define HD4 URI_HTTP "://" URI_HOST #define HD5 URI_PATH void @@ -1075,16 +1081,15 @@ redir (char *pos, char *status_line) char xx[2]; char type[6]; char *addr; - char port[6]; char *url; addr = malloc (MAX_IPV4_HOSTLENGTH + 1); if (addr == NULL) - die (STATE_UNKNOWN, _("Could not allocate addr\n")); + die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n")); url = malloc (strcspn (pos, "\r\n")); if (url == NULL) - die (STATE_UNKNOWN, _("Could not allocate url\n")); + die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n")); while (pos) { sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i); @@ -1093,23 +1098,33 @@ redir (char *pos, char *status_line) pos += (size_t) strspn (pos, "\r\n"); if (strlen(pos) == 0) die (STATE_UNKNOWN, - _("UNKNOWN - Could not find redirect location - %s%s\n"), + _("HTTP UNKNOWN - Could not find redirect location - %s%s\n"), status_line, (display_html ? "" : "")); continue; } pos += i; - pos += strspn (pos, " \t\r\n"); + pos += strspn (pos, " \t"); - url = realloc (url, strcspn (pos, "\r\n")); + /* + * RFC 2616 (4.2): ``Header fields can be extended over multiple lines by + * preceding each extra line with at least one SP or HT.'' + */ + for (; (i = strspn (pos, "\r\n")); pos += i) { + pos += i; + if (!(i = strspn (pos, " \t"))) { + die (STATE_UNKNOWN, _("HTTP UNKNOWN - Empty redirect location%s\n"), + display_html ? "" : ""); + } + } + + url = realloc (url, strcspn (pos, "\r\n") + 1); if (url == NULL) - die (STATE_UNKNOWN, _("could not allocate url\n")); + die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n")); /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */ - if (sscanf (pos, HD1, type, addr, port, url) == 4) { + if (sscanf (pos, HD1, type, addr, &i, url) == 4) use_ssl = server_type_check (type); - i = atoi (port); - } /* URI_HTTP URI_HOST URI_PATH */ else if (sscanf (pos, HD2, type, addr, url) == 3 ) { @@ -1118,10 +1133,9 @@ redir (char *pos, char *status_line) } /* URI_HTTP URI_HOST URI_PORT */ - else if(sscanf (pos, HD3, type, addr, port) == 3) { + else if(sscanf (pos, HD3, type, addr, &i) == 3) { strcpy (url, HTTP_URL); use_ssl = server_type_check (type); - i = atoi (port); } /* URI_HTTP URI_HOST */ @@ -1141,12 +1155,12 @@ redir (char *pos, char *status_line) } i = server_port; strcpy (type, server_type); - strcpy (addr, host_name); + strcpy (addr, server_address); } else { die (STATE_UNKNOWN, - _("UNKNOWN - Could not parse redirect location - %s%s\n"), + _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"), pos, (display_html ? "" : "")); } @@ -1156,7 +1170,7 @@ redir (char *pos, char *status_line) if (++redir_depth > max_depth) die (STATE_WARNING, - _("WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"), + _("HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"), max_depth, type, addr, i, url, (display_html ? "" : "")); if (server_port==i && @@ -1164,10 +1178,9 @@ redir (char *pos, char *status_line) (host_name && !strcmp(host_name, addr)) && !strcmp(server_url, url)) die (STATE_WARNING, - _("WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), + _("HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), type, addr, i, url, (display_html ? "" : "")); - server_port = i; strcpy (server_type, type); free (host_name); @@ -1177,7 +1190,22 @@ redir (char *pos, char *status_line) server_address = strdup (addr); free (server_url); - server_url = strdup (url); + if ((url[0] == '/')) + server_url = strdup (url); + else if (asprintf(&server_url, "/%s", url) == -1) + die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate server_url%s\n"), + display_html ? "" : ""); + free(url); + + if ((server_port = i) > MAX_PORT) + die (STATE_UNKNOWN, + _("HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"), + MAX_PORT, server_type, server_address, server_port, server_url, + display_html ? "" : ""); + + if (verbose) + printf (_("Redirection to %s://%s:%d%s\n"), server_type, server_address, + server_port, server_url); check_http (); } @@ -1349,5 +1377,6 @@ print_usage (void) printf (" [-w ] [-c ] [-t ] [-L]\n"); printf (" [-a auth] [-f ] [-e ]\n"); printf (" [-s string] [-l] [-r | -R ] [-P string]\n"); - printf (" [-m :] [-4|-6] [-N] [-M ] [-A string] [-k string]\n"); + printf (" [-m :] [-4|-6] [-N] [-M ] [-A string]\n"); + printf (" [-k string] [-S] [-C ] [-T ]\n"); } diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index f612974..8e44c45 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c @@ -10,7 +10,7 @@ * Copyright (c) 2000 Robert Dale * Copyright (c) 2000-2006 nagios-plugins team * -* Last Modified: $Date: 2007/02/06 21:03:21 $ +* Last Modified: $Date: 2007-06-13 10:43:28 +0100 (Wed, 13 Jun 2007) $ * * Description: * @@ -35,11 +35,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: check_ide_smart.c,v 1.14 2007/02/06 21:03:21 opensides Exp $ + * $Id: check_ide_smart.c 1739 2007-06-13 09:43:28Z psychotrahe $ */ const char *progname = "check_ide_smart"; -const char *revision = "$Revision: 1.14 $"; +const char *revision = "$Revision: 1739 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -437,23 +437,6 @@ print_values (values_t * p, thresholds_t * t) } - -void -print_thresholds (thresholds_t * p) -{ - threshold_t * threshold = p->thresholds; - int i; - printf ("\n"); - printf ("SmartRevision=%d\n", p->revision); - for (i = 0; i < NR_ATTRIBUTES; i++) { - if (threshold->id) { - printf ("Id=%3d, Threshold=%3d\n", threshold->id, - threshold->threshold); } - ++threshold; - } - printf ("CheckSum=%d\n", p->checksum); -} - int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) { @@ -541,7 +524,7 @@ print_help (void) void print_usage (void) { - printf (_("Usage:"); + printf (_("Usage:")); printf ("%s [-d ] [-i ] [-q quiet] [-1 ]",progname); - pritnf (" [-O ] [-n ]\n"); + printf (" [-O ] [-n ]\n"); } diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 2a00698..e2cc885 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2000-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-07-07 23:20:40 +0100 (Sat, 07 Jul 2007) $ * * Description: * @@ -27,13 +27,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_ldap.c,v 1.35 2007/01/28 21:46:40 hweiss Exp $ + $Id: check_ldap.c 1753 2007-07-07 22:20:40Z psychotrahe $ ******************************************************************************/ /* progname may be check_ldaps */ char *progname = "check_ldap"; -const char *revision = "$Revision: 1.35 $"; +const char *revision = "$Revision: 1753 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -70,6 +70,9 @@ int ld_protocol = DEFAULT_PROTOCOL; double warn_time = UNDEFINED; double crit_time = UNDEFINED; struct timeval tv; +int starttls = FALSE; +int ssl_on_connect = FALSE; +int verbose = 0; /* for ldap tls */ @@ -104,6 +107,9 @@ main (int argc, char *argv[]) if (process_arguments (argc, argv) == ERROR) usage4 (_("Could not parse arguments")); + if (strstr(argv[0],"check_ldaps") && ! starttls && ! ssl_on_connect) + starttls = TRUE; + /* initialize alarm signal handling */ signal (SIGALRM, socket_timeout_alarm_handler); @@ -121,7 +127,8 @@ main (int argc, char *argv[]) } #else if (!(ld = ldap_open (ld_host, ld_port))) { - /*ldap_perror(ld, "ldap_open"); */ + if (verbose) + ldap_perror(ld, "ldap_open"); printf (_("Could not connect to the server at port %i\n"), ld_port); return STATE_CRITICAL; } @@ -136,54 +143,54 @@ main (int argc, char *argv[]) } #endif - if (strstr(argv[0],"check_ldaps")) { - /* with TLS */ - if ( ld_port == LDAPS_PORT ) { - asprintf (&SERVICE, "LDAPS"); + if (ld_port == LDAPS_PORT || ssl_on_connect) { + asprintf (&SERVICE, "LDAPS"); #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS) - /* ldaps: set option tls */ - tls = LDAP_OPT_X_TLS_HARD; - - if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) - { - /*ldap_perror(ld, "ldaps_option"); */ - printf (_("Could not init TLS at port %i!\n"), ld_port); - return STATE_CRITICAL; - } -#else - printf (_("TLS not supported by the libraries!\n"), ld_port); + /* ldaps: set option tls */ + tls = LDAP_OPT_X_TLS_HARD; + + if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) + { + if (verbose) + ldap_perror(ld, "ldaps_option"); + printf (_("Could not init TLS at port %i!\n"), ld_port); return STATE_CRITICAL; -#endif /* LDAP_OPT_X_TLS */ - } else { - asprintf (&SERVICE, "LDAP-TLS"); -#if defined(HAVE_LDAP_SET_OPTION) && defined(HAVE_LDAP_START_TLS_S) - /* ldap with startTLS: set option version */ - if (ldap_get_option(ld,LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS ) - { - if (version < LDAP_VERSION3) - { - version = LDAP_VERSION3; - ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version); - } - } - /* call start_tls */ - if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) - { - /*ldap_perror(ld, "ldap_start_tls"); */ - printf (_("Could not init startTLS at port %i!\n"), ld_port); - return STATE_CRITICAL; - } -#else - printf (_("startTLS not supported by the library, needs LDAPv3!\n")); - return STATE_CRITICAL; -#endif /* HAVE_LDAP_START_TLS_S */ } +#else + printf (_("TLS not supported by the libraries!\n")); + return STATE_CRITICAL; +#endif /* LDAP_OPT_X_TLS */ + } else if (starttls) { + asprintf (&SERVICE, "LDAP-TLS"); +#if defined(HAVE_LDAP_SET_OPTION) && defined(HAVE_LDAP_START_TLS_S) + /* ldap with startTLS: set option version */ + if (ldap_get_option(ld,LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS ) + { + if (version < LDAP_VERSION3) + { + version = LDAP_VERSION3; + ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version); + } + } + /* call start_tls */ + if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) + { + if (verbose) + ldap_perror(ld, "ldap_start_tls"); + printf (_("Could not init startTLS at port %i!\n"), ld_port); + return STATE_CRITICAL; + } +#else + printf (_("startTLS not supported by the library, needs LDAPv3!\n")); + return STATE_CRITICAL; +#endif /* HAVE_LDAP_START_TLS_S */ } /* bind to the ldap server */ if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) { - /*ldap_perror(ld, "ldap_bind"); */ + if (verbose) + ldap_perror(ld, "ldap_bind"); printf (_("Could not bind to the ldap-server\n")); return STATE_CRITICAL; } @@ -191,7 +198,8 @@ main (int argc, char *argv[]) /* do a search of all objectclasses in the base dn */ if (ldap_search_s (ld, ld_base, LDAP_SCOPE_BASE, ld_attr, NULL, 0, &result) != LDAP_SUCCESS) { - /*ldap_perror(ld, "ldap_search"); */ + if (verbose) + ldap_perror(ld, "ldap_search"); printf (_("Could not search/find objectclasses in %s\n"), ld_base); return STATE_CRITICAL; } @@ -247,11 +255,14 @@ process_arguments (int argc, char **argv) {"ver2", no_argument, 0, '2'}, {"ver3", no_argument, 0, '3'}, #endif + {"starttls", no_argument, 0, 'T'}, + {"ssl", no_argument, 0, 'S'}, {"use-ipv4", no_argument, 0, '4'}, {"use-ipv6", no_argument, 0, '6'}, {"port", required_argument, 0, 'p'}, {"warn", required_argument, 0, 'w'}, {"crit", required_argument, 0, 'c'}, + {"verbose", no_argument, 0, 'v'}, {0, 0, 0, 0} }; @@ -264,7 +275,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "hV2346t:c:w:H:b:p:a:D:P:", longopts, &option); + c = getopt_long (argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:", longopts, &option); if (c == -1 || c == EOF) break; @@ -317,6 +328,22 @@ process_arguments (int argc, char **argv) case '4': address_family = AF_INET; break; + case 'v': + verbose++; + break; + case 'T': + if (! ssl_on_connect) + starttls = TRUE; + else + usage_va(_("%s cannot be combined with %s"), "-T/--starttls", "-S/--ssl"); + break; + case 'S': + if (! starttls) { + ssl_on_connect = TRUE; + ld_port = LDAPS_PORT; + } else + usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls"); + break; case '6': #ifdef USE_IPV6 address_family = AF_INET6; @@ -382,13 +409,17 @@ print_help (void) printf (" %s\n", _("ldap bind DN (if required)")); printf (" %s\n", "-P [--pass]"); printf (" %s\n", _("ldap password (if required)")); + printf (" %s\n", "-T [--starttls]"); + printf (" %s\n", _("use starttls mechanism introduced in protocol version 3")); + printf (" %s\n", "-S [--ssl]"); + printf (" %s\n", _("use ldaps (ldap v2 ssl method). this also sets the default port to %s"), LDAPS_PORT); #ifdef HAVE_LDAP_SET_OPTION printf (" %s\n", "-2 [--ver2]"); printf (" %s\n", _("use ldap protocol version 2")); printf (" %s\n", "-3 [--ver3]"); printf (" %s\n", _("use ldap protocol version 3")); - printf ("(default protocol version: %d)", DEFAULT_PROTOCOL); + printf (" (default protocol version: %d)\n", DEFAULT_PROTOCOL); #endif printf (_(UT_WARN_CRIT)); @@ -397,6 +428,13 @@ print_help (void) printf (_(UT_VERBOSE)); + printf ("\n%s\n", _("Note:")); + printf ("%s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be")); + printf (_("implied (using default port %i) unless --port=636 is specified. In that case %s"), DEFAULT_PORT, "\n"); + printf ("%s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); + printf ("%s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); + printf ("%s\n", _("to define the behaviour explicitly instead.")); + printf (_(UT_SUPPORT)); } diff --git a/plugins/check_load.c b/plugins/check_load.c index 2e002e1..ec4b6d2 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-04-25 23:10:13 +0100 (Wed, 25 Apr 2007) $ * * Description: * @@ -30,12 +30,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_load.c,v 1.33 2007/01/28 21:46:40 hweiss Exp $ + $Id: check_load.c 1700 2007-04-25 22:10:13Z tonvoon $ ******************************************************************************/ const char *progname = "check_load"; -const char *revision = "$Revision: 1.33 $"; +const char *revision = "$Revision: 1700 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -71,6 +71,7 @@ double cload[3] = { 0.0, 0.0, 0.0 }; #define la15 la[2] char *status_line; +int take_into_account_cpus = 0; static void get_threshold(char *arg, double *th) @@ -103,6 +104,7 @@ main (int argc, char **argv) { int result; int i; + long numcpus; double la[3] = { 0.0, 0.0, 0.0 }; /* NetBSD complains about unitialized arrays */ #ifndef HAVE_GETLOADAVG @@ -163,6 +165,13 @@ main (int argc, char **argv) # endif #endif + if (take_into_account_cpus == 1) { + if ((numcpus = GET_NUMBER_OF_CPUS()) > 0) { + la[0] = la[0] / numcpus; + la[1] = la[1] / numcpus; + la[2] = la[2] / numcpus; + } + } if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) { #ifdef HAVE_GETLOADAVG printf (_("Error in getloadavg()\n")); @@ -208,6 +217,7 @@ process_arguments (int argc, char **argv) static struct option longopts[] = { {"warning", required_argument, 0, 'w'}, {"critical", required_argument, 0, 'c'}, + {"percpu", no_argument, 0, 'r'}, {"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} @@ -217,7 +227,7 @@ process_arguments (int argc, char **argv) return ERROR; while (1) { - c = getopt_long (argc, argv, "Vhc:w:", longopts, &option); + c = getopt_long (argc, argv, "Vhrc:w:", longopts, &option); if (c == -1 || c == EOF) break; @@ -229,6 +239,9 @@ process_arguments (int argc, char **argv) case 'c': /* critical time threshold */ get_threshold(optarg, cload); break; + case 'r': /* Divide load average by number of CPUs */ + take_into_account_cpus = 1; + break; case 'V': /* version */ print_revision (progname, revision); exit (STATE_OK); @@ -301,6 +314,8 @@ print_help (void) printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15"); printf (" %s\n", _("Exit with CRITICAL status if load average exceed CLOADn")); printf (" %s\n", _("the load average format is the same used by \"uptime\" and \"w\"")); + printf (" %s\n", "-r, --percpu"); + printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); printf (_(UT_SUPPORT)); } @@ -309,5 +324,5 @@ void print_usage (void) { printf (_("Usage:")); - printf ("%s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n", progname); + printf ("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n", progname); } diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index e734db5..2f62692 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/02/06 21:03:21 $ +* Last Modified: $Date: 2007-02-06 21:03:21 +0000 (Tue, 06 Feb 2007) $ * * Description: * @@ -31,12 +31,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_mrtg.c,v 1.30 2007/02/06 21:03:21 opensides Exp $ + $Id: check_mrtg.c 1611 2007-02-06 21:03:21Z opensides $ ******************************************************************************/ const char *progname = "check_mrtg"; -const char *revision = "$Revision: 1.30 $"; +const char *revision = "$Revision: 1611 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index cc6773e..c05df3b 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2007 nagios-plugins team * -* Last Modified: $Date: 2007/03/02 01:38:04 $ +* Last Modified: $Date: 2007-03-02 01:38:04 +0000 (Fri, 02 Mar 2007) $ * * Description: * @@ -31,7 +31,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_mrtgtraf.c,v 1.28 2007/03/02 01:38:04 egalstad Exp $ + $Id: check_mrtgtraf.c 1624 2007-03-02 01:38:04Z egalstad $ ******************************************************************************/ @@ -39,7 +39,7 @@ #include "utils.h" const char *progname = "check_mrtgtraf"; -const char *revision = "$Revision: 1.28 $"; +const char *revision = "$Revision: 1624 $"; const char *copyright = "1999-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 79124d2..5b239e9 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -7,7 +7,7 @@ * Copyright (c) 1999-2006 nagios-plugins team * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) * -* Last Modified: $Date: 2007/03/29 17:58:28 $ +* Last Modified: $Date: 2007-03-29 18:58:28 +0100 (Thu, 29 Mar 2007) $ * * Description: * @@ -32,12 +32,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_mysql.c,v 1.35 2007/03/29 17:58:28 hweiss Exp $ +* $Id: check_mysql.c 1655 2007-03-29 17:58:28Z hweiss $ * ******************************************************************************/ const char *progname = "check_mysql"; -const char *revision = "$Revision: 1.35 $"; +const char *revision = "$Revision: 1655 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 9d8ba7b..8da06d7 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2006 nagios-plugins team, after Didi Rieder (check_mysql) * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -30,12 +30,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * CHECK_MYSQL_QUERY.C * -* $Id: check_mysql_query.c,v 1.6 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_mysql_query.c 1590 2007-01-28 21:46:41Z hweiss $ * ******************************************************************************/ const char *progname = "check_mysql_query"; -const char *revision = "$Revision: 1.6 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c index 9f2abc9..316ab3b 100644 --- a/plugins/check_nagios.c +++ b/plugins/check_nagios.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -33,12 +33,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_nagios.c,v 1.32 2007/01/28 21:46:40 hweiss Exp $ + $Id: check_nagios.c 1590 2007-01-28 21:46:41Z hweiss $ ******************************************************************************/ const char *progname = "check_nagios"; -const char *revision = "$Revision: 1.32 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_nt.c b/plugins/check_nt.c index ca2a43f..eed854c 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) * Copyright (c) 2003-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -32,12 +32,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_nt.c,v 1.46 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_nt.c 1590 2007-01-28 21:46:41Z hweiss $ * *****************************************************************************/ const char *progname = "check_nt"; -const char *revision = "$Revision: 1.46 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2003-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index f59c050..22f9e3a 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -6,7 +6,7 @@ * Copyright (c) 2006 sean finney * Copyright (c) 2006 nagios-plugins team * -* Last Modified: $Date: 2007/04/10 07:17:18 $ +* Last Modified: $Date: 2007-09-26 05:16:21 +0100 (Wed, 26 Sep 2007) $ * * Description: * @@ -32,12 +32,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: check_ntp.c,v 1.25 2007/04/10 07:17:18 dermoth Exp $ + $Id: check_ntp.c 1799 2007-09-26 04:16:21Z dermoth $ *****************************************************************************/ const char *progname = "check_ntp"; -const char *revision = "$Revision: 1.25 $"; +const char *revision = "$Revision: 1799 $"; const char *copyright = "2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -86,6 +86,7 @@ typedef struct { double rtdelay; /* converted from the ntp_message */ double rtdisp; /* converted from the ntp_message */ double offset[AVG_NUM]; /* offsets from each response */ + uint8_t flags; /* byte with leapindicator,vers,mode. see macros */ } ntp_server_results; /* this structure holds everything in an ntp control message as per rfc1305 */ @@ -302,6 +303,12 @@ int best_offset_server(const ntp_server_results *slist, int nservers){ /* for each server */ for(cserver=0; cserver= expected_cols ) { diff --git a/plugins/check_radius.c b/plugins/check_radius.c index 4d44786..9d77512 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-09-26 11:57:44 +0100 (Wed, 26 Sep 2007) $ * * Description: * @@ -30,12 +30,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_radius.c,v 1.25 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_radius.c 1800 2007-09-26 10:57:44Z hweiss $ * *******************************************************************************/ const char *progname = "check_radius"; -const char *revision = "$Revision: 1.25 $"; +const char *revision = "$Revision: 1800 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -43,12 +43,35 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "utils.h" #include "netutils.h" +#ifdef HAVE_LIBRADIUSCLIENT_NG +#include +rc_handle *rch = NULL; +#else #include +#endif int process_arguments (int, char **); void print_help (void); void print_usage (void); +/* libradiusclient(-ng) wrapper functions */ +#ifdef HAVE_LIBRADIUSCLIENT_NG +#define my_rc_conf_str(a) rc_conf_str(rch,a) +#define my_rc_send_server(a,b) rc_send_server(rch,a,b) +#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,e,f) +#define my_rc_own_ipaddress() rc_own_ipaddress(rch) +#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(rch,a,b,c,-1,d) +#define my_rc_read_dictionary(a) rc_read_dictionary(rch, a) +#else +#define my_rc_conf_str(a) rc_conf_str(a) +#define my_rc_send_server(a,b) rc_send_server(a, b) +#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(a,b,c,d,e,f) +#define my_rc_own_ipaddress() rc_own_ipaddress() +#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(a, b, c, d) +#define my_rc_read_dictionary(a) rc_read_dictionary(a) +#endif +int my_rc_read_config(char *); + char *server = NULL; char *username = NULL; char *password = NULL; @@ -133,33 +156,33 @@ main (int argc, char **argv) usage4 (_("Could not parse arguments")); str = strdup ("dictionary"); - if ((config_file && rc_read_config (config_file)) || - rc_read_dictionary (rc_conf_str (str))) + if ((config_file && my_rc_read_config (config_file)) || + my_rc_read_dictionary (my_rc_conf_str (str))) die (STATE_UNKNOWN, _("Config file error")); service = PW_AUTHENTICATE_ONLY; memset (&data, 0, sizeof(data)); - if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && - rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) && - rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) && - (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))) + if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && + my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) && + my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) && + (nasid==NULL || my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))) die (STATE_UNKNOWN, _("Out of Memory?")); /* * Fill in NAS-IP-Address */ - if ((client_id = rc_own_ipaddress ()) == 0) + if ((client_id = my_rc_own_ipaddress ()) == 0) return (ERROR_RC); - if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == + if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL) return (ERROR_RC); - rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, + my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, retries); - result = rc_send_server (&data, msg); + result = my_rc_send_server (&data, msg); rc_avpair_free (data.send_pairs); if (data.receive_pairs) rc_avpair_free (data.receive_pairs); @@ -202,30 +225,6 @@ process_arguments (int argc, char **argv) {0, 0, 0, 0} }; - if (argc < 2) - return ERROR; - - if (argc == 9) { - config_file = argv[1]; - username = argv[2]; - password = argv[3]; - if (is_intpos (argv[4])) - timeout_interval = atoi (argv[4]); - else - usage2 (_("Timeout interval must be a positive integer"), optarg); - if (is_intpos (argv[5])) - retries = atoi (argv[5]); - else - usage4 (_("Number of retries must be a positive integer")); - server = argv[6]; - if (is_intpos (argv[7])) - port = atoi (argv[7]); - else - usage4 (_("Port must be a positive integer")); - expect = argv[8]; - return OK; - } - while (1) { c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts, &option); @@ -286,6 +285,16 @@ process_arguments (int argc, char **argv) break; } } + + if (server == NULL) + usage4 (_("Host not specified")); + if (username == NULL) + usage4 (_("User not specified")); + if (password == NULL) + usage4 (_("Password not specified")); + if (config_file == NULL) + usage4 (_("Configuration file not specified")); + return OK; } @@ -350,3 +359,15 @@ print_usage (void) printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\ [-t timeout] [-r retries] [-e expect]\n", progname); } + + + +int my_rc_read_config(char * a) +{ +#ifdef HAVE_LIBRADIUSCLIENT_NG + rch = rc_read_config(a); + return (rch == NULL) ? 1 : 0; +#else + return rc_read_config(a); +#endif +} diff --git a/plugins/check_real.c b/plugins/check_real.c index e13ec92..6c206a1 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -31,12 +31,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * -* $Id: check_real.c,v 1.29 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_real.c 1590 2007-01-28 21:46:41Z hweiss $ * ******************************************************************************/ const char *progname = "check_real"; -const char *revision = "$Revision: 1.29 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index b521908..dbeca35 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/03/06 22:29:27 $ +* Last Modified: $Date: 2007-09-15 15:25:56 +0100 (Sat, 15 Sep 2007) $ * * Description: * @@ -31,15 +31,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * -* $Id: check_smtp.c,v 1.59 2007/03/06 22:29:27 tonvoon Exp $ +* $Id: check_smtp.c 1780 2007-09-15 14:25:56Z hweiss $ * ******************************************************************************/ const char *progname = "check_smtp"; -const char *revision = "$Revision: 1.59 $"; +const char *revision = "$Revision: 1780 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; +#include + #include "common.h" #include "netutils.h" #include "utils.h" @@ -74,6 +76,9 @@ int process_arguments (int, char **); int validate_arguments (void); void print_help (void); void print_usage (void); +void smtp_quit(void); +int recvline(char *, size_t); +int recvlines(char *, size_t); int my_close(void); #include "regex.h" @@ -115,7 +120,6 @@ char buffer[MAX_INPUT_BUFFER]; enum { TCP_PROTOCOL = 1, UDP_PROTOCOL = 2, - MAXBUF = 1024 }; /* written by lauri alanko */ @@ -221,7 +225,7 @@ main (int argc, char **argv) /* watch for the SMTP connection string and */ /* return a WARNING status if we couldn't read any data */ - if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) == -1) { + if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) { printf (_("recv() failed\n")); result = STATE_WARNING; } @@ -245,11 +249,10 @@ main (int argc, char **argv) send(sd, helocmd, strlen(helocmd), 0); /* allow for response to helo command to reach us */ - if(read (sd, buffer, MAXBUF - 1) < 0){ + if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) { printf (_("recv() failed\n")); return STATE_WARNING; } else if(use_ehlo){ - buffer[MAXBUF-1]='\0'; if(strstr(buffer, "250 STARTTLS") != NULL || strstr(buffer, "250-STARTTLS") != NULL){ supports_tls=TRUE; @@ -258,7 +261,7 @@ main (int argc, char **argv) if(use_ssl && ! supports_tls){ printf(_("WARNING - TLS not supported by server\n")); - send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0); + smtp_quit(); return STATE_WARNING; } @@ -267,10 +270,10 @@ main (int argc, char **argv) /* send the STARTTLS command */ send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); - recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); /* wait for it */ + recvlines(buffer, MAX_INPUT_BUFFER); /* wait for it */ if (!strstr (buffer, server_expect)) { printf (_("Server does not support STARTTLS\n")); - send (sd, SMTP_QUIT, strlen (SMTP_QUIT), 0); + smtp_quit(); return STATE_UNKNOWN; } result = np_net_ssl_init(sd); @@ -301,13 +304,12 @@ main (int argc, char **argv) } if (verbose) printf(_("sent %s"), helocmd); - if ((n = my_recv(buffer, MAX_INPUT_BUFFER - 1)) <= 0) { + if ((n = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) { printf("%s\n", _("SMTP UNKNOWN - Cannot read EHLO response via TLS.")); my_close(); return STATE_UNKNOWN; } if (verbose) { - buffer[n] = '\0'; printf("%s", buffer); } @@ -336,16 +338,14 @@ main (int argc, char **argv) */ if (smtp_use_dummycmd) { my_send(cmd_str, strlen(cmd_str)); - my_recv(buffer, MAX_INPUT_BUFFER-1); - if (verbose) + if (recvlines(buffer, MAX_INPUT_BUFFER) >= 1 && verbose) printf("%s", buffer); } while (n < ncommands) { asprintf (&cmd_str, "%s%s", commands[n], "\r\n"); my_send(cmd_str, strlen(cmd_str)); - my_recv(buffer, MAX_INPUT_BUFFER-1); - if (verbose) + if (recvlines(buffer, MAX_INPUT_BUFFER) >= 1 && verbose) printf("%s", buffer); strip (buffer); if (n < nresponses) { @@ -394,12 +394,11 @@ main (int argc, char **argv) if (verbose) printf (_("sent %s\n"), "AUTH LOGIN"); - if((ret = my_recv(buffer, MAXBUF - 1)) < 0){ + if ((ret = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) { asprintf(&error_msg, _("recv() failed after AUTH LOGIN, ")); result = STATE_WARNING; break; } - buffer[ret] = 0; if (verbose) printf (_("received %s\n"), buffer); @@ -416,12 +415,11 @@ main (int argc, char **argv) if (verbose) printf (_("sent %s\n"), abuf); - if ((ret = my_recv(buffer, MAX_INPUT_BUFFER-1)) == -1) { + if ((ret = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) { result = STATE_CRITICAL; asprintf(&error_msg, _("recv() failed after sending authuser, ")); break; } - buffer[ret] = 0; if (verbose) { printf (_("received %s\n"), buffer); } @@ -437,12 +435,11 @@ main (int argc, char **argv) if (verbose) { printf (_("sent %s\n"), abuf); } - if ((ret = my_recv(buffer, MAX_INPUT_BUFFER-1)) == -1) { + if ((ret = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) { result = STATE_CRITICAL; asprintf(&error_msg, _("recv() failed after sending authpass, ")); break; } - buffer[ret] = 0; if (verbose) { printf (_("received %s\n"), buffer); } @@ -460,7 +457,7 @@ main (int argc, char **argv) } /* tell the server we're done */ - my_send (SMTP_QUIT, strlen (SMTP_QUIT)); + smtp_quit(); /* finally close the connection */ close (sd); @@ -582,22 +579,26 @@ process_arguments (int argc, char **argv) break; case 'C': /* commands */ if (ncommands >= command_size) { - commands = realloc (commands, command_size+8); + command_size+=8; + commands = realloc (commands, sizeof(char *) * command_size); if (commands == NULL) die (STATE_UNKNOWN, _("Could not realloc() units [%d]\n"), ncommands); } - commands[ncommands] = optarg; + commands[ncommands] = (char *) malloc (sizeof(char) * 255); + strncpy (commands[ncommands], optarg, 255); ncommands++; break; case 'R': /* server responses */ if (nresponses >= response_size) { - responses = realloc (responses, response_size+8); + response_size += 8; + responses = realloc (responses, sizeof(char *) * response_size); if (responses == NULL) die (STATE_UNKNOWN, _("Could not realloc() units [%d]\n"), nresponses); } - responses[nresponses] = optarg; + responses[nresponses] = (char *) malloc (sizeof(char) * 255); + strncpy (responses[nresponses], optarg, 255); nresponses++; break; case 'c': /* critical time threshold */ @@ -700,6 +701,88 @@ validate_arguments (void) } +void +smtp_quit(void) +{ + int bytes; + + my_send(SMTP_QUIT, strlen(SMTP_QUIT)); + if (verbose) + printf(_("sent %s\n"), "QUIT"); + + /* read the response but don't care about problems */ + bytes = recvlines(buffer, MAX_INPUT_BUFFER); + if (verbose) { + if (bytes < 0) + printf(_("recv() failed after QUIT.")); + else if (bytes == 0) + printf(_("Connection reset by peer.")); + else { + buffer[bytes] = '\0'; + printf(_("received %s\n"), buffer); + } + } +} + + +/* + * Receive one line, copy it into buf and nul-terminate it. Returns the + * number of bytes written to buf (excluding the '\0') or 0 on EOF or <0 on + * error. + * + * TODO: Reading one byte at a time is very inefficient. Replace this by a + * function which buffers the data, move that to netutils.c and change + * check_smtp and other plugins to use that. Also, remove (\r)\n. + */ +int +recvline(char *buf, size_t bufsize) +{ + int result; + unsigned i; + + for (i = result = 0; i < bufsize - 1; i++) { + if ((result = my_recv(&buf[i], 1)) != 1) + break; + if (buf[i] == '\n') { + buf[++i] = '\0'; + return i; + } + } + return (result == 1 || i == 0) ? -2 : result; /* -2 if out of space */ +} + + +/* + * Receive one or more lines, copy them into buf and nul-terminate it. Returns + * the number of bytes written to buf (excluding the '\0') or 0 on EOF or <0 on + * error. Works for all protocols which format multiline replies as follows: + * + * ``The format for multiline replies requires that every line, except the last, + * begin with the reply code, followed immediately by a hyphen, `-' (also known + * as minus), followed by text. The last line will begin with the reply code, + * followed immediately by , optionally some text, and . As noted + * above, servers SHOULD send the if subsequent text is not sent, but + * clients MUST be prepared for it to be omitted.'' (RFC 2821, 4.2.1) + * + * TODO: Move this to netutils.c. Also, remove \r and possibly the final \n. + */ +int +recvlines(char *buf, size_t bufsize) +{ + int result, i; + + for (i = 0; /* forever */; i += result) + if (!((result = recvline(buf + i, bufsize - i)) > 3 && + isdigit((int)buf[i]) && + isdigit((int)buf[i + 1]) && + isdigit((int)buf[i + 2]) && + buf[i + 3] == '-')) + break; + + return (result <= 0) ? result : result + i; +} + + int my_close (void) { diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 2791883..2125b91 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -3,15 +3,15 @@ * Nagios check_snmp plugin * * License: GPL -* Copyright (c) 1999-2006 nagios-plugins team +* Copyright (c) 1999-2007 nagios-plugins team * -* Last Modified: $Date: 2007/02/02 09:10:22 $ +* Last Modified: $Date: 2007-05-29 06:22:32 +0100 (Tue, 29 May 2007) $ * * Description: * * This file contains the check_snmp plugin * -* Check status of remote machines and obtain sustem information via SNMP +* Check status of remote machines and obtain system information via SNMP * * * License Information: @@ -30,13 +30,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_snmp.c,v 1.69 2007/02/02 09:10:22 dermoth Exp $ +* $Id: check_snmp.c 1721 2007-05-29 05:22:32Z dermoth $ * ******************************************************************************/ const char *progname = "check_snmp"; -const char *revision = "$Revision: 1.69 $"; -const char *copyright = "1999-2006"; +const char *revision = "$Revision: 1721 $"; +const char *copyright = "1999-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" @@ -84,8 +84,8 @@ int process_arguments (int, char **); int validate_arguments (void); char *clarify_message (char *); int check_num (int); -int lu_getll (unsigned long *, char *); -int lu_getul (unsigned long *, char *); +int llu_getll (unsigned long long *, char *); +int llu_getul (unsigned long long *, char *); char *thisarg (char *str); char *nextarg (char *str); void print_usage (void); @@ -124,15 +124,15 @@ size_t nunits = 0; size_t unitv_size = 8; int verbose = FALSE; int usesnmpgetnext = FALSE; -unsigned long lower_warn_lim[MAX_OIDS]; -unsigned long upper_warn_lim[MAX_OIDS]; -unsigned long lower_crit_lim[MAX_OIDS]; -unsigned long upper_crit_lim[MAX_OIDS]; -unsigned long response_value[MAX_OIDS]; +unsigned long long lower_warn_lim[MAX_OIDS]; +unsigned long long upper_warn_lim[MAX_OIDS]; +unsigned long long lower_crit_lim[MAX_OIDS]; +unsigned long long upper_crit_lim[MAX_OIDS]; +unsigned long long response_value[MAX_OIDS]; int check_warning_value = FALSE; int check_critical_value = FALSE; int retries = 0; -unsigned long eval_method[MAX_OIDS]; +unsigned long long eval_method[MAX_OIDS]; char *delimiter; char *output_delim; char *miblist = NULL; @@ -184,13 +184,13 @@ main (int argc, char **argv) /* create the command line to execute */ if(usesnmpgetnext == TRUE) { asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s", - PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto, - authpriv, server_address, port, oid); + PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto, + authpriv, server_address, port, oid); }else{ asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s", - PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto, - authpriv, server_address, port, oid); + PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto, + authpriv, server_address, port, oid); } if (verbose) @@ -204,10 +204,12 @@ main (int argc, char **argv) exit (STATE_UNKNOWN); } +#if 0 /* Removed May 29, 2007 */ child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r"); if (child_stderr == NULL) { printf (_("Could not open stderr for %s\n"), command_line); } +#endif while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) asprintf (&output, "%s%s", output, input_buffer); @@ -268,6 +270,10 @@ main (int argc, char **argv) show = strstr (response, "Counter32: ") + 11; strcpy(type, "c"); } + else if (strstr (response, "Counter64: ")) { + show = strstr (response, "Counter64: ") + 11; + strcpy(type, "c"); + } else if (strstr (response, "INTEGER: ")) show = strstr (response, "INTEGER: ") + 9; else if (strstr (response, "STRING: ")) @@ -296,7 +302,7 @@ main (int argc, char **argv) die (STATE_UNKNOWN,_("No valid data returned")); response_value[i] = strtoul (p2, NULL, 10); iresult = check_num (i); - asprintf (&show, "%lu", response_value[i]); + asprintf (&show, "%llu", response_value[i]); } /* Process this block for string matching */ @@ -339,11 +345,11 @@ main (int argc, char **argv) /* Prepend a label for this OID if there is one */ if (nlabels > (size_t)1 && (size_t)i < nlabels && labels[i] != NULL) asprintf (&outbuff, "%s%s%s %s%s%s", outbuff, - (i == 0) ? " " : output_delim, - labels[i], mark (iresult), show, mark (iresult)); + (i == 0) ? " " : output_delim, + labels[i], mark (iresult), show, mark (iresult)); else asprintf (&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim, - mark (iresult), show, mark (iresult)); + mark (iresult), show, mark (iresult)); /* Append a unit string for this OID if there is one */ if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL) @@ -361,20 +367,25 @@ main (int argc, char **argv) if (found == 0) die (STATE_UNKNOWN, - _("%s problem - No data received from host\nCMD: %s\n"), - label, - command_line); + _("%s problem - No data received from host\nCMD: %s\n"), + label, + command_line); +#if 0 /* Removed May 29, 2007 */ /* WARNING if output found on stderr */ if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) result = max_state (result, STATE_WARNING); /* close stderr */ (void) fclose (child_stderr); +#endif /* close the pipe */ - if (spclose (child_process)) - result = max_state (result, STATE_WARNING); + if (spclose (child_process)) { + if (result == STATE_OK) + result = STATE_UNKNOWN; + asprintf (&outbuff, "%s (%s)", outbuff, _("snmpget returned an error status")); + } /* if (nunits == 1 || i == 1) */ /* printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */ @@ -462,31 +473,31 @@ process_arguments (int argc, char **argv) case 'H': /* Host or server */ server_address = optarg; break; - case 'p': /* TCP port number */ + case 'p': /* TCP port number */ port = optarg; break; - case 'm': /* List of MIBS */ + case 'm': /* List of MIBS */ miblist = optarg; break; - case 'n': /* usesnmpgetnext */ + case 'n': /* usesnmpgetnext */ usesnmpgetnext = TRUE; break; - case 'P': /* SNMP protocol version */ + case 'P': /* SNMP protocol version */ proto = optarg; break; - case 'L': /* security level */ + case 'L': /* security level */ seclevel = optarg; break; - case 'U': /* security username */ + case 'U': /* security username */ secname = optarg; break; - case 'a': /* auth protocol */ + case 'a': /* auth protocol */ authproto = optarg; break; - case 'A': /* auth passwd */ + case 'A': /* auth passwd */ authpasswd = optarg; break; - case 'X': /* priv passwd */ + case 'X': /* priv passwd */ privpasswd = optarg; break; case 't': /* timeout period */ @@ -501,9 +512,9 @@ process_arguments (int argc, char **argv) if (strspn (optarg, "0123456789:,") < strlen (optarg)) usage2 (_("Invalid critical threshold: %s\n"), optarg); for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) { - if (lu_getll (&lower_crit_lim[jj], ptr) == 1) + if (llu_getll (&lower_crit_lim[jj], ptr) == 1) eval_method[jj] |= CRIT_LT; - if (lu_getul (&upper_crit_lim[jj], ptr) == 1) + if (llu_getul (&upper_crit_lim[jj], ptr) == 1) eval_method[jj] |= CRIT_GT; (ptr = index (ptr, ',')) ? ptr++ : ptr; } @@ -512,9 +523,9 @@ process_arguments (int argc, char **argv) if (strspn (optarg, "0123456789:,") < strlen (optarg)) usage2 (_("Invalid warning threshold: %s\n"), optarg); for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) { - if (lu_getll (&lower_warn_lim[ii], ptr) == 1) + if (llu_getll (&lower_warn_lim[ii], ptr) == 1) eval_method[ii] |= WARN_LT; - if (lu_getul (&upper_warn_lim[ii], ptr) == 1) + if (llu_getul (&upper_warn_lim[ii], ptr) == 1) eval_method[ii] |= WARN_GT; (ptr = index (ptr, ',')) ? ptr++ : ptr; } @@ -697,14 +708,14 @@ validate_arguments () - if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) { /* default protocol version */ + if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) { /* default protocol version */ asprintf(&proto, DEFAULT_PROTOCOL); asprintf(&authpriv, "%s%s", "-c ", community); } - else if ( strcmp (proto, "2c") == 0 ) { /* snmpv2c args */ + else if ( strcmp (proto, "2c") == 0 ) { /* snmpv2c args */ asprintf(&authpriv, "%s%s", "-c ", community); } - else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */ + else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */ asprintf(&proto, "%s", "3"); if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) { @@ -819,14 +830,14 @@ check_num (int i) int -lu_getll (unsigned long *ll, char *str) +llu_getll (unsigned long long *ll, char *str) { char tmp[100]; if (strchr (str, ':') == NULL) return 0; if (strchr (str, ',') != NULL && (strchr (str, ',') < strchr (str, ':'))) return 0; - if (sscanf (str, "%lu%[:]", ll, tmp) == 2) + if (sscanf (str, "%llu%[:]", ll, tmp) == 2) return 1; return 0; } @@ -834,14 +845,14 @@ lu_getll (unsigned long *ll, char *str) int -lu_getul (unsigned long *ul, char *str) +llu_getul (unsigned long long *ul, char *str) { char tmp[100]; - if (sscanf (str, "%lu%[^,]", ul, tmp) == 1) + if (sscanf (str, "%llu%[^,]", ul, tmp) == 1) return 1; - if (sscanf (str, ":%lu%[^,]", ul, tmp) == 1) + if (sscanf (str, ":%llu%[^,]", ul, tmp) == 1) return 1; - if (sscanf (str, "%*u:%lu%[^,]", ul, tmp) == 1) + if (sscanf (str, "%*u:%llu%[^,]", ul, tmp) == 1) return 1; return 0; } diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 7442074..719cd73 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -31,12 +31,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_ssh.c,v 1.32 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_ssh.c 1590 2007-01-28 21:46:41Z hweiss $ * ******************************************************************************/ const char *progname = "check_ssh"; -const char *revision = "$Revision: 1.32 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -221,7 +221,7 @@ ssh_connect (char *haddr, int hport, char *remote_version) char *ssh_server = NULL; char rev_no[20]; - sscanf ("$Revision: 1.32 $", "$Revision: %[0123456789.]", rev_no); + sscanf ("$Revision: 1590 $", "$Revision: %[0123456789.]", rev_no); result = my_tcp_connect (haddr, hport, &sd); diff --git a/plugins/check_swap.c b/plugins/check_swap.c index a3404aa..b933250 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -6,7 +6,7 @@ * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) * Copyright (c) 2000-2006 nagios-plugins team * -* Last Modified: $Date: 2007/02/07 14:06:11 $ +* Last Modified: $Date: 2007-02-07 14:06:11 +0000 (Wed, 07 Feb 2007) $ * * Description: * @@ -28,12 +28,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_swap.c,v 1.59 2007/02/07 14:06:11 hweiss Exp $ +* $Id: check_swap.c 1613 2007-02-07 14:06:11Z hweiss $ * *****************************************************************************/ const char *progname = "check_swap"; -const char *revision = "$Revision: 1.59 $"; +const char *revision = "$Revision: 1613 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 2bdb85c..b5a31f1 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/02/14 10:11:06 $ +* Last Modified: $Date: 2007-06-03 15:40:13 +0100 (Sun, 03 Jun 2007) $ * * Description: * @@ -27,19 +27,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_tcp.c,v 1.89 2007/02/14 10:11:06 tonvoon Exp $ +* $Id: check_tcp.c 1729 2007-06-03 14:40:13Z psychotrahe $ * *****************************************************************************/ /* progname "check_tcp" changes depending on symlink called */ char *progname; -const char *revision = "$Revision: 1.89 $"; +const char *revision = "$Revision: 1729 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" #include "netutils.h" #include "utils.h" +#include "utils_tcp.h" #ifdef HAVE_SSL static int check_cert = FALSE; @@ -90,6 +91,7 @@ static int expect_mismatch_state = STATE_WARNING; #define FLAG_TIME_WARN 0x08 #define FLAG_TIME_CRIT 0x10 #define FLAG_HIDE_OUTPUT 0x20 +#define FLAG_MATCH_ALL 0x40 static size_t flags = FLAG_EXACT_MATCH; int @@ -99,7 +101,8 @@ main (int argc, char **argv) int i; char *status = NULL; struct timeval tv; - size_t len, match = -1; + size_t len; + int match = -1; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -298,22 +301,12 @@ main (int argc, char **argv) (int)len + 1, status); while(isspace(status[len])) status[len--] = '\0'; - for (i = 0; i < server_expect_count; i++) { - match = -2; /* tag it so we know if we tried and failed */ - if (flags & FLAG_VERBOSE) - printf ("looking for [%s] %s [%s]\n", server_expect[i], - (flags & FLAG_EXACT_MATCH) ? "in beginning of" : "anywhere in", - status); - - /* match it. math first in short-circuit */ - if ((flags & FLAG_EXACT_MATCH && !strncmp(status, server_expect[i], strlen(server_expect[i]))) || - (!(flags & FLAG_EXACT_MATCH) && strstr(status, server_expect[i]))) - { - if(flags & FLAG_VERBOSE) puts("found it"); - match = i; - break; - } - } + match = np_expect_match(status, + server_expect, + server_expect_count, + (flags & FLAG_MATCH_ALL ? TRUE : FALSE), + (flags & FLAG_EXACT_MATCH ? TRUE : FALSE), + (flags & FLAG_VERBOSE ? TRUE : FALSE)); } if (server_quit != NULL) { @@ -333,7 +326,7 @@ main (int argc, char **argv) result = STATE_WARNING; /* did we get the response we hoped? */ - if(match == -2 && result != STATE_CRITICAL) + if(match == FALSE && result != STATE_CRITICAL) result = expect_mismatch_state; /* reset the alarm */ @@ -344,10 +337,10 @@ main (int argc, char **argv) * the response we were looking for. if-else */ printf("%s %s - ", SERVICE, state_text(result)); - if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT)) + if(match == FALSE && len && !(flags & FLAG_HIDE_OUTPUT)) printf("Unexpected response from host/socket: %s", status); else { - if(match == -2) + if(match == FALSE) printf("Unexpected response from host/socket on "); else printf("%.3f second response time on ", elapsed_time); @@ -357,25 +350,25 @@ main (int argc, char **argv) printf("socket %s", server_address); } - if (match != -2 && !(flags & FLAG_HIDE_OUTPUT) && len) + if (match != FALSE && !(flags & FLAG_HIDE_OUTPUT) && len) printf (" [%s]", status); /* perf-data doesn't apply when server doesn't talk properly, * so print all zeroes on warn and crit. Use fperfdata since * localisation settings can make different outputs */ - if(match == -2) + if(match == FALSE) printf ("|%s", fperfdata ("time", elapsed_time, "s", - TRUE, 0, - TRUE, 0, + (flags & FLAG_TIME_WARN ? TRUE : FALSE), 0, + (flags & FLAG_TIME_CRIT ? TRUE : FALSE), 0, TRUE, 0, TRUE, socket_timeout) ); else printf("|%s", fperfdata ("time", elapsed_time, "s", - TRUE, warning_time, - TRUE, critical_time, + (flags & FLAG_TIME_WARN ? TRUE : FALSE), warning_time, + (flags & FLAG_TIME_CRIT ? TRUE : FALSE), critical_time, TRUE, 0, TRUE, socket_timeout) ); @@ -404,6 +397,7 @@ process_arguments (int argc, char **argv) {"protocol", required_argument, 0, 'P'}, {"port", required_argument, 0, 'p'}, {"escape", required_argument, 0, 'E'}, + {"all", required_argument, 0, 'A'}, {"send", required_argument, 0, 's'}, {"expect", required_argument, 0, 'e'}, {"maxbytes", required_argument, 0, 'm'}, @@ -445,7 +439,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "+hVv46EH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", + c = getopt_long (argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option); if (c == -1 || c == EOF || c == 1) @@ -517,7 +511,6 @@ process_arguments (int argc, char **argv) asprintf(&server_send, "%s", optarg); break; case 'e': /* expect string (may be repeated) */ - EXPECT = NULL; flags &= ~FLAG_EXACT_MATCH; if (server_expect_count == 0) server_expect = malloc (sizeof (char *) * (++server_expect_count)); @@ -582,6 +575,9 @@ process_arguments (int argc, char **argv) die (STATE_UNKNOWN, _("Invalid option - SSL is not available")); #endif break; + case 'A': + flags |= FLAG_MATCH_ALL; + break; } } @@ -619,10 +615,12 @@ print_help (void) printf (" %s\n", "-s, --send=STRING"); printf (" %s\n", _("String to send to the server")); printf (" %s\n", "-e, --expect=STRING"); - printf (" %s\n", _("String to expect in server response")); + printf (" %s %s\n", _("String to expect in server response"), _("(may be repeated)")); + printf (" %s\n", "-A, --all"); + printf (" %s\n", _("All expect strings need to occur in server response. Default is any")); printf (" %s\n", "-q, --quit=STRING"); printf (" %s\n", _("String to send server to initiate a clean close of the connection")); - printf (" %s\n", "-r, --refuse=ok|warn|crit"); + printf (" %s\n", "-r, --refuse=ok|warn|crit"); printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)")); printf (" %s\n", "-M, --mismatch=ok|warn|crit"); printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)")); diff --git a/plugins/check_time.c b/plugins/check_time.c index 18b3a4e..833f710 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:40 $ +* Last Modified: $Date: 2007-05-02 06:22:31 +0100 (Wed, 02 May 2007) $ * * Description: * @@ -30,12 +30,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * -* $Id: check_time.c,v 1.29 2007/01/28 21:46:40 hweiss Exp $ +* $Id: check_time.c 1703 2007-05-02 05:22:31Z dermoth $ * ******************************************************************************/ const char *progname = "check_time"; -const char *revision = "$Revision: 1.29 $"; +const char *revision = "$Revision: 1703 $"; const char *copyright = "1999-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -49,8 +49,8 @@ enum { #define UNIX_EPOCH 2208988800UL -uint32_t server_time, raw_server_time; -time_t diff_time; +uint32_t raw_server_time; +unsigned long server_time, diff_time; int warning_time = 0; int check_warning_time = FALSE; int critical_time = 0; @@ -166,9 +166,9 @@ main (int argc, char **argv) else diff_time = (unsigned long)end_time - server_time; - if (check_critical_diff == TRUE && diff_time > (time_t)critical_diff) + if (check_critical_diff == TRUE && diff_time > critical_diff) result = STATE_CRITICAL; - else if (check_warning_diff == TRUE && diff_time > (time_t)warning_diff) + else if (check_warning_diff == TRUE && diff_time > warning_diff) result = STATE_WARNING; printf (_("TIME %s - %lu second time difference|%s %s\n"), @@ -177,9 +177,9 @@ main (int argc, char **argv) check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, TRUE, 0, FALSE, 0), - perfdata ("offset", (long)diff_time, "s", - check_warning_diff, (long)warning_diff, - check_critical_diff, (long)critical_diff, + perfdata ("offset", diff_time, "s", + check_warning_diff, warning_diff, + check_critical_diff, critical_diff, TRUE, 0, FALSE, 0)); return result; } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 30c9865..0f5438a 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -8,7 +8,7 @@ * 2004 Arnaud Quette * Copyright (c) 2002-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:41 $ +* Last Modified: $Date: 2007-05-09 10:16:33 +0100 (Wed, 09 May 2007) $ * * Description: * @@ -33,12 +33,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_ups.c,v 1.31 2007/01/28 21:46:41 hweiss Exp $ +* $Id: check_ups.c 1709 2007-05-09 09:16:33Z psychotrahe $ * ******************************************************************************/ const char *progname = "check_ups"; -const char *revision = "$Revision: 1.31 $"; +const char *revision = "$Revision: 1709 $"; const char *copyright = "2002-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -618,12 +618,16 @@ print_help (void) printf (" %s\n", _("Name of UPS")); printf (" %s\n", "-T, --temperature"); printf (" %s\n", _("Output of temperatures in Celsius")); + printf (" %s\n", "-v, --variable=STRING"); + printf (" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT"); printf (_(UT_WARN_CRIT)); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); - printf (_(UT_VERBOSE)); +/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose + is unused up to now */ +/* printf (_(UT_VERBOSE)); */ printf ("\n"); printf ("%s\n", _("Notes:")); diff --git a/plugins/check_users.c b/plugins/check_users.c index a5be5a5..ee5a2e1 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2000-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:41 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -30,12 +30,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: check_users.c,v 1.22 2007/01/28 21:46:41 hweiss Exp $ +* $Id: check_users.c 1590 2007-01-28 21:46:41Z hweiss $ * *****************************************************************************/ const char *progname = "check_users"; -const char *revision = "$Revision: 1.22 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/common.h b/plugins/common.h index 0380ac1..c11ec55 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -28,7 +28,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: common.h,v 1.28 2007/03/22 17:54:16 hweiss Exp $ + * $Id: common.h 1700 2007-04-25 22:10:13Z tonvoon $ * *****************************************************************************/ @@ -80,6 +80,18 @@ #include #endif +/* GET_NUMBER_OF_CPUS is a macro to return + number of CPUs, if we can get that data. + Use configure.in to test for various OS ways of + getting that data + Will return -1 if cannot get data +*/ +#ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF +#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF) +#else +#define GET_NUMBER_OF_CPUS() -1 +#endif + #ifdef TIME_WITH_SYS_TIME # include # include diff --git a/plugins/negate.c b/plugins/negate.c index 1eb7eec..70e2fbc 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -3,9 +3,9 @@ * Nagios negate plugin * * License: GPL -* Copyright (c) 2002-2006 nagios-plugins team +* Copyright (c) 2002-2007 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:41 $ +* Last Modified: $Date: 2007-09-23 13:29:36 +0100 (Sun, 23 Sep 2007) $ * * Description: * @@ -29,7 +29,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: negate.c,v 1.27 2007/01/28 21:46:41 hweiss Exp $ +* $Id: negate.c 1793 2007-09-23 12:29:36Z psychotrahe $ @@-
@@ -69,37 +69,44 @@ ******************************************************************************/ const char *progname = "negate"; -const char *revision = "$Revision: 1.27 $"; -const char *copyright = "2002-2006"; +const char *revision = "$Revision: 1793 $"; +const char *copyright = "2002-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #define DEFAULT_TIMEOUT 9 #include "common.h" #include "utils.h" -#include "popen.h" +#include "utils_cmd.h" -char *command_line; +/* char *command_line; */ -int process_arguments (int, char **); -int validate_arguments (void); +static const char **process_arguments (int, char **); +int validate_arguments (char **); void print_help (void); void print_usage (void); - +static int state[4] = { + STATE_OK, + STATE_WARNING, + STATE_CRITICAL, + STATE_UNKNOWN, +}; int main (int argc, char **argv) { int found = 0, result = STATE_UNKNOWN; char *buf; + char **command_line; + output chld_out, chld_err; + int i; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - if (process_arguments (argc, argv) == ERROR) - usage4 (_("Could not parse arguments")); + command_line = (char **) process_arguments (argc, argv); /* Set signal handling and alarm */ if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) @@ -107,43 +114,32 @@ main (int argc, char **argv) (void) alarm ((unsigned) timeout_interval); - child_process = spopen (command_line); - if (child_process == NULL) - die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line); - - child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r"); - - if (child_stderr == NULL) { - printf (_("Could not open stderr for %s\n"), command_line); + /* catch when the command is quoted */ + if(command_line[1] == NULL) { + result = cmd_run (command_line[0], &chld_out, &chld_err, 0); + } else { + result = cmd_run_array (command_line, &chld_out, &chld_err, 0); + } + if (chld_err.lines > 0) { + printf ("Error output from command:\n"); + for (i = 0; i < chld_err.lines; i++) { + printf ("%s\n", chld_err.line[i]); + } + exit (STATE_WARNING); } - buf = malloc(MAX_INPUT_BUFFER); - while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) { - found++; - printf ("%s", buf); + if (chld_out.lines == 0) + die (STATE_UNKNOWN, _("No data returned from command\n")); + + for (i = 0; i < chld_out.lines; i++) { + printf ("%s\n", chld_out.line[i]); } - if (!found) - die (STATE_UNKNOWN, - _("%s problem - No data received from host\nCMD: %s\n"),\ - argv[0], command_line); - - /* close the pipe */ - result = spclose (child_process); - - /* WARNING if output found on stderr */ - if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) - result = max_state (result, STATE_WARNING); - - /* close stderr */ - (void) fclose (child_stderr); - - if (result == STATE_OK) - exit (STATE_CRITICAL); - else if (result == STATE_CRITICAL) - exit (EXIT_SUCCESS); - else + if (result >= 0 && result <= 4) { + exit (state[result]); + } else { exit (result); + } } /****************************************************************************** @@ -167,22 +163,26 @@ is a only a 'timeout' option. /* process command-line arguments */ -int +static const char ** process_arguments (int argc, char **argv) { int c; + int permute = TRUE; int option = 0; static struct option longopts[] = { {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {"timeout", required_argument, 0, 't'}, + {"ok", required_argument, 0, 'o'}, + {"warning", required_argument, 0, 'w'}, + {"critical", required_argument, 0, 'c'}, + {"unknown", required_argument, 0, 'u'}, {0, 0, 0, 0} }; while (1) { - c = getopt_long (argc, argv, "+hVt:", - longopts, &option); + c = getopt_long (argc, argv, "+hVt:o:w:c:u:", longopts, &option); if (c == -1 || c == EOF) break; @@ -204,15 +204,38 @@ process_arguments (int argc, char **argv) else timeout_interval = atoi (optarg); break; + case 'o': /* replacement for OK */ + if ((state[STATE_OK] = translate_state(optarg)) == ERROR) + usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-4).")); + permute = FALSE; + break; + + case 'w': /* replacement for WARNING */ + if ((state[STATE_WARNING] = translate_state(optarg)) == ERROR) + usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); + permute = FALSE; + break; + case 'c': /* replacement for CRITICAL */ + if ((state[STATE_CRITICAL] = translate_state(optarg)) == ERROR) + usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); + permute = FALSE; + break; + case 'u': /* replacement for UNKNOWN */ + if ((state[STATE_UNKNOWN] = translate_state(optarg)) == ERROR) + usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); + permute = FALSE; + break; } } - asprintf (&command_line, "%s", argv[optind]); - for (c = optind+1; c < argc; c++) { - asprintf (&command_line, "%s %s", command_line, argv[c]); + validate_arguments (&argv[optind]); + + if (permute) { /* No [owcu] switch specified, default to this */ + state[STATE_OK] = STATE_CRITICAL; + state[STATE_CRITICAL] = STATE_OK; } - return validate_arguments (); + return (const char **) &argv[optind]; } @@ -230,11 +253,13 @@ process_arguments (int argc, char **argv) int -validate_arguments () +validate_arguments (char **command_line) { - if (command_line == NULL) - return ERROR; - return STATE_OK; + if (command_line[0] == NULL) + usage4 (_("Could not parse arguments")); + + if (strncmp(command_line[0],"/",1) != 0 && strncmp(command_line[0],"./",2) != 0) + usage4 (_("Require path to command")); } /****************************************************************************** @@ -245,7 +270,23 @@ validate_arguments () -@@ ******************************************************************************/ - +int +translate_state (char *state_text) +{ + char *temp_ptr; + for (temp_ptr = state_text; *temp_ptr; temp_ptr++) { + *temp_ptr = toupper(*temp_ptr); + } + if (!strcmp(state_text,"OK") || !strcmp(state_text,"0")) + return STATE_OK; + if (!strcmp(state_text,"WARNING") || !strcmp(state_text,"1")) + return STATE_WARNING; + if (!strcmp(state_text,"CRITICAL") || !strcmp(state_text,"2")) + return STATE_CRITICAL; + if (!strcmp(state_text,"UNKNOWN") || !strcmp(state_text,"3")) + return STATE_UNKNOWN; + return ERROR; +} void print_help (void) @@ -254,30 +295,39 @@ print_help (void) printf (COPYRIGHT, copyright, email); - printf ("%s\n", _("Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).")); + printf ("%s\n", _("Negates the status of a plugin (returns OK for CRITICAL and vice-versa).")); + printf ("%s\n", _("Additional switches can be used to control which state becomes what.")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); printf (_(UT_HELP_VRSN)); printf (_(UT_TIMEOUT), DEFAULT_TIMEOUT); + printf (" %s\n", _("Keep timeout lower than the plugin timeout to retain CRITICAL status.")); - printf (" %s\n", _("[keep timeout than the plugin timeout to retain CRITICAL status]")); - printf ("\n"); - printf ("%s\n", _("Examples:")); - printf (" %s\n", "negate \"/usr/local/nagios/libexec/check_ping -H host\""); - printf (" %s\n", _("Run check_ping and invert result. Must use full path to plugin")); - printf (" %s\n", "negate \"/usr/local/nagios/libexec/check_procs -a 'vi negate.c'\""); - printf (" %s\n", _("Use single quotes if you need to retain spaces")); - printf (_(UT_VERBOSE)); - printf ("\n"); - printf ("%s\n", _("Notes:")); + printf(" -o,--ok=STATUS\n"); + printf(" -w,--warning=STATUS\n"); + printf(" -c,--critical=STATUS\n"); + printf(" -u,--unknown=STATUS\n"); + printf(_(" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n")); + printf(_(" quotes. Numeric values are accepted. If nothing is specified, permutes\n")); + printf(_(" OK and CRITICAL.\n")); + + printf ("\n"); + printf ("%s\n", _("Examples:")); + printf (" %s\n", "negate /usr/local/nagios/libexec/check_ping -H host"); + printf (" %s\n", _("Run check_ping and invert result. Must use full path to plugin")); + printf (" %s\n", "negate -w OK -c UNKNOWN /usr/local/nagios/libexec/check_procs -a 'vi negate.c'"); + printf (" %s\n", _("This will return OK instead of WARNING and UNKNOWN instead of CRITICAL")); + printf ("\n"); + printf ("%s\n", _("Notes:")); printf ("%s\n", _("This plugin is a wrapper to take the output of another plugin and invert it.")); - printf ("%s\n", _("If the wrapped plugin returns STATE_OK, the wrapper will return STATE_CRITICAL.")); - printf ("%s\n", _("If the wrapped plugin returns STATE_CRITICAL, the wrapper will return STATE_OK.")); - printf ("%s\n", _("Otherwise, the output state of the wrapped plugin is unchanged.")); + printf ("%s\n", _("The full path of the plugin must be provided.")); + printf ("%s\n", _("If the wrapped plugin returns STATE_OK, the wrapper will return STATE_CRITICAL.")); + printf ("%s\n", _("If the wrapped plugin returns STATE_CRITICAL, the wrapper will return STATE_OK.")); + printf ("%s\n", _("Otherwise, the output state of the wrapped plugin is unchanged.")); printf (_(UT_SUPPORT)); } @@ -287,6 +337,6 @@ print_help (void) void print_usage (void) { - printf (_("Usage:")); - printf ("%s [-t timeout] \n",progname); + printf (_("Usage:")); + printf ("%s [-t timeout] [-owcu STATE] \n", progname); } diff --git a/plugins/netutils.c b/plugins/netutils.c index 965605b..75d70d1 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) * -* Last Modified: $Date: 2007/01/20 06:07:48 $ +* Last Modified: $Date: 2007-09-24 01:30:14 +0100 (Mon, 24 Sep 2007) $ * * Description: * @@ -27,7 +27,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: netutils.c,v 1.33 2007/01/20 06:07:48 dermoth Exp $ +* $Id: netutils.c 1794 2007-09-24 00:30:14Z hweiss $ * ****************************************************************************/ @@ -39,7 +39,11 @@ unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT; int econn_refuse_state = STATE_CRITICAL; int was_refused = FALSE; +#if USE_IPV6 int address_family = AF_UNSPEC; +#else +int address_family = AF_INET; +#endif /* handles socket timeouts */ void diff --git a/plugins/netutils.h b/plugins/netutils.h index 1c05017..115d61c 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) * -* Last Modified: $Date: 2007/01/24 22:47:25 $ +* Last Modified: $Date: 2007-01-24 22:47:25 +0000 (Wed, 24 Jan 2007) $ * * Description: * @@ -28,7 +28,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: netutils.h,v 1.18 2007/01/24 22:47:25 tonvoon Exp $ +* $Id: netutils.h 1580 2007-01-24 22:47:25Z tonvoon $ * ******************************************************************************/ diff --git a/plugins/popen.c b/plugins/popen.c index f19adb8..819a2ae 100644 --- a/plugins/popen.c +++ b/plugins/popen.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2005 nagios-plugins team * - * Last Modified: $Date: 2006/06/18 19:36:48 $ + * Last Modified: $Date: 2007-06-12 08:13:02 +0100 (Tue, 12 Jun 2007) $ * * Description: * @@ -40,7 +40,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: popen.c,v 1.15 2006/06/18 19:36:48 opensides Exp $ + * $Id: popen.c 1737 2007-06-12 07:13:02Z psychotrahe $ * ******************************************************************************/ @@ -104,7 +104,7 @@ spopen (const char *cmdstring) char *env[2]; char *cmd = NULL; char **argv = NULL; - char *str; + char *str, *tmp; int argc; int i = 0, pfd[2], pfderr[2]; @@ -166,7 +166,15 @@ spopen (const char *cmdstring) cmd = 1 + strstr (str, "'"); str[strcspn (str, "'")] = 0; } - else { + else if (strcspn(str,"'") < strcspn (str, " \t\r\n")) { + /* handle --option='foo bar' strings */ + tmp = str + strcspn(str, "'") + 1; + if (!strstr (tmp, "'")) + return NULL; /* balanced? */ + tmp += strcspn(tmp,"'") + 1; + *tmp = 0; + cmd = tmp + 1; + } else { if (strpbrk (str, " \t\r\n")) { cmd = 1 + strpbrk (str, " \t\r\n"); str[strcspn (str, " \t\r\n")] = 0; diff --git a/plugins/popen.h b/plugins/popen.h index 2c653ff..fae9fd5 100644 --- a/plugins/popen.h +++ b/plugins/popen.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id: popen.h,v 1.4 2005/05/01 20:12:03 seanius Exp $ + * $Id: popen.h 1169 2005-05-01 20:12:03Z seanius $ * ******************************************************************************/ diff --git a/plugins/runcmd.c b/plugins/runcmd.c index 7dbf06e..5fdf4d0 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c @@ -4,7 +4,7 @@ * License: GPL * Copyright (c) 2005 nagios-plugins team * - * $Id: runcmd.c,v 1.4 2006/06/18 19:36:48 opensides Exp $ + * $Id: runcmd.c 1434 2006-06-18 19:36:48Z opensides $ * * Description : * diff --git a/plugins/runcmd.h b/plugins/runcmd.h index 6d9f8cb..59b2949 100644 --- a/plugins/runcmd.h +++ b/plugins/runcmd.h @@ -1,5 +1,5 @@ /* - * $Id: runcmd.h,v 1.2 2005/10/24 11:10:29 seanius Exp $ + * $Id: runcmd.h 1260 2005-10-24 11:10:29Z seanius $ * * Author: Andreas Ericsson * diff --git a/plugins/sslutils.c b/plugins/sslutils.c index 8d77930..605449f 100644 --- a/plugins/sslutils.c +++ b/plugins/sslutils.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2005 nagios-plugins team * -* Last Modified: $Date: 2006/06/18 19:36:48 $ +* Last Modified: $Date: 2007-06-01 23:57:31 +0100 (Fri, 01 Jun 2007) $ * * Description: * @@ -27,7 +27,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: sslutils.c,v 1.3 2006/06/18 19:36:48 opensides Exp $ +* $Id: sslutils.c 1726 2007-06-01 22:57:31Z hweiss $ * ****************************************************************************/ @@ -38,15 +38,17 @@ #ifdef HAVE_SSL static SSL_CTX *c=NULL; static SSL *s=NULL; +static int initialized=0; int np_net_ssl_init (int sd){ - SSL_METHOD *m=NULL; - /* Initialize SSL context */ - SSLeay_add_ssl_algorithms (); - m = SSLv23_client_method (); - SSL_load_error_strings (); - OpenSSL_add_all_algorithms(); - if ((c = SSL_CTX_new (m)) == NULL) { + if (!initialized) { + /* Initialize SSL context */ + SSLeay_add_ssl_algorithms (); + SSL_load_error_strings (); + OpenSSL_add_all_algorithms (); + initialized = 1; + } + if ((c = SSL_CTX_new (SSLv23_client_method ())) == NULL) { printf ("%s\n", _("CRITICAL - Cannot create SSL context.")); return STATE_CRITICAL; } @@ -70,7 +72,11 @@ void np_net_ssl_cleanup (){ if(s){ SSL_shutdown (s); SSL_free (s); - if(c) SSL_CTX_free (c); + if(c) { + SSL_CTX_free (c); + c=NULL; + } + s=NULL; } } diff --git a/plugins/t/.cvsignore b/plugins/t/.cvsignore deleted file mode 100644 index 1944fd6..0000000 --- a/plugins/t/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.tmp diff --git a/plugins/t/check_cluster.t b/plugins/t/check_cluster.t new file mode 100644 index 0000000..9f1f89e --- /dev/null +++ b/plugins/t/check_cluster.t @@ -0,0 +1,83 @@ +#! /usr/bin/perl -w -I .. +# +# check_cluster tests +# +# $Id: check_cluster.t 1702 2007-04-28 21:57:17Z psychotrahe $ +# + +use strict; +use Test::More tests => 15; +use NPTest; + +my $result; + +$result = NPTest->testCmd( + "./check_cluster -s -w 0:0 -c 0:0 -d 0,0,0,0" + ); +cmp_ok( $result->return_code, '==', 0, "Exit OK if non-ok services are inside critical and warning ranges" ); +like( $result->output, qr/service/i, "Output contains the word 'service' (case insensitive)"); + +$result = NPTest->testCmd( + "./check_cluster -l LABEL -s -w 0:0 -c 0:0 -d 0,0,0,0" + ); +like( $result->output, qr/LABEL/, "Output contains the defined label 'LABEL' (case sensitive)"); + +$result = NPTest->testCmd( + "./check_cluster -s -w 0:0 -c 0:1 -d 0,0,0,1" + ); +cmp_ok( $result->return_code, '==', 1, "Exit WARNING if non-ok services are inside critical and outside warning ranges" ); + +$result = NPTest->testCmd( + "./check_cluster -s -w 0:0 -c 0:1 -d 0,0,1,1" + ); +cmp_ok( $result->return_code, '==', 2, "Exit CRITICAL if non-ok services are inside critical and outside warning ranges" ); + +$result = NPTest->testCmd( + "./check_cluster -s -w 0 -c 0 -d 0,0,0,0" + ); +cmp_ok( $result->return_code, '==', 0, "Exit OK if non-ok services are inside critical and warning (no ranges)" ); + +$result = NPTest->testCmd( + "./check_cluster -s -w 0 -c 1 -d 0,0,1,0" + ); +cmp_ok( $result->return_code, '==', 1, "Exit WARNING if number of non-ok services exceed warning (no ranges)" ); + +$result = NPTest->testCmd( + "./check_cluster -s -w 0 -c 1 -d 0,0,1,1" + ); +cmp_ok( $result->return_code, '==', 2, "Exit Critical if non-ok services exceed critical warning (no ranges)" ); + + +# +# And for hosts.. +# +$result = NPTest->testCmd( + "./check_cluster -h -w 0:0 -c 0:0 -d 0,0,0,0" + ); +cmp_ok( $result->return_code, '==', 0, "Exit OK if non-ok hosts are inside critical and warning ranges" ); +like( $result->output, qr/host/i, "Output contains the word 'host' (case insensitive)"); + +$result = NPTest->testCmd( + "./check_cluster -h -w 0:0 -c 0:1 -d 0,0,0,1" + ); +cmp_ok( $result->return_code, '==', 1, "Exit WARNING if non-ok hosts are inside critical and outside warning ranges" ); + +$result = NPTest->testCmd( + "./check_cluster -h -w 0:0 -c 0:1 -d 0,0,1,1" + ); +cmp_ok( $result->return_code, '==', 2, "Exit CRITICAL if non-ok hosts are inside critical and outside warning ranges" ); + +$result = NPTest->testCmd( + "./check_cluster -h -w 0 -c 0 -d 0,0,0,0" + ); +cmp_ok( $result->return_code, '==', 0, "Exit OK if non-ok hosts are inside critical and warning (no ranges)" ); + +$result = NPTest->testCmd( + "./check_cluster -h -w 0 -c 1 -d 0,0,1,0" + ); +cmp_ok( $result->return_code, '==', 1, "Exit WARNING if number of non-ok hosts exceed warning (no ranges)" ); + +$result = NPTest->testCmd( + "./check_cluster -h -w 0 -c 1 -d 0,0,1,1" + ); +cmp_ok( $result->return_code, '==', 2, "Exit Critical if non-ok hosts exceed critical warning (no ranges)" ); diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t index d45d2ea..d9e9a9c 100644 --- a/plugins/t/check_disk.t +++ b/plugins/t/check_disk.t @@ -2,7 +2,7 @@ # # Disk Space Tests via check_disk # -# $Id: check_disk.t,v 1.20 2007/03/30 09:00:06 psychotrahe Exp $ +# $Id: check_disk.t 1786 2007-09-22 17:40:35Z psychotrahe $ # # TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc @@ -24,7 +24,7 @@ my $mountpoint2_valid = getTestParameter( "NP_MOUNTPOINT2_VALID", "Path to anoth if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") { plan skip_all => "Need 2 mountpoints to test"; } else { - plan tests => 68; + plan tests => 78; } $result = NPTest->testCmd( @@ -114,10 +114,8 @@ like ( $result->only_output, qr/$more_free/, "Have disk name in text"); $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" ); cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free"); $_ = $result->output; -print $result->output."\n"; my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+) MB .* (\d+) MB /g); my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2; -print "$free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2\n"; @@ -255,6 +253,7 @@ cmp_ok( $result->return_code, "==", 2, "100 GB empty" ); # Checking old syntax of check_disk warn crit [fs], with warn/crit at USED% thresholds $result = NPTest->testCmd( "./check_disk 0 0 ".${mountpoint_valid} ); cmp_ok( $result->return_code, "==", 2, "Old syntax: 0% used"); +like ( $result->only_output, qr(^[^;]*;[^;]*$), "Select only one path with positional arguments"); $result = NPTest->testCmd( "./check_disk 100 100 $mountpoint_valid" ); cmp_ok( $result->return_code, '==', 0, "Old syntax: 100% used" ); @@ -276,7 +275,7 @@ TODO: { $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p /bob" ); cmp_ok( $result->return_code, '==', 2, "Checking /bob - return error because /bob does not exist" ); -cmp_ok( $result->output, 'eq', 'DISK CRITICAL - /bob does not exist', 'Output OK'); +like( $result->output, '/^DISK CRITICAL - /bob is not accessible:.*$/', 'Output OK'); $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p /" ); my $root_output = $result->output; @@ -285,9 +284,15 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p /etc" ); cmp_ok( $result->return_code, '==', 0, "Checking /etc - should return info for /" ); cmp_ok( $result->output, 'eq', $root_output, "check_disk /etc gives same as check_disk /"); -$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p /etc -E" ); +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -E -p /etc " ); cmp_ok( $result->return_code, '==', 2, "... unless -E/--exact-match is specified"); +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p /etc -E " ); +cmp_ok( $result->return_code, '==', 3, "-E/--exact-match must be specified before -p"); + +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -r /etc -E " ); +cmp_ok( $result->return_code, '==', 3, "-E/--exact-match must be specified before -r"); + $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p / -p /bob" ); cmp_ok( $result->return_code, '==', 2, "Checking / and /bob gives critical"); unlike( $result->perf_output, '/\/bob/', "perf data does not have /bob in it"); @@ -319,3 +324,24 @@ cmp_ok( $result->return_code, '==', 3, "Invalid options: -p must come after grou $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -r '('" ); cmp_ok( $result->return_code, '==', 3, "Exit UNKNOWN if regex is not compileable"); +# ignore: exit unknown, if all pathes are deselected using -i +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '$mountpoint_valid' -i '$mountpoint2_valid'" ); +cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored (case sensitive)"); + +# ignore: exit unknown, if all pathes are deselected using -I +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -I '".uc($mountpoint_valid)."' -I '".uc($mountpoint2_valid)."'" ); +cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored (case insensitive)"); + +# ignore: exit unknown, if all pathes are deselected using -i +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '.*'" ); +cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored using -i '.*'"); + +# ignore: test if ignored path is actually ignored +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '^$mountpoint2_valid\$'"); +like( $result->output, qr/$mountpoint_valid/, "output data does have $mountpoint_valid in it"); +unlike( $result->output, qr/$mountpoint2_valid/, "output data does not have $mountpoint2_valid in it"); + +# ignore: test if all pathes are listed when ignore regex doesn't match +$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '^barbazJodsf\$'"); +like( $result->output, qr/$mountpoint_valid/, "ignore: output data does have $mountpoint_valid when regex doesn't match"); +like( $result->output, qr/$mountpoint2_valid/,"ignore: output data does have $mountpoint2_valid when regex doesn't match"); diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index b0b4f69..cabd2e4 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t @@ -2,7 +2,7 @@ # # Domain Name Server (DNS) Tests via check_dns # -# $Id: check_dns.t,v 1.7 2006/03/29 08:13:29 tonvoon Exp $ +# $Id: check_dns.t 1361 2006-03-29 08:13:29Z tonvoon $ # use strict; diff --git a/plugins/t/check_dummy.t b/plugins/t/check_dummy.t new file mode 100644 index 0000000..a661947 --- /dev/null +++ b/plugins/t/check_dummy.t @@ -0,0 +1,55 @@ +#! /usr/bin/perl -w -I .. +# +# check_dummy tests +# +# $Id: check_dummy.t 1716 2007-05-24 08:35:53Z tonvoon $ +# + +use strict; +use Test::More; +use NPTest; + +plan tests => 20; + +my $res; + +$res = NPTest->testCmd("./check_dummy"); +is( $res->return_code, 3, "No args" ); +like( $res->output, "/Could not parse arguments/", "Correct usage message"); + +$res = NPTest->testCmd("./check_dummy 0"); +is( $res->return_code, 0, "OK state returned"); +is( $res->output, "OK", "Says 'OK'"); + +$res = NPTest->testCmd("./check_dummy 0 'some random data'"); +is( $res->return_code, 0, "Still OK"); +is( $res->output, "OK: some random data", "Sample text okay"); + +$res = NPTest->testCmd("./check_dummy 1"); +is( $res->return_code, 1, "Warning okay"); +is( $res->output, "WARNING", "Says 'WARNING'"); + +$res = NPTest->testCmd("./check_dummy 1 'more stuff'"); +is( $res->return_code, 1, "Still warning"); +is( $res->output, "WARNING: more stuff", "optional text okay" ); + +$res = NPTest->testCmd("./check_dummy 2"); +is( $res->return_code, 2, "Critical ok" ); +is( $res->output, "CRITICAL", "Says 'CRITICAL'"); + +$res = NPTest->testCmd("./check_dummy 2 'roughly drafted'"); +is( $res->return_code, 2, "Still critical"); +is( $res->output, "CRITICAL: roughly drafted", "optional text okay" ); + +$res = NPTest->testCmd("./check_dummy 3"); +is( $res->return_code, 3, "Unknown ok" ); +is( $res->output, "UNKNOWN", "Says 'UNKNOWN'"); + +$res = NPTest->testCmd("./check_dummy 3 'daringfireball'"); +is( $res->return_code, 3, "Still unknown"); +is( $res->output, "UNKNOWN: daringfireball", "optional text okay" ); + +$res = NPTest->testCmd("./check_dummy 4"); +is( $res->return_code, 3, "Invalid error code" ); +is( $res->output, "UNKNOWN: Status 4 is not a supported error state", "With appropriate error message"); + diff --git a/plugins/t/check_fping.t b/plugins/t/check_fping.t index af7cee9..feafea6 100644 --- a/plugins/t/check_fping.t +++ b/plugins/t/check_fping.t @@ -2,7 +2,7 @@ # # FPing Tests via check_fping # -# $Id: check_fping.t,v 1.2 2005/07/25 01:47:14 illumino Exp $ +# $Id: check_fping.t 1207 2005-07-25 01:47:15Z illumino $ # use strict; diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t index bac32db..48de543 100644 --- a/plugins/t/check_ftp.t +++ b/plugins/t/check_ftp.t @@ -2,7 +2,7 @@ # # File Transfer Protocol (FTP) Test via check_ftp # -# $Id: check_ftp.t,v 1.3 2005/07/25 01:47:14 illumino Exp $ +# $Id: check_ftp.t 1207 2005-07-25 01:47:15Z illumino $ # use strict; diff --git a/plugins/t/check_hpjd.t b/plugins/t/check_hpjd.t index 90ed150..cdb99dd 100644 --- a/plugins/t/check_hpjd.t +++ b/plugins/t/check_hpjd.t @@ -2,7 +2,7 @@ # # HP JetDirect Test via check_hpjd # -# $Id: check_hpjd.t,v 1.3 2006/03/24 16:13:40 tonvoon Exp $ +# $Id: check_hpjd.t 1354 2006-03-24 16:13:40Z tonvoon $ # use strict; diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index 9f52aab..712f272 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t @@ -2,7 +2,7 @@ # # HyperText Transfer Protocol (HTTP) Test via check_http # -# $Id: check_http.t,v 1.14 2007/04/01 14:21:09 psychotrahe Exp $ +# $Id: check_http.t 1669 2007-04-01 14:21:09Z psychotrahe $ # use strict; diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t index a36399f..704bd15 100644 --- a/plugins/t/check_imap.t +++ b/plugins/t/check_imap.t @@ -2,7 +2,7 @@ # # Internet Mail Access Protocol (IMAP) Server Tests via check_imap # -# $Id: check_imap.t,v 1.4 2005/11/09 16:40:12 tonvoon Exp $ +# $Id: check_imap.t 1279 2005-11-09 16:40:12Z tonvoon $ # use strict; diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t index a8890e0..8dd7207 100644 --- a/plugins/t/check_jabber.t +++ b/plugins/t/check_jabber.t @@ -2,7 +2,7 @@ # # Jabber Server Tests via check_jabber # -# $Id: check_jabber.t,v 1.3 2007/02/01 06:53:12 dermoth Exp $ +# $Id: check_jabber.t 1604 2007-02-01 06:53:12Z dermoth $ # use strict; diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t index 9a2c60e..8feb4b0 100644 --- a/plugins/t/check_load.t +++ b/plugins/t/check_load.t @@ -2,7 +2,7 @@ # # Load Average Tests via check_load # -# $Id: check_load.t,v 1.6 2006/10/02 12:09:18 tonvoon Exp $ +# $Id: check_load.t 1700 2007-04-25 22:10:13Z tonvoon $ # use strict; @@ -14,7 +14,7 @@ my $res; my $successOutput = '/^OK - load average: [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+/'; my $failureOutput = '/^CRITICAL - load average: [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+/'; -plan tests => 4; +plan tests => 6; $res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100" ); cmp_ok( $res->return_code, 'eq', 0, "load not over 100"); @@ -24,3 +24,7 @@ $res = NPTest->testCmd( "./check_load -w 0,0,0 -c 0,0,0" ); cmp_ok( $res->return_code, 'eq', 2, "Load over 0"); like( $res->output, $failureOutput, "Output OK"); +$res = NPTest->testCmd( "./check_load -r -w 0,0,0 -c 0,0,0" ); +cmp_ok( $res->return_code, 'eq', 2, "Load over 0 with per cpu division"); +like( $res->output, $failureOutput, "Output OK"); + diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t index b86f369..8c80925 100644 --- a/plugins/t/check_mysql.t +++ b/plugins/t/check_mysql.t @@ -2,7 +2,7 @@ # # MySQL Database Server Tests via check_mysql # -# $Id: check_mysql.t,v 1.8 2006/03/17 14:07:34 tonvoon Exp $ +# $Id: check_mysql.t 1327 2006-03-17 14:07:34Z tonvoon $ # # # These are the database permissions required for this test: diff --git a/plugins/t/check_mysql_query.t b/plugins/t/check_mysql_query.t index 22104c6..ef01cbc 100644 --- a/plugins/t/check_mysql_query.t +++ b/plugins/t/check_mysql_query.t @@ -2,7 +2,7 @@ # # MySQL Database Server Tests via check_mysql # -# $Id: check_mysql_query.t,v 1.2 2006/02/01 13:23:38 tonvoon Exp $ +# $Id: check_mysql_query.t 1315 2006-02-01 13:23:38Z tonvoon $ # # # These are the database permissions required for this test: diff --git a/plugins/t/check_nagios.t b/plugins/t/check_nagios.t index 8b70416..41da237 100644 --- a/plugins/t/check_nagios.t +++ b/plugins/t/check_nagios.t @@ -2,7 +2,7 @@ # # check_nagios tests # -# $Id: check_nagios.t,v 1.2 2006/04/19 09:33:44 tonvoon Exp $ +# $Id: check_nagios.t 1382 2006-04-19 09:33:44Z tonvoon $ # use strict; diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t index 187dfe4..3c5fe2e 100644 --- a/plugins/t/check_ntp.t +++ b/plugins/t/check_ntp.t @@ -2,7 +2,7 @@ # # Testing NTP # -# $Id: check_ntp.t,v 1.2 2006/08/14 08:42:23 tonvoon Exp $ +# $Id: check_ntp.t 1468 2006-08-14 08:42:23Z tonvoon $ # use strict; diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t index d1edcad..74404fd 100644 --- a/plugins/t/check_ping.t +++ b/plugins/t/check_ping.t @@ -2,7 +2,7 @@ # # Ping Response Tests via check_ping # -# $Id: check_ping.t,v 1.5 2007/03/12 10:51:06 tonvoon Exp $ +# $Id: check_ping.t 1639 2007-03-12 10:51:06Z tonvoon $ # use strict; diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t index 2fcd954..55ac723 100644 --- a/plugins/t/check_pop.t +++ b/plugins/t/check_pop.t @@ -2,7 +2,7 @@ # # Post Office Protocol (POP) Server Tests via check_pop # -# $Id: check_pop.t,v 1.3 2006/03/22 15:45:49 tonvoon Exp $ +# $Id: check_pop.t 1345 2006-03-22 15:45:49Z tonvoon $ # use strict; diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t index e80ea8d..e784d8d 100644 --- a/plugins/t/check_procs.t +++ b/plugins/t/check_procs.t @@ -2,7 +2,7 @@ # # Process Tests via check_procs # -# $Id: check_procs.t,v 1.5 2005/11/03 15:13:13 tonvoon Exp $ +# $Id: check_procs.t 1271 2005-11-03 15:13:13Z tonvoon $ # use strict; diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t index b4e6b72..bd07fd3 100644 --- a/plugins/t/check_smtp.t +++ b/plugins/t/check_smtp.t @@ -2,7 +2,7 @@ # # Simple Mail Transfer Protocol (SMTP) Test via check_smtp # -# $Id: check_smtp.t,v 1.4 2006/10/19 11:56:34 tonvoon Exp $ +# $Id: check_smtp.t 1500 2006-10-19 11:56:34Z tonvoon $ # use strict; diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t index 0a2688e..b676472 100644 --- a/plugins/t/check_snmp.t +++ b/plugins/t/check_snmp.t @@ -2,7 +2,7 @@ # # Simple Network Management Protocol (SNMP) Test via check_snmp # -# $Id: check_snmp.t,v 1.3 2006/12/23 18:59:36 dermoth Exp $ +# $Id: check_snmp.t 1557 2006-12-23 18:59:36Z dermoth $ # use strict; diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t index 03170fa..8b945ec 100644 --- a/plugins/t/check_swap.t +++ b/plugins/t/check_swap.t @@ -2,7 +2,7 @@ # # Swap Space Tests via check_swap # -# $Id: check_swap.t,v 1.3 2005/11/09 16:40:12 tonvoon Exp $ +# $Id: check_swap.t 1279 2005-11-09 16:40:12Z tonvoon $ # use strict; diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t index f7ec79e..5292788 100644 --- a/plugins/t/check_tcp.t +++ b/plugins/t/check_tcp.t @@ -2,7 +2,7 @@ # # TCP Connection Based Tests via check_tcp # -# $Id: check_tcp.t,v 1.5 2007/02/14 10:11:07 tonvoon Exp $ +# $Id: check_tcp.t 1714 2007-05-18 07:17:59Z dermoth $ # use strict; @@ -34,7 +34,7 @@ $t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 # Need the \r\n to make it more standards compliant with web servers. Need the various quotes # so that perl doesn't interpret the \r\n and is passed onto command line correctly -$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -E -s ".'"GET /\r\n\r\n"'." -e 'ThisShouldntMatch' -j", 1, $failedExpect ); +$t += checkCmd( "./check_tcp $host_tcp_http -p 80 -E -s ".'"GET / HTTP/1.1\r\n\r\n"'." -e 'ThisShouldntMatch' -j", 1, $failedExpect ); exit(0) if defined($Test::Harness::VERSION); exit($tests - $t); diff --git a/plugins/t/check_time.t b/plugins/t/check_time.t index a8edb53..19448cd 100644 --- a/plugins/t/check_time.t +++ b/plugins/t/check_time.t @@ -2,7 +2,7 @@ # # System Time Tests via check_time # -# $Id: check_time.t,v 1.3 2005/11/03 15:04:16 tonvoon Exp $ +# $Id: check_time.t 1270 2005-11-03 15:04:16Z tonvoon $ # use strict; diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t index b179f07..024e34a 100644 --- a/plugins/t/check_udp.t +++ b/plugins/t/check_udp.t @@ -2,7 +2,7 @@ # # UDP Connection Based Tests via check_udp # -# $Id: check_udp.t,v 1.6 2006/07/28 22:44:11 tonvoon Exp $ +# $Id: check_udp.t 1459 2006-07-28 22:44:11Z tonvoon $ # use strict; diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t index 6d8b7a4..66f9855 100644 --- a/plugins/t/check_users.t +++ b/plugins/t/check_users.t @@ -2,7 +2,7 @@ # # Logged in Users Tests via check_users # -# $Id: check_users.t,v 1.2 2005/07/25 01:47:15 illumino Exp $ +# $Id: check_users.t 1207 2005-07-25 01:47:15Z illumino $ # use strict; diff --git a/plugins/t/negate.t b/plugins/t/negate.t new file mode 100644 index 0000000..3a894f5 --- /dev/null +++ b/plugins/t/negate.t @@ -0,0 +1,72 @@ +#! /usr/bin/perl -w -I .. +# +# negate checks +# Need check_dummy to work for testing +# +# $Id: negate.pl 1717 2007-05-24 08:53:50Z tonvoon $ +# + +use strict; +use Test::More; +use NPTest; + +# 15 tests in the first part and 32 in the last loop +plan tests => 47; + +my $res; + +my $PWD = $ENV{PWD}; + +$res = NPTest->testCmd( "./negate" ); +is( $res->return_code, 3, "Not enough parameters"); +like( $res->output, "/Could not parse arguments/", "Could not parse arguments"); + +$res = NPTest->testCmd( "./negate bobthebuilder" ); +is( $res->return_code, 3, "Require full path" ); +like( $res->output, "/Require path to command/", "Appropriate error message"); + +$res = NPTest->testCmd( "./negate $PWD/check_dummy 0 'a dummy okay'" ); +is( $res->return_code, 2, "OK changed to CRITICAL" ); +is( $res->output, "OK: a dummy okay", "Output as expected" ); + +$res = NPTest->testCmd( "./negate '$PWD/check_dummy 0 redsweaterblog'"); +is( $res->return_code, 2, "OK => CRIT with a single quote for command to run" ); +is( $res->output, "OK: redsweaterblog", "Output as expected" ); + +$res = NPTest->testCmd( "./negate $PWD/check_dummy 1 'a warn a day keeps the managers at bay'" ); +is( $res->return_code, 1, "WARN stays same" ); + +$res = NPTest->testCmd( "./negate $PWD/check_dummy 3 mysterious"); +is( $res->return_code, 3, "UNKNOWN stays same" ); + +$res = NPTest->testCmd( "./negate \"$PWD/check_dummy 0 'a dummy okay'\"" ); +is( $res->output, "OK: a dummy okay", "Checking slashed quotes - the single quotes are re-evaluated at shell" ); + +# Output is "OK: a" because check_dummy only returns the first arg +$res = NPTest->testCmd( "./negate $PWD/check_dummy 0 a dummy okay" ); +is( $res->output, "OK: a", "Multiple args passed as arrays" ); + +$res = NPTest->testCmd( "./negate $PWD/check_dummy 0 'a dummy okay'" ); +is( $res->output, "OK: a dummy okay", "The quoted string is passed through to subcommand correctly" ); + +$res = NPTest->testCmd( "./negate '$PWD/check_dummy 0' 'a dummy okay'" ); +is( $res->output, "No data returned from command", "Bad command, as expected (trying to execute './check_dummy 0')"); + +$res = NPTest->testCmd( './negate $PWD/check_dummy 0 \'$$ a dummy okay\'' ); +is( $res->output, 'OK: $$ a dummy okay', 'Proves that $$ is not being expanded again' ); + + +my %state = ( + ok => 0, + warning => 1, + critical => 2, + unknown => 3, + ); +foreach my $current_state (qw(ok warning critical unknown)) { + foreach my $new_state (qw(ok warning critical unknown)) { + $res = NPTest->testCmd( "./negate --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" ); + is( $res->return_code, $state{$new_state}, "Got fake $new_state" ); + is( $res->output, uc($current_state).": Fake $new_state" ); + } +} + diff --git a/plugins/urlize.c b/plugins/urlize.c index b80f854..5e42958 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 2000-2006 nagios-plugins team * -* Last Modified: $Date: 2007/01/28 21:46:41 $ +* Last Modified: $Date: 2007-01-28 21:46:41 +0000 (Sun, 28 Jan 2007) $ * * Description: * @@ -32,12 +32,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - $Id: urlize.c,v 1.22 2007/01/28 21:46:41 hweiss Exp $ + $Id: urlize.c 1590 2007-01-28 21:46:41Z hweiss $ ******************************************************************************/ const char *progname = "urlize"; -const char *revision = "$Revision: 1.22 $"; +const char *revision = "$Revision: 1590 $"; const char *copyright = "2000-2006"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; diff --git a/plugins/utils.c b/plugins/utils.c index 0ee1fe4..061c086 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -8,8 +8,8 @@ * Copyright (c) 2006 Nagios Plugin Development Team * License: GPL * - * $Revision: 1.51 $ - * $Date: 2007/01/28 21:46:41 $ + * $Revision: 1752 $ + * $Date: 2007-07-07 13:02:45 +0100 (Sat, 07 Jul 2007) $ ****************************************************************************/ #define LOCAL_TIMEOUT_ALARM_HANDLER @@ -105,10 +105,11 @@ char * clean_revstring (const char *revstring) { char plugin_revision[STRLEN]; - if (sscanf (revstring,"$Revision: %[0-9.]",plugin_revision) == 1) + plugin_revision[0] = 'v'; + if (sscanf (revstring,"$Revision: %[0-9.]", plugin_revision + 1) == 1) return strscpy (NULL, plugin_revision); else - return strscpy (NULL, "N/A"); + return strscpy (NULL, "N/A"); } void @@ -116,10 +117,8 @@ print_revision (const char *command_name, const char *revision_string) { char plugin_revision[STRLEN]; - if (sscanf (revision_string, "$Revision: %[0-9.]", plugin_revision) != 1) - strncpy (plugin_revision, "N/A", STRLEN); - printf ("%s (%s %s) %s\n", - command_name, PACKAGE, VERSION, plugin_revision); + printf ("%s %s (%s %s)\n", + command_name, clean_revstring(revision_string), PACKAGE, VERSION); } const char * diff --git a/plugins/utils.h b/plugins/utils.h index ad4a103..970aaea 100644 --- a/plugins/utils.h +++ b/plugins/utils.h @@ -18,7 +18,7 @@ suite of plugins. */ /* Standardize version information, termination */ -/* $Id: utils.h,v 1.33 2007/01/28 21:46:41 hweiss Exp $ */ +/* $Id: utils.h 1590 2007-01-28 21:46:41Z hweiss $ */ void support (void); char *clean_revstring (const char *); diff --git a/po/de.gmo b/po/de.gmo index 0e82ed8..dd6febd 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d898c5f..5bdef38 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nagiosplug\n" "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-10 03:05-0400\n" +"POT-Creation-Date: 2007-09-29 02:04+0100\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n" "Last-Translator: <>\n" "Language-Team: English \n" @@ -18,80 +18,85 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n" -#: plugins/check_by_ssh.c:82 plugins/check_dig.c:89 plugins/check_disk.c:192 +#: plugins/check_by_ssh.c:83 plugins/check_dig.c:89 plugins/check_disk.c:198 #: plugins/check_dns.c:93 plugins/check_dummy.c:59 plugins/check_fping.c:89 -#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:147 -#: plugins/check_ldap.c:105 plugins/check_load.c:122 +#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:150 +#: plugins/check_ldap.c:108 plugins/check_load.c:124 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:88 -#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:758 +#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:766 #: plugins/check_nwstat.c:177 plugins/check_overcr.c:106 #: plugins/check_pgsql.c:156 plugins/check_ping.c:99 plugins/check_procs.c:143 -#: plugins/check_radius.c:133 plugins/check_real.c:85 plugins/check_smtp.c:180 +#: plugins/check_radius.c:156 plugins/check_real.c:85 plugins/check_smtp.c:184 #: plugins/check_snmp.c:182 plugins/check_ssh.c:78 plugins/check_swap.c:113 -#: plugins/check_tcp.c:208 plugins/check_time.c:82 plugins/check_ups.c:125 -#: plugins/check_users.c:70 plugins/negate.c:102 plugins-root/check_dhcp.c:256 +#: plugins/check_tcp.c:211 plugins/check_time.c:82 plugins/check_ups.c:125 +#: plugins/check_users.c:70 plugins/negate.c:259 plugins-root/check_dhcp.c:280 msgid "Could not parse arguments" msgstr "Argumente konnten nicht ausgewertet werden" -#: plugins/check_by_ssh.c:86 plugins/check_dig.c:86 plugins/check_dns.c:89 +#: plugins/check_by_ssh.c:87 plugins/check_dig.c:86 plugins/check_dns.c:89 #: plugins/check_nagios.c:98 plugins/check_pgsql.c:160 -#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:106 +#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:113 msgid "Cannot catch SIGALRM" msgstr "Konnte SIGALRM nicht erhalten" -#: plugins/check_by_ssh.c:97 +#: plugins/check_by_ssh.c:104 #, c-format msgid "Remote command execution failed: %s\n" msgstr "" -#: plugins/check_by_ssh.c:98 -#, fuzzy -msgid "Unknown error" -msgstr "Papierfehler" - #: plugins/check_by_ssh.c:116 #, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" +msgstr "" + +#: plugins/check_by_ssh.c:128 +#, c-format msgid "SSH WARNING: could not open %s\n" msgstr "SSH WARNING: Konnte %s nicht öffnen\n" -#: plugins/check_by_ssh.c:200 plugins/check_disk.c:507 -#: plugins/check_http.c:241 plugins/check_ldap.c:281 plugins/check_pgsql.c:237 -#: plugins/check_procs.c:371 plugins/check_radius.c:215 -#: plugins/check_radius.c:285 plugins/check_real.c:361 -#: plugins/check_smtp.c:629 plugins/check_snmp.c:494 plugins/check_ssh.c:143 -#: plugins/check_tcp.c:500 plugins/check_time.c:306 plugins/check_ups.c:555 -#: plugins/negate.c:203 +#: plugins/check_by_ssh.c:214 plugins/check_disk.c:523 +#: plugins/check_http.c:244 plugins/check_ldap.c:292 plugins/check_pgsql.c:237 +#: plugins/check_procs.c:371 plugins/check_radius.c:284 +#: plugins/check_real.c:361 plugins/check_smtp.c:630 plugins/check_snmp.c:505 +#: plugins/check_ssh.c:143 plugins/check_tcp.c:494 plugins/check_time.c:306 +#: plugins/check_ups.c:555 plugins/negate.c:203 msgid "Timeout interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" -#: plugins/check_by_ssh.c:210 plugins/check_pgsql.c:261 -#: plugins/check_radius.c:224 plugins/check_radius.c:258 -#: plugins/check_real.c:332 plugins/check_smtp.c:561 plugins/check_tcp.c:506 -#: plugins/check_time.c:300 plugins/check_ups.c:517 +#: plugins/check_by_ssh.c:224 plugins/check_pgsql.c:261 +#: plugins/check_radius.c:257 plugins/check_real.c:332 +#: plugins/check_smtp.c:558 plugins/check_tcp.c:500 plugins/check_time.c:300 +#: plugins/check_ups.c:517 msgid "Port must be a positive integer" msgstr "Port muss ein positiver Integer sein" -#: plugins/check_by_ssh.c:254 -msgid "skip lines must be an integer" +#: plugins/check_by_ssh.c:270 +#, fuzzy +msgid "skip-stdout argument must be an integer" msgstr "skip lines muss ein Integer sein" -#: plugins/check_by_ssh.c:272 +#: plugins/check_by_ssh.c:278 +#, fuzzy +msgid "skip-stderr argument must be an integer" +msgstr "skip lines muss ein Integer sein" + +#: plugins/check_by_ssh.c:296 #, c-format msgid "%s: You must provide a host name\n" msgstr "%s: Hostname muss angegeben werden\n" -#: plugins/check_by_ssh.c:290 +#: plugins/check_by_ssh.c:314 msgid "No remotecmd" msgstr "Kein remotecm" -#: plugins/check_by_ssh.c:306 +#: plugins/check_by_ssh.c:330 #, c-format msgid "" "%s: In passive mode, you must provide a service name for each command.\n" msgstr "" "%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n" -#: plugins/check_by_ssh.c:309 +#: plugins/check_by_ssh.c:333 #, c-format msgid "" "%s: In passive mode, you must provide the host short name from the nagios " @@ -100,119 +105,123 @@ msgstr "" "%s: Im passive mode muss der \"host short name\" aus der Nagios " "Konfiguration angegeben werden\n" -#: plugins/check_by_ssh.c:323 +#: plugins/check_by_ssh.c:347 #, fuzzy, c-format msgid "This plugin uses SSH to execute commands on a remote host" msgstr "" "Dieses Plugin nutzt SSH um Befehle auf dem entfernten Rechner auszuführen\n" "\n" -#: plugins/check_by_ssh.c:336 -msgid "tell ssh to use Protocol 1" -msgstr "" - -#: plugins/check_by_ssh.c:338 -msgid "tell ssh to use Protocol 2" -msgstr "" - -#: plugins/check_by_ssh.c:340 -msgid "Ignore first n lines on STDERR (to suppress a logon banner)" -msgstr "" - -#: plugins/check_by_ssh.c:342 -msgid "tells ssh to fork rather than create a tty" -msgstr "" - -#: plugins/check_by_ssh.c:344 -msgid "command to execute on the remote machine" -msgstr "" - -#: plugins/check_by_ssh.c:346 -msgid "SSH user name on remote host [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:348 -msgid "identity of an authorized key [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:350 -msgid "external command file for nagios [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:352 -msgid "list of nagios service names, separated by ':' [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:354 -msgid "short name of host in nagios configuration [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:356 -msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:358 -msgid "Tell ssh to suppress warning and diagnostic messages [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:361 -msgid "The most common mode of use is to refer to a local identity file with" +#: plugins/check_by_ssh.c:360 +msgid "tell ssh to use Protocol 1 [optional]" msgstr "" #: plugins/check_by_ssh.c:362 -msgid "the '-i' option. In this mode, the identity pair should have a null" -msgstr "" - -#: plugins/check_by_ssh.c:363 -msgid "passphrase and the public key should be listed in the authorized_keys" +msgid "tell ssh to use Protocol 2 [optional]" msgstr "" #: plugins/check_by_ssh.c:364 -msgid "file of the remote host. Usually the key will be restricted to running" -msgstr "" - -#: plugins/check_by_ssh.c:365 -msgid "only one command on the remote server. If the remote SSH server tracks" +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" msgstr "" #: plugins/check_by_ssh.c:366 -msgid "invocation arguments, the one remote program may be an agent that can" -msgstr "" - -#: plugins/check_by_ssh.c:367 -msgid "execute additional commands as proxy" +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" msgstr "" #: plugins/check_by_ssh.c:368 +msgid "tells ssh to fork rather than create a tty [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:370 +msgid "command to execute on the remote machine" +msgstr "" + +#: plugins/check_by_ssh.c:372 +msgid "SSH user name on remote host [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:374 +msgid "identity of an authorized key [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:376 +msgid "external command file for nagios [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:378 +msgid "list of nagios service names, separated by ':' [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:380 +msgid "short name of host in nagios configuration [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:382 +msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:384 +msgid "Tell ssh to suppress warning and diagnostic messages [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:387 +msgid "The most common mode of use is to refer to a local identity file with" +msgstr "" + +#: plugins/check_by_ssh.c:388 +msgid "the '-i' option. In this mode, the identity pair should have a null" +msgstr "" + +#: plugins/check_by_ssh.c:389 +msgid "passphrase and the public key should be listed in the authorized_keys" +msgstr "" + +#: plugins/check_by_ssh.c:390 +msgid "file of the remote host. Usually the key will be restricted to running" +msgstr "" + +#: plugins/check_by_ssh.c:391 +msgid "only one command on the remote server. If the remote SSH server tracks" +msgstr "" + +#: plugins/check_by_ssh.c:392 +msgid "invocation arguments, the one remote program may be an agent that can" +msgstr "" + +#: plugins/check_by_ssh.c:393 +msgid "execute additional commands as proxy" +msgstr "" + +#: plugins/check_by_ssh.c:394 msgid "To use passive mode, provide multiple '-C' options, and provide" msgstr "" -#: plugins/check_by_ssh.c:369 +#: plugins/check_by_ssh.c:395 msgid "" "all of -O, -s, and -n options (servicelist order must match '-C'options)" msgstr "" -#: plugins/check_by_ssh.c:371 plugins/check_disk.c:901 -#: plugins/check_http.c:1324 plugins/check_nagios.c:303 -#: plugins/check_procs.c:735 plugins/negate.c:269 plugins/urlize.c:187 +#: plugins/check_by_ssh.c:397 plugins/check_disk.c:947 +#: plugins/check_http.c:1352 plugins/check_nagios.c:303 +#: plugins/check_procs.c:735 plugins/negate.c:319 plugins/urlize.c:187 #, c-format msgid "Examples:" msgstr "" -#: plugins/check_by_ssh.c:385 plugins/check_dig.c:336 plugins/check_disk.c:912 -#: plugins/check_dns.c:447 plugins/check_dummy.c:127 plugins/check_fping.c:407 -#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1347 -#: plugins/check_ldap.c:411 plugins/check_load.c:311 plugins/check_mrtg.c:383 +#: plugins/check_by_ssh.c:412 plugins/check_dig.c:336 plugins/check_disk.c:963 +#: plugins/check_dns.c:447 plugins/check_dummy.c:129 plugins/check_fping.c:407 +#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1375 +#: plugins/check_ldap.c:449 plugins/check_load.c:326 plugins/check_mrtg.c:383 #: plugins/check_mysql.c:407 plugins/check_nagios.c:313 plugins/check_nt.c:707 -#: plugins/check_ntp.c:859 plugins/check_nwstat.c:1688 +#: plugins/check_ntp.c:868 plugins/check_nwstat.c:1688 #: plugins/check_overcr.c:469 plugins/check_pgsql.c:458 #: plugins/check_ping.c:597 plugins/check_procs.c:753 -#: plugins/check_radius.c:349 plugins/check_real.c:454 -#: plugins/check_smtp.c:780 plugins/check_snmp.c:1007 plugins/check_ssh.c:306 -#: plugins/check_swap.c:560 plugins/check_tcp.c:656 plugins/check_time.c:373 -#: plugins/check_ups.c:653 plugins/check_users.c:230 -#: plugins/check_ide_smart.c:544 plugins/negate.c:290 plugins/urlize.c:204 -#: plugins-root/check_dhcp.c:1283 plugins-root/check_icmp.c:1282 +#: plugins/check_radius.c:358 plugins/check_real.c:454 +#: plugins/check_smtp.c:863 plugins/check_snmp.c:1018 plugins/check_ssh.c:306 +#: plugins/check_swap.c:560 plugins/check_tcp.c:654 plugins/check_time.c:373 +#: plugins/check_ups.c:657 plugins/check_users.c:230 +#: plugins/check_ide_smart.c:527 plugins/negate.c:340 plugins/urlize.c:204 +#: plugins-root/check_dhcp.c:1426 plugins-root/check_icmp.c:1278 #, c-format msgid "Usage:" msgstr "" @@ -290,75 +299,80 @@ msgstr "" " Adresse die in der ANSWER SECTION erwartet wird.\n" " wenn nicht gesetzt, ubernommen aus -l\n" -#: plugins/check_disk.c:213 +#: plugins/check_disk.c:220 #, fuzzy, c-format msgid "DISK %s: %s not found\n" msgstr "%s [%s nicht gefunden]" -#: plugins/check_disk.c:213 plugins/check_disk.c:751 plugins/check_dns.c:208 -#: plugins/check_dummy.c:81 plugins/check_http.c:959 plugins/check_http.c:1022 -#: plugins/check_mysql.c:214 plugins/check_nagios.c:107 -#: plugins/check_nagios.c:171 plugins/check_nagios.c:175 -#: plugins/check_procs.c:302 +#: plugins/check_disk.c:220 plugins/check_disk.c:978 plugins/check_dns.c:208 +#: plugins/check_dummy.c:81 plugins/check_mysql.c:214 +#: plugins/check_nagios.c:107 plugins/check_nagios.c:171 +#: plugins/check_nagios.c:175 plugins/check_procs.c:302 #, c-format msgid "CRITICAL" msgstr "CRITICAL" -#: plugins/check_disk.c:581 +#: plugins/check_disk.c:597 #, c-format msgid "unit type %s not known\n" msgstr "unbekannter unit type: %s\n" -#: plugins/check_disk.c:584 +#: plugins/check_disk.c:600 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/check_disk.c:606 plugins/check_disk.c:643 plugins/check_disk.c:653 -#: plugins/check_disk.c:659 plugins/check_disk.c:678 plugins/check_dummy.c:84 -#: plugins/check_http.c:953 +#: plugins/check_disk.c:624 plugins/check_disk.c:655 plugins/check_disk.c:660 +#: plugins/check_disk.c:667 plugins/check_disk.c:671 plugins/check_disk.c:711 +#: plugins/check_disk.c:717 plugins/check_disk.c:736 plugins/check_dummy.c:84 +#: plugins/check_dummy.c:87 #, c-format msgid "UNKNOWN" msgstr "UNKNOWN" -#: plugins/check_disk.c:606 +#: plugins/check_disk.c:624 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:643 -msgid "Must set group value before using -p\n" +#: plugins/check_disk.c:655 +msgid "Must set -E before selecting pathes\n" msgstr "" -#: plugins/check_disk.c:653 -msgid "Must set a threshold value before using -r/-R\n" +#: plugins/check_disk.c:660 +msgid "Must set group value before selecting pathes \n" msgstr "" -#: plugins/check_disk.c:659 +#: plugins/check_disk.c:667 +msgid "" +"Pathes need to be selected before using -i/-I. Use -A to select all pathes " +"explicitly" +msgstr "" + +#: plugins/check_disk.c:671 plugins/check_disk.c:717 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:679 +#: plugins/check_disk.c:711 +msgid "Must set a threshold value before using -r/-R\n" +msgstr "" + +#: plugins/check_disk.c:737 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:723 +#: plugins/check_disk.c:784 #, fuzzy msgid "Unknown argument" msgstr "" "%s: Unbekanntes Argument: %s\n" "\n" -#: plugins/check_disk.c:752 -#, fuzzy, c-format -msgid "%s does not exist\n" -msgstr "%s [%s nicht gefunden]" - -#: plugins/check_disk.c:781 +#: plugins/check_disk.c:818 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:849 +#: plugins/check_disk.c:886 #, fuzzy msgid "" "This plugin checks the amount of used disk space on a mounted file system" @@ -368,7 +382,7 @@ msgstr "" "unterschritten wird.\n" "\n" -#: plugins/check_disk.c:850 +#: plugins/check_disk.c:887 #, fuzzy msgid "" "and generates an alert if free space is less than one of the threshold values" @@ -378,92 +392,144 @@ msgstr "" "unterschritten wird.\n" "\n" -#: plugins/check_disk.c:859 +#: plugins/check_disk.c:896 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:861 +#: plugins/check_disk.c:898 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:863 -msgid "Exit with WARNING status if less than PERCENT of inode space is free" -msgstr "" - -#: plugins/check_disk.c:865 -msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" -msgstr "" - -#: plugins/check_disk.c:867 +#: plugins/check_disk.c:900 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:869 +#: plugins/check_disk.c:902 msgid "Exit with CRITCAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:871 -msgid "Clear thresholds" +#: plugins/check_disk.c:904 +msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:873 -msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +#: plugins/check_disk.c:906 +msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:875 -msgid "Same as '--units kB'" -msgstr "" - -#: plugins/check_disk.c:877 -msgid "Same as '--units MB'" -msgstr "" - -#: plugins/check_disk.c:879 -msgid "Only check local filesystems" -msgstr "" - -#: plugins/check_disk.c:881 +#: plugins/check_disk.c:908 msgid "Path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:883 -msgid "Regular expression for path or partition (may be repeated)" +#: plugins/check_disk.c:910 +msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:885 -msgid "" -"Case insensitive regular expression for path/partition (may be repeated)" +#: plugins/check_disk.c:912 +msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:887 +#: plugins/check_disk.c:914 +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +#: plugins/check_disk.c:916 +msgid "Display only devices/mountpoints with errors" +msgstr "" + +#: plugins/check_disk.c:918 msgid "" "Group pathes. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:889 -msgid "Ignore device (only works if -p unspecified)" +#: plugins/check_disk.c:920 +msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:891 -msgid "Ignore all filesystems of indicated type (may be repeated)" +#: plugins/check_disk.c:922 +msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:893 +#: plugins/check_disk.c:924 +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +#: plugins/check_disk.c:925 +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +#: plugins/check_disk.c:927 msgid "Display the mountpoint instead of the partition" msgstr "" -#: plugins/check_disk.c:895 -msgid "For paths or partitions specified with -p, only check for exact paths" +#: plugins/check_disk.c:929 +msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:897 -msgid "Display only devices/mountpoints with errors" +#: plugins/check_disk.c:931 +msgid "Explicitly select all pathes. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:933 +msgid "" +"Case insensitive regular expression for path/partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:935 +msgid "Regular expression for path or partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:937 +msgid "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "" + +#: plugins/check_disk.c:939 +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:942 +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "" + +#: plugins/check_disk.c:945 +msgid "Ignore all filesystems of indicated type (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:949 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" +#: plugins/check_disk.c:951 +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +#: plugins/check_disk.c:952 +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +#: plugins/check_disk.c:954 +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#: plugins/check_disk.c:979 +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +#: plugins/check_disk.c:979 +msgid "is not accessible" +msgstr "" + #: plugins/check_dns.c:107 #, fuzzy msgid "nslookup returned an error status" @@ -497,15 +563,14 @@ msgstr "Erwartet: %s aber: %s erhalten" msgid "server %s is not authoritative for %s" msgstr "Server %s ist nicht autoritativ für %s" -#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_http.c:955 -#: plugins/check_nagios.c:185 plugins/check_procs.c:295 +#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_nagios.c:185 +#: plugins/check_procs.c:295 #, c-format msgid "OK" msgstr "OK" -#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_http.c:957 -#: plugins/check_mysql.c:211 plugins/check_nagios.c:185 -#: plugins/check_procs.c:297 +#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_mysql.c:211 +#: plugins/check_nagios.c:185 plugins/check_procs.c:297 #, c-format msgid "WARNING" msgstr "WARNING" @@ -643,30 +708,30 @@ msgstr "" msgid "Arguments to check_dummy must be an integer" msgstr "Argument für check_dummy muss ein Integer sein" -#: plugins/check_dummy.c:87 +#: plugins/check_dummy.c:89 #, c-format msgid "Status %d is not a supported error state\n" msgstr "Status %d ist kein bekannter Fehlerstatus\n" -#: plugins/check_dummy.c:109 +#: plugins/check_dummy.c:111 msgid "" "This plugin will simply return the state corresponding to the numeric value" msgstr "" -#: plugins/check_dummy.c:111 +#: plugins/check_dummy.c:113 msgid "of the argument with optional text" msgstr "" #: plugins/check_fping.c:103 plugins/check_hpjd.c:131 plugins/check_ping.c:432 #: plugins/check_procs.c:159 plugins/check_snmp.c:203 plugins/check_swap.c:178 -#: plugins/check_users.c:75 plugins/negate.c:112 plugins/urlize.c:117 +#: plugins/check_users.c:75 plugins/urlize.c:117 #, c-format msgid "Could not open pipe: %s\n" msgstr "Pipe: %s konnte nicht geöffnet werden\n" -#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:153 -#: plugins/check_procs.c:165 plugins/check_snmp.c:209 plugins/check_swap.c:184 -#: plugins/check_users.c:81 plugins/negate.c:117 plugins/urlize.c:123 +#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:155 +#: plugins/check_procs.c:165 plugins/check_snmp.c:210 plugins/check_swap.c:184 +#: plugins/check_users.c:81 plugins/urlize.c:123 #, c-format msgid "Could not open stderr for %s\n" msgstr "Konnte stderr nicht öffnen für: %s\n" @@ -697,10 +762,10 @@ msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" #: plugins/check_fping.c:273 plugins/check_hpjd.c:341 plugins/check_hpjd.c:364 -#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:696 +#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:704 #: plugins/check_pgsql.c:255 plugins/check_ping.c:290 plugins/check_ping.c:413 -#: plugins/check_radius.c:250 plugins/check_real.c:319 -#: plugins/check_real.c:381 plugins/check_smtp.c:554 plugins/check_smtp.c:675 +#: plugins/check_radius.c:249 plugins/check_real.c:319 +#: plugins/check_real.c:381 plugins/check_smtp.c:551 plugins/check_smtp.c:676 #: plugins/check_ssh.c:162 plugins/check_time.c:244 plugins/check_time.c:319 #: plugins/check_ups.c:503 plugins/check_ups.c:572 msgid "Invalid hostname/address" @@ -714,7 +779,7 @@ msgstr "Paketgr msgid "Packet count must be a positive integer" msgstr "Paketanzahl muss ein positiver Integer sein" -#: plugins/check_fping.c:319 plugins/check_ntp.c:728 plugins/check_time.c:323 +#: plugins/check_fping.c:319 plugins/check_ntp.c:736 plugins/check_time.c:323 msgid "Hostname was not supplied" msgstr "" @@ -821,10 +886,10 @@ msgstr "" msgid "Field number in raw qstat output that contains ping time" msgstr "" -#: plugins/check_game.c:318 plugins/check_http.c:1312 plugins/check_mrtg.c:364 +#: plugins/check_game.c:318 plugins/check_http.c:1340 plugins/check_mrtg.c:364 #: plugins/check_mrtgtraf.c:361 plugins/check_nt.c:693 #: plugins/check_nwstat.c:1673 plugins/check_overcr.c:452 -#: plugins/check_swap.c:549 plugins/check_ups.c:629 plugins/negate.c:276 +#: plugins/check_swap.c:549 plugins/check_ups.c:633 plugins/negate.c:325 #, c-format msgid "Notes:" msgstr "" @@ -922,573 +987,662 @@ msgstr "" msgid "(default=%s)" msgstr "" -#: plugins/check_http.c:247 +#: plugins/check_http.c:250 msgid "Critical threshold must be integer" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_http.c:255 +#: plugins/check_http.c:258 msgid "Warning threshold must be integer" msgstr "Warning threshold Integer sein" -#: plugins/check_http.c:281 plugins/check_tcp.c:570 +#: plugins/check_http.c:284 plugins/check_tcp.c:563 msgid "Invalid certificate expiration period" msgstr "Ungültiger Zertifikatsablauftermin" -#: plugins/check_http.c:290 plugins/check_tcp.c:582 +#: plugins/check_http.c:293 plugins/check_tcp.c:575 #, fuzzy msgid "Invalid option - SSL is not available" msgstr "Ungültige Option - SSL ist nicht verfügbar\n" -#: plugins/check_http.c:308 +#: plugins/check_http.c:311 #, c-format msgid "option f:%d \n" msgstr "Option f:%d \n" -#: plugins/check_http.c:325 +#: plugins/check_http.c:328 msgid "Invalid port number" msgstr "Ungültige Portnummer" -#: plugins/check_http.c:363 +#: plugins/check_http.c:366 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:377 plugins/check_ntp.c:709 plugins/check_smtp.c:655 -#: plugins/check_ssh.c:154 plugins/check_tcp.c:473 +#: plugins/check_http.c:380 plugins/check_ntp.c:717 plugins/check_smtp.c:656 +#: plugins/check_ssh.c:154 plugins/check_tcp.c:467 msgid "IPv6 support not available" msgstr "IPv6 Unterstützung nicht vorhanden" -#: plugins/check_http.c:439 plugins/check_ping.c:417 +#: plugins/check_http.c:442 plugins/check_ping.c:417 msgid "You must specify a server address or host name" msgstr "Hostname oder Serveradresse muss angegeben werden" -#: plugins/check_http.c:665 -msgid "Server date unknown\n" -msgstr "Serverdatum unbekannt\n" +#: plugins/check_http.c:668 +msgid "HTTP UNKNOWN - Server date unknown\n" +msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" -#: plugins/check_http.c:667 -msgid "Document modification date unknown\n" -msgstr "Datum der letzten Änderung unbekannt\n" +#: plugins/check_http.c:670 +msgid "HTTP CRITICAL - Document modification date unknown\n" +msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n" -#: plugins/check_http.c:673 +#: plugins/check_http.c:676 #, c-format -msgid "CRITICAL - Server date \"%100s\" unparsable" -msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" +msgid "HTTP CRITICAL - Server date \"%100s\" unparsable" +msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" -#: plugins/check_http.c:675 +#: plugins/check_http.c:678 #, c-format -msgid "CRITICAL - Document date \"%100s\" unparsable" -msgstr "CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden" - -#: plugins/check_http.c:677 -#, c-format -msgid "CRITICAL - Document is %d seconds in the future\n" -msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" - -#: plugins/check_http.c:682 -#, c-format -msgid "CRITICAL - Last modified %.1f days ago\n" -msgstr "CRITICAL - Letzte Änderung vor %.1f Tagen\n" - -#: plugins/check_http.c:686 -#, c-format -msgid "CRITICAL - Last modified %d:%02d:%02d ago\n" -msgstr "CRITICAL - Letzte Änderung vor %d:%02d:%02d \n" - -#: plugins/check_http.c:767 -msgid "Unable to open TCP socket\n" -msgstr "Konnte TCP socket nicht öffnen\n" - -#: plugins/check_http.c:847 -msgid "Error on receive\n" -msgstr "Fehler beim Empfangen\n" - -#: plugins/check_http.c:857 plugins/check_real.c:189 plugins/check_tcp.c:291 -#, c-format -msgid "No data received from host\n" +msgid "HTTP CRITICAL - Document date \"%100s\" unparsable" msgstr "" +"HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden" -#: plugins/check_http.c:907 +#: plugins/check_http.c:680 +#, c-format +msgid "HTTP CRITICAL - Document is %d seconds in the future\n" +msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" + +#: plugins/check_http.c:685 +#, c-format +msgid "HTTP CRITICAL - Last modified %.1f days ago\n" +msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n" + +#: plugins/check_http.c:689 +#, c-format +msgid "HTTP CRITICAL - Last modified %d:%02d:%02d ago\n" +msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n" + +#: plugins/check_http.c:770 +msgid "HTTP CRITICAL - Unable to open TCP socket\n" +msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n" + +#: plugins/check_http.c:853 +msgid "HTTP CRITICAL - Error on receive\n" +msgstr "HTTP CRITICAL - Fehler beim Empfangen\n" + +#: plugins/check_http.c:863 +#, fuzzy +msgid "HTTP CRITICAL - No data received from host\n" +msgstr "HTTP CRITICAL - Keine Daten empfangen\n" + +#: plugins/check_http.c:913 msgid "Invalid HTTP response received from host\n" msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_http.c:910 +#: plugins/check_http.c:916 #, c-format msgid "Invalid HTTP response received from host on port %d\n" msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" -#: plugins/check_http.c:918 +#: plugins/check_http.c:924 #, c-format msgid "HTTP OK: Status line output matched \"%s\"\n" msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n" -#: plugins/check_http.c:930 +#: plugins/check_http.c:936 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n" -#: plugins/check_http.c:937 +#: plugins/check_http.c:943 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n" -#: plugins/check_http.c:941 +#: plugins/check_http.c:947 #, c-format msgid "HTTP CRITICAL: %s\n" msgstr "HTTP CRITICAL: %s\n" -#: plugins/check_http.c:945 +#: plugins/check_http.c:951 #, c-format msgid "HTTP WARNING: %s\n" msgstr "HTTP WARNING: %s\n" +#: plugins/check_http.c:959 +#, c-format +msgid "HTTP UNKNOWN" +msgstr "HTTP UNKNOWN" + +#: plugins/check_http.c:961 +#, c-format +msgid "HTTP OK" +msgstr "HTTP OK" + #: plugins/check_http.c:963 +#, c-format +msgid "HTTP WARNING" +msgstr "HTTP WARNING" + +#: plugins/check_http.c:965 plugins/check_http.c:1028 +#, c-format +msgid "HTTP CRITICAL" +msgstr "HTTP CRITICAL" + +#: plugins/check_http.c:969 #, fuzzy, c-format msgid " - %s - %.3f second response time %s|%s %s\n" msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:979 +#: plugins/check_http.c:985 #, fuzzy, c-format msgid "HTTP WARNING: %s - %.3f second response time %s|%s %s\n" msgstr "HTTP WARNING: %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:993 plugins/check_http.c:1010 +#: plugins/check_http.c:999 plugins/check_http.c:1016 #, fuzzy, c-format msgid "HTTP OK %s - %.3f second response time %s|%s %s\n" msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:1000 +#: plugins/check_http.c:1006 #, c-format -msgid "CRITICAL - string not found%s|%s %s\n" -msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n" +msgid "HTTP CRITICAL - string not found%s|%s %s\n" +msgstr "HTTP CRITICAL - Text nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1018 +#: plugins/check_http.c:1024 #, fuzzy msgid "pattern not found" msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1020 +#: plugins/check_http.c:1026 msgid "pattern found" msgstr "" -#: plugins/check_http.c:1030 +#: plugins/check_http.c:1036 #, c-format -msgid "CRITICAL - Execute Error: %s\n" -msgstr "CRITICAL - Fehler: %s\n" +msgid "HTTP CRITICAL - Execute Error: %s\n" +msgstr "HTTP CRITICAL - Fehler: %s\n" -#: plugins/check_http.c:1039 +#: plugins/check_http.c:1045 #, fuzzy, c-format msgid "HTTP WARNING: page size %d too large%s|%s\n" msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" -#: plugins/check_http.c:1043 +#: plugins/check_http.c:1049 #, c-format msgid "HTTP WARNING: page size %d too small%s|%s\n" msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" -#: plugins/check_http.c:1048 +#: plugins/check_http.c:1054 #, fuzzy, c-format msgid "HTTP OK %s - %d bytes in %.3f seconds %s|%s %s\n" msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:1083 -msgid "Could not allocate addr\n" -msgstr "Konnte addr nicht zuweisen\n" +#: plugins/check_http.c:1088 +msgid "HTTP UNKNOWN - Could not allocate addr\n" +msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n" -#: plugins/check_http.c:1087 -msgid "Could not allocate url\n" -msgstr "Konnte·url·nicht·zuweisen\n" +#: plugins/check_http.c:1092 +msgid "HTTP UNKNOWN - Could not allocate url\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" -#: plugins/check_http.c:1096 +#: plugins/check_http.c:1101 #, c-format -msgid "UNKNOWN - Could not find redirect location - %s%s\n" +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1106 -msgid "could not allocate url\n" +#: plugins/check_http.c:1116 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Empty redirect location%s\n" +msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" + +#: plugins/check_http.c:1123 +#, fuzzy +msgid "HTTP UNKNOWN - could not allocate url\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +#: plugins/check_http.c:1163 +#, c-format +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1149 +#: plugins/check_http.c:1173 +#, fuzzy, c-format +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#: plugins/check_http.c:1181 #, c-format -msgid "UNKNOWN - Could not parse redirect location - %s%s\n" +msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#: plugins/check_http.c:1196 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Could not allocate server_url%s\n" +msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" + +#: plugins/check_http.c:1202 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" + +#: plugins/check_http.c:1207 +#, c-format +msgid "Redirection to %s://%s:%d%s\n" msgstr "" -#: plugins/check_http.c:1159 -#, c-format -msgid "WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" -msgstr "" - -#: plugins/check_http.c:1167 -#, c-format -msgid "WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" -msgstr "WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" - -#: plugins/check_http.c:1231 +#: plugins/check_http.c:1259 #, fuzzy msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_http.c:1232 +#: plugins/check_http.c:1260 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1233 +#: plugins/check_http.c:1261 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1234 +#: plugins/check_http.c:1262 #, fuzzy msgid "certificate expiration times." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_http.c:1240 +#: plugins/check_http.c:1268 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1247 +#: plugins/check_http.c:1275 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1248 +#: plugins/check_http.c:1276 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1250 +#: plugins/check_http.c:1278 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1252 +#: plugins/check_http.c:1280 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1259 +#: plugins/check_http.c:1287 msgid "Connect via SSL. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1261 +#: plugins/check_http.c:1289 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1262 +#: plugins/check_http.c:1290 msgid "(when this option is used the url is not checked.)\n" msgstr "" -#: plugins/check_http.c:1266 +#: plugins/check_http.c:1294 msgid "String to expect in first (status) line of server response (default: " msgstr "" -#: plugins/check_http.c:1268 +#: plugins/check_http.c:1296 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1270 +#: plugins/check_http.c:1298 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1300 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1274 +#: plugins/check_http.c:1302 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1276 +#: plugins/check_http.c:1304 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1277 +#: plugins/check_http.c:1305 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1279 +#: plugins/check_http.c:1307 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1280 +#: plugins/check_http.c:1308 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1282 +#: plugins/check_http.c:1310 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1285 +#: plugins/check_http.c:1313 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1287 +#: plugins/check_http.c:1315 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1289 +#: plugins/check_http.c:1317 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1319 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1322 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1296 +#: plugins/check_http.c:1324 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1298 +#: plugins/check_http.c:1326 msgid "" " Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1300 +#: plugins/check_http.c:1328 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1302 +#: plugins/check_http.c:1330 msgid "How to handle redirected pages" msgstr "" -#: plugins/check_http.c:1304 +#: plugins/check_http.c:1332 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1313 +#: plugins/check_http.c:1341 #, fuzzy msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_http.c:1314 +#: plugins/check_http.c:1342 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1315 +#: plugins/check_http.c:1343 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1316 +#: plugins/check_http.c:1344 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1317 +#: plugins/check_http.c:1345 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1318 +#: plugins/check_http.c:1346 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1321 +#: plugins/check_http.c:1349 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1350 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1323 +#: plugins/check_http.c:1351 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1326 +#: plugins/check_http.c:1354 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1327 +#: plugins/check_http.c:1355 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1328 +#: plugins/check_http.c:1356 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1329 +#: plugins/check_http.c:1357 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1360 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1333 +#: plugins/check_http.c:1361 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1334 +#: plugins/check_http.c:1362 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1335 +#: plugins/check_http.c:1363 #, fuzzy msgid "the certificate is expired." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_ldap.c:125 +#: plugins/check_ldap.c:132 #, c-format msgid "Could not connect to the server at port %i\n" msgstr "" -#: plugins/check_ldap.c:134 +#: plugins/check_ldap.c:141 #, c-format msgid "Could not set protocol version %d\n" msgstr "" -#: plugins/check_ldap.c:150 +#: plugins/check_ldap.c:156 #, fuzzy, c-format msgid "Could not init TLS at port %i!\n" msgstr "Konnte stderr nicht öffnen für: %s\n" -#: plugins/check_ldap.c:154 +#: plugins/check_ldap.c:160 #, c-format msgid "TLS not supported by the libraries!\n" msgstr "" -#: plugins/check_ldap.c:173 +#: plugins/check_ldap.c:180 #, fuzzy, c-format msgid "Could not init startTLS at port %i!\n" msgstr "Konnte stderr nicht öffnen für: %s\n" -#: plugins/check_ldap.c:177 +#: plugins/check_ldap.c:184 #, c-format msgid "startTLS not supported by the library, needs LDAPv3!\n" msgstr "" -#: plugins/check_ldap.c:187 +#: plugins/check_ldap.c:194 #, c-format msgid "Could not bind to the ldap-server\n" msgstr "" -#: plugins/check_ldap.c:195 +#: plugins/check_ldap.c:203 #, c-format msgid "Could not search/find objectclasses in %s\n" msgstr "" -#: plugins/check_ldap.c:218 +#: plugins/check_ldap.c:226 #, c-format msgid "LDAP %s - %.3f seconds response time|%s\n" msgstr "" -#: plugins/check_ldap.c:324 plugins/check_ping.c:241 +#: plugins/check_ldap.c:338 plugins/check_ldap.c:345 +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +#: plugins/check_ldap.c:351 plugins/check_ping.c:241 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_ldap.c:347 +#: plugins/check_ldap.c:374 msgid "Please specify the host name\n" msgstr "" -#: plugins/check_ldap.c:350 +#: plugins/check_ldap.c:377 msgid "Please specify the LDAP base\n" msgstr "" -#: plugins/check_ldap.c:378 +#: plugins/check_ldap.c:405 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:380 +#: plugins/check_ldap.c:407 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:382 +#: plugins/check_ldap.c:409 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:384 +#: plugins/check_ldap.c:411 msgid "ldap password (if required)" msgstr "" -#: plugins/check_ldap.c:388 +#: plugins/check_ldap.c:413 +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "" + +#: plugins/check_ldap.c:415 +#, c-format +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to %s" +msgstr "" + +#: plugins/check_ldap.c:419 msgid "use ldap protocol version 2" msgstr "" -#: plugins/check_ldap.c:390 +#: plugins/check_ldap.c:421 msgid "use ldap protocol version 3" msgstr "" -#: plugins/check_load.c:91 +#: plugins/check_ldap.c:431 +msgid "Note:" +msgstr "" + +#: plugins/check_ldap.c:432 +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#: plugins/check_ldap.c:433 +#, c-format +msgid "" +"implied (using default port %i) unless --port=636 is specified. In that case " +"%s" +msgstr "" + +#: plugins/check_ldap.c:434 +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +#: plugins/check_ldap.c:435 +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +#: plugins/check_ldap.c:436 +msgid "to define the behaviour explicitly instead." +msgstr "" + +#: plugins/check_load.c:92 msgid "Warning threshold must be float or float triplet!\n" msgstr "" -#: plugins/check_load.c:132 plugins/check_load.c:148 +#: plugins/check_load.c:134 plugins/check_load.c:150 #, c-format msgid "Error opening %s\n" msgstr "" -#: plugins/check_load.c:160 +#: plugins/check_load.c:162 #, c-format msgid "Error code %d returned in %s\n" msgstr "" -#: plugins/check_load.c:168 +#: plugins/check_load.c:177 #, c-format msgid "Error in getloadavg()\n" msgstr "" -#: plugins/check_load.c:171 plugins/check_load.c:173 +#: plugins/check_load.c:180 plugins/check_load.c:182 #, c-format msgid "Error processing %s\n" msgstr "" -#: plugins/check_load.c:182 +#: plugins/check_load.c:191 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "" -#: plugins/check_load.c:271 +#: plugins/check_load.c:284 #, fuzzy, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "Critical threshold muss ein positiver Integer sein\n" -#: plugins/check_load.c:273 +#: plugins/check_load.c:286 #, fuzzy, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "Warning threshold muss ein positiver Integer sein\n" -#: plugins/check_load.c:275 +#: plugins/check_load.c:288 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " "\"critical load\"\n" msgstr "" -#: plugins/check_load.c:291 +#: plugins/check_load.c:304 #, c-format msgid "This plugin tests the current system load average." msgstr "" -#: plugins/check_load.c:300 +#: plugins/check_load.c:313 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" -#: plugins/check_load.c:302 +#: plugins/check_load.c:315 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "" -#: plugins/check_load.c:303 +#: plugins/check_load.c:316 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" +#: plugins/check_load.c:318 +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + #: plugins/check_mrtg.c:79 msgid "Could not parse arguments\n" msgstr "" @@ -2194,42 +2348,42 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:720 +#: plugins/check_ntp.c:728 msgid "Critical offset should be larger than warning offset" msgstr "" -#: plugins/check_ntp.c:724 +#: plugins/check_ntp.c:732 msgid "Critical jitter should be larger than warning jitter" msgstr "" -#: plugins/check_ntp.c:810 +#: plugins/check_ntp.c:818 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:813 +#: plugins/check_ntp.c:822 msgid "Unable to fully sample sync server" msgstr "" -#: plugins/check_ntp.c:836 +#: plugins/check_ntp.c:845 #, fuzzy msgid "This plugin checks the selected ntp server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_ntp.c:844 +#: plugins/check_ntp.c:853 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:846 +#: plugins/check_ntp.c:855 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:848 +#: plugins/check_ntp.c:857 msgid "Warning value for jitter" msgstr "" -#: plugins/check_ntp.c:850 +#: plugins/check_ntp.c:859 msgid "Critical value for jitter" msgstr "" @@ -3346,104 +3500,123 @@ msgstr "" msgid "Alert if cpu of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:138 +#: plugins/check_radius.c:161 msgid "Config file error" msgstr "" -#: plugins/check_radius.c:147 +#: plugins/check_radius.c:170 msgid "Out of Memory?" msgstr "" -#: plugins/check_radius.c:168 +#: plugins/check_radius.c:191 msgid "Timeout" msgstr "" -#: plugins/check_radius.c:170 +#: plugins/check_radius.c:193 msgid "Auth Error" msgstr "" -#: plugins/check_radius.c:172 +#: plugins/check_radius.c:195 msgid "Auth Failed" msgstr "" -#: plugins/check_radius.c:176 +#: plugins/check_radius.c:199 msgid "Auth OK" msgstr "" -#: plugins/check_radius.c:219 plugins/check_radius.c:279 +#: plugins/check_radius.c:278 msgid "Number of retries must be a positive integer" msgstr "" -#: plugins/check_radius.c:305 +#: plugins/check_radius.c:290 +#, fuzzy +msgid "Host not specified" +msgstr "" +"Kein Hostname angegeben\n" +"\n" + +#: plugins/check_radius.c:292 +msgid "User not specified" +msgstr "" + +#: plugins/check_radius.c:294 +msgid "Password not specified" +msgstr "" + +#: plugins/check_radius.c:296 +msgid "Configuration file not specified" +msgstr "" + +#: plugins/check_radius.c:314 msgid "Tests to see if a radius server is accepting connections." msgstr "" -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:325 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:327 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:329 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:322 +#: plugins/check_radius.c:331 msgid "Configuration file" msgstr "" -#: plugins/check_radius.c:324 +#: plugins/check_radius.c:333 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:326 +#: plugins/check_radius.c:335 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:330 +#: plugins/check_radius.c:339 #, fuzzy msgid "" "This plugin tests a radius server to see if it is accepting connections." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_radius.c:331 +#: plugins/check_radius.c:340 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:332 +#: plugins/check_radius.c:341 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:333 +#: plugins/check_radius.c:342 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:334 +#: plugins/check_radius.c:343 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:335 +#: plugins/check_radius.c:344 msgid "password can be determined by careful watching of the command line in" msgstr "" -#: plugins/check_radius.c:336 +#: plugins/check_radius.c:345 msgid "a process listing. This risk is exacerbated because nagios will" msgstr "" -#: plugins/check_radius.c:337 +#: plugins/check_radius.c:346 msgid "run the plugin at regular prdictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:347 msgid "the password used does not allow access to sensitive system resources," msgstr "" -#: plugins/check_radius.c:339 +#: plugins/check_radius.c:348 msgid "otherwise compormise could occur." msgstr "" @@ -3467,16 +3640,21 @@ msgstr "Ung msgid "Invalid REAL response received from host on port %d\n" msgstr "" +#: plugins/check_real.c:189 plugins/check_tcp.c:294 +#, c-format +msgid "No data received from host\n" +msgstr "" + #: plugins/check_real.c:252 #, c-format msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:341 plugins/check_smtp.c:618 plugins/check_ups.c:535 +#: plugins/check_real.c:341 plugins/check_smtp.c:619 plugins/check_ups.c:535 msgid "Warning time must be a positive integer" msgstr "Warnung time muss ein positiver Integer sein" -#: plugins/check_real.c:350 plugins/check_smtp.c:609 plugins/check_ups.c:526 +#: plugins/check_real.c:350 plugins/check_smtp.c:610 plugins/check_ups.c:526 msgid "Critical time must be a positive integer" msgstr "Critical time muss ein positiver Integer sein" @@ -3506,7 +3684,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_real.c:441 plugins/check_smtp.c:767 +#: plugins/check_real.c:441 plugins/check_smtp.c:850 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -3524,65 +3702,65 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:186 plugins/check_swap.c:268 plugins/check_swap.c:274 +#: plugins/check_smtp.c:190 plugins/check_swap.c:268 plugins/check_swap.c:274 #, c-format msgid "malloc() failed!\n" msgstr "" -#: plugins/check_smtp.c:190 +#: plugins/check_smtp.c:194 #, c-format msgid "gethostname() failed!\n" msgstr "" -#: plugins/check_smtp.c:225 plugins/check_smtp.c:249 +#: plugins/check_smtp.c:229 plugins/check_smtp.c:253 #, c-format msgid "recv() failed\n" msgstr "" -#: plugins/check_smtp.c:236 +#: plugins/check_smtp.c:240 #, c-format msgid "Invalid SMTP response received from host\n" msgstr "" -#: plugins/check_smtp.c:238 +#: plugins/check_smtp.c:242 #, c-format msgid "Invalid SMTP response received from host on port %d\n" msgstr "" -#: plugins/check_smtp.c:260 +#: plugins/check_smtp.c:263 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "" -#: plugins/check_smtp.c:272 +#: plugins/check_smtp.c:275 #, c-format msgid "Server does not support STARTTLS\n" msgstr "" -#: plugins/check_smtp.c:278 +#: plugins/check_smtp.c:281 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "" -#: plugins/check_smtp.c:298 +#: plugins/check_smtp.c:301 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:303 +#: plugins/check_smtp.c:306 #, c-format msgid "sent %s" msgstr "" -#: plugins/check_smtp.c:305 +#: plugins/check_smtp.c:308 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:318 +#: plugins/check_smtp.c:320 #, fuzzy msgid "CRITICAL - Cannot retrieve server certificate." msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" -#: plugins/check_smtp.c:356 plugins/check_snmp.c:568 +#: plugins/check_smtp.c:356 plugins/check_snmp.c:579 #, c-format msgid "Could Not Compile Regular Expression" msgstr "" @@ -3592,7 +3770,7 @@ msgstr "" msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "" -#: plugins/check_smtp.c:369 plugins/check_snmp.c:318 +#: plugins/check_smtp.c:369 plugins/check_snmp.c:324 #, c-format msgid "Execute Error: %s\n" msgstr "" @@ -3605,7 +3783,8 @@ msgstr "" msgid "no authpass specified, " msgstr "" -#: plugins/check_smtp.c:395 plugins/check_smtp.c:417 plugins/check_smtp.c:438 +#: plugins/check_smtp.c:395 plugins/check_smtp.c:416 plugins/check_smtp.c:436 +#: plugins/check_smtp.c:711 #, c-format msgid "sent %s\n" msgstr "" @@ -3615,349 +3794,365 @@ msgstr "" msgid "recv() failed after AUTH LOGIN, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:404 plugins/check_smtp.c:426 plugins/check_smtp.c:447 +#: plugins/check_smtp.c:403 plugins/check_smtp.c:424 plugins/check_smtp.c:444 +#: plugins/check_smtp.c:722 #, fuzzy, c-format msgid "received %s\n" msgstr "Keine Daten empfangen %s\n" -#: plugins/check_smtp.c:408 +#: plugins/check_smtp.c:407 #, fuzzy msgid "invalid response received after AUTH LOGIN, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:421 +#: plugins/check_smtp.c:420 msgid "recv() failed after sending authuser, " msgstr "" -#: plugins/check_smtp.c:430 +#: plugins/check_smtp.c:428 #, fuzzy msgid "invalid response received after authuser, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:442 +#: plugins/check_smtp.c:440 msgid "recv() failed after sending authpass, " msgstr "" -#: plugins/check_smtp.c:451 +#: plugins/check_smtp.c:448 #, fuzzy msgid "invalid response received after authpass, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:458 +#: plugins/check_smtp.c:455 msgid "only authtype LOGIN is supported, " msgstr "" -#: plugins/check_smtp.c:482 +#: plugins/check_smtp.c:479 #, fuzzy, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_smtp.c:588 plugins/check_smtp.c:598 +#: plugins/check_smtp.c:586 plugins/check_smtp.c:598 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "" -#: plugins/check_smtp.c:645 +#: plugins/check_smtp.c:646 msgid "SSL support not available - install OpenSSL and recompile" msgstr "" -#: plugins/check_smtp.c:724 +#: plugins/check_smtp.c:717 +#, fuzzy, c-format +msgid "recv() failed after QUIT." +msgstr "Ungültige HTTP Antwort von Host empfangen\n" + +#: plugins/check_smtp.c:719 +#, c-format +msgid "Connection reset by peer." +msgstr "" + +#: plugins/check_smtp.c:807 #, fuzzy msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_smtp.c:737 +#: plugins/check_smtp.c:820 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" -#: plugins/check_smtp.c:739 +#: plugins/check_smtp.c:822 msgid "Suppress SMTP command" msgstr "" -#: plugins/check_smtp.c:741 +#: plugins/check_smtp.c:824 msgid "SMTP command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:743 +#: plugins/check_smtp.c:826 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:745 +#: plugins/check_smtp.c:828 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:748 plugins/check_tcp.c:638 +#: plugins/check_smtp.c:831 plugins/check_tcp.c:636 msgid "Minimum number of days a certificate has to be valid." msgstr "" -#: plugins/check_smtp.c:750 +#: plugins/check_smtp.c:833 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:754 +#: plugins/check_smtp.c:837 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:756 +#: plugins/check_smtp.c:839 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:758 +#: plugins/check_smtp.c:841 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:768 +#: plugins/check_smtp.c:851 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:769 +#: plugins/check_smtp.c:852 msgid "connects, but incorrect reponse messages from the host result in" msgstr "" -#: plugins/check_smtp.c:770 +#: plugins/check_smtp.c:853 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:296 +#: plugins/check_snmp.c:302 msgid "No valid data returned" msgstr "" -#: plugins/check_snmp.c:364 plugins/negate.c:128 +#: plugins/check_snmp.c:370 #, c-format msgid "" "%s problem - No data received from host\n" "CMD: %s\n" msgstr "" -#: plugins/check_snmp.c:502 +#: plugins/check_snmp.c:387 +#, fuzzy +msgid "snmpget returned an error status" +msgstr "dig hat einen Fehler zurückgegeben" + +#: plugins/check_snmp.c:513 #, c-format msgid "Invalid critical threshold: %s\n" msgstr "" -#: plugins/check_snmp.c:513 +#: plugins/check_snmp.c:524 #, c-format msgid "Invalid warning threshold: %s\n" msgstr "" -#: plugins/check_snmp.c:525 +#: plugins/check_snmp.c:536 #, fuzzy msgid "Retries interval must be a positive integer" msgstr "Time interval muss ein positiver Integer sein" -#: plugins/check_snmp.c:589 +#: plugins/check_snmp.c:600 #, fuzzy, c-format msgid "Could not reallocate labels[%d]" msgstr "Konnte addr nicht zuweisen\n" -#: plugins/check_snmp.c:601 +#: plugins/check_snmp.c:612 #, fuzzy msgid "Could not reallocate labels\n" msgstr "Konnte·url·nicht·zuweisen\n" -#: plugins/check_snmp.c:618 +#: plugins/check_snmp.c:629 #, fuzzy, c-format msgid "Could not reallocate units [%d]\n" msgstr "Konnte·url·nicht·zuweisen\n" -#: plugins/check_snmp.c:630 +#: plugins/check_snmp.c:641 msgid "Could not realloc() units\n" msgstr "" -#: plugins/check_snmp.c:715 +#: plugins/check_snmp.c:726 #, c-format msgid "Missing secname (%s) or authpassword (%s) ! \n" msgstr "" -#: plugins/check_snmp.c:723 +#: plugins/check_snmp.c:734 #, c-format msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n" msgstr "" -#: plugins/check_snmp.c:732 +#: plugins/check_snmp.c:743 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:860 +#: plugins/check_snmp.c:871 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:909 +#: plugins/check_snmp.c:920 msgid "Check status of remote machines and obtain sustem information via SNMP" msgstr "" -#: plugins/check_snmp.c:921 +#: plugins/check_snmp.c:932 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:923 +#: plugins/check_snmp.c:934 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:925 +#: plugins/check_snmp.c:936 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:927 +#: plugins/check_snmp.c:938 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:931 +#: plugins/check_snmp.c:942 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:932 +#: plugins/check_snmp.c:943 #, c-format msgid "(default is \"%s\")" msgstr "" -#: plugins/check_snmp.c:934 +#: plugins/check_snmp.c:945 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:936 +#: plugins/check_snmp.c:947 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:938 +#: plugins/check_snmp.c:949 msgid "SNMPv3 crypt passwd (DES)" msgstr "" -#: plugins/check_snmp.c:942 +#: plugins/check_snmp.c:953 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:944 +#: plugins/check_snmp.c:955 msgid "" "List of MIBS to be loaded (default = none if using numeric oids or 'ALL'" msgstr "" -#: plugins/check_snmp.c:945 +#: plugins/check_snmp.c:956 msgid "for symbolic oids.)" msgstr "" -#: plugins/check_snmp.c:947 +#: plugins/check_snmp.c:958 #, c-format msgid " Delimiter to use when parsing returned data. Default is \"%s\"" msgstr "" -#: plugins/check_snmp.c:948 +#: plugins/check_snmp.c:959 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:949 +#: plugins/check_snmp.c:960 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:953 +#: plugins/check_snmp.c:964 msgid "Range(s) which will not result in a WARNING status" msgstr "" -#: plugins/check_snmp.c:955 +#: plugins/check_snmp.c:966 msgid "Range(s) which will not result in a CRITICAL status" msgstr "" -#: plugins/check_snmp.c:959 +#: plugins/check_snmp.c:970 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:961 +#: plugins/check_snmp.c:972 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:963 +#: plugins/check_snmp.c:974 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:965 +#: plugins/check_snmp.c:976 msgid "Prefix label for output from plugin (default -s 'SNMP')" msgstr "" -#: plugins/check_snmp.c:969 +#: plugins/check_snmp.c:980 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:971 +#: plugins/check_snmp.c:982 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:977 +#: plugins/check_snmp.c:988 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:978 +#: plugins/check_snmp.c:989 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:979 +#: plugins/check_snmp.c:990 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:981 +#: plugins/check_snmp.c:992 msgid "" "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists " "with" msgstr "" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:993 msgid " internal spaces must be quoted) [max 8 OIDs]" msgstr "" -#: plugins/check_snmp.c:984 +#: plugins/check_snmp.c:995 msgid "- Ranges are inclusive and are indicated with colons. When specified as" msgstr "" -#: plugins/check_snmp.c:985 +#: plugins/check_snmp.c:996 msgid "" " 'min:max' a STATE_OK will be returned if the result is within the indicated" msgstr "" -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:997 msgid " range or is equal to the upper or lower bound. A non-OK state will be" msgstr "" -#: plugins/check_snmp.c:987 +#: plugins/check_snmp.c:998 msgid " returned if the result is outside the specified range." msgstr "" -#: plugins/check_snmp.c:989 +#: plugins/check_snmp.c:1000 msgid "" "- If specified in the order 'max:min' a non-OK state will be returned if the" msgstr "" -#: plugins/check_snmp.c:990 +#: plugins/check_snmp.c:1001 msgid " result is within the (inclusive) range." msgstr "" -#: plugins/check_snmp.c:992 +#: plugins/check_snmp.c:1003 msgid "" "- Upper or lower bounds may be omitted to skip checking the respective limit." msgstr "" -#: plugins/check_snmp.c:993 +#: plugins/check_snmp.c:1004 msgid "- Bare integers are interpreted as upper limits." msgstr "" -#: plugins/check_snmp.c:994 +#: plugins/check_snmp.c:1005 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:995 +#: plugins/check_snmp.c:1006 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:996 +#: plugins/check_snmp.c:1007 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:997 +#: plugins/check_snmp.c:1008 msgid " returned from the SNMP query is an unsigned integer." msgstr "" @@ -4082,101 +4277,109 @@ msgstr "" msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n" msgstr "" -#: plugins/check_tcp.c:199 +#: plugins/check_tcp.c:202 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:220 +#: plugins/check_tcp.c:223 msgid "With UDP checks, a send/expect string must be specified." msgstr "" -#: plugins/check_tcp.c:239 +#: plugins/check_tcp.c:242 #, c-format msgid "CRITICAL - Cannot retrieve server certificate.\n" msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n" -#: plugins/check_tcp.c:428 +#: plugins/check_tcp.c:422 msgid "No arguments found" msgstr "" -#: plugins/check_tcp.c:530 +#: plugins/check_tcp.c:523 msgid "Maxbytes must be a positive integer" msgstr "Maxbytes muss ein positiver Integer sein" -#: plugins/check_tcp.c:548 +#: plugins/check_tcp.c:541 msgid "Refuse must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:558 +#: plugins/check_tcp.c:551 msgid "Mismatch must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:564 +#: plugins/check_tcp.c:557 msgid "Delay must be a positive integer" msgstr "Delay muss ein positiver Integer sein" -#: plugins/check_tcp.c:589 +#: plugins/check_tcp.c:585 #, fuzzy msgid "You must provide a server address" msgstr "%s: Hostname muss angegeben werden\n" -#: plugins/check_tcp.c:591 +#: plugins/check_tcp.c:587 #, fuzzy msgid "Invalid hostname, address or socket" msgstr "Ungültige(r) Hostname/Adresse" -#: plugins/check_tcp.c:605 +#: plugins/check_tcp.c:601 #, fuzzy, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" "\n" msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_tcp.c:617 +#: plugins/check_tcp.c:613 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" msgstr "" -#: plugins/check_tcp.c:618 +#: plugins/check_tcp.c:614 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" -#: plugins/check_tcp.c:620 +#: plugins/check_tcp.c:616 msgid "String to send to the server" msgstr "" -#: plugins/check_tcp.c:622 +#: plugins/check_tcp.c:618 msgid "String to expect in server response" msgstr "" -#: plugins/check_tcp.c:624 +#: plugins/check_tcp.c:618 +msgid "(may be repeated)" +msgstr "" + +#: plugins/check_tcp.c:620 +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" + +#: plugins/check_tcp.c:622 msgid "String to send server to initiate a clean close of the connection" msgstr "" -#: plugins/check_tcp.c:626 +#: plugins/check_tcp.c:624 msgid "Accept tcp refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:628 +#: plugins/check_tcp.c:626 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:630 +#: plugins/check_tcp.c:628 #, fuzzy msgid "Hide output from TCP socket" msgstr "Konnte TCP socket nicht öffnen\n" -#: plugins/check_tcp.c:632 +#: plugins/check_tcp.c:630 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:634 +#: plugins/check_tcp.c:632 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:640 +#: plugins/check_tcp.c:638 msgid "Use SSL for the connection." msgstr "" @@ -4349,64 +4552,68 @@ msgstr "" msgid "Output of temperatures in Celsius" msgstr "" -#: plugins/check_ups.c:631 +#: plugins/check_ups.c:622 +msgid "Valid values for STRING are" +msgstr "" + +#: plugins/check_ups.c:635 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:632 +#: plugins/check_ups.c:636 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:633 +#: plugins/check_ups.c:637 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:634 +#: plugins/check_ups.c:638 msgid "" "state.If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:639 msgid "state." msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:641 msgid "" "You may also specify a variable to check [such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:642 msgid "" "battery load, etc.] as well as warning and critical thresholds for the " "value of" msgstr "" -#: plugins/check_ups.c:639 +#: plugins/check_ups.c:643 msgid "" "that variable. If the remote host has multiple UPS that are being monitored " "you" msgstr "" -#: plugins/check_ups.c:640 +#: plugins/check_ups.c:644 msgid "will have to use the [ups] option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:642 +#: plugins/check_ups.c:646 msgid "" "This plugin requires that the UPSD daemon distributed with Russel Kroll's" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:647 msgid "" "Smart UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:648 msgid "" "package installed on your system, you can download it from http://www." "networkupstools.org" @@ -4498,123 +4705,181 @@ msgstr "" msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:469 +#: plugins/check_ide_smart.c:452 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "" -#: plugins/check_ide_smart.c:488 +#: plugins/check_ide_smart.c:471 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "" -#: plugins/check_ide_smart.c:505 +#: plugins/check_ide_smart.c:488 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " "interface [http://smartlinux.sourceforge.net/smart/index.php]." msgstr "" -#: plugins/check_ide_smart.c:514 +#: plugins/check_ide_smart.c:497 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:515 +#: plugins/check_ide_smart.c:498 msgid "" "Note: if the device is selected with this option, _no_ other options are " "accepted" msgstr "" -#: plugins/check_ide_smart.c:517 +#: plugins/check_ide_smart.c:500 msgid "Perform immediately offline tests" msgstr "" -#: plugins/check_ide_smart.c:519 +#: plugins/check_ide_smart.c:502 msgid "Returns the number of failed tests" msgstr "" -#: plugins/check_ide_smart.c:521 +#: plugins/check_ide_smart.c:504 msgid "Turn on automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:523 +#: plugins/check_ide_smart.c:506 msgid "Turn off automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:525 +#: plugins/check_ide_smart.c:508 msgid "Output suitable for Nagios" msgstr "" -#: plugins/negate.c:257 +#: plugins/negate.c:132 +#, fuzzy +msgid "No data returned from command\n" +msgstr "Keine Daten empfangen %s\n" + +#: plugins/negate.c:209 msgid "" -"Negates the status of a plugin (returns OK for CRITICAL, and vice-versa)." +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-" +"4)." msgstr "" -#: plugins/negate.c:267 -msgid "[keep timeout than the plugin timeout to retain CRITICAL status]" +#: plugins/negate.c:215 +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." msgstr "" -#: plugins/negate.c:271 +#: plugins/negate.c:220 +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:225 +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:262 +msgid "Require path to command" +msgstr "" + +#: plugins/negate.c:298 +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." +msgstr "" + +#: plugins/negate.c:299 +msgid "Additional switches can be used to control which state becomes what." +msgstr "" + +#: plugins/negate.c:308 +msgid "Keep timeout lower than the plugin timeout to retain CRITICAL status." +msgstr "" + +#: plugins/negate.c:314 +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" + +#: plugins/negate.c:315 +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr "" + +#: plugins/negate.c:316 +#, c-format +msgid " OK and CRITICAL.\n" +msgstr "" + +#: plugins/negate.c:321 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" -#: plugins/negate.c:273 -msgid "Use single quotes if you need to retain spaces" +#: plugins/negate.c:323 +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" -#: plugins/negate.c:277 +#: plugins/negate.c:326 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" -#: plugins/negate.c:278 +#: plugins/negate.c:327 +msgid "The full path of the plugin must be provided." +msgstr "" + +#: plugins/negate.c:328 msgid "" "If the wrapped plugin returns STATE_OK, the wrapper will return " "STATE_CRITICAL." msgstr "" -#: plugins/negate.c:279 +#: plugins/negate.c:329 msgid "" "If the wrapped plugin returns STATE_CRITICAL, the wrapper will return " "STATE_OK." msgstr "" -#: plugins/negate.c:280 +#: plugins/negate.c:330 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "" -#: plugins/netutils.c:49 +#: plugins/netutils.c:53 #, fuzzy, c-format msgid "CRITICAL - Socket timeout after %d seconds\n" msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" -#: plugins/netutils.c:51 +#: plugins/netutils.c:55 #, fuzzy, c-format msgid "CRITICAL - Abnormal timeout after %d seconds\n" msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" -#: plugins/netutils.c:79 plugins/netutils.c:270 +#: plugins/netutils.c:83 plugins/netutils.c:274 msgid "Send failed" msgstr "" -#: plugins/netutils.c:96 plugins/netutils.c:285 +#: plugins/netutils.c:100 plugins/netutils.c:289 #, fuzzy msgid "No data was received from host!" msgstr "Keine Daten empfangen %s\n" -#: plugins/netutils.c:193 plugins/netutils.c:229 +#: plugins/netutils.c:197 plugins/netutils.c:233 msgid "Socket creation failed" msgstr "" -#: plugins/netutils.c:222 +#: plugins/netutils.c:226 msgid "Supplied path too long unix domain socket" msgstr "" -#: plugins/netutils.c:294 +#: plugins/netutils.c:298 msgid "Receive failed" msgstr "" -#: plugins/netutils.c:320 +#: plugins/netutils.c:324 plugins-root/check_dhcp.c:1348 #, fuzzy, c-format msgid "Invalid hostname/address - %s" msgstr "" @@ -4631,21 +4896,21 @@ msgstr "Konnte addr nicht zuweisen\n" msgid "CRITICAL - You need more args!!!" msgstr "CRITICAL - Fehler: %s\n" -#: plugins/popen.c:207 +#: plugins/popen.c:215 #, fuzzy msgid "Cannot catch SIGCHLD" msgstr "Konnte SIGALRM nicht erhalten" -#: plugins/popen.c:302 plugins/utils.c:146 +#: plugins/popen.c:310 plugins/utils.c:145 #, fuzzy, c-format msgid "CRITICAL - Plugin timed out after %d seconds\n" msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" -#: plugins/popen.c:305 +#: plugins/popen.c:313 msgid "CRITICAL - popen timeout received, but no child process" msgstr "" -#: plugins/popen.c:321 +#: plugins/popen.c:329 msgid "sysconf error for _SC_OPEN_MAX" msgstr "" @@ -4700,382 +4965,414 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:441 +#: plugins/utils.c:440 #, fuzzy msgid "failed realloc in strpcpy\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/utils.c:483 +#: plugins/utils.c:482 #, fuzzy msgid "failed malloc in strscat\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins-root/check_dhcp.c:298 +#: plugins-root/check_dhcp.c:327 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:325 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:330 +#: plugins-root/check_dhcp.c:359 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:335 +#: plugins-root/check_dhcp.c:364 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:361 +#: plugins-root/check_dhcp.c:390 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " "eg lnc0.\n" msgstr "" -#: plugins-root/check_dhcp.c:366 plugins-root/check_dhcp.c:378 +#: plugins-root/check_dhcp.c:395 plugins-root/check_dhcp.c:407 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " "%d.\n" msgstr "" -#: plugins-root/check_dhcp.c:384 +#: plugins-root/check_dhcp.c:413 #, c-format -msgid "Error: can't get MAC address for this architecture.\n" +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" msgstr "" -#: plugins-root/check_dhcp.c:389 +#: plugins-root/check_dhcp.c:432 #, c-format -msgid "Hardware address: " +msgid "Error: Cannot determine IP address of interface %s\n" msgstr "" -#: plugins-root/check_dhcp.c:464 +#: plugins-root/check_dhcp.c:440 +#, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "" + +#: plugins-root/check_dhcp.c:445 +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#: plugins-root/check_dhcp.c:530 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "" -#: plugins-root/check_dhcp.c:517 +#: plugins-root/check_dhcp.c:582 #, c-format msgid "Result=ERROR\n" msgstr "" -#: plugins-root/check_dhcp.c:523 +#: plugins-root/check_dhcp.c:588 #, c-format msgid "Result=OK\n" msgstr "" -#: plugins-root/check_dhcp.c:538 +#: plugins-root/check_dhcp.c:603 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "" -#: plugins-root/check_dhcp.c:539 +#: plugins-root/check_dhcp.c:604 #, c-format msgid " via %s\n" msgstr "" -#: plugins-root/check_dhcp.c:546 +#: plugins-root/check_dhcp.c:611 #, c-format msgid "" -"DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:568 +#: plugins-root/check_dhcp.c:633 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:651 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:587 +#: plugins-root/check_dhcp.c:652 #, fuzzy, c-format msgid "Valid responses for this machine: %d\n" msgstr "Keine Antwort vom Host \n" -#: plugins-root/check_dhcp.c:603 +#: plugins-root/check_dhcp.c:667 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:632 +#: plugins-root/check_dhcp.c:700 #, fuzzy, c-format -msgid "No (more) data received\n" +msgid "No (more) data received (nfound: %d)\n" msgstr "Keine Daten empfangen %s\n" -#: plugins-root/check_dhcp.c:651 +#: plugins-root/check_dhcp.c:719 #, c-format msgid "recvfrom() failed, " msgstr "" -#: plugins-root/check_dhcp.c:658 +#: plugins-root/check_dhcp.c:726 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:659 +#: plugins-root/check_dhcp.c:727 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:688 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not create socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:698 +#: plugins-root/check_dhcp.c:767 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:704 +#: plugins-root/check_dhcp.c:773 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:782 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:722 +#: plugins-root/check_dhcp.c:793 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:756 +#: plugins-root/check_dhcp.c:827 #, c-format msgid "Requested server address: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:812 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Lease Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:814 +#: plugins-root/check_dhcp.c:890 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:816 +#: plugins-root/check_dhcp.c:892 #, c-format msgid "Renewal Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:818 +#: plugins-root/check_dhcp.c:894 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:896 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:821 +#: plugins-root/check_dhcp.c:897 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:837 +#: plugins-root/check_dhcp.c:925 #, c-format msgid "Added offer from server @ %s" msgstr "" -#: plugins-root/check_dhcp.c:838 +#: plugins-root/check_dhcp.c:926 #, c-format msgid " of IP address %s\n" msgstr "" -#: plugins-root/check_dhcp.c:905 +#: plugins-root/check_dhcp.c:993 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "" -#: plugins-root/check_dhcp.c:906 +#: plugins-root/check_dhcp.c:994 #, c-format msgid " Requested=%s" msgstr "" -#: plugins-root/check_dhcp.c:908 +#: plugins-root/check_dhcp.c:996 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:909 +#: plugins-root/check_dhcp.c:997 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:957 +#: plugins-root/check_dhcp.c:1045 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "" -#: plugins-root/check_dhcp.c:961 +#: plugins-root/check_dhcp.c:1049 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "" -#: plugins-root/check_dhcp.c:964 +#: plugins-root/check_dhcp.c:1052 #, c-format msgid ", %s%d of %d requested servers responded" msgstr "" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 #, c-format msgid ", requested address (%s) was %soffered" msgstr "" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 msgid "not " msgstr "" -#: plugins-root/check_dhcp.c:969 +#: plugins-root/check_dhcp.c:1057 #, c-format msgid ", max lease time = " msgstr "" -#: plugins-root/check_dhcp.c:971 +#: plugins-root/check_dhcp.c:1059 #, c-format msgid "Infinity" msgstr "" -#: plugins-root/check_dhcp.c:1148 +#: plugins-root/check_dhcp.c:1240 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1160 +#: plugins-root/check_dhcp.c:1252 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1173 +#: plugins-root/check_dhcp.c:1265 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" -#: plugins-root/check_dhcp.c:1185 +#: plugins-root/check_dhcp.c:1277 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1209 +#: plugins-root/check_dhcp.c:1301 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1257 +#: plugins-root/check_dhcp.c:1380 +#, c-format +msgid "Hardware address: " +msgstr "" + +#: plugins-root/check_dhcp.c:1396 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "" -#: plugins-root/check_dhcp.c:1268 +#: plugins-root/check_dhcp.c:1407 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1270 +#: plugins-root/check_dhcp.c:1409 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1272 +#: plugins-root/check_dhcp.c:1411 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1274 +#: plugins-root/check_dhcp.c:1413 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_icmp.c:1227 +#: plugins-root/check_dhcp.c:1415 +msgid "MAC address to use in the DHCP request" +msgstr "" + +#: plugins-root/check_dhcp.c:1417 +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +#: plugins-root/check_icmp.c:1223 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1229 +#: plugins-root/check_icmp.c:1225 #, fuzzy msgid "warning threshold (currently " msgstr "Warning threshold Integer sein" -#: plugins-root/check_icmp.c:1232 +#: plugins-root/check_icmp.c:1228 #, fuzzy msgid "critical threshold (currently " msgstr "Critical threshold muss ein Integer sein" -#: plugins-root/check_icmp.c:1235 +#: plugins-root/check_icmp.c:1231 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1238 +#: plugins-root/check_icmp.c:1234 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1241 +#: plugins-root/check_icmp.c:1237 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1244 +#: plugins-root/check_icmp.c:1240 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1247 +#: plugins-root/check_icmp.c:1243 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1250 +#: plugins-root/check_icmp.c:1246 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1253 +#: plugins-root/check_icmp.c:1249 msgid "icmp packet size (currenly ignored)" msgstr "" -#: plugins-root/check_icmp.c:1255 +#: plugins-root/check_icmp.c:1251 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1258 +#: plugins-root/check_icmp.c:1254 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1259 +#: plugins-root/check_icmp.c:1255 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1260 +#: plugins-root/check_icmp.c:1256 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1261 +#: plugins-root/check_icmp.c:1257 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1262 +#: plugins-root/check_icmp.c:1258 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1267 +#: plugins-root/check_icmp.c:1263 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" +#, fuzzy +#~ msgid "%s does not exist\n" +#~ msgstr "%s [%s nicht gefunden]" + +#, fuzzy +#~ msgid "Unknown error" +#~ msgstr "Papierfehler" + #, fuzzy #~ msgid "Unknown argument - %s" #~ msgstr "" @@ -5274,13 +5571,6 @@ msgstr "" #~ msgid "ERROR: Cannot initiate SSL handshake.\n" #~ msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n" -#~ msgid "" -#~ "Hostname was not supplied\n" -#~ "\n" -#~ msgstr "" -#~ "Kein Hostname angegeben\n" -#~ "\n" - #~ msgid "" #~ "%s: Unknown argument: %s\n" #~ "\n" diff --git a/po/fr.gmo b/po/fr.gmo index cb8493d..bc62fae 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 75d59ea..2621f12 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-10 03:05-0400\n" +"POT-Creation-Date: 2007-09-29 02:04+0100\n" "PO-Revision-Date: 2007-04-10 02:46-0400\n" "Last-Translator: Thomas Guyot-Sionnest \n" "Language-Team: Français \n" @@ -19,79 +19,85 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: KBabel 1.11.1\n" -#: plugins/check_by_ssh.c:82 plugins/check_dig.c:89 plugins/check_disk.c:192 +#: plugins/check_by_ssh.c:83 plugins/check_dig.c:89 plugins/check_disk.c:198 #: plugins/check_dns.c:93 plugins/check_dummy.c:59 plugins/check_fping.c:89 -#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:147 -#: plugins/check_ldap.c:105 plugins/check_load.c:122 +#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:150 +#: plugins/check_ldap.c:108 plugins/check_load.c:124 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:88 -#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:758 +#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:766 #: plugins/check_nwstat.c:177 plugins/check_overcr.c:106 #: plugins/check_pgsql.c:156 plugins/check_ping.c:99 plugins/check_procs.c:143 -#: plugins/check_radius.c:133 plugins/check_real.c:85 plugins/check_smtp.c:180 +#: plugins/check_radius.c:156 plugins/check_real.c:85 plugins/check_smtp.c:184 #: plugins/check_snmp.c:182 plugins/check_ssh.c:78 plugins/check_swap.c:113 -#: plugins/check_tcp.c:208 plugins/check_time.c:82 plugins/check_ups.c:125 -#: plugins/check_users.c:70 plugins/negate.c:102 plugins-root/check_dhcp.c:256 +#: plugins/check_tcp.c:211 plugins/check_time.c:82 plugins/check_ups.c:125 +#: plugins/check_users.c:70 plugins/negate.c:259 plugins-root/check_dhcp.c:280 msgid "Could not parse arguments" msgstr "Impossible de parcourir les arguments" -#: plugins/check_by_ssh.c:86 plugins/check_dig.c:86 plugins/check_dns.c:89 +#: plugins/check_by_ssh.c:87 plugins/check_dig.c:86 plugins/check_dns.c:89 #: plugins/check_nagios.c:98 plugins/check_pgsql.c:160 -#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:106 +#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:113 msgid "Cannot catch SIGALRM" msgstr "impossible d'obtenir le signal SIGALRM" -#: plugins/check_by_ssh.c:97 +#: plugins/check_by_ssh.c:104 #, c-format msgid "Remote command execution failed: %s\n" msgstr "L'exécution de la commande à distance %s à échoué\n" -#: plugins/check_by_ssh.c:98 -msgid "Unknown error" -msgstr "Erreur inconnue" - #: plugins/check_by_ssh.c:116 #, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" +msgstr "" + +#: plugins/check_by_ssh.c:128 +#, c-format msgid "SSH WARNING: could not open %s\n" msgstr "SSH AVERTISSEMENT: impossible d'ouvrir %s\n" -#: plugins/check_by_ssh.c:200 plugins/check_disk.c:507 -#: plugins/check_http.c:241 plugins/check_ldap.c:281 plugins/check_pgsql.c:237 -#: plugins/check_procs.c:371 plugins/check_radius.c:215 -#: plugins/check_radius.c:285 plugins/check_real.c:361 -#: plugins/check_smtp.c:629 plugins/check_snmp.c:494 plugins/check_ssh.c:143 -#: plugins/check_tcp.c:500 plugins/check_time.c:306 plugins/check_ups.c:555 -#: plugins/negate.c:203 +#: plugins/check_by_ssh.c:214 plugins/check_disk.c:523 +#: plugins/check_http.c:244 plugins/check_ldap.c:292 plugins/check_pgsql.c:237 +#: plugins/check_procs.c:371 plugins/check_radius.c:284 +#: plugins/check_real.c:361 plugins/check_smtp.c:630 plugins/check_snmp.c:505 +#: plugins/check_ssh.c:143 plugins/check_tcp.c:494 plugins/check_time.c:306 +#: plugins/check_ups.c:555 plugins/negate.c:203 msgid "Timeout interval must be a positive integer" msgstr "Le délai d'attente doit être un entier positif" -#: plugins/check_by_ssh.c:210 plugins/check_pgsql.c:261 -#: plugins/check_radius.c:224 plugins/check_radius.c:258 -#: plugins/check_real.c:332 plugins/check_smtp.c:561 plugins/check_tcp.c:506 -#: plugins/check_time.c:300 plugins/check_ups.c:517 +#: plugins/check_by_ssh.c:224 plugins/check_pgsql.c:261 +#: plugins/check_radius.c:257 plugins/check_real.c:332 +#: plugins/check_smtp.c:558 plugins/check_tcp.c:500 plugins/check_time.c:300 +#: plugins/check_ups.c:517 msgid "Port must be a positive integer" msgstr "Le numéro du port doit être un entier positif" -#: plugins/check_by_ssh.c:254 -msgid "skip lines must be an integer" +#: plugins/check_by_ssh.c:270 +#, fuzzy +msgid "skip-stdout argument must be an integer" msgstr "Le nombres de lignes à sauter doit être un entier" -#: plugins/check_by_ssh.c:272 +#: plugins/check_by_ssh.c:278 +#, fuzzy +msgid "skip-stderr argument must be an integer" +msgstr "Le nombres de lignes à sauter doit être un entier" + +#: plugins/check_by_ssh.c:296 #, c-format msgid "%s: You must provide a host name\n" msgstr "%s: Vous devez fournir un nom d'hôte\n" -#: plugins/check_by_ssh.c:290 +#: plugins/check_by_ssh.c:314 msgid "No remotecmd" msgstr "Pas de commande distante" -#: plugins/check_by_ssh.c:306 +#: plugins/check_by_ssh.c:330 #, c-format msgid "" "%s: In passive mode, you must provide a service name for each command.\n" msgstr "" "%s: En mode passif, vous devez fournir un service pour chaque commande.\n" -#: plugins/check_by_ssh.c:309 +#: plugins/check_by_ssh.c:333 #, c-format msgid "" "%s: In passive mode, you must provide the host short name from the nagios " @@ -100,123 +106,127 @@ msgstr "" "%s: En mode passif, vous devez fournir le nom court du hôte mentionné dans " "la configuration de nagios.\n" -#: plugins/check_by_ssh.c:323 +#: plugins/check_by_ssh.c:347 #, c-format msgid "This plugin uses SSH to execute commands on a remote host" msgstr "Ce plugin utilise SSH pour exécuter des commandes sur un hôte distant" -#: plugins/check_by_ssh.c:336 -msgid "tell ssh to use Protocol 1" +#: plugins/check_by_ssh.c:360 +#, fuzzy +msgid "tell ssh to use Protocol 1 [optional]" msgstr "dire à ssh d'utiliser le protocole version 1" -#: plugins/check_by_ssh.c:338 -msgid "tell ssh to use Protocol 2" +#: plugins/check_by_ssh.c:362 +#, fuzzy +msgid "tell ssh to use Protocol 2 [optional]" msgstr "dire à ssh d'utiliser le protocole 2" -#: plugins/check_by_ssh.c:340 -msgid "Ignore first n lines on STDERR (to suppress a logon banner)" -msgstr "" -"ignorer les x premières lignes sur STDERR (pour supprimer une bannière de " -"connexion)" - -#: plugins/check_by_ssh.c:342 -msgid "tells ssh to fork rather than create a tty" +#: plugins/check_by_ssh.c:364 +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" msgstr "" -#: plugins/check_by_ssh.c:344 +#: plugins/check_by_ssh.c:366 +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:368 +msgid "tells ssh to fork rather than create a tty [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:370 msgid "command to execute on the remote machine" msgstr "commande à exécuter sur la machine distante" -#: plugins/check_by_ssh.c:346 +#: plugins/check_by_ssh.c:372 msgid "SSH user name on remote host [optional]" msgstr "Nom d'utilisateur ssh sur la machine distante [optionnel]" -#: plugins/check_by_ssh.c:348 +#: plugins/check_by_ssh.c:374 msgid "identity of an authorized key [optional]" msgstr "Identité de la clé autorisée [optionnel]" -#: plugins/check_by_ssh.c:350 +#: plugins/check_by_ssh.c:376 msgid "external command file for nagios [optional]" msgstr "commande externe pour nagios [optionnel]" -#: plugins/check_by_ssh.c:352 +#: plugins/check_by_ssh.c:378 msgid "list of nagios service names, separated by ':' [optional]" msgstr "liste des services nagios, séparés par ':' [optionnel] " -#: plugins/check_by_ssh.c:354 +#: plugins/check_by_ssh.c:380 msgid "short name of host in nagios configuration [optional]" msgstr "nom court de l'hôte dans la configuration nagios [optionnel]" -#: plugins/check_by_ssh.c:356 +#: plugins/check_by_ssh.c:382 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" msgstr "" "appelle ssh avec '-o OPTION' (peut être utilisé plusieurs fois) [optionnel]" -#: plugins/check_by_ssh.c:358 +#: plugins/check_by_ssh.c:384 msgid "Tell ssh to suppress warning and diagnostic messages [optional]" msgstr "" "dire à ssh de supprimer les messages d'erreurs et de diagnostic [optionnel]" -#: plugins/check_by_ssh.c:361 +#: plugins/check_by_ssh.c:387 msgid "The most common mode of use is to refer to a local identity file with" msgstr "" -#: plugins/check_by_ssh.c:362 +#: plugins/check_by_ssh.c:388 msgid "the '-i' option. In this mode, the identity pair should have a null" msgstr "" -#: plugins/check_by_ssh.c:363 +#: plugins/check_by_ssh.c:389 msgid "passphrase and the public key should be listed in the authorized_keys" msgstr "" -#: plugins/check_by_ssh.c:364 +#: plugins/check_by_ssh.c:390 msgid "file of the remote host. Usually the key will be restricted to running" msgstr "" -#: plugins/check_by_ssh.c:365 +#: plugins/check_by_ssh.c:391 msgid "only one command on the remote server. If the remote SSH server tracks" msgstr "" -#: plugins/check_by_ssh.c:366 +#: plugins/check_by_ssh.c:392 msgid "invocation arguments, the one remote program may be an agent that can" msgstr "" -#: plugins/check_by_ssh.c:367 +#: plugins/check_by_ssh.c:393 msgid "execute additional commands as proxy" msgstr "" -#: plugins/check_by_ssh.c:368 +#: plugins/check_by_ssh.c:394 msgid "To use passive mode, provide multiple '-C' options, and provide" msgstr "Pour utiliser le mode passif, utilisez plusieurs fois l'option '-C',et" -#: plugins/check_by_ssh.c:369 +#: plugins/check_by_ssh.c:395 msgid "" "all of -O, -s, and -n options (servicelist order must match '-C'options)" msgstr "" "et les options -O, -s, n (l'ordre des services doit correspondre aux " "multiples options '-C)" -#: plugins/check_by_ssh.c:371 plugins/check_disk.c:901 -#: plugins/check_http.c:1324 plugins/check_nagios.c:303 -#: plugins/check_procs.c:735 plugins/negate.c:269 plugins/urlize.c:187 +#: plugins/check_by_ssh.c:397 plugins/check_disk.c:947 +#: plugins/check_http.c:1352 plugins/check_nagios.c:303 +#: plugins/check_procs.c:735 plugins/negate.c:319 plugins/urlize.c:187 #, c-format msgid "Examples:" msgstr "Exemples:" -#: plugins/check_by_ssh.c:385 plugins/check_dig.c:336 plugins/check_disk.c:912 -#: plugins/check_dns.c:447 plugins/check_dummy.c:127 plugins/check_fping.c:407 -#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1347 -#: plugins/check_ldap.c:411 plugins/check_load.c:311 plugins/check_mrtg.c:383 +#: plugins/check_by_ssh.c:412 plugins/check_dig.c:336 plugins/check_disk.c:963 +#: plugins/check_dns.c:447 plugins/check_dummy.c:129 plugins/check_fping.c:407 +#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1375 +#: plugins/check_ldap.c:449 plugins/check_load.c:326 plugins/check_mrtg.c:383 #: plugins/check_mysql.c:407 plugins/check_nagios.c:313 plugins/check_nt.c:707 -#: plugins/check_ntp.c:859 plugins/check_nwstat.c:1688 +#: plugins/check_ntp.c:868 plugins/check_nwstat.c:1688 #: plugins/check_overcr.c:469 plugins/check_pgsql.c:458 #: plugins/check_ping.c:597 plugins/check_procs.c:753 -#: plugins/check_radius.c:349 plugins/check_real.c:454 -#: plugins/check_smtp.c:780 plugins/check_snmp.c:1007 plugins/check_ssh.c:306 -#: plugins/check_swap.c:560 plugins/check_tcp.c:656 plugins/check_time.c:373 -#: plugins/check_ups.c:653 plugins/check_users.c:230 -#: plugins/check_ide_smart.c:544 plugins/negate.c:290 plugins/urlize.c:204 -#: plugins-root/check_dhcp.c:1283 plugins-root/check_icmp.c:1282 +#: plugins/check_radius.c:358 plugins/check_real.c:454 +#: plugins/check_smtp.c:863 plugins/check_snmp.c:1018 plugins/check_ssh.c:306 +#: plugins/check_swap.c:560 plugins/check_tcp.c:654 plugins/check_time.c:373 +#: plugins/check_ups.c:657 plugins/check_users.c:230 +#: plugins/check_ide_smart.c:527 plugins/negate.c:340 plugins/urlize.c:204 +#: plugins-root/check_dhcp.c:1426 plugins-root/check_icmp.c:1278 #, c-format msgid "Usage:" msgstr "Utilisation:" @@ -283,184 +293,243 @@ msgstr "" "une adresse qui devrait se trouver dans l'ANSWER SECTION. Si elle ne si " "trouve pas, utilise ce qui a été précisé avec -l" -#: plugins/check_disk.c:213 +#: plugins/check_disk.c:220 #, c-format msgid "DISK %s: %s not found\n" msgstr "DISK %s: %s non trouvé\n" -#: plugins/check_disk.c:213 plugins/check_disk.c:751 plugins/check_dns.c:208 -#: plugins/check_dummy.c:81 plugins/check_http.c:959 plugins/check_http.c:1022 -#: plugins/check_mysql.c:214 plugins/check_nagios.c:107 -#: plugins/check_nagios.c:171 plugins/check_nagios.c:175 -#: plugins/check_procs.c:302 +#: plugins/check_disk.c:220 plugins/check_disk.c:978 plugins/check_dns.c:208 +#: plugins/check_dummy.c:81 plugins/check_mysql.c:214 +#: plugins/check_nagios.c:107 plugins/check_nagios.c:171 +#: plugins/check_nagios.c:175 plugins/check_procs.c:302 #, c-format msgid "CRITICAL" msgstr "CRITIQUE" -#: plugins/check_disk.c:581 +#: plugins/check_disk.c:597 #, c-format msgid "unit type %s not known\n" msgstr "unité de type %s inconnue\n" -#: plugins/check_disk.c:584 +#: plugins/check_disk.c:600 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "Impossible d'allouer de l'espace pour '%s'\n" -#: plugins/check_disk.c:606 plugins/check_disk.c:643 plugins/check_disk.c:653 -#: plugins/check_disk.c:659 plugins/check_disk.c:678 plugins/check_dummy.c:84 -#: plugins/check_http.c:953 +#: plugins/check_disk.c:624 plugins/check_disk.c:655 plugins/check_disk.c:660 +#: plugins/check_disk.c:667 plugins/check_disk.c:671 plugins/check_disk.c:711 +#: plugins/check_disk.c:717 plugins/check_disk.c:736 plugins/check_dummy.c:84 +#: plugins/check_dummy.c:87 #, c-format msgid "UNKNOWN" msgstr "INCONNU" -#: plugins/check_disk.c:606 +#: plugins/check_disk.c:624 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:643 -msgid "Must set group value before using -p\n" +#: plugins/check_disk.c:655 +msgid "Must set -E before selecting pathes\n" msgstr "" -#: plugins/check_disk.c:653 -msgid "Must set a threshold value before using -r/-R\n" +#: plugins/check_disk.c:660 +msgid "Must set group value before selecting pathes \n" msgstr "" -#: plugins/check_disk.c:659 +#: plugins/check_disk.c:667 +msgid "" +"Pathes need to be selected before using -i/-I. Use -A to select all pathes " +"explicitly" +msgstr "" + +#: plugins/check_disk.c:671 plugins/check_disk.c:717 #, fuzzy msgid "Could not compile regular expression" msgstr "Impossible de compiler l'expression régulière" -#: plugins/check_disk.c:679 +#: plugins/check_disk.c:711 +msgid "Must set a threshold value before using -r/-R\n" +msgstr "" + +#: plugins/check_disk.c:737 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:723 +#: plugins/check_disk.c:784 msgid "Unknown argument" msgstr "Argument inconnu" -#: plugins/check_disk.c:752 -#, c-format -msgid "%s does not exist\n" -msgstr "%s n'existe pas\n" - -#: plugins/check_disk.c:781 +#: plugins/check_disk.c:818 #, c-format msgid " for %s\n" msgstr " pour %s\n" -#: plugins/check_disk.c:849 +#: plugins/check_disk.c:886 msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "Ce plugin vérifie la place utilisé sur un système de fichier monté" -#: plugins/check_disk.c:850 +#: plugins/check_disk.c:887 msgid "" "and generates an alert if free space is less than one of the threshold values" msgstr "" "et génère une alerte si la place disponible est plus petite qu'une des " "valeurs fournies" -#: plugins/check_disk.c:859 +#: plugins/check_disk.c:896 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de x unités de disques sont " "libres" -#: plugins/check_disk.c:861 +#: plugins/check_disk.c:898 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de x pour-cent du disque est " "libre" -#: plugins/check_disk.c:863 +#: plugins/check_disk.c:900 +msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de x unités du disque sont libres" + +#: plugins/check_disk.c:902 +msgid "Exit with CRITCAL status if less than PERCENT of disk space is free" +msgstr "" +"Sortir avec un résultat CRITIQUE si moins de x pour-cent du disque est libre" + +#: plugins/check_disk.c:904 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de x pour-cent des inodes " "sont libres" -#: plugins/check_disk.c:865 +#: plugins/check_disk.c:906 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de x pour-cent des inodes sont " "libres" -#: plugins/check_disk.c:867 -msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" -msgstr "" -"Sortir avec un résultat CRITIQUE si moins de x unités du disque sont libres" - -#: plugins/check_disk.c:869 -msgid "Exit with CRITCAL status if less than PERCENT of disk space is free" -msgstr "" -"Sortir avec un résultat CRITIQUE si moins de x pour-cent du disque est libre" - -#: plugins/check_disk.c:871 -msgid "Clear thresholds" -msgstr "Effacer les seuils" - -#: plugins/check_disk.c:873 -msgid "Choose bytes, kB, MB, GB, TB (default: MB)" -msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)" - -#: plugins/check_disk.c:875 -msgid "Same as '--units kB'" -msgstr "Pareil à '--units kB'" - -#: plugins/check_disk.c:877 -msgid "Same as '--units MB'" -msgstr "Pareil à '--units MB'" - -#: plugins/check_disk.c:879 -msgid "Only check local filesystems" -msgstr "Vérifier seulement les systèmes de fichiers locaux" - -#: plugins/check_disk.c:881 +#: plugins/check_disk.c:908 msgid "Path or partition (may be repeated)" msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:883 -#, fuzzy -msgid "Regular expression for path or partition (may be repeated)" -msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" +#: plugins/check_disk.c:910 +msgid "Ignore device (only works if -p unspecified)" +msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)" -#: plugins/check_disk.c:885 +#: plugins/check_disk.c:912 +msgid "Clear thresholds" +msgstr "Effacer les seuils" + +#: plugins/check_disk.c:914 +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +#: plugins/check_disk.c:916 +msgid "Display only devices/mountpoints with errors" +msgstr "Afficher seulement les périphériques/point de montage avec des erreurs" + +#: plugins/check_disk.c:918 +msgid "" +"Group pathes. Thresholds apply to (free-)space of all partitions together" +msgstr "" + +#: plugins/check_disk.c:920 +msgid "Same as '--units kB'" +msgstr "Pareil à '--units kB'" + +#: plugins/check_disk.c:922 +msgid "Only check local filesystems" +msgstr "Vérifier seulement les systèmes de fichiers locaux" + +#: plugins/check_disk.c:924 +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +#: plugins/check_disk.c:925 +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +#: plugins/check_disk.c:927 +msgid "Display the mountpoint instead of the partition" +msgstr "Afficher le point de montage au lieu de la partition" + +#: plugins/check_disk.c:929 +msgid "Same as '--units MB'" +msgstr "Pareil à '--units MB'" + +#: plugins/check_disk.c:931 +msgid "Explicitly select all pathes. This is equivalent to -R '.*'" +msgstr "" + +#: plugins/check_disk.c:933 #, fuzzy msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:887 +#: plugins/check_disk.c:935 +#, fuzzy +msgid "Regular expression for path or partition (may be repeated)" +msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" + +#: plugins/check_disk.c:937 +#, fuzzy msgid "" -"Group pathes. Thresholds apply to (free-)space of all partitions together" -msgstr "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:889 -msgid "Ignore device (only works if -p unspecified)" -msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)" +#: plugins/check_disk.c:939 +#, fuzzy +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:891 +#: plugins/check_disk.c:942 +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)" + +#: plugins/check_disk.c:945 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " "(peut être utilisé plusieurs fois)" -#: plugins/check_disk.c:893 -msgid "Display the mountpoint instead of the partition" -msgstr "Afficher le point de montage au lieu de la partition" - -#: plugins/check_disk.c:895 -msgid "For paths or partitions specified with -p, only check for exact paths" -msgstr "" - -#: plugins/check_disk.c:897 -msgid "Display only devices/mountpoints with errors" -msgstr "Afficher seulement les périphériques/point de montage avec des erreurs" - -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:949 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "Vérifie /tmp à 10% et /var à 5% et / à 100MB et 50MB" +#: plugins/check_disk.c:951 +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +#: plugins/check_disk.c:952 +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +#: plugins/check_disk.c:954 +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#: plugins/check_disk.c:979 +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +#: plugins/check_disk.c:979 +msgid "is not accessible" +msgstr "" + #: plugins/check_dns.c:107 msgid "nslookup returned an error status" msgstr "nslookup à retourné un code d'erreur" @@ -493,15 +562,14 @@ msgstr "j'attendais '%s' mais j'ai reçu '%s'" msgid "server %s is not authoritative for %s" msgstr "serveur %s n'est pas autoritaire pour %s" -#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_http.c:955 -#: plugins/check_nagios.c:185 plugins/check_procs.c:295 +#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_nagios.c:185 +#: plugins/check_procs.c:295 #, c-format msgid "OK" msgstr "OK" -#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_http.c:957 -#: plugins/check_mysql.c:211 plugins/check_nagios.c:185 -#: plugins/check_procs.c:297 +#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_mysql.c:211 +#: plugins/check_nagios.c:185 plugins/check_procs.c:297 #, c-format msgid "WARNING" msgstr "AVERTISSEMENT" @@ -653,31 +721,31 @@ msgstr "" msgid "Arguments to check_dummy must be an integer" msgstr "Les arguments pour check_dummy doivent être des entiers" -#: plugins/check_dummy.c:87 +#: plugins/check_dummy.c:89 #, c-format msgid "Status %d is not a supported error state\n" msgstr "Le résultat %d n'est pas un résultat supporté\n" -#: plugins/check_dummy.c:109 +#: plugins/check_dummy.c:111 msgid "" "This plugin will simply return the state corresponding to the numeric value" msgstr "" "Ce plugin renverra simplement l'état correspondant à la valeur numérique" -#: plugins/check_dummy.c:111 +#: plugins/check_dummy.c:113 msgid "of the argument with optional text" msgstr "du paramètre avec un texte optionnel" #: plugins/check_fping.c:103 plugins/check_hpjd.c:131 plugins/check_ping.c:432 #: plugins/check_procs.c:159 plugins/check_snmp.c:203 plugins/check_swap.c:178 -#: plugins/check_users.c:75 plugins/negate.c:112 plugins/urlize.c:117 +#: plugins/check_users.c:75 plugins/urlize.c:117 #, c-format msgid "Could not open pipe: %s\n" msgstr "Impossible d'ouvrir le pipe: %s\n" -#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:153 -#: plugins/check_procs.c:165 plugins/check_snmp.c:209 plugins/check_swap.c:184 -#: plugins/check_users.c:81 plugins/negate.c:117 plugins/urlize.c:123 +#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:155 +#: plugins/check_procs.c:165 plugins/check_snmp.c:210 plugins/check_swap.c:184 +#: plugins/check_users.c:81 plugins/urlize.c:123 #, c-format msgid "Could not open stderr for %s\n" msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n" @@ -708,10 +776,10 @@ msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" #: plugins/check_fping.c:273 plugins/check_hpjd.c:341 plugins/check_hpjd.c:364 -#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:696 +#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:704 #: plugins/check_pgsql.c:255 plugins/check_ping.c:290 plugins/check_ping.c:413 -#: plugins/check_radius.c:250 plugins/check_real.c:319 -#: plugins/check_real.c:381 plugins/check_smtp.c:554 plugins/check_smtp.c:675 +#: plugins/check_radius.c:249 plugins/check_real.c:319 +#: plugins/check_real.c:381 plugins/check_smtp.c:551 plugins/check_smtp.c:676 #: plugins/check_ssh.c:162 plugins/check_time.c:244 plugins/check_time.c:319 #: plugins/check_ups.c:503 plugins/check_ups.c:572 msgid "Invalid hostname/address" @@ -725,7 +793,7 @@ msgstr "La taille du paquet doit être un entier positif" msgid "Packet count must be a positive integer" msgstr "Le nombre de paquets doit être un entier positif" -#: plugins/check_fping.c:319 plugins/check_ntp.c:728 plugins/check_time.c:323 +#: plugins/check_fping.c:319 plugins/check_ntp.c:736 plugins/check_time.c:323 msgid "Hostname was not supplied" msgstr "Le nom de l'hôte n'a pas été spécifié" @@ -841,10 +909,10 @@ msgstr "" msgid "Field number in raw qstat output that contains ping time" msgstr "" -#: plugins/check_game.c:318 plugins/check_http.c:1312 plugins/check_mrtg.c:364 +#: plugins/check_game.c:318 plugins/check_http.c:1340 plugins/check_mrtg.c:364 #: plugins/check_mrtgtraf.c:361 plugins/check_nt.c:693 #: plugins/check_nwstat.c:1673 plugins/check_overcr.c:452 -#: plugins/check_swap.c:549 plugins/check_ups.c:629 plugins/negate.c:276 +#: plugins/check_swap.c:549 plugins/check_ups.c:633 plugins/negate.c:325 #, c-format msgid "Notes:" msgstr "Notes:" @@ -937,553 +1005,643 @@ msgstr "Le nom de la communauté SNMP " msgid "(default=%s)" msgstr "(défaut=%s)" -#: plugins/check_http.c:247 +#: plugins/check_http.c:250 msgid "Critical threshold must be integer" msgstr "le seuil critique doit être un entier positif" -#: plugins/check_http.c:255 +#: plugins/check_http.c:258 msgid "Warning threshold must be integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_http.c:281 plugins/check_tcp.c:570 +#: plugins/check_http.c:284 plugins/check_tcp.c:563 msgid "Invalid certificate expiration period" msgstr "Période d'expiration du certificat invalide" -#: plugins/check_http.c:290 plugins/check_tcp.c:582 +#: plugins/check_http.c:293 plugins/check_tcp.c:575 msgid "Invalid option - SSL is not available" msgstr "Option invalide - SSL n'est pas disponible" -#: plugins/check_http.c:308 +#: plugins/check_http.c:311 #, c-format msgid "option f:%d \n" msgstr "option f:%d \n" -#: plugins/check_http.c:325 +#: plugins/check_http.c:328 msgid "Invalid port number" msgstr "Numéro de port invalide" -#: plugins/check_http.c:363 +#: plugins/check_http.c:366 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "Impossible de compiler l'expression régulière: %s" -#: plugins/check_http.c:377 plugins/check_ntp.c:709 plugins/check_smtp.c:655 -#: plugins/check_ssh.c:154 plugins/check_tcp.c:473 +#: plugins/check_http.c:380 plugins/check_ntp.c:717 plugins/check_smtp.c:656 +#: plugins/check_ssh.c:154 plugins/check_tcp.c:467 msgid "IPv6 support not available" msgstr "Support IPv6 non disponible" -#: plugins/check_http.c:439 plugins/check_ping.c:417 +#: plugins/check_http.c:442 plugins/check_ping.c:417 msgid "You must specify a server address or host name" msgstr "Vous devez spécifier une adresse ou un nom d'hôte" -#: plugins/check_http.c:665 -msgid "Server date unknown\n" -msgstr "Date du serveur inconnue\n" +#: plugins/check_http.c:668 +msgid "HTTP UNKNOWN - Server date unknown\n" +msgstr "HTTP INCONNU - Date du serveur inconnue\n" -#: plugins/check_http.c:667 -msgid "Document modification date unknown\n" -msgstr "Date de modification du document inconnue\n" +#: plugins/check_http.c:670 +msgid "HTTP CRITICAL - Document modification date unknown\n" +msgstr "HTTP CRITIQUE - Date de modification du document inconnue\n" -#: plugins/check_http.c:673 +#: plugins/check_http.c:676 #, c-format -msgid "CRITICAL - Server date \"%100s\" unparsable" -msgstr "CRITIQUE - Date du serveur \"%100s\" illisible" +msgid "HTTP CRITICAL - Server date \"%100s\" unparsable" +msgstr "HTTP CRITIQUE - Date du serveur \"%100s\" illisible" -#: plugins/check_http.c:675 +#: plugins/check_http.c:678 #, c-format -msgid "CRITICAL - Document date \"%100s\" unparsable" -msgstr "CRITIQUE - Date du document \"%100s\" illisible" +msgid "HTTP CRITICAL - Document date \"%100s\" unparsable" +msgstr "HTTP CRITIQUE - Date du document \"%100s\" illisible" -#: plugins/check_http.c:677 +#: plugins/check_http.c:680 #, c-format -msgid "CRITICAL - Document is %d seconds in the future\n" -msgstr "CRITIQUE - La date du document est %d secondes dans le futur\n" +msgid "HTTP CRITICAL - Document is %d seconds in the future\n" +msgstr "HTTP CRITIQUE - La date du document est %d secondes dans le futur\n" -#: plugins/check_http.c:682 +#: plugins/check_http.c:685 #, c-format -msgid "CRITICAL - Last modified %.1f days ago\n" -msgstr "CRITIQUE - Dernière modification %.1f jours auparavant\n" +msgid "HTTP CRITICAL - Last modified %.1f days ago\n" +msgstr "HTTP CRITIQUE - Dernière modification %.1f jours auparavant\n" -#: plugins/check_http.c:686 +#: plugins/check_http.c:689 #, c-format -msgid "CRITICAL - Last modified %d:%02d:%02d ago\n" -msgstr "CRITIQUE - Dernière modification %d:%02d:%02d auparavant\n" +msgid "HTTP CRITICAL - Last modified %d:%02d:%02d ago\n" +msgstr "HTTP CRITIQUE - Dernière modification %d:%02d:%02d auparavant\n" -#: plugins/check_http.c:767 -msgid "Unable to open TCP socket\n" -msgstr "Impossible d'ouvrir un socket TCP\n" +#: plugins/check_http.c:770 +msgid "HTTP CRITICAL - Unable to open TCP socket\n" +msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n" -#: plugins/check_http.c:847 -msgid "Error on receive\n" -msgstr "Erreur dans la réception\n" +#: plugins/check_http.c:853 +msgid "HTTP CRITICAL - Error on receive\n" +msgstr "HTTP CRITIQUE - Erreur dans la réception\n" -#: plugins/check_http.c:857 plugins/check_real.c:189 plugins/check_tcp.c:291 -#, c-format -msgid "No data received from host\n" -msgstr "Pas de données reçues de l'hôte\n" +#: plugins/check_http.c:863 +msgid "HTTP CRITICAL - No data received from host\n" +msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n" -#: plugins/check_http.c:907 +#: plugins/check_http.c:913 msgid "Invalid HTTP response received from host\n" msgstr "Réponse HTTP invalide reçue de l'hôte\n" -#: plugins/check_http.c:910 +#: plugins/check_http.c:916 #, c-format msgid "Invalid HTTP response received from host on port %d\n" msgstr "Réponse HTTP invalide reçue de l'hôte sur le port %d\n" -#: plugins/check_http.c:918 +#: plugins/check_http.c:924 #, c-format msgid "HTTP OK: Status line output matched \"%s\"\n" msgstr "HTTP OK: La ligne d'état correspond à \"%s\"\n" -#: plugins/check_http.c:930 +#: plugins/check_http.c:936 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n" -#: plugins/check_http.c:937 +#: plugins/check_http.c:943 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n" -#: plugins/check_http.c:941 +#: plugins/check_http.c:947 #, c-format msgid "HTTP CRITICAL: %s\n" msgstr "HTTP CRITIQUE: %s\n" -#: plugins/check_http.c:945 +#: plugins/check_http.c:951 #, c-format msgid "HTTP WARNING: %s\n" msgstr "HTTP AVERTISSEMENT: %s\n" +#: plugins/check_http.c:959 +#, c-format +msgid "HTTP UNKNOWN" +msgstr "HTTP INCONNU" + +#: plugins/check_http.c:961 +#, c-format +msgid "HTTP OK" +msgstr "" + #: plugins/check_http.c:963 #, c-format +msgid "HTTP WARNING" +msgstr "HTTP AVERTISSEMENT" + +#: plugins/check_http.c:965 plugins/check_http.c:1028 +#, c-format +msgid "HTTP CRITICAL" +msgstr "HTTP CRITIQUE" + +#: plugins/check_http.c:969 +#, c-format msgid " - %s - %.3f second response time %s|%s %s\n" msgstr " - %s - %.3f secondes de temps de réponse %s|%s %s\n" -#: plugins/check_http.c:979 +#: plugins/check_http.c:985 #, c-format msgid "HTTP WARNING: %s - %.3f second response time %s|%s %s\n" msgstr "HTTP AVERTISSEMENT: %s - %.3f secondes de temps de réponse %s|%s %s\n" -#: plugins/check_http.c:993 plugins/check_http.c:1010 +#: plugins/check_http.c:999 plugins/check_http.c:1016 #, c-format msgid "HTTP OK %s - %.3f second response time %s|%s %s\n" msgstr "HTTP OK %s - %.3f secondes de temps de réponse %s|%s %s\n" -#: plugins/check_http.c:1000 +#: plugins/check_http.c:1006 #, c-format -msgid "CRITICAL - string not found%s|%s %s\n" -msgstr "CRITIQUE - chaîne non trouvée%s|%s %s\n" +msgid "HTTP CRITICAL - string not found%s|%s %s\n" +msgstr "HTTP CRITIQUE - chaîne non trouvée%s|%s %s\n" -#: plugins/check_http.c:1018 +#: plugins/check_http.c:1024 msgid "pattern not found" msgstr "chaîne non trouvée" -#: plugins/check_http.c:1020 +#: plugins/check_http.c:1026 msgid "pattern found" msgstr "chaîne de caractère trouvée" -#: plugins/check_http.c:1030 +#: plugins/check_http.c:1036 #, c-format -msgid "CRITICAL - Execute Error: %s\n" -msgstr "CRITIQUE - Erreur d'exécution: %s\n" +msgid "HTTP CRITICAL - Execute Error: %s\n" +msgstr "HTTP CRITIQUE - Erreur d'exécution: %s\n" -#: plugins/check_http.c:1039 +#: plugins/check_http.c:1045 #, c-format msgid "HTTP WARNING: page size %d too large%s|%s\n" msgstr "HTTP AVERTISSEMENT: la taille de la page %d est trop grande%s|%s\n" -#: plugins/check_http.c:1043 +#: plugins/check_http.c:1049 #, c-format msgid "HTTP WARNING: page size %d too small%s|%s\n" msgstr "HTTP AVERTISSEMENT: la taille de la page %d est trop petite%s|%s\n" -#: plugins/check_http.c:1048 +#: plugins/check_http.c:1054 #, c-format msgid "HTTP OK %s - %d bytes in %.3f seconds %s|%s %s\n" msgstr "HTTP OK %s - %d bytes en %.3f secondes %s|%s %s\n" -#: plugins/check_http.c:1083 -msgid "Could not allocate addr\n" -msgstr "Impossible d'allouer une adresse\n" +#: plugins/check_http.c:1088 +msgid "HTTP UNKNOWN - Could not allocate addr\n" +msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n" -#: plugins/check_http.c:1087 -msgid "Could not allocate url\n" +#: plugins/check_http.c:1092 +msgid "HTTP UNKNOWN - Could not allocate url\n" +msgstr "HTTP INCONNU - Impossible d'allouer une URL\n" + +#: plugins/check_http.c:1101 +#, c-format +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" +msgstr "" +"HTTP INCONNU - Impossible de trouver l'endroit de la relocation - %s%s\n" + +#: plugins/check_http.c:1116 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Empty redirect location%s\n" +msgstr "" +"HTTP INCONNU - Impossible de trouver l'endroit de la relocation - %s%s\n" + +#: plugins/check_http.c:1123 +msgid "HTTP UNKNOWN - could not allocate url\n" msgstr "Impossible d'allouer une URL\n" -#: plugins/check_http.c:1096 +#: plugins/check_http.c:1163 #, c-format -msgid "UNKNOWN - Could not find redirect location - %s%s\n" -msgstr "INCONNU - Impossible de trouver l'endroit de la relocation - %s%s\n" - -#: plugins/check_http.c:1106 -msgid "could not allocate url\n" -msgstr "Impossible d'allouer une URL\n" - -#: plugins/check_http.c:1149 -#, c-format -msgid "UNKNOWN - Could not parse redirect location - %s%s\n" -msgstr "INCONNU - Impossible de définir l'endroit de la relocation - %s%s\n" - -#: plugins/check_http.c:1159 -#, c-format -msgid "WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -"AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - %s://%s:%" -"d%s%s\n" +"HTTP INCONNU - Impossible de définir l'endroit de la relocation - %s%s\n" -#: plugins/check_http.c:1167 +#: plugins/check_http.c:1173 #, c-format -msgid "WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" -"AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s%s\n" +"HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - %" +"s://%s:%d%s%s\n" -#: plugins/check_http.c:1231 +#: plugins/check_http.c:1181 +#, c-format +msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "" +"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s%" +"s\n" + +#: plugins/check_http.c:1196 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Could not allocate server_url%s\n" +msgstr "HTTP INCONNU - Impossible d'allouer une URL\n" + +#: plugins/check_http.c:1202 +#, fuzzy, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "" +"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s%" +"s\n" + +#: plugins/check_http.c:1207 +#, c-format +msgid "Redirection to %s://%s:%d%s\n" +msgstr "" + +#: plugins/check_http.c:1259 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester" -#: plugins/check_http.c:1232 +#: plugins/check_http.c:1260 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1233 +#: plugins/check_http.c:1261 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1234 +#: plugins/check_http.c:1262 msgid "certificate expiration times." msgstr "Période d'expiration du certificat invalide." -#: plugins/check_http.c:1240 +#: plugins/check_http.c:1268 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés" -#: plugins/check_http.c:1247 +#: plugins/check_http.c:1275 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1248 +#: plugins/check_http.c:1276 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1250 +#: plugins/check_http.c:1278 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1252 +#: plugins/check_http.c:1280 msgid "Port number (default: " msgstr "Numéro du port (défaut: " -#: plugins/check_http.c:1259 +#: plugins/check_http.c:1287 msgid "Connect via SSL. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1261 +#: plugins/check_http.c:1289 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" "Nombre de jours minimum pour que le certificat soit valide. Port par défaut " "443" -#: plugins/check_http.c:1262 +#: plugins/check_http.c:1290 msgid "(when this option is used the url is not checked.)\n" msgstr "" -#: plugins/check_http.c:1266 +#: plugins/check_http.c:1294 msgid "String to expect in first (status) line of server response (default: " msgstr "Texte attendu dans la première ligne de réponse du serveur (défaut: " -#: plugins/check_http.c:1268 +#: plugins/check_http.c:1296 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1270 +#: plugins/check_http.c:1298 msgid "String to expect in the content" msgstr "Chaîne de caractère attendue dans le contenu" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1300 msgid "URL to GET or POST (default: /)" msgstr "URL pour le GET ou le POST (défaut: /)" -#: plugins/check_http.c:1274 +#: plugins/check_http.c:1302 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1276 +#: plugins/check_http.c:1304 msgid "Don't wait for document body: stop reading after headers." msgstr "" "Ne pas attendre pour le corps du document: arrêter de lire après les entêtes" -#: plugins/check_http.c:1277 +#: plugins/check_http.c:1305 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)" -#: plugins/check_http.c:1279 +#: plugins/check_http.c:1307 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1280 +#: plugins/check_http.c:1308 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1282 +#: plugins/check_http.c:1310 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1285 +#: plugins/check_http.c:1313 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1287 +#: plugins/check_http.c:1315 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1289 +#: plugins/check_http.c:1317 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1319 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1322 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1296 +#: plugins/check_http.c:1324 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1298 +#: plugins/check_http.c:1326 msgid "" " Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1300 +#: plugins/check_http.c:1328 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1302 +#: plugins/check_http.c:1330 msgid "How to handle redirected pages" msgstr "" -#: plugins/check_http.c:1304 +#: plugins/check_http.c:1332 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1313 +#: plugins/check_http.c:1341 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." -#: plugins/check_http.c:1314 +#: plugins/check_http.c:1342 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1315 +#: plugins/check_http.c:1343 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1316 +#: plugins/check_http.c:1344 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1317 +#: plugins/check_http.c:1345 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1318 +#: plugins/check_http.c:1346 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1321 +#: plugins/check_http.c:1349 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1350 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1323 +#: plugins/check_http.c:1351 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1326 +#: plugins/check_http.c:1354 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1327 +#: plugins/check_http.c:1355 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1328 +#: plugins/check_http.c:1356 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1329 +#: plugins/check_http.c:1357 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1360 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1333 +#: plugins/check_http.c:1361 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1334 +#: plugins/check_http.c:1362 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1335 +#: plugins/check_http.c:1363 msgid "the certificate is expired." msgstr "le certificat est expiré." -#: plugins/check_ldap.c:125 +#: plugins/check_ldap.c:132 #, c-format msgid "Could not connect to the server at port %i\n" msgstr "Impossible de se connecter au serveur port %i\n" -#: plugins/check_ldap.c:134 +#: plugins/check_ldap.c:141 #, c-format msgid "Could not set protocol version %d\n" msgstr "Impossible d'utiliser le protocole version %d\n" -#: plugins/check_ldap.c:150 +#: plugins/check_ldap.c:156 #, c-format msgid "Could not init TLS at port %i!\n" msgstr "Impossible d'initialiser TLS sur le port %i!\n" -#: plugins/check_ldap.c:154 +#: plugins/check_ldap.c:160 #, c-format msgid "TLS not supported by the libraries!\n" msgstr "TLS n'est pas supporté!\n" -#: plugins/check_ldap.c:173 +#: plugins/check_ldap.c:180 #, c-format msgid "Could not init startTLS at port %i!\n" msgstr "Impossible d'initialiser startTLS sur le port %i!\n" -#: plugins/check_ldap.c:177 +#: plugins/check_ldap.c:184 #, c-format msgid "startTLS not supported by the library, needs LDAPv3!\n" msgstr "" "startTLS n'est pas supporté par la librairie LDAP, j'ai besoin de LDAPv3!\n" -#: plugins/check_ldap.c:187 +#: plugins/check_ldap.c:194 #, c-format msgid "Could not bind to the ldap-server\n" msgstr "Impossible de se connecter au serveur LDAP\n" -#: plugins/check_ldap.c:195 +#: plugins/check_ldap.c:203 #, c-format msgid "Could not search/find objectclasses in %s\n" msgstr "Impossible de chercher/trouver les objectclasses dans %s\n" -#: plugins/check_ldap.c:218 +#: plugins/check_ldap.c:226 #, c-format msgid "LDAP %s - %.3f seconds response time|%s\n" msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n" -#: plugins/check_ldap.c:324 plugins/check_ping.c:241 +#: plugins/check_ldap.c:338 plugins/check_ldap.c:345 +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +#: plugins/check_ldap.c:351 plugins/check_ping.c:241 msgid "IPv6 support not available\n" msgstr "Support IPv6 non disponible\n" -#: plugins/check_ldap.c:347 +#: plugins/check_ldap.c:374 msgid "Please specify the host name\n" msgstr "Veuillez spécifier le nom de l'hôte\n" -#: plugins/check_ldap.c:350 +#: plugins/check_ldap.c:377 msgid "Please specify the LDAP base\n" msgstr "Veuillez spécifier la base LDAP\n" -#: plugins/check_ldap.c:378 +#: plugins/check_ldap.c:405 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:380 +#: plugins/check_ldap.c:407 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:382 +#: plugins/check_ldap.c:409 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:384 +#: plugins/check_ldap.c:411 msgid "ldap password (if required)" msgstr "" -#: plugins/check_ldap.c:388 +#: plugins/check_ldap.c:413 +#, fuzzy +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "Impossible d'utiliser le protocole version 3" + +#: plugins/check_ldap.c:415 +#, c-format +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to %s" +msgstr "" + +#: plugins/check_ldap.c:419 msgid "use ldap protocol version 2" msgstr "utiliser le protocole version 2" -#: plugins/check_ldap.c:390 +#: plugins/check_ldap.c:421 msgid "use ldap protocol version 3" msgstr "Impossible d'utiliser le protocole version 3" -#: plugins/check_load.c:91 +#: plugins/check_ldap.c:431 +#, fuzzy +msgid "Note:" +msgstr "Notes:" + +#: plugins/check_ldap.c:432 +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#: plugins/check_ldap.c:433 +#, c-format +msgid "" +"implied (using default port %i) unless --port=636 is specified. In that case " +"%s" +msgstr "" + +#: plugins/check_ldap.c:434 +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +#: plugins/check_ldap.c:435 +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +#: plugins/check_ldap.c:436 +msgid "to define the behaviour explicitly instead." +msgstr "" + +#: plugins/check_load.c:92 msgid "Warning threshold must be float or float triplet!\n" msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n" -#: plugins/check_load.c:132 plugins/check_load.c:148 +#: plugins/check_load.c:134 plugins/check_load.c:150 #, c-format msgid "Error opening %s\n" msgstr "Erreur à l'ouverture de %s\n" -#: plugins/check_load.c:160 +#: plugins/check_load.c:162 #, c-format msgid "Error code %d returned in %s\n" msgstr "Le code erreur %d à été retourné par %s\n" -#: plugins/check_load.c:168 +#: plugins/check_load.c:177 #, c-format msgid "Error in getloadavg()\n" msgstr "Erreur dans la fonction getloadavg()\n" -#: plugins/check_load.c:171 plugins/check_load.c:173 +#: plugins/check_load.c:180 plugins/check_load.c:182 #, c-format msgid "Error processing %s\n" msgstr "Erreur lors de l'utilisation de %s\n" -#: plugins/check_load.c:182 +#: plugins/check_load.c:191 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "Charge moyenne: %.2f, %.2f, %.2f" -#: plugins/check_load.c:271 +#: plugins/check_load.c:284 #, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "" "Le seuil critique pour la charge système après %d minutes n'est pas " "spécifié\n" -#: plugins/check_load.c:273 +#: plugins/check_load.c:286 #, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "" "Le seuil d'avertissement pour la charge système après %d minutes n'est pas " "spécifié\n" -#: plugins/check_load.c:275 +#: plugins/check_load.c:288 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " @@ -1492,24 +1650,28 @@ msgstr "" "Arguments Incorrects: %d-minute \"alerte charge système\" est plus grand que " "\"alerte critique charge système\"\n" -#: plugins/check_load.c:291 +#: plugins/check_load.c:304 #, c-format msgid "This plugin tests the current system load average." msgstr "Ce plugin teste la charge système actuelle." -#: plugins/check_load.c:300 +#: plugins/check_load.c:313 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" "Sortir avec un résultat AVERTISSEMENT si la charge moyenne dépasse WLOAD" -#: plugins/check_load.c:302 +#: plugins/check_load.c:315 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "Sortir avec un résultat CRITIQUE si la charge moyenne excède CLOAD" -#: plugins/check_load.c:303 +#: plugins/check_load.c:316 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" +#: plugins/check_load.c:318 +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + #: plugins/check_mrtg.c:79 msgid "Could not parse arguments\n" msgstr "Lecture des arguments impossible\n" @@ -2229,42 +2391,42 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "et dans le service auquel il se connecte." -#: plugins/check_ntp.c:720 +#: plugins/check_ntp.c:728 msgid "Critical offset should be larger than warning offset" msgstr "" "Le décalage critique devrait être plus large que le décalage d'avertissement" -#: plugins/check_ntp.c:724 +#: plugins/check_ntp.c:732 msgid "Critical jitter should be larger than warning jitter" msgstr "" "La variation critique devrait être plus large que la variation " "d'avertissement" -#: plugins/check_ntp.c:810 +#: plugins/check_ntp.c:818 msgid "Offset unknown" msgstr "Décalage inconnu" -#: plugins/check_ntp.c:813 +#: plugins/check_ntp.c:822 msgid "Unable to fully sample sync server" msgstr "Échantionage incomplet" -#: plugins/check_ntp.c:836 +#: plugins/check_ntp.c:845 msgid "This plugin checks the selected ntp server" msgstr "Ce plugin vérifie le service ntp sur l'hôte" -#: plugins/check_ntp.c:844 +#: plugins/check_ntp.c:853 msgid "Offset to result in warning status (seconds)" msgstr "Décalage résultant un avertissement (secondes)" -#: plugins/check_ntp.c:846 +#: plugins/check_ntp.c:855 msgid "Offset to result in critical status (seconds)" msgstr "Décalage résultant un état critique (secondes)" -#: plugins/check_ntp.c:848 +#: plugins/check_ntp.c:857 msgid "Warning value for jitter" msgstr "Valeur d'avertissement pour la variation (jitter)" -#: plugins/check_ntp.c:850 +#: plugins/check_ntp.c:859 msgid "Critical value for jitter" msgstr "Valeur critique pour la variation (jitter)" @@ -3407,105 +3569,125 @@ msgstr "" msgid "Alert if cpu of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:138 +#: plugins/check_radius.c:161 msgid "Config file error" msgstr "Erreur dans le fichier de configuration" -#: plugins/check_radius.c:147 +#: plugins/check_radius.c:170 msgid "Out of Memory?" msgstr "Manque de Mémoire?" -#: plugins/check_radius.c:168 +#: plugins/check_radius.c:191 msgid "Timeout" msgstr "Temps dépassé" -#: plugins/check_radius.c:170 +#: plugins/check_radius.c:193 msgid "Auth Error" msgstr "Erreur d'authentification" -#: plugins/check_radius.c:172 +#: plugins/check_radius.c:195 msgid "Auth Failed" msgstr "L'authentification à échoué" -#: plugins/check_radius.c:176 +#: plugins/check_radius.c:199 msgid "Auth OK" msgstr "L'authentification à réussi" -#: plugins/check_radius.c:219 plugins/check_radius.c:279 +#: plugins/check_radius.c:278 msgid "Number of retries must be a positive integer" msgstr "Le nombre d'essai doit être un entier positif" -#: plugins/check_radius.c:305 +#: plugins/check_radius.c:290 +#, fuzzy +msgid "Host not specified" +msgstr "Pas de compteur spécifié" + +#: plugins/check_radius.c:292 +#, fuzzy +msgid "User not specified" +msgstr "Pas de compteur spécifié" + +#: plugins/check_radius.c:294 +#, fuzzy +msgid "Password not specified" +msgstr "Pas de compteur spécifié" + +#: plugins/check_radius.c:296 +#, fuzzy +msgid "Configuration file not specified" +msgstr "Fichier de configuration" + +#: plugins/check_radius.c:314 msgid "Tests to see if a radius server is accepting connections." msgstr "Teste si un serveur radius accepte les connections." -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:325 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:327 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:329 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:322 +#: plugins/check_radius.c:331 msgid "Configuration file" msgstr "Fichier de configuration" -#: plugins/check_radius.c:324 +#: plugins/check_radius.c:333 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:326 +#: plugins/check_radius.c:335 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:330 +#: plugins/check_radius.c:339 msgid "" "This plugin tests a radius server to see if it is accepting connections." msgstr "" "Ce plugin teste un serveur radius afin de vérifier si il accepte les " "connections." -#: plugins/check_radius.c:331 +#: plugins/check_radius.c:340 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:332 +#: plugins/check_radius.c:341 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:333 +#: plugins/check_radius.c:342 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:334 +#: plugins/check_radius.c:343 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:335 +#: plugins/check_radius.c:344 msgid "password can be determined by careful watching of the command line in" msgstr "" -#: plugins/check_radius.c:336 +#: plugins/check_radius.c:345 msgid "a process listing. This risk is exacerbated because nagios will" msgstr "" -#: plugins/check_radius.c:337 +#: plugins/check_radius.c:346 msgid "run the plugin at regular prdictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:347 msgid "the password used does not allow access to sensitive system resources," msgstr "" -#: plugins/check_radius.c:339 +#: plugins/check_radius.c:348 msgid "otherwise compormise could occur." msgstr "" @@ -3528,16 +3710,21 @@ msgstr "Réponses REAL invalide reçue de l'hôte" msgid "Invalid REAL response received from host on port %d\n" msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n" +#: plugins/check_real.c:189 plugins/check_tcp.c:294 +#, c-format +msgid "No data received from host\n" +msgstr "Pas de données reçues de l'hôte\n" + #: plugins/check_real.c:252 #, c-format msgid "REAL %s - %d second response time\n" msgstr "REAL %s - %d secondes de temps de réponse\n" -#: plugins/check_real.c:341 plugins/check_smtp.c:618 plugins/check_ups.c:535 +#: plugins/check_real.c:341 plugins/check_smtp.c:619 plugins/check_ups.c:535 msgid "Warning time must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_real.c:350 plugins/check_smtp.c:609 plugins/check_ups.c:526 +#: plugins/check_real.c:350 plugins/check_smtp.c:610 plugins/check_ups.c:526 msgid "Critical time must be a positive integer" msgstr "Le seuil critique doit être un entier positif" @@ -3563,7 +3750,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte." -#: plugins/check_real.c:441 plugins/check_smtp.c:767 +#: plugins/check_real.c:441 plugins/check_smtp.c:850 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -3581,65 +3768,65 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:186 plugins/check_swap.c:268 plugins/check_swap.c:274 +#: plugins/check_smtp.c:190 plugins/check_swap.c:268 plugins/check_swap.c:274 #, c-format msgid "malloc() failed!\n" msgstr "l'allocation mémoire à échoué!\n" -#: plugins/check_smtp.c:190 +#: plugins/check_smtp.c:194 #, c-format msgid "gethostname() failed!\n" msgstr "La commande gethostname() à échoué\n" -#: plugins/check_smtp.c:225 plugins/check_smtp.c:249 +#: plugins/check_smtp.c:229 plugins/check_smtp.c:253 #, c-format msgid "recv() failed\n" msgstr "La commande recv() à échoué\n" -#: plugins/check_smtp.c:236 +#: plugins/check_smtp.c:240 #, c-format msgid "Invalid SMTP response received from host\n" msgstr "Réponse SMTP invalide reçue de l'hôte\n" -#: plugins/check_smtp.c:238 +#: plugins/check_smtp.c:242 #, c-format msgid "Invalid SMTP response received from host on port %d\n" msgstr "Réponse SMTP invalide reçue de l'hôte sur le port %d\n" -#: plugins/check_smtp.c:260 +#: plugins/check_smtp.c:263 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n" -#: plugins/check_smtp.c:272 +#: plugins/check_smtp.c:275 #, c-format msgid "Server does not support STARTTLS\n" msgstr "Le serveur ne supporte pas STARTTLS\n" -#: plugins/check_smtp.c:278 +#: plugins/check_smtp.c:281 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n" -#: plugins/check_smtp.c:298 +#: plugins/check_smtp.c:301 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:303 +#: plugins/check_smtp.c:306 #, c-format msgid "sent %s" msgstr "envoyé %s" -#: plugins/check_smtp.c:305 +#: plugins/check_smtp.c:308 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:318 +#: plugins/check_smtp.c:320 #, fuzzy msgid "CRITICAL - Cannot retrieve server certificate." msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n" -#: plugins/check_smtp.c:356 plugins/check_snmp.c:568 +#: plugins/check_smtp.c:356 plugins/check_snmp.c:579 #, c-format msgid "Could Not Compile Regular Expression" msgstr "Impossible de compiler l'expression régulière" @@ -3649,7 +3836,7 @@ msgstr "Impossible de compiler l'expression régulière" msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n" -#: plugins/check_smtp.c:369 plugins/check_snmp.c:318 +#: plugins/check_smtp.c:369 plugins/check_snmp.c:324 #, c-format msgid "Execute Error: %s\n" msgstr "Erreur d'exécution: %s\n" @@ -3662,7 +3849,8 @@ msgstr "Pas d'utilisateur pour l'authentification spécifié, " msgid "no authpass specified, " msgstr "pas de mot de passe spécifié, " -#: plugins/check_smtp.c:395 plugins/check_smtp.c:417 plugins/check_smtp.c:438 +#: plugins/check_smtp.c:395 plugins/check_smtp.c:416 plugins/check_smtp.c:436 +#: plugins/check_smtp.c:711 #, c-format msgid "sent %s\n" msgstr "envoyé %s\n" @@ -3672,113 +3860,124 @@ msgstr "envoyé %s\n" msgid "recv() failed after AUTH LOGIN, " msgstr "la commande recv() à échoué après AUTH LOGIN, \n" -#: plugins/check_smtp.c:404 plugins/check_smtp.c:426 plugins/check_smtp.c:447 +#: plugins/check_smtp.c:403 plugins/check_smtp.c:424 plugins/check_smtp.c:444 +#: plugins/check_smtp.c:722 #, c-format msgid "received %s\n" msgstr "reçu %s\n" -#: plugins/check_smtp.c:408 +#: plugins/check_smtp.c:407 msgid "invalid response received after AUTH LOGIN, " msgstr "Réponse invalide reçue après AUTH LOGIN, " -#: plugins/check_smtp.c:421 +#: plugins/check_smtp.c:420 msgid "recv() failed after sending authuser, " msgstr "La commande recv() a échoué après authuser, " -#: plugins/check_smtp.c:430 +#: plugins/check_smtp.c:428 msgid "invalid response received after authuser, " msgstr "Réponse invalide reçue après authuser, " -#: plugins/check_smtp.c:442 +#: plugins/check_smtp.c:440 msgid "recv() failed after sending authpass, " msgstr "la commande recv() à échoué après authpass, " -#: plugins/check_smtp.c:451 +#: plugins/check_smtp.c:448 msgid "invalid response received after authpass, " msgstr "Réponse invalide reçue après authpass, " -#: plugins/check_smtp.c:458 +#: plugins/check_smtp.c:455 msgid "only authtype LOGIN is supported, " msgstr "seul la méthode d'authentification LOGIN est supportée, " -#: plugins/check_smtp.c:482 +#: plugins/check_smtp.c:479 #, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr "SMTP %s - %s%.3f sec. de temps de réponse%s%s|%s\n" -#: plugins/check_smtp.c:588 plugins/check_smtp.c:598 +#: plugins/check_smtp.c:586 plugins/check_smtp.c:598 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "Impossible de réallouer des unités [%d]\n" -#: plugins/check_smtp.c:645 +#: plugins/check_smtp.c:646 msgid "SSL support not available - install OpenSSL and recompile" msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez" -#: plugins/check_smtp.c:724 +#: plugins/check_smtp.c:717 +#, fuzzy, c-format +msgid "recv() failed after QUIT." +msgstr "la commande recv() à échoué après AUTH LOGIN, \n" + +#: plugins/check_smtp.c:719 +#, c-format +msgid "Connection reset by peer." +msgstr "" + +#: plugins/check_smtp.c:807 msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." -#: plugins/check_smtp.c:737 +#: plugins/check_smtp.c:820 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" " Texte attendu dans la première ligne de réponse du serveur (défaut: '%" "s')\n" -#: plugins/check_smtp.c:739 +#: plugins/check_smtp.c:822 msgid "Suppress SMTP command" msgstr "" -#: plugins/check_smtp.c:741 +#: plugins/check_smtp.c:824 msgid "SMTP command (may be used repeatedly)" msgstr "Commande SMTP (peut être utilisé plusieurs fois)" -#: plugins/check_smtp.c:743 +#: plugins/check_smtp.c:826 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:745 +#: plugins/check_smtp.c:828 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:748 plugins/check_tcp.c:638 +#: plugins/check_smtp.c:831 plugins/check_tcp.c:636 msgid "Minimum number of days a certificate has to be valid." msgstr "Nombre de jours minimum pour que le certificat soit valide." -#: plugins/check_smtp.c:750 +#: plugins/check_smtp.c:833 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:754 +#: plugins/check_smtp.c:837 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:756 +#: plugins/check_smtp.c:839 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:758 +#: plugins/check_smtp.c:841 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:768 +#: plugins/check_smtp.c:851 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:769 +#: plugins/check_smtp.c:852 msgid "connects, but incorrect reponse messages from the host result in" msgstr "" -#: plugins/check_smtp.c:770 +#: plugins/check_smtp.c:853 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:296 +#: plugins/check_snmp.c:302 msgid "No valid data returned" msgstr "Pas de données valides reçues" -#: plugins/check_snmp.c:364 plugins/negate.c:128 +#: plugins/check_snmp.c:370 #, c-format msgid "" "%s problem - No data received from host\n" @@ -3787,240 +3986,245 @@ msgstr "" "%s problème - Pas de données reçues de l'hôte\n" "Commande: %s\n" -#: plugins/check_snmp.c:502 +#: plugins/check_snmp.c:387 +#, fuzzy +msgid "snmpget returned an error status" +msgstr "dig à renvoyé un message d'erreur" + +#: plugins/check_snmp.c:513 #, c-format msgid "Invalid critical threshold: %s\n" msgstr "Seuil critique invalide: %s\n" -#: plugins/check_snmp.c:513 +#: plugins/check_snmp.c:524 #, c-format msgid "Invalid warning threshold: %s\n" msgstr "Seuil d'avertissement invalide: %s\n" -#: plugins/check_snmp.c:525 +#: plugins/check_snmp.c:536 msgid "Retries interval must be a positive integer" msgstr "L'intervalle pour les essais doit être un entier positif" -#: plugins/check_snmp.c:589 +#: plugins/check_snmp.c:600 #, c-format msgid "Could not reallocate labels[%d]" msgstr "Impossible de réallouer des labels[%d]" -#: plugins/check_snmp.c:601 +#: plugins/check_snmp.c:612 msgid "Could not reallocate labels\n" msgstr "Impossible de réallouer des labels\n" -#: plugins/check_snmp.c:618 +#: plugins/check_snmp.c:629 #, c-format msgid "Could not reallocate units [%d]\n" msgstr "Impossible de réallouer des unités [%d]\n" -#: plugins/check_snmp.c:630 +#: plugins/check_snmp.c:641 msgid "Could not realloc() units\n" msgstr "Impossible de réallouer des unités\n" -#: plugins/check_snmp.c:715 +#: plugins/check_snmp.c:726 #, c-format msgid "Missing secname (%s) or authpassword (%s) ! \n" msgstr "Manque secname (%s) ou authpassword (%s) ! \n" -#: plugins/check_snmp.c:723 +#: plugins/check_snmp.c:734 #, c-format msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n" msgstr "Manque secname (%s) ou authpassword (%s) ou privpassword (%s)! \n" -#: plugins/check_snmp.c:732 +#: plugins/check_snmp.c:743 msgid "Invalid SNMP version" msgstr "Version de SNMP invalide" -#: plugins/check_snmp.c:860 +#: plugins/check_snmp.c:871 msgid "Unbalanced quotes\n" msgstr "Guillemets manquants\n" -#: plugins/check_snmp.c:909 +#: plugins/check_snmp.c:920 msgid "Check status of remote machines and obtain sustem information via SNMP" msgstr "" "Vérifie l'état des machines distantes et obtient l'information système via " "SNMP" -#: plugins/check_snmp.c:921 +#: plugins/check_snmp.c:932 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:923 +#: plugins/check_snmp.c:934 msgid "SNMP protocol version" msgstr "Version du protocole SNMP" -#: plugins/check_snmp.c:925 +#: plugins/check_snmp.c:936 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:927 +#: plugins/check_snmp.c:938 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:931 +#: plugins/check_snmp.c:942 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:932 +#: plugins/check_snmp.c:943 #, c-format msgid "(default is \"%s\")" msgstr "(défaut \"%s\")" -#: plugins/check_snmp.c:934 +#: plugins/check_snmp.c:945 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:936 +#: plugins/check_snmp.c:947 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:938 +#: plugins/check_snmp.c:949 msgid "SNMPv3 crypt passwd (DES)" msgstr "" -#: plugins/check_snmp.c:942 +#: plugins/check_snmp.c:953 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:944 +#: plugins/check_snmp.c:955 msgid "" "List of MIBS to be loaded (default = none if using numeric oids or 'ALL'" msgstr "" -#: plugins/check_snmp.c:945 +#: plugins/check_snmp.c:956 msgid "for symbolic oids.)" msgstr "" -#: plugins/check_snmp.c:947 +#: plugins/check_snmp.c:958 #, c-format msgid " Delimiter to use when parsing returned data. Default is \"%s\"" msgstr "" -#: plugins/check_snmp.c:948 +#: plugins/check_snmp.c:959 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:949 +#: plugins/check_snmp.c:960 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:953 +#: plugins/check_snmp.c:964 msgid "Range(s) which will not result in a WARNING status" msgstr "" -#: plugins/check_snmp.c:955 +#: plugins/check_snmp.c:966 msgid "Range(s) which will not result in a CRITICAL status" msgstr "" -#: plugins/check_snmp.c:959 +#: plugins/check_snmp.c:970 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:961 +#: plugins/check_snmp.c:972 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:963 +#: plugins/check_snmp.c:974 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:965 +#: plugins/check_snmp.c:976 msgid "Prefix label for output from plugin (default -s 'SNMP')" msgstr "" -#: plugins/check_snmp.c:969 +#: plugins/check_snmp.c:980 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:971 +#: plugins/check_snmp.c:982 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:977 +#: plugins/check_snmp.c:988 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:978 +#: plugins/check_snmp.c:989 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" -#: plugins/check_snmp.c:979 +#: plugins/check_snmp.c:990 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin." -#: plugins/check_snmp.c:981 +#: plugins/check_snmp.c:992 msgid "" "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists " "with" msgstr "" "- Des OIDs multiples peuvent être indiquées par une virgule ou par des listes" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:993 msgid " internal spaces must be quoted) [max 8 OIDs]" msgstr "" -#: plugins/check_snmp.c:984 +#: plugins/check_snmp.c:995 msgid "- Ranges are inclusive and are indicated with colons. When specified as" msgstr "" -#: plugins/check_snmp.c:985 +#: plugins/check_snmp.c:996 msgid "" " 'min:max' a STATE_OK will be returned if the result is within the indicated" msgstr "" " 'max:min' un résultat STATE_OK sera retourné si le résultat est dans " "l'écart spécifié." -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:997 msgid " range or is equal to the upper or lower bound. A non-OK state will be" msgstr "" -#: plugins/check_snmp.c:987 +#: plugins/check_snmp.c:998 msgid " returned if the result is outside the specified range." msgstr "" -#: plugins/check_snmp.c:989 +#: plugins/check_snmp.c:1000 msgid "" "- If specified in the order 'max:min' a non-OK state will be returned if the" msgstr "" "- Si l'écart est indiqué comme 'max:min' un résultat autre que STATE_OK sera " "retourné si le" -#: plugins/check_snmp.c:990 +#: plugins/check_snmp.c:1001 msgid " result is within the (inclusive) range." msgstr "" -#: plugins/check_snmp.c:992 +#: plugins/check_snmp.c:1003 msgid "" "- Upper or lower bounds may be omitted to skip checking the respective limit." msgstr "" -#: plugins/check_snmp.c:993 +#: plugins/check_snmp.c:1004 msgid "- Bare integers are interpreted as upper limits." msgstr "" -#: plugins/check_snmp.c:994 +#: plugins/check_snmp.c:1005 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:995 +#: plugins/check_snmp.c:1006 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:996 +#: plugins/check_snmp.c:1007 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:997 +#: plugins/check_snmp.c:1008 msgid " returned from the SNMP query is an unsigned integer." msgstr "" @@ -4162,51 +4366,51 @@ msgstr "" "Sur AIX, si -a est spécifié, le plugin utilise lsps -a, au sinon il utilise " "lsps -s.\n" -#: plugins/check_tcp.c:199 +#: plugins/check_tcp.c:202 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" "CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n" -#: plugins/check_tcp.c:220 +#: plugins/check_tcp.c:223 msgid "With UDP checks, a send/expect string must be specified." msgstr "" "Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit " "être spécifiée." -#: plugins/check_tcp.c:239 +#: plugins/check_tcp.c:242 #, c-format msgid "CRITICAL - Cannot retrieve server certificate.\n" msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n" -#: plugins/check_tcp.c:428 +#: plugins/check_tcp.c:422 msgid "No arguments found" msgstr "Pas de paramètres" -#: plugins/check_tcp.c:530 +#: plugins/check_tcp.c:523 msgid "Maxbytes must be a positive integer" msgstr "Maxbytes doit être un entier positif" -#: plugins/check_tcp.c:548 +#: plugins/check_tcp.c:541 msgid "Refuse must be one of ok, warn, crit" msgstr "Refuse doit être parmis ok, warn, crit" -#: plugins/check_tcp.c:558 +#: plugins/check_tcp.c:551 msgid "Mismatch must be one of ok, warn, crit" msgstr "Mismatch doit être parmis ok, warn, crit" -#: plugins/check_tcp.c:564 +#: plugins/check_tcp.c:557 msgid "Delay must be a positive integer" msgstr "Delay doit être un entier positif" -#: plugins/check_tcp.c:589 +#: plugins/check_tcp.c:585 msgid "You must provide a server address" msgstr "Vous devez fournir une adresse serveur" -#: plugins/check_tcp.c:591 +#: plugins/check_tcp.c:587 msgid "Invalid hostname, address or socket" msgstr "Adresse/Nom/Socket invalide" -#: plugins/check_tcp.c:605 +#: plugins/check_tcp.c:601 #, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" @@ -4215,51 +4419,62 @@ msgstr "" "Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n" "\n" -#: plugins/check_tcp.c:617 +#: plugins/check_tcp.c:613 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" msgstr "" -#: plugins/check_tcp.c:618 +#: plugins/check_tcp.c:614 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" -#: plugins/check_tcp.c:620 +#: plugins/check_tcp.c:616 msgid "String to send to the server" msgstr "Chaîne de caractères à envoyer au serveur" -#: plugins/check_tcp.c:622 +#: plugins/check_tcp.c:618 msgid "String to expect in server response" msgstr "" -#: plugins/check_tcp.c:624 +#: plugins/check_tcp.c:618 +#, fuzzy +msgid "(may be repeated)" +msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" + +#: plugins/check_tcp.c:620 +#, fuzzy +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" +"Texte attendu dans la première ligne de réponse du serveur (défaut: %s)\n" + +#: plugins/check_tcp.c:622 msgid "String to send server to initiate a clean close of the connection" msgstr "" -#: plugins/check_tcp.c:626 +#: plugins/check_tcp.c:624 msgid "Accept tcp refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:628 +#: plugins/check_tcp.c:626 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:630 +#: plugins/check_tcp.c:628 #, fuzzy msgid "Hide output from TCP socket" msgstr "Impossible d'ouvrir un socket TCP\n" -#: plugins/check_tcp.c:632 +#: plugins/check_tcp.c:630 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:634 +#: plugins/check_tcp.c:632 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:640 +#: plugins/check_tcp.c:638 msgid "Use SSL for the connection." msgstr "" @@ -4429,64 +4644,69 @@ msgstr "" msgid "Output of temperatures in Celsius" msgstr "Affichage des températures en Celsius" -#: plugins/check_ups.c:631 +#: plugins/check_ups.c:622 +#, fuzzy +msgid "Valid values for STRING are" +msgstr "Les variables valides sont" + +#: plugins/check_ups.c:635 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:632 +#: plugins/check_ups.c:636 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:633 +#: plugins/check_ups.c:637 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:634 +#: plugins/check_ups.c:638 msgid "" "state.If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:639 msgid "state." msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:641 msgid "" "You may also specify a variable to check [such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:642 msgid "" "battery load, etc.] as well as warning and critical thresholds for the " "value of" msgstr "" -#: plugins/check_ups.c:639 +#: plugins/check_ups.c:643 msgid "" "that variable. If the remote host has multiple UPS that are being monitored " "you" msgstr "" -#: plugins/check_ups.c:640 +#: plugins/check_ups.c:644 msgid "will have to use the [ups] option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:642 +#: plugins/check_ups.c:646 msgid "" "This plugin requires that the UPSD daemon distributed with Russel Kroll's" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:647 msgid "" "Smart UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:648 msgid "" "package installed on your system, you can download it from http://www." "networkupstools.org" @@ -4583,17 +4803,17 @@ msgstr "Capacité Hors Ligne=%d {%s %s %s}\n" msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "Révision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n" -#: plugins/check_ide_smart.c:469 +#: plugins/check_ide_smart.c:452 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "CRITIQUE - %s: %s\n" -#: plugins/check_ide_smart.c:488 +#: plugins/check_ide_smart.c:471 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n" -#: plugins/check_ide_smart.c:505 +#: plugins/check_ide_smart.c:488 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " @@ -4602,108 +4822,168 @@ msgstr "" "Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour " "Linux) [http://smartlinux.sourceforge.net/smart/index.php]." -#: plugins/check_ide_smart.c:514 +#: plugins/check_ide_smart.c:497 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:515 +#: plugins/check_ide_smart.c:498 msgid "" "Note: if the device is selected with this option, _no_ other options are " "accepted" msgstr "" -#: plugins/check_ide_smart.c:517 +#: plugins/check_ide_smart.c:500 msgid "Perform immediately offline tests" msgstr "" -#: plugins/check_ide_smart.c:519 +#: plugins/check_ide_smart.c:502 msgid "Returns the number of failed tests" msgstr "" -#: plugins/check_ide_smart.c:521 +#: plugins/check_ide_smart.c:504 msgid "Turn on automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:523 +#: plugins/check_ide_smart.c:506 msgid "Turn off automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:525 +#: plugins/check_ide_smart.c:508 msgid "Output suitable for Nagios" msgstr "" -#: plugins/negate.c:257 +#: plugins/negate.c:132 +#, fuzzy +msgid "No data returned from command\n" +msgstr "Pas de données reçues de l'hôte\n" + +#: plugins/negate.c:209 msgid "" -"Negates the status of a plugin (returns OK for CRITICAL, and vice-versa)." +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-" +"4)." +msgstr "" + +#: plugins/negate.c:215 +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:220 +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:225 +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:262 +msgid "Require path to command" +msgstr "" + +#: plugins/negate.c:298 +#, fuzzy +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." msgstr "" "Inverse le statut d'un plugin (retourne OK pour CRITIQUE, et vice-versa)." -#: plugins/negate.c:267 -msgid "[keep timeout than the plugin timeout to retain CRITICAL status]" +#: plugins/negate.c:299 +msgid "Additional switches can be used to control which state becomes what." +msgstr "" + +#: plugins/negate.c:308 +#, fuzzy +msgid "Keep timeout lower than the plugin timeout to retain CRITICAL status." msgstr "" "[conserver le délai de réponse dépassé du plugin original afin de conserver " "le résultat CRITIQUE]" -#: plugins/negate.c:271 +#: plugins/negate.c:314 +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" + +#: plugins/negate.c:315 +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr "" + +#: plugins/negate.c:316 +#, c-format +msgid " OK and CRITICAL.\n" +msgstr "" + +#: plugins/negate.c:321 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" -#: plugins/negate.c:273 -msgid "Use single quotes if you need to retain spaces" +#: plugins/negate.c:323 +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" -#: plugins/negate.c:277 +#: plugins/negate.c:326 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" -#: plugins/negate.c:278 +#: plugins/negate.c:327 +msgid "The full path of the plugin must be provided." +msgstr "" + +#: plugins/negate.c:328 msgid "" "If the wrapped plugin returns STATE_OK, the wrapper will return " "STATE_CRITICAL." msgstr "" -#: plugins/negate.c:279 +#: plugins/negate.c:329 msgid "" "If the wrapped plugin returns STATE_CRITICAL, the wrapper will return " "STATE_OK." msgstr "" -#: plugins/negate.c:280 +#: plugins/negate.c:330 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "" -#: plugins/netutils.c:49 +#: plugins/netutils.c:53 #, c-format msgid "CRITICAL - Socket timeout after %d seconds\n" msgstr "CRITIQUE - le socket n'as pas répondu dans les %d secondes\n" -#: plugins/netutils.c:51 +#: plugins/netutils.c:55 #, c-format msgid "CRITICAL - Abnormal timeout after %d seconds\n" msgstr "CRITIQUE - dépassement anormal du temps de réponse après %d secondes\n" -#: plugins/netutils.c:79 plugins/netutils.c:270 +#: plugins/netutils.c:83 plugins/netutils.c:274 msgid "Send failed" msgstr "L'envoi à échoué" -#: plugins/netutils.c:96 plugins/netutils.c:285 +#: plugins/netutils.c:100 plugins/netutils.c:289 msgid "No data was received from host!" msgstr "Pas de données reçues de l'hôte!" -#: plugins/netutils.c:193 plugins/netutils.c:229 +#: plugins/netutils.c:197 plugins/netutils.c:233 msgid "Socket creation failed" msgstr "La création du socket à échoué " -#: plugins/netutils.c:222 +#: plugins/netutils.c:226 msgid "Supplied path too long unix domain socket" msgstr "Le chemin fourni est trop long pour un socket unix" -#: plugins/netutils.c:294 +#: plugins/netutils.c:298 msgid "Receive failed" msgstr "La réception à échoué" -#: plugins/netutils.c:320 +#: plugins/netutils.c:324 plugins-root/check_dhcp.c:1348 #, c-format msgid "Invalid hostname/address - %s" msgstr "Adresse/Nom invalide - %s" @@ -4716,22 +4996,22 @@ msgstr "Impossible de réallouer un tableau pour les paramètres dans popen()" msgid "CRITICAL - You need more args!!!" msgstr "CRITIQUE - Vous devez spécifier plus d'arguments!!!" -#: plugins/popen.c:207 +#: plugins/popen.c:215 msgid "Cannot catch SIGCHLD" msgstr "impossible d'obtenir le signal SIGCHLD" -#: plugins/popen.c:302 plugins/utils.c:146 +#: plugins/popen.c:310 plugins/utils.c:145 #, c-format msgid "CRITICAL - Plugin timed out after %d seconds\n" msgstr "CRITIQUE - Le plugin n'as pas répondu dans les %d secondes\n" -#: plugins/popen.c:305 +#: plugins/popen.c:313 msgid "CRITICAL - popen timeout received, but no child process" msgstr "" "CRITIQUE - le temps d'attente à été dépassé dans la fonction popen, mais il " "n'y a pas de processus fils" -#: plugins/popen.c:321 +#: plugins/popen.c:329 msgid "sysconf error for _SC_OPEN_MAX" msgstr "" @@ -4788,33 +5068,33 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:441 +#: plugins/utils.c:440 msgid "failed realloc in strpcpy\n" msgstr "La fonction realloc à échoué dans strpcpy\n" -#: plugins/utils.c:483 +#: plugins/utils.c:482 msgid "failed malloc in strscat\n" msgstr "La fonction malloc à échoué dans strscat\n" -#: plugins-root/check_dhcp.c:298 +#: plugins-root/check_dhcp.c:327 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle pour l'interface '%s'\n" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "Erreur: if_nametoindex erreur - %s.\n" -#: plugins-root/check_dhcp.c:325 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis %s. erreur sysctl 1 " "- %s.\n" -#: plugins-root/check_dhcp.c:330 +#: plugins-root/check_dhcp.c:359 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" @@ -4822,14 +5102,14 @@ msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis l'interface %s\n" " erreur malloc - %s.\n" -#: plugins-root/check_dhcp.c:335 +#: plugins-root/check_dhcp.c:364 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" "Erreur: Impossible d'obtenir l'adresse matérielle depuis %s erreur sysctl 2 " "- %s.\n" -#: plugins-root/check_dhcp.c:361 +#: plugins-root/check_dhcp.c:390 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " @@ -4838,7 +5118,7 @@ msgstr "" "Erreur: impossible de trouver le numéro dans le nom de l'interface (%s).\n" "J'attendais le nom suivi du type ex lnc0.\n" -#: plugins-root/check_dhcp.c:366 plugins-root/check_dhcp.c:378 +#: plugins-root/check_dhcp.c:395 plugins-root/check_dhcp.c:407 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " @@ -4847,110 +5127,122 @@ msgstr "" "Erreur: impossible de lire l'adresse MAC depuis l'interface DLPI pour le \n" "périphérique %s numéro %d.\n" -#: plugins-root/check_dhcp.c:384 -#, c-format -msgid "Error: can't get MAC address for this architecture.\n" +#: plugins-root/check_dhcp.c:413 +#, fuzzy, c-format +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" msgstr "Erreur: impossible d'obtenir l'adresse MAC pour cette architecture.\n" -#: plugins-root/check_dhcp.c:389 -#, c-format -msgid "Hardware address: " -msgstr "Adresse matérielle: " +#: plugins-root/check_dhcp.c:432 +#, fuzzy, c-format +msgid "Error: Cannot determine IP address of interface %s\n" +msgstr "" +"Erreur: Impossible d'obtenir l'adresse matérielle pour l'interface '%s'\n" -#: plugins-root/check_dhcp.c:464 +#: plugins-root/check_dhcp.c:440 +#, fuzzy, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "Erreur: impossible d'obtenir l'adresse MAC pour cette architecture.\n" + +#: plugins-root/check_dhcp.c:445 +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#: plugins-root/check_dhcp.c:530 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "DHCPDISCOVER vers %s port %d\n" -#: plugins-root/check_dhcp.c:517 +#: plugins-root/check_dhcp.c:582 #, c-format msgid "Result=ERROR\n" msgstr "Résultat=ERREUR\n" -#: plugins-root/check_dhcp.c:523 +#: plugins-root/check_dhcp.c:588 #, c-format msgid "Result=OK\n" msgstr "Résultat=OK\n" -#: plugins-root/check_dhcp.c:538 +#: plugins-root/check_dhcp.c:603 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "DHCPOFFER depuis l'adresse IP %s" -#: plugins-root/check_dhcp.c:539 +#: plugins-root/check_dhcp.c:604 #, c-format msgid " via %s\n" msgstr " depuis %s\n" -#: plugins-root/check_dhcp.c:546 -#, c-format +#: plugins-root/check_dhcp.c:611 +#, fuzzy, c-format msgid "" -"DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" msgstr "" "DHCPOFFER XID (%lu) ne correspond pas à DHCPDISCOVER XID (%lu) - paquet " "ignoré\n" -#: plugins-root/check_dhcp.c:568 +#: plugins-root/check_dhcp.c:633 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" "l'adresse matérielle du DHCPOFFER ne correspond pas à la notre paquet " "ignoré\n" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:651 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "Nombre total de réponses vues: %d\n" -#: plugins-root/check_dhcp.c:587 +#: plugins-root/check_dhcp.c:652 #, c-format msgid "Valid responses for this machine: %d\n" msgstr "Nombre de réponse valides pour cette machine: %d\n" -#: plugins-root/check_dhcp.c:603 +#: plugins-root/check_dhcp.c:667 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "résultat de send_dchp_packet: %d\n" -#: plugins-root/check_dhcp.c:632 -#, c-format -msgid "No (more) data received\n" +#: plugins-root/check_dhcp.c:700 +#, fuzzy, c-format +msgid "No (more) data received (nfound: %d)\n" msgstr "Plus de données reçues\n" -#: plugins-root/check_dhcp.c:651 +#: plugins-root/check_dhcp.c:719 #, c-format msgid "recvfrom() failed, " msgstr "recvfrom() a échoué, " -#: plugins-root/check_dhcp.c:658 +#: plugins-root/check_dhcp.c:726 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "résultat de receive_dchp_packet(): %d\n" -#: plugins-root/check_dhcp.c:659 +#: plugins-root/check_dhcp.c:727 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "source de receive_dchp_packet(): %s\n" -#: plugins-root/check_dhcp.c:688 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not create socket!\n" msgstr "Erreur: Impossible de créer un socket!\n" -#: plugins-root/check_dhcp.c:698 +#: plugins-root/check_dhcp.c:767 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" "Erreur: Impossible de configurer l'option de réutilisation de l'adresse sur\n" "le socket DHCP!\n" -#: plugins-root/check_dhcp.c:704 +#: plugins-root/check_dhcp.c:773 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" "Erreur: Impossible de configurer l'option broadcast sur le socket DHCP!\n" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:782 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" @@ -4958,7 +5250,7 @@ msgstr "" "Erreur: Impossible de connecter le socket à l'interface %s.\n" "Vérifiez vos droits...\n" -#: plugins-root/check_dhcp.c:722 +#: plugins-root/check_dhcp.c:793 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" @@ -4966,125 +5258,125 @@ msgstr "" "Erreur: Impossible de se connecter au socket (port %d)! Vérifiez vos " "droits..\n" -#: plugins-root/check_dhcp.c:756 +#: plugins-root/check_dhcp.c:827 #, c-format msgid "Requested server address: %s\n" msgstr "Adresse serveur demandée: %s\n" -#: plugins-root/check_dhcp.c:812 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Lease Time: Infinite\n" msgstr "Durée du Bail: Infini\n" -#: plugins-root/check_dhcp.c:814 +#: plugins-root/check_dhcp.c:890 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "Durée du Bail: %lu secondes\n" -#: plugins-root/check_dhcp.c:816 +#: plugins-root/check_dhcp.c:892 #, c-format msgid "Renewal Time: Infinite\n" msgstr "Renouvellement du bail: Infini\n" -#: plugins-root/check_dhcp.c:818 +#: plugins-root/check_dhcp.c:894 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "Durée du renouvellement = %lu secondes\n" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:896 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "Délai de nouvelle demande: Infini\n" -#: plugins-root/check_dhcp.c:821 +#: plugins-root/check_dhcp.c:897 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "Délai de nouvelle demande: %lu secondes\n" -#: plugins-root/check_dhcp.c:837 +#: plugins-root/check_dhcp.c:925 #, c-format msgid "Added offer from server @ %s" msgstr "Rajouté offre du serveur @ %s" -#: plugins-root/check_dhcp.c:838 +#: plugins-root/check_dhcp.c:926 #, c-format msgid " of IP address %s\n" msgstr "de l'adresse IP %s\n" -#: plugins-root/check_dhcp.c:905 +#: plugins-root/check_dhcp.c:993 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "Correspondance du serveur DHCP: Offrant=%s" -#: plugins-root/check_dhcp.c:906 +#: plugins-root/check_dhcp.c:994 #, c-format msgid " Requested=%s" msgstr " Demandé=%s" -#: plugins-root/check_dhcp.c:908 +#: plugins-root/check_dhcp.c:996 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:909 +#: plugins-root/check_dhcp.c:997 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:957 +#: plugins-root/check_dhcp.c:1045 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "Pas de DHCPOFFERs reçus.\n" -#: plugins-root/check_dhcp.c:961 +#: plugins-root/check_dhcp.c:1049 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "Reçu %d DHCPOFFER(s)" -#: plugins-root/check_dhcp.c:964 +#: plugins-root/check_dhcp.c:1052 #, c-format msgid ", %s%d of %d requested servers responded" msgstr ", %s%d de %d serveurs ont répondus" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 #, c-format msgid ", requested address (%s) was %soffered" msgstr ", l'adresse demandée (%s) %s été offerte" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 msgid "not " msgstr "n'as pas" -#: plugins-root/check_dhcp.c:969 +#: plugins-root/check_dhcp.c:1057 #, c-format msgid ", max lease time = " msgstr ", bail maximum = " -#: plugins-root/check_dhcp.c:971 +#: plugins-root/check_dhcp.c:1059 #, c-format msgid "Infinity" msgstr "Infini" -#: plugins-root/check_dhcp.c:1148 +#: plugins-root/check_dhcp.c:1240 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans check_ctrl: %s.\n" -#: plugins-root/check_dhcp.c:1160 +#: plugins-root/check_dhcp.c:1252 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_ctrl/putmsg(): %" "s.\n" -#: plugins-root/check_dhcp.c:1173 +#: plugins-root/check_dhcp.c:1265 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_both/putmsg().\n" -#: plugins-root/check_dhcp.c:1185 +#: plugins-root/check_dhcp.c:1277 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" @@ -5092,100 +5384,124 @@ msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/open(%" "s..): %s.\n" -#: plugins-root/check_dhcp.c:1209 +#: plugins-root/check_dhcp.c:1301 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/check_ctrl" "(): %s.\n" -#: plugins-root/check_dhcp.c:1257 +#: plugins-root/check_dhcp.c:1380 +#, c-format +msgid "Hardware address: " +msgstr "Adresse matérielle: " + +#: plugins-root/check_dhcp.c:1396 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "Ce plugin teste la disponibilité de serveurs DHCP dans un réseau." -#: plugins-root/check_dhcp.c:1268 +#: plugins-root/check_dhcp.c:1407 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1270 +#: plugins-root/check_dhcp.c:1409 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1272 +#: plugins-root/check_dhcp.c:1411 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1274 +#: plugins-root/check_dhcp.c:1413 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_icmp.c:1227 +#: plugins-root/check_dhcp.c:1415 +msgid "MAC address to use in the DHCP request" +msgstr "" + +#: plugins-root/check_dhcp.c:1417 +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +#: plugins-root/check_icmp.c:1223 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1229 +#: plugins-root/check_icmp.c:1225 msgid "warning threshold (currently " msgstr "Valeurs pour le seuil d'avertissement (actuellement " -#: plugins-root/check_icmp.c:1232 +#: plugins-root/check_icmp.c:1228 msgid "critical threshold (currently " msgstr "Valeurs pour le seuil critique (actuellement " -#: plugins-root/check_icmp.c:1235 +#: plugins-root/check_icmp.c:1231 msgid "number of packets to send (currently " msgstr "nombre de paquets à envoyer (actuellement " -#: plugins-root/check_icmp.c:1238 +#: plugins-root/check_icmp.c:1234 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1241 +#: plugins-root/check_icmp.c:1237 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1244 +#: plugins-root/check_icmp.c:1240 msgid "number of alive hosts required for success" msgstr "nombre d'hôtes vivants requis pour réussite" -#: plugins-root/check_icmp.c:1247 +#: plugins-root/check_icmp.c:1243 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1250 +#: plugins-root/check_icmp.c:1246 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1253 +#: plugins-root/check_icmp.c:1249 msgid "icmp packet size (currenly ignored)" msgstr "" -#: plugins-root/check_icmp.c:1255 +#: plugins-root/check_icmp.c:1251 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1258 +#: plugins-root/check_icmp.c:1254 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1259 +#: plugins-root/check_icmp.c:1255 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1260 +#: plugins-root/check_icmp.c:1256 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1261 +#: plugins-root/check_icmp.c:1257 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1262 +#: plugins-root/check_icmp.c:1258 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1267 +#: plugins-root/check_icmp.c:1263 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" + +#~ msgid "%s does not exist\n" +#~ msgstr "%s n'existe pas\n" + +#~ msgid "Unknown error" +#~ msgstr "Erreur inconnue" + +#~ msgid "Ignore first n lines on STDERR (to suppress a logon banner)" +#~ msgstr "" +#~ "ignorer les x premières lignes sur STDERR (pour supprimer une bannière de " +#~ "connexion)" diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot index 8e28bc5..92732e1 100644 --- a/po/nagios-plugins.pot +++ b/po/nagios-plugins.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-10 03:05-0400\n" +"POT-Creation-Date: 2007-09-29 02:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,195 +17,203 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: plugins/check_by_ssh.c:82 plugins/check_dig.c:89 plugins/check_disk.c:192 +#: plugins/check_by_ssh.c:83 plugins/check_dig.c:89 plugins/check_disk.c:198 #: plugins/check_dns.c:93 plugins/check_dummy.c:59 plugins/check_fping.c:89 -#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:147 -#: plugins/check_ldap.c:105 plugins/check_load.c:122 +#: plugins/check_game.c:84 plugins/check_hpjd.c:106 plugins/check_http.c:150 +#: plugins/check_ldap.c:108 plugins/check_load.c:124 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:88 -#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:758 +#: plugins/check_nagios.c:94 plugins/check_nt.c:126 plugins/check_ntp.c:766 #: plugins/check_nwstat.c:177 plugins/check_overcr.c:106 #: plugins/check_pgsql.c:156 plugins/check_ping.c:99 plugins/check_procs.c:143 -#: plugins/check_radius.c:133 plugins/check_real.c:85 plugins/check_smtp.c:180 +#: plugins/check_radius.c:156 plugins/check_real.c:85 plugins/check_smtp.c:184 #: plugins/check_snmp.c:182 plugins/check_ssh.c:78 plugins/check_swap.c:113 -#: plugins/check_tcp.c:208 plugins/check_time.c:82 plugins/check_ups.c:125 -#: plugins/check_users.c:70 plugins/negate.c:102 plugins-root/check_dhcp.c:256 +#: plugins/check_tcp.c:211 plugins/check_time.c:82 plugins/check_ups.c:125 +#: plugins/check_users.c:70 plugins/negate.c:259 plugins-root/check_dhcp.c:280 msgid "Could not parse arguments" msgstr "" -#: plugins/check_by_ssh.c:86 plugins/check_dig.c:86 plugins/check_dns.c:89 +#: plugins/check_by_ssh.c:87 plugins/check_dig.c:86 plugins/check_dns.c:89 #: plugins/check_nagios.c:98 plugins/check_pgsql.c:160 -#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:106 +#: plugins/check_ping.c:103 plugins/check_procs.c:150 plugins/negate.c:113 msgid "Cannot catch SIGALRM" msgstr "" -#: plugins/check_by_ssh.c:97 +#: plugins/check_by_ssh.c:104 #, c-format msgid "Remote command execution failed: %s\n" msgstr "" -#: plugins/check_by_ssh.c:98 -msgid "Unknown error" +#: plugins/check_by_ssh.c:116 +#, c-format +msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" msgstr "" -#: plugins/check_by_ssh.c:116 +#: plugins/check_by_ssh.c:128 #, c-format msgid "SSH WARNING: could not open %s\n" msgstr "" -#: plugins/check_by_ssh.c:200 plugins/check_disk.c:507 -#: plugins/check_http.c:241 plugins/check_ldap.c:281 plugins/check_pgsql.c:237 -#: plugins/check_procs.c:371 plugins/check_radius.c:215 -#: plugins/check_radius.c:285 plugins/check_real.c:361 -#: plugins/check_smtp.c:629 plugins/check_snmp.c:494 plugins/check_ssh.c:143 -#: plugins/check_tcp.c:500 plugins/check_time.c:306 plugins/check_ups.c:555 -#: plugins/negate.c:203 +#: plugins/check_by_ssh.c:214 plugins/check_disk.c:523 +#: plugins/check_http.c:244 plugins/check_ldap.c:292 plugins/check_pgsql.c:237 +#: plugins/check_procs.c:371 plugins/check_radius.c:284 +#: plugins/check_real.c:361 plugins/check_smtp.c:630 plugins/check_snmp.c:505 +#: plugins/check_ssh.c:143 plugins/check_tcp.c:494 plugins/check_time.c:306 +#: plugins/check_ups.c:555 plugins/negate.c:203 msgid "Timeout interval must be a positive integer" msgstr "" -#: plugins/check_by_ssh.c:210 plugins/check_pgsql.c:261 -#: plugins/check_radius.c:224 plugins/check_radius.c:258 -#: plugins/check_real.c:332 plugins/check_smtp.c:561 plugins/check_tcp.c:506 -#: plugins/check_time.c:300 plugins/check_ups.c:517 +#: plugins/check_by_ssh.c:224 plugins/check_pgsql.c:261 +#: plugins/check_radius.c:257 plugins/check_real.c:332 +#: plugins/check_smtp.c:558 plugins/check_tcp.c:500 plugins/check_time.c:300 +#: plugins/check_ups.c:517 msgid "Port must be a positive integer" msgstr "" -#: plugins/check_by_ssh.c:254 -msgid "skip lines must be an integer" +#: plugins/check_by_ssh.c:270 +msgid "skip-stdout argument must be an integer" msgstr "" -#: plugins/check_by_ssh.c:272 +#: plugins/check_by_ssh.c:278 +msgid "skip-stderr argument must be an integer" +msgstr "" + +#: plugins/check_by_ssh.c:296 #, c-format msgid "%s: You must provide a host name\n" msgstr "" -#: plugins/check_by_ssh.c:290 +#: plugins/check_by_ssh.c:314 msgid "No remotecmd" msgstr "" -#: plugins/check_by_ssh.c:306 +#: plugins/check_by_ssh.c:330 #, c-format msgid "" "%s: In passive mode, you must provide a service name for each command.\n" msgstr "" -#: plugins/check_by_ssh.c:309 +#: plugins/check_by_ssh.c:333 #, c-format msgid "" "%s: In passive mode, you must provide the host short name from the nagios " "configs.\n" msgstr "" -#: plugins/check_by_ssh.c:323 +#: plugins/check_by_ssh.c:347 #, c-format msgid "This plugin uses SSH to execute commands on a remote host" msgstr "" -#: plugins/check_by_ssh.c:336 -msgid "tell ssh to use Protocol 1" -msgstr "" - -#: plugins/check_by_ssh.c:338 -msgid "tell ssh to use Protocol 2" -msgstr "" - -#: plugins/check_by_ssh.c:340 -msgid "Ignore first n lines on STDERR (to suppress a logon banner)" -msgstr "" - -#: plugins/check_by_ssh.c:342 -msgid "tells ssh to fork rather than create a tty" -msgstr "" - -#: plugins/check_by_ssh.c:344 -msgid "command to execute on the remote machine" -msgstr "" - -#: plugins/check_by_ssh.c:346 -msgid "SSH user name on remote host [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:348 -msgid "identity of an authorized key [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:350 -msgid "external command file for nagios [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:352 -msgid "list of nagios service names, separated by ':' [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:354 -msgid "short name of host in nagios configuration [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:356 -msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:358 -msgid "Tell ssh to suppress warning and diagnostic messages [optional]" -msgstr "" - -#: plugins/check_by_ssh.c:361 -msgid "The most common mode of use is to refer to a local identity file with" +#: plugins/check_by_ssh.c:360 +msgid "tell ssh to use Protocol 1 [optional]" msgstr "" #: plugins/check_by_ssh.c:362 -msgid "the '-i' option. In this mode, the identity pair should have a null" -msgstr "" - -#: plugins/check_by_ssh.c:363 -msgid "passphrase and the public key should be listed in the authorized_keys" +msgid "tell ssh to use Protocol 2 [optional]" msgstr "" #: plugins/check_by_ssh.c:364 -msgid "file of the remote host. Usually the key will be restricted to running" -msgstr "" - -#: plugins/check_by_ssh.c:365 -msgid "only one command on the remote server. If the remote SSH server tracks" +msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" msgstr "" #: plugins/check_by_ssh.c:366 -msgid "invocation arguments, the one remote program may be an agent that can" -msgstr "" - -#: plugins/check_by_ssh.c:367 -msgid "execute additional commands as proxy" +msgid "Ignore all or (if specified) first n lines on STDERR [optional]" msgstr "" #: plugins/check_by_ssh.c:368 +msgid "tells ssh to fork rather than create a tty [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:370 +msgid "command to execute on the remote machine" +msgstr "" + +#: plugins/check_by_ssh.c:372 +msgid "SSH user name on remote host [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:374 +msgid "identity of an authorized key [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:376 +msgid "external command file for nagios [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:378 +msgid "list of nagios service names, separated by ':' [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:380 +msgid "short name of host in nagios configuration [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:382 +msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:384 +msgid "Tell ssh to suppress warning and diagnostic messages [optional]" +msgstr "" + +#: plugins/check_by_ssh.c:387 +msgid "The most common mode of use is to refer to a local identity file with" +msgstr "" + +#: plugins/check_by_ssh.c:388 +msgid "the '-i' option. In this mode, the identity pair should have a null" +msgstr "" + +#: plugins/check_by_ssh.c:389 +msgid "passphrase and the public key should be listed in the authorized_keys" +msgstr "" + +#: plugins/check_by_ssh.c:390 +msgid "file of the remote host. Usually the key will be restricted to running" +msgstr "" + +#: plugins/check_by_ssh.c:391 +msgid "only one command on the remote server. If the remote SSH server tracks" +msgstr "" + +#: plugins/check_by_ssh.c:392 +msgid "invocation arguments, the one remote program may be an agent that can" +msgstr "" + +#: plugins/check_by_ssh.c:393 +msgid "execute additional commands as proxy" +msgstr "" + +#: plugins/check_by_ssh.c:394 msgid "To use passive mode, provide multiple '-C' options, and provide" msgstr "" -#: plugins/check_by_ssh.c:369 +#: plugins/check_by_ssh.c:395 msgid "" "all of -O, -s, and -n options (servicelist order must match '-C'options)" msgstr "" -#: plugins/check_by_ssh.c:371 plugins/check_disk.c:901 -#: plugins/check_http.c:1324 plugins/check_nagios.c:303 -#: plugins/check_procs.c:735 plugins/negate.c:269 plugins/urlize.c:187 +#: plugins/check_by_ssh.c:397 plugins/check_disk.c:947 +#: plugins/check_http.c:1352 plugins/check_nagios.c:303 +#: plugins/check_procs.c:735 plugins/negate.c:319 plugins/urlize.c:187 #, c-format msgid "Examples:" msgstr "" -#: plugins/check_by_ssh.c:385 plugins/check_dig.c:336 plugins/check_disk.c:912 -#: plugins/check_dns.c:447 plugins/check_dummy.c:127 plugins/check_fping.c:407 -#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1347 -#: plugins/check_ldap.c:411 plugins/check_load.c:311 plugins/check_mrtg.c:383 +#: plugins/check_by_ssh.c:412 plugins/check_dig.c:336 plugins/check_disk.c:963 +#: plugins/check_dns.c:447 plugins/check_dummy.c:129 plugins/check_fping.c:407 +#: plugins/check_game.c:334 plugins/check_hpjd.c:415 plugins/check_http.c:1375 +#: plugins/check_ldap.c:449 plugins/check_load.c:326 plugins/check_mrtg.c:383 #: plugins/check_mysql.c:407 plugins/check_nagios.c:313 plugins/check_nt.c:707 -#: plugins/check_ntp.c:859 plugins/check_nwstat.c:1688 +#: plugins/check_ntp.c:868 plugins/check_nwstat.c:1688 #: plugins/check_overcr.c:469 plugins/check_pgsql.c:458 #: plugins/check_ping.c:597 plugins/check_procs.c:753 -#: plugins/check_radius.c:349 plugins/check_real.c:454 -#: plugins/check_smtp.c:780 plugins/check_snmp.c:1007 plugins/check_ssh.c:306 -#: plugins/check_swap.c:560 plugins/check_tcp.c:656 plugins/check_time.c:373 -#: plugins/check_ups.c:653 plugins/check_users.c:230 -#: plugins/check_ide_smart.c:544 plugins/negate.c:290 plugins/urlize.c:204 -#: plugins-root/check_dhcp.c:1283 plugins-root/check_icmp.c:1282 +#: plugins/check_radius.c:358 plugins/check_real.c:454 +#: plugins/check_smtp.c:863 plugins/check_snmp.c:1018 plugins/check_ssh.c:306 +#: plugins/check_swap.c:560 plugins/check_tcp.c:654 plugins/check_time.c:373 +#: plugins/check_ups.c:657 plugins/check_users.c:230 +#: plugins/check_ide_smart.c:527 plugins/negate.c:340 plugins/urlize.c:204 +#: plugins-root/check_dhcp.c:1426 plugins-root/check_icmp.c:1278 #, c-format msgid "Usage:" msgstr "" @@ -270,167 +278,224 @@ msgid "" "was in -l" msgstr "" -#: plugins/check_disk.c:213 +#: plugins/check_disk.c:220 #, c-format msgid "DISK %s: %s not found\n" msgstr "" -#: plugins/check_disk.c:213 plugins/check_disk.c:751 plugins/check_dns.c:208 -#: plugins/check_dummy.c:81 plugins/check_http.c:959 plugins/check_http.c:1022 -#: plugins/check_mysql.c:214 plugins/check_nagios.c:107 -#: plugins/check_nagios.c:171 plugins/check_nagios.c:175 -#: plugins/check_procs.c:302 +#: plugins/check_disk.c:220 plugins/check_disk.c:978 plugins/check_dns.c:208 +#: plugins/check_dummy.c:81 plugins/check_mysql.c:214 +#: plugins/check_nagios.c:107 plugins/check_nagios.c:171 +#: plugins/check_nagios.c:175 plugins/check_procs.c:302 #, c-format msgid "CRITICAL" msgstr "" -#: plugins/check_disk.c:581 +#: plugins/check_disk.c:597 #, c-format msgid "unit type %s not known\n" msgstr "" -#: plugins/check_disk.c:584 +#: plugins/check_disk.c:600 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "" -#: plugins/check_disk.c:606 plugins/check_disk.c:643 plugins/check_disk.c:653 -#: plugins/check_disk.c:659 plugins/check_disk.c:678 plugins/check_dummy.c:84 -#: plugins/check_http.c:953 +#: plugins/check_disk.c:624 plugins/check_disk.c:655 plugins/check_disk.c:660 +#: plugins/check_disk.c:667 plugins/check_disk.c:671 plugins/check_disk.c:711 +#: plugins/check_disk.c:717 plugins/check_disk.c:736 plugins/check_dummy.c:84 +#: plugins/check_dummy.c:87 #, c-format msgid "UNKNOWN" msgstr "" -#: plugins/check_disk.c:606 +#: plugins/check_disk.c:624 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:643 -msgid "Must set group value before using -p\n" +#: plugins/check_disk.c:655 +msgid "Must set -E before selecting pathes\n" msgstr "" -#: plugins/check_disk.c:653 -msgid "Must set a threshold value before using -r/-R\n" +#: plugins/check_disk.c:660 +msgid "Must set group value before selecting pathes \n" msgstr "" -#: plugins/check_disk.c:659 +#: plugins/check_disk.c:667 +msgid "" +"Pathes need to be selected before using -i/-I. Use -A to select all pathes " +"explicitly" +msgstr "" + +#: plugins/check_disk.c:671 plugins/check_disk.c:717 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:679 +#: plugins/check_disk.c:711 +msgid "Must set a threshold value before using -r/-R\n" +msgstr "" + +#: plugins/check_disk.c:737 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:723 +#: plugins/check_disk.c:784 msgid "Unknown argument" msgstr "" -#: plugins/check_disk.c:752 -#, c-format -msgid "%s does not exist\n" -msgstr "" - -#: plugins/check_disk.c:781 +#: plugins/check_disk.c:818 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:849 +#: plugins/check_disk.c:886 msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "" -#: plugins/check_disk.c:850 +#: plugins/check_disk.c:887 msgid "" "and generates an alert if free space is less than one of the threshold values" msgstr "" -#: plugins/check_disk.c:859 +#: plugins/check_disk.c:896 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:861 +#: plugins/check_disk.c:898 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:863 -msgid "Exit with WARNING status if less than PERCENT of inode space is free" -msgstr "" - -#: plugins/check_disk.c:865 -msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" -msgstr "" - -#: plugins/check_disk.c:867 +#: plugins/check_disk.c:900 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:869 +#: plugins/check_disk.c:902 msgid "Exit with CRITCAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:871 -msgid "Clear thresholds" +#: plugins/check_disk.c:904 +msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:873 -msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +#: plugins/check_disk.c:906 +msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:875 -msgid "Same as '--units kB'" -msgstr "" - -#: plugins/check_disk.c:877 -msgid "Same as '--units MB'" -msgstr "" - -#: plugins/check_disk.c:879 -msgid "Only check local filesystems" -msgstr "" - -#: plugins/check_disk.c:881 +#: plugins/check_disk.c:908 msgid "Path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:883 -msgid "Regular expression for path or partition (may be repeated)" +#: plugins/check_disk.c:910 +msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:885 -msgid "" -"Case insensitive regular expression for path/partition (may be repeated)" +#: plugins/check_disk.c:912 +msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:887 +#: plugins/check_disk.c:914 +msgid "For paths or partitions specified with -p, only check for exact paths" +msgstr "" + +#: plugins/check_disk.c:916 +msgid "Display only devices/mountpoints with errors" +msgstr "" + +#: plugins/check_disk.c:918 msgid "" "Group pathes. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:889 -msgid "Ignore device (only works if -p unspecified)" +#: plugins/check_disk.c:920 +msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:891 -msgid "Ignore all filesystems of indicated type (may be repeated)" +#: plugins/check_disk.c:922 +msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:893 +#: plugins/check_disk.c:924 +msgid "" +"Only check local filesystems against thresholds. Yet call stat on remote " +"filesystems" +msgstr "" + +#: plugins/check_disk.c:925 +msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" +msgstr "" + +#: plugins/check_disk.c:927 msgid "Display the mountpoint instead of the partition" msgstr "" -#: plugins/check_disk.c:895 -msgid "For paths or partitions specified with -p, only check for exact paths" +#: plugins/check_disk.c:929 +msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:897 -msgid "Display only devices/mountpoints with errors" +#: plugins/check_disk.c:931 +msgid "Explicitly select all pathes. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:903 +#: plugins/check_disk.c:933 +msgid "" +"Case insensitive regular expression for path/partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:935 +msgid "Regular expression for path or partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:937 +msgid "" +"Regular expression to ignore selected path/partition (case insensitive) (may " +"be repeated)" +msgstr "" + +#: plugins/check_disk.c:939 +msgid "" +"Regular expression to ignore selected path or partition (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:942 +msgid "Choose bytes, kB, MB, GB, TB (default: MB)" +msgstr "" + +#: plugins/check_disk.c:945 +msgid "Ignore all filesystems of indicated type (may be repeated)" +msgstr "" + +#: plugins/check_disk.c:949 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" +#: plugins/check_disk.c:951 +msgid "" +"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" +"r regex" +msgstr "" + +#: plugins/check_disk.c:952 +msgid "" +"are grouped which means the freespace thresholds are applied to all disks " +"together" +msgstr "" + +#: plugins/check_disk.c:954 +msgid "" +"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " +"100M/50M" +msgstr "" + +#: plugins/check_disk.c:979 +#, c-format +msgid "%s %s: %s\n" +msgstr "" + +#: plugins/check_disk.c:979 +msgid "is not accessible" +msgstr "" + #: plugins/check_dns.c:107 msgid "nslookup returned an error status" msgstr "" @@ -463,15 +528,14 @@ msgstr "" msgid "server %s is not authoritative for %s" msgstr "" -#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_http.c:955 -#: plugins/check_nagios.c:185 plugins/check_procs.c:295 +#: plugins/check_dns.c:204 plugins/check_dummy.c:75 plugins/check_nagios.c:185 +#: plugins/check_procs.c:295 #, c-format msgid "OK" msgstr "" -#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_http.c:957 -#: plugins/check_mysql.c:211 plugins/check_nagios.c:185 -#: plugins/check_procs.c:297 +#: plugins/check_dns.c:206 plugins/check_dummy.c:78 plugins/check_mysql.c:211 +#: plugins/check_nagios.c:185 plugins/check_procs.c:297 #, c-format msgid "WARNING" msgstr "" @@ -609,30 +673,30 @@ msgstr "" msgid "Arguments to check_dummy must be an integer" msgstr "" -#: plugins/check_dummy.c:87 +#: plugins/check_dummy.c:89 #, c-format msgid "Status %d is not a supported error state\n" msgstr "" -#: plugins/check_dummy.c:109 +#: plugins/check_dummy.c:111 msgid "" "This plugin will simply return the state corresponding to the numeric value" msgstr "" -#: plugins/check_dummy.c:111 +#: plugins/check_dummy.c:113 msgid "of the argument with optional text" msgstr "" #: plugins/check_fping.c:103 plugins/check_hpjd.c:131 plugins/check_ping.c:432 #: plugins/check_procs.c:159 plugins/check_snmp.c:203 plugins/check_swap.c:178 -#: plugins/check_users.c:75 plugins/negate.c:112 plugins/urlize.c:117 +#: plugins/check_users.c:75 plugins/urlize.c:117 #, c-format msgid "Could not open pipe: %s\n" msgstr "" -#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:153 -#: plugins/check_procs.c:165 plugins/check_snmp.c:209 plugins/check_swap.c:184 -#: plugins/check_users.c:81 plugins/negate.c:117 plugins/urlize.c:123 +#: plugins/check_fping.c:109 plugins/check_hpjd.c:137 plugins/check_load.c:155 +#: plugins/check_procs.c:165 plugins/check_snmp.c:210 plugins/check_swap.c:184 +#: plugins/check_users.c:81 plugins/urlize.c:123 #, c-format msgid "Could not open stderr for %s\n" msgstr "" @@ -663,10 +727,10 @@ msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "" #: plugins/check_fping.c:273 plugins/check_hpjd.c:341 plugins/check_hpjd.c:364 -#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:696 +#: plugins/check_mysql.c:277 plugins/check_mysql.c:326 plugins/check_ntp.c:704 #: plugins/check_pgsql.c:255 plugins/check_ping.c:290 plugins/check_ping.c:413 -#: plugins/check_radius.c:250 plugins/check_real.c:319 -#: plugins/check_real.c:381 plugins/check_smtp.c:554 plugins/check_smtp.c:675 +#: plugins/check_radius.c:249 plugins/check_real.c:319 +#: plugins/check_real.c:381 plugins/check_smtp.c:551 plugins/check_smtp.c:676 #: plugins/check_ssh.c:162 plugins/check_time.c:244 plugins/check_time.c:319 #: plugins/check_ups.c:503 plugins/check_ups.c:572 msgid "Invalid hostname/address" @@ -680,7 +744,7 @@ msgstr "" msgid "Packet count must be a positive integer" msgstr "" -#: plugins/check_fping.c:319 plugins/check_ntp.c:728 plugins/check_time.c:323 +#: plugins/check_fping.c:319 plugins/check_ntp.c:736 plugins/check_time.c:323 msgid "Hostname was not supplied" msgstr "" @@ -785,10 +849,10 @@ msgstr "" msgid "Field number in raw qstat output that contains ping time" msgstr "" -#: plugins/check_game.c:318 plugins/check_http.c:1312 plugins/check_mrtg.c:364 +#: plugins/check_game.c:318 plugins/check_http.c:1340 plugins/check_mrtg.c:364 #: plugins/check_mrtgtraf.c:361 plugins/check_nt.c:693 #: plugins/check_nwstat.c:1673 plugins/check_overcr.c:452 -#: plugins/check_swap.c:549 plugins/check_ups.c:629 plugins/negate.c:276 +#: plugins/check_swap.c:549 plugins/check_ups.c:633 plugins/negate.c:325 #, c-format msgid "Notes:" msgstr "" @@ -876,565 +940,651 @@ msgstr "" msgid "(default=%s)" msgstr "" -#: plugins/check_http.c:247 +#: plugins/check_http.c:250 msgid "Critical threshold must be integer" msgstr "" -#: plugins/check_http.c:255 +#: plugins/check_http.c:258 msgid "Warning threshold must be integer" msgstr "" -#: plugins/check_http.c:281 plugins/check_tcp.c:570 +#: plugins/check_http.c:284 plugins/check_tcp.c:563 msgid "Invalid certificate expiration period" msgstr "" -#: plugins/check_http.c:290 plugins/check_tcp.c:582 +#: plugins/check_http.c:293 plugins/check_tcp.c:575 msgid "Invalid option - SSL is not available" msgstr "" -#: plugins/check_http.c:308 +#: plugins/check_http.c:311 #, c-format msgid "option f:%d \n" msgstr "" -#: plugins/check_http.c:325 +#: plugins/check_http.c:328 msgid "Invalid port number" msgstr "" -#: plugins/check_http.c:363 +#: plugins/check_http.c:366 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:377 plugins/check_ntp.c:709 plugins/check_smtp.c:655 -#: plugins/check_ssh.c:154 plugins/check_tcp.c:473 +#: plugins/check_http.c:380 plugins/check_ntp.c:717 plugins/check_smtp.c:656 +#: plugins/check_ssh.c:154 plugins/check_tcp.c:467 msgid "IPv6 support not available" msgstr "" -#: plugins/check_http.c:439 plugins/check_ping.c:417 +#: plugins/check_http.c:442 plugins/check_ping.c:417 msgid "You must specify a server address or host name" msgstr "" -#: plugins/check_http.c:665 -msgid "Server date unknown\n" +#: plugins/check_http.c:668 +msgid "HTTP UNKNOWN - Server date unknown\n" msgstr "" -#: plugins/check_http.c:667 -msgid "Document modification date unknown\n" +#: plugins/check_http.c:670 +msgid "HTTP CRITICAL - Document modification date unknown\n" msgstr "" -#: plugins/check_http.c:673 +#: plugins/check_http.c:676 #, c-format -msgid "CRITICAL - Server date \"%100s\" unparsable" +msgid "HTTP CRITICAL - Server date \"%100s\" unparsable" msgstr "" -#: plugins/check_http.c:675 +#: plugins/check_http.c:678 #, c-format -msgid "CRITICAL - Document date \"%100s\" unparsable" +msgid "HTTP CRITICAL - Document date \"%100s\" unparsable" msgstr "" -#: plugins/check_http.c:677 +#: plugins/check_http.c:680 #, c-format -msgid "CRITICAL - Document is %d seconds in the future\n" +msgid "HTTP CRITICAL - Document is %d seconds in the future\n" msgstr "" -#: plugins/check_http.c:682 +#: plugins/check_http.c:685 #, c-format -msgid "CRITICAL - Last modified %.1f days ago\n" +msgid "HTTP CRITICAL - Last modified %.1f days ago\n" msgstr "" -#: plugins/check_http.c:686 +#: plugins/check_http.c:689 #, c-format -msgid "CRITICAL - Last modified %d:%02d:%02d ago\n" +msgid "HTTP CRITICAL - Last modified %d:%02d:%02d ago\n" msgstr "" -#: plugins/check_http.c:767 -msgid "Unable to open TCP socket\n" +#: plugins/check_http.c:770 +msgid "HTTP CRITICAL - Unable to open TCP socket\n" msgstr "" -#: plugins/check_http.c:847 -msgid "Error on receive\n" +#: plugins/check_http.c:853 +msgid "HTTP CRITICAL - Error on receive\n" msgstr "" -#: plugins/check_http.c:857 plugins/check_real.c:189 plugins/check_tcp.c:291 -#, c-format -msgid "No data received from host\n" +#: plugins/check_http.c:863 +msgid "HTTP CRITICAL - No data received from host\n" msgstr "" -#: plugins/check_http.c:907 +#: plugins/check_http.c:913 msgid "Invalid HTTP response received from host\n" msgstr "" -#: plugins/check_http.c:910 +#: plugins/check_http.c:916 #, c-format msgid "Invalid HTTP response received from host on port %d\n" msgstr "" -#: plugins/check_http.c:918 +#: plugins/check_http.c:924 #, c-format msgid "HTTP OK: Status line output matched \"%s\"\n" msgstr "" -#: plugins/check_http.c:930 +#: plugins/check_http.c:936 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "" -#: plugins/check_http.c:937 +#: plugins/check_http.c:943 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "" -#: plugins/check_http.c:941 +#: plugins/check_http.c:947 #, c-format msgid "HTTP CRITICAL: %s\n" msgstr "" -#: plugins/check_http.c:945 +#: plugins/check_http.c:951 #, c-format msgid "HTTP WARNING: %s\n" msgstr "" +#: plugins/check_http.c:959 +#, c-format +msgid "HTTP UNKNOWN" +msgstr "" + +#: plugins/check_http.c:961 +#, c-format +msgid "HTTP OK" +msgstr "" + #: plugins/check_http.c:963 #, c-format +msgid "HTTP WARNING" +msgstr "" + +#: plugins/check_http.c:965 plugins/check_http.c:1028 +#, c-format +msgid "HTTP CRITICAL" +msgstr "" + +#: plugins/check_http.c:969 +#, c-format msgid " - %s - %.3f second response time %s|%s %s\n" msgstr "" -#: plugins/check_http.c:979 +#: plugins/check_http.c:985 #, c-format msgid "HTTP WARNING: %s - %.3f second response time %s|%s %s\n" msgstr "" -#: plugins/check_http.c:993 plugins/check_http.c:1010 +#: plugins/check_http.c:999 plugins/check_http.c:1016 #, c-format msgid "HTTP OK %s - %.3f second response time %s|%s %s\n" msgstr "" -#: plugins/check_http.c:1000 +#: plugins/check_http.c:1006 #, c-format -msgid "CRITICAL - string not found%s|%s %s\n" +msgid "HTTP CRITICAL - string not found%s|%s %s\n" msgstr "" -#: plugins/check_http.c:1018 +#: plugins/check_http.c:1024 msgid "pattern not found" msgstr "" -#: plugins/check_http.c:1020 +#: plugins/check_http.c:1026 msgid "pattern found" msgstr "" -#: plugins/check_http.c:1030 +#: plugins/check_http.c:1036 #, c-format -msgid "CRITICAL - Execute Error: %s\n" +msgid "HTTP CRITICAL - Execute Error: %s\n" msgstr "" -#: plugins/check_http.c:1039 +#: plugins/check_http.c:1045 #, c-format msgid "HTTP WARNING: page size %d too large%s|%s\n" msgstr "" -#: plugins/check_http.c:1043 +#: plugins/check_http.c:1049 #, c-format msgid "HTTP WARNING: page size %d too small%s|%s\n" msgstr "" -#: plugins/check_http.c:1048 +#: plugins/check_http.c:1054 #, c-format msgid "HTTP OK %s - %d bytes in %.3f seconds %s|%s %s\n" msgstr "" -#: plugins/check_http.c:1083 -msgid "Could not allocate addr\n" +#: plugins/check_http.c:1088 +msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "" -#: plugins/check_http.c:1087 -msgid "Could not allocate url\n" +#: plugins/check_http.c:1092 +msgid "HTTP UNKNOWN - Could not allocate url\n" msgstr "" -#: plugins/check_http.c:1096 +#: plugins/check_http.c:1101 #, c-format -msgid "UNKNOWN - Could not find redirect location - %s%s\n" +msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1106 -msgid "could not allocate url\n" -msgstr "" - -#: plugins/check_http.c:1149 +#: plugins/check_http.c:1116 #, c-format -msgid "UNKNOWN - Could not parse redirect location - %s%s\n" +msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "" -#: plugins/check_http.c:1159 +#: plugins/check_http.c:1123 +msgid "HTTP UNKNOWN - could not allocate url\n" +msgstr "" + +#: plugins/check_http.c:1163 #, c-format -msgid "WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" +msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1167 +#: plugins/check_http.c:1173 #, c-format -msgid "WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1231 +#: plugins/check_http.c:1181 +#, c-format +msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgstr "" + +#: plugins/check_http.c:1196 +#, c-format +msgid "HTTP UNKNOWN - Could not allocate server_url%s\n" +msgstr "" + +#: plugins/check_http.c:1202 +#, c-format +msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" +msgstr "" + +#: plugins/check_http.c:1207 +#, c-format +msgid "Redirection to %s://%s:%d%s\n" +msgstr "" + +#: plugins/check_http.c:1259 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" -#: plugins/check_http.c:1232 +#: plugins/check_http.c:1260 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1233 +#: plugins/check_http.c:1261 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1234 +#: plugins/check_http.c:1262 msgid "certificate expiration times." msgstr "" -#: plugins/check_http.c:1240 +#: plugins/check_http.c:1268 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1247 +#: plugins/check_http.c:1275 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1248 +#: plugins/check_http.c:1276 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1250 +#: plugins/check_http.c:1278 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1252 +#: plugins/check_http.c:1280 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1259 +#: plugins/check_http.c:1287 msgid "Connect via SSL. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1261 +#: plugins/check_http.c:1289 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1262 +#: plugins/check_http.c:1290 msgid "(when this option is used the url is not checked.)\n" msgstr "" -#: plugins/check_http.c:1266 +#: plugins/check_http.c:1294 msgid "String to expect in first (status) line of server response (default: " msgstr "" -#: plugins/check_http.c:1268 +#: plugins/check_http.c:1296 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1270 +#: plugins/check_http.c:1298 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1272 +#: plugins/check_http.c:1300 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1274 +#: plugins/check_http.c:1302 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1276 +#: plugins/check_http.c:1304 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1277 +#: plugins/check_http.c:1305 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1279 +#: plugins/check_http.c:1307 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1280 +#: plugins/check_http.c:1308 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1282 +#: plugins/check_http.c:1310 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1285 +#: plugins/check_http.c:1313 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1287 +#: plugins/check_http.c:1315 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1289 +#: plugins/check_http.c:1317 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1319 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1322 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1296 +#: plugins/check_http.c:1324 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1298 +#: plugins/check_http.c:1326 msgid "" " Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1300 +#: plugins/check_http.c:1328 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1302 +#: plugins/check_http.c:1330 msgid "How to handle redirected pages" msgstr "" -#: plugins/check_http.c:1304 +#: plugins/check_http.c:1332 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1313 +#: plugins/check_http.c:1341 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "" -#: plugins/check_http.c:1314 +#: plugins/check_http.c:1342 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1315 +#: plugins/check_http.c:1343 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "reponse" msgstr "" -#: plugins/check_http.c:1316 +#: plugins/check_http.c:1344 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1317 +#: plugins/check_http.c:1345 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1318 +#: plugins/check_http.c:1346 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1321 +#: plugins/check_http.c:1349 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1322 +#: plugins/check_http.c:1350 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1323 +#: plugins/check_http.c:1351 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1326 +#: plugins/check_http.c:1354 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1327 +#: plugins/check_http.c:1355 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1328 +#: plugins/check_http.c:1356 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1329 +#: plugins/check_http.c:1357 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1332 +#: plugins/check_http.c:1360 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1333 +#: plugins/check_http.c:1361 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1334 +#: plugins/check_http.c:1362 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1335 +#: plugins/check_http.c:1363 msgid "the certificate is expired." msgstr "" -#: plugins/check_ldap.c:125 +#: plugins/check_ldap.c:132 #, c-format msgid "Could not connect to the server at port %i\n" msgstr "" -#: plugins/check_ldap.c:134 +#: plugins/check_ldap.c:141 #, c-format msgid "Could not set protocol version %d\n" msgstr "" -#: plugins/check_ldap.c:150 +#: plugins/check_ldap.c:156 #, c-format msgid "Could not init TLS at port %i!\n" msgstr "" -#: plugins/check_ldap.c:154 +#: plugins/check_ldap.c:160 #, c-format msgid "TLS not supported by the libraries!\n" msgstr "" -#: plugins/check_ldap.c:173 +#: plugins/check_ldap.c:180 #, c-format msgid "Could not init startTLS at port %i!\n" msgstr "" -#: plugins/check_ldap.c:177 +#: plugins/check_ldap.c:184 #, c-format msgid "startTLS not supported by the library, needs LDAPv3!\n" msgstr "" -#: plugins/check_ldap.c:187 +#: plugins/check_ldap.c:194 #, c-format msgid "Could not bind to the ldap-server\n" msgstr "" -#: plugins/check_ldap.c:195 +#: plugins/check_ldap.c:203 #, c-format msgid "Could not search/find objectclasses in %s\n" msgstr "" -#: plugins/check_ldap.c:218 +#: plugins/check_ldap.c:226 #, c-format msgid "LDAP %s - %.3f seconds response time|%s\n" msgstr "" -#: plugins/check_ldap.c:324 plugins/check_ping.c:241 +#: plugins/check_ldap.c:338 plugins/check_ldap.c:345 +#, c-format +msgid "%s cannot be combined with %s" +msgstr "" + +#: plugins/check_ldap.c:351 plugins/check_ping.c:241 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_ldap.c:347 +#: plugins/check_ldap.c:374 msgid "Please specify the host name\n" msgstr "" -#: plugins/check_ldap.c:350 +#: plugins/check_ldap.c:377 msgid "Please specify the LDAP base\n" msgstr "" -#: plugins/check_ldap.c:378 +#: plugins/check_ldap.c:405 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:380 +#: plugins/check_ldap.c:407 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:382 +#: plugins/check_ldap.c:409 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:384 +#: plugins/check_ldap.c:411 msgid "ldap password (if required)" msgstr "" -#: plugins/check_ldap.c:388 +#: plugins/check_ldap.c:413 +msgid "use starttls mechanism introduced in protocol version 3" +msgstr "" + +#: plugins/check_ldap.c:415 +#, c-format +msgid "use ldaps (ldap v2 ssl method). this also sets the default port to %s" +msgstr "" + +#: plugins/check_ldap.c:419 msgid "use ldap protocol version 2" msgstr "" -#: plugins/check_ldap.c:390 +#: plugins/check_ldap.c:421 msgid "use ldap protocol version 3" msgstr "" -#: plugins/check_load.c:91 +#: plugins/check_ldap.c:431 +msgid "Note:" +msgstr "" + +#: plugins/check_ldap.c:432 +msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" +msgstr "" + +#: plugins/check_ldap.c:433 +#, c-format +msgid "" +"implied (using default port %i) unless --port=636 is specified. In that case " +"%s" +msgstr "" + +#: plugins/check_ldap.c:434 +msgid "'SSL on connect' will be used no matter how the plugin was called." +msgstr "" + +#: plugins/check_ldap.c:435 +msgid "" +"This detection is deprecated, please use 'check_ldap' with the '--starttls' " +"or '--ssl' flags" +msgstr "" + +#: plugins/check_ldap.c:436 +msgid "to define the behaviour explicitly instead." +msgstr "" + +#: plugins/check_load.c:92 msgid "Warning threshold must be float or float triplet!\n" msgstr "" -#: plugins/check_load.c:132 plugins/check_load.c:148 +#: plugins/check_load.c:134 plugins/check_load.c:150 #, c-format msgid "Error opening %s\n" msgstr "" -#: plugins/check_load.c:160 +#: plugins/check_load.c:162 #, c-format msgid "Error code %d returned in %s\n" msgstr "" -#: plugins/check_load.c:168 +#: plugins/check_load.c:177 #, c-format msgid "Error in getloadavg()\n" msgstr "" -#: plugins/check_load.c:171 plugins/check_load.c:173 +#: plugins/check_load.c:180 plugins/check_load.c:182 #, c-format msgid "Error processing %s\n" msgstr "" -#: plugins/check_load.c:182 +#: plugins/check_load.c:191 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "" -#: plugins/check_load.c:271 +#: plugins/check_load.c:284 #, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "" -#: plugins/check_load.c:273 +#: plugins/check_load.c:286 #, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "" -#: plugins/check_load.c:275 +#: plugins/check_load.c:288 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " "\"critical load\"\n" msgstr "" -#: plugins/check_load.c:291 +#: plugins/check_load.c:304 #, c-format msgid "This plugin tests the current system load average." msgstr "" -#: plugins/check_load.c:300 +#: plugins/check_load.c:313 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" -#: plugins/check_load.c:302 +#: plugins/check_load.c:315 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "" -#: plugins/check_load.c:303 +#: plugins/check_load.c:316 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" +#: plugins/check_load.c:318 +msgid "Divide the load averages by the number of CPUs (when possible)" +msgstr "" + #: plugins/check_mrtg.c:79 msgid "Could not parse arguments\n" msgstr "" @@ -2127,39 +2277,39 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:720 +#: plugins/check_ntp.c:728 msgid "Critical offset should be larger than warning offset" msgstr "" -#: plugins/check_ntp.c:724 +#: plugins/check_ntp.c:732 msgid "Critical jitter should be larger than warning jitter" msgstr "" -#: plugins/check_ntp.c:810 +#: plugins/check_ntp.c:818 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:813 +#: plugins/check_ntp.c:822 msgid "Unable to fully sample sync server" msgstr "" -#: plugins/check_ntp.c:836 +#: plugins/check_ntp.c:845 msgid "This plugin checks the selected ntp server" msgstr "" -#: plugins/check_ntp.c:844 +#: plugins/check_ntp.c:853 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:846 +#: plugins/check_ntp.c:855 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:848 +#: plugins/check_ntp.c:857 msgid "Warning value for jitter" msgstr "" -#: plugins/check_ntp.c:850 +#: plugins/check_ntp.c:859 msgid "Critical value for jitter" msgstr "" @@ -3268,103 +3418,119 @@ msgstr "" msgid "Alert if cpu of any processes over 10%% or 20%%" msgstr "" -#: plugins/check_radius.c:138 +#: plugins/check_radius.c:161 msgid "Config file error" msgstr "" -#: plugins/check_radius.c:147 +#: plugins/check_radius.c:170 msgid "Out of Memory?" msgstr "" -#: plugins/check_radius.c:168 +#: plugins/check_radius.c:191 msgid "Timeout" msgstr "" -#: plugins/check_radius.c:170 +#: plugins/check_radius.c:193 msgid "Auth Error" msgstr "" -#: plugins/check_radius.c:172 +#: plugins/check_radius.c:195 msgid "Auth Failed" msgstr "" -#: plugins/check_radius.c:176 +#: plugins/check_radius.c:199 msgid "Auth OK" msgstr "" -#: plugins/check_radius.c:219 plugins/check_radius.c:279 +#: plugins/check_radius.c:278 msgid "Number of retries must be a positive integer" msgstr "" -#: plugins/check_radius.c:305 +#: plugins/check_radius.c:290 +msgid "Host not specified" +msgstr "" + +#: plugins/check_radius.c:292 +msgid "User not specified" +msgstr "" + +#: plugins/check_radius.c:294 +msgid "Password not specified" +msgstr "" + +#: plugins/check_radius.c:296 +msgid "Configuration file not specified" +msgstr "" + +#: plugins/check_radius.c:314 msgid "Tests to see if a radius server is accepting connections." msgstr "" -#: plugins/check_radius.c:316 +#: plugins/check_radius.c:325 msgid "The user to authenticate" msgstr "" -#: plugins/check_radius.c:318 +#: plugins/check_radius.c:327 msgid "Password for autentication (SECURITY RISK)" msgstr "" -#: plugins/check_radius.c:320 +#: plugins/check_radius.c:329 msgid "NAS identifier" msgstr "" -#: plugins/check_radius.c:322 +#: plugins/check_radius.c:331 msgid "Configuration file" msgstr "" -#: plugins/check_radius.c:324 +#: plugins/check_radius.c:333 msgid "Response string to expect from the server" msgstr "" -#: plugins/check_radius.c:326 +#: plugins/check_radius.c:335 msgid "Number of times to retry a failed connection" msgstr "" -#: plugins/check_radius.c:330 +#: plugins/check_radius.c:339 msgid "" "This plugin tests a radius server to see if it is accepting connections." msgstr "" -#: plugins/check_radius.c:331 +#: plugins/check_radius.c:340 msgid "" "The server to test must be specified in the invocation, as well as a user" msgstr "" -#: plugins/check_radius.c:332 +#: plugins/check_radius.c:341 msgid "" "name and password. A configuration file may also be present. The format of" msgstr "" -#: plugins/check_radius.c:333 +#: plugins/check_radius.c:342 msgid "" "the configuration file is described in the radiusclient library sources." msgstr "" -#: plugins/check_radius.c:334 +#: plugins/check_radius.c:343 msgid "The password option presents a substantial security issue because the" msgstr "" -#: plugins/check_radius.c:335 +#: plugins/check_radius.c:344 msgid "password can be determined by careful watching of the command line in" msgstr "" -#: plugins/check_radius.c:336 +#: plugins/check_radius.c:345 msgid "a process listing. This risk is exacerbated because nagios will" msgstr "" -#: plugins/check_radius.c:337 +#: plugins/check_radius.c:346 msgid "run the plugin at regular prdictable intervals. Please be sure that" msgstr "" -#: plugins/check_radius.c:338 +#: plugins/check_radius.c:347 msgid "the password used does not allow access to sensitive system resources," msgstr "" -#: plugins/check_radius.c:339 +#: plugins/check_radius.c:348 msgid "otherwise compormise could occur." msgstr "" @@ -3387,16 +3553,21 @@ msgstr "" msgid "Invalid REAL response received from host on port %d\n" msgstr "" +#: plugins/check_real.c:189 plugins/check_tcp.c:294 +#, c-format +msgid "No data received from host\n" +msgstr "" + #: plugins/check_real.c:252 #, c-format msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:341 plugins/check_smtp.c:618 plugins/check_ups.c:535 +#: plugins/check_real.c:341 plugins/check_smtp.c:619 plugins/check_ups.c:535 msgid "Warning time must be a positive integer" msgstr "" -#: plugins/check_real.c:350 plugins/check_smtp.c:609 plugins/check_ups.c:526 +#: plugins/check_real.c:350 plugins/check_smtp.c:610 plugins/check_ups.c:526 msgid "Critical time must be a positive integer" msgstr "" @@ -3421,7 +3592,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "" -#: plugins/check_real.c:441 plugins/check_smtp.c:767 +#: plugins/check_real.c:441 plugins/check_smtp.c:850 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -3439,64 +3610,64 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:186 plugins/check_swap.c:268 plugins/check_swap.c:274 +#: plugins/check_smtp.c:190 plugins/check_swap.c:268 plugins/check_swap.c:274 #, c-format msgid "malloc() failed!\n" msgstr "" -#: plugins/check_smtp.c:190 +#: plugins/check_smtp.c:194 #, c-format msgid "gethostname() failed!\n" msgstr "" -#: plugins/check_smtp.c:225 plugins/check_smtp.c:249 +#: plugins/check_smtp.c:229 plugins/check_smtp.c:253 #, c-format msgid "recv() failed\n" msgstr "" -#: plugins/check_smtp.c:236 +#: plugins/check_smtp.c:240 #, c-format msgid "Invalid SMTP response received from host\n" msgstr "" -#: plugins/check_smtp.c:238 +#: plugins/check_smtp.c:242 #, c-format msgid "Invalid SMTP response received from host on port %d\n" msgstr "" -#: plugins/check_smtp.c:260 +#: plugins/check_smtp.c:263 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "" -#: plugins/check_smtp.c:272 +#: plugins/check_smtp.c:275 #, c-format msgid "Server does not support STARTTLS\n" msgstr "" -#: plugins/check_smtp.c:278 +#: plugins/check_smtp.c:281 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "" -#: plugins/check_smtp.c:298 +#: plugins/check_smtp.c:301 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:303 +#: plugins/check_smtp.c:306 #, c-format msgid "sent %s" msgstr "" -#: plugins/check_smtp.c:305 +#: plugins/check_smtp.c:308 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:318 +#: plugins/check_smtp.c:320 msgid "CRITICAL - Cannot retrieve server certificate." msgstr "" -#: plugins/check_smtp.c:356 plugins/check_snmp.c:568 +#: plugins/check_smtp.c:356 plugins/check_snmp.c:579 #, c-format msgid "Could Not Compile Regular Expression" msgstr "" @@ -3506,7 +3677,7 @@ msgstr "" msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "" -#: plugins/check_smtp.c:369 plugins/check_snmp.c:318 +#: plugins/check_smtp.c:369 plugins/check_snmp.c:324 #, c-format msgid "Execute Error: %s\n" msgstr "" @@ -3519,7 +3690,8 @@ msgstr "" msgid "no authpass specified, " msgstr "" -#: plugins/check_smtp.c:395 plugins/check_smtp.c:417 plugins/check_smtp.c:438 +#: plugins/check_smtp.c:395 plugins/check_smtp.c:416 plugins/check_smtp.c:436 +#: plugins/check_smtp.c:711 #, c-format msgid "sent %s\n" msgstr "" @@ -3528,343 +3700,358 @@ msgstr "" msgid "recv() failed after AUTH LOGIN, " msgstr "" -#: plugins/check_smtp.c:404 plugins/check_smtp.c:426 plugins/check_smtp.c:447 +#: plugins/check_smtp.c:403 plugins/check_smtp.c:424 plugins/check_smtp.c:444 +#: plugins/check_smtp.c:722 #, c-format msgid "received %s\n" msgstr "" -#: plugins/check_smtp.c:408 +#: plugins/check_smtp.c:407 msgid "invalid response received after AUTH LOGIN, " msgstr "" -#: plugins/check_smtp.c:421 +#: plugins/check_smtp.c:420 msgid "recv() failed after sending authuser, " msgstr "" -#: plugins/check_smtp.c:430 +#: plugins/check_smtp.c:428 msgid "invalid response received after authuser, " msgstr "" -#: plugins/check_smtp.c:442 +#: plugins/check_smtp.c:440 msgid "recv() failed after sending authpass, " msgstr "" -#: plugins/check_smtp.c:451 +#: plugins/check_smtp.c:448 msgid "invalid response received after authpass, " msgstr "" -#: plugins/check_smtp.c:458 +#: plugins/check_smtp.c:455 msgid "only authtype LOGIN is supported, " msgstr "" -#: plugins/check_smtp.c:482 +#: plugins/check_smtp.c:479 #, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr "" -#: plugins/check_smtp.c:588 plugins/check_smtp.c:598 +#: plugins/check_smtp.c:586 plugins/check_smtp.c:598 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "" -#: plugins/check_smtp.c:645 +#: plugins/check_smtp.c:646 msgid "SSL support not available - install OpenSSL and recompile" msgstr "" -#: plugins/check_smtp.c:724 +#: plugins/check_smtp.c:717 +#, c-format +msgid "recv() failed after QUIT." +msgstr "" + +#: plugins/check_smtp.c:719 +#, c-format +msgid "Connection reset by peer." +msgstr "" + +#: plugins/check_smtp.c:807 msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "" -#: plugins/check_smtp.c:737 +#: plugins/check_smtp.c:820 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" -#: plugins/check_smtp.c:739 +#: plugins/check_smtp.c:822 msgid "Suppress SMTP command" msgstr "" -#: plugins/check_smtp.c:741 +#: plugins/check_smtp.c:824 msgid "SMTP command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:743 +#: plugins/check_smtp.c:826 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:745 +#: plugins/check_smtp.c:828 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:748 plugins/check_tcp.c:638 +#: plugins/check_smtp.c:831 plugins/check_tcp.c:636 msgid "Minimum number of days a certificate has to be valid." msgstr "" -#: plugins/check_smtp.c:750 +#: plugins/check_smtp.c:833 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:754 +#: plugins/check_smtp.c:837 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:756 +#: plugins/check_smtp.c:839 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:758 +#: plugins/check_smtp.c:841 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:768 +#: plugins/check_smtp.c:851 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:769 +#: plugins/check_smtp.c:852 msgid "connects, but incorrect reponse messages from the host result in" msgstr "" -#: plugins/check_smtp.c:770 +#: plugins/check_smtp.c:853 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:296 +#: plugins/check_snmp.c:302 msgid "No valid data returned" msgstr "" -#: plugins/check_snmp.c:364 plugins/negate.c:128 +#: plugins/check_snmp.c:370 #, c-format msgid "" "%s problem - No data received from host\n" "CMD: %s\n" msgstr "" -#: plugins/check_snmp.c:502 -#, c-format -msgid "Invalid critical threshold: %s\n" +#: plugins/check_snmp.c:387 +msgid "snmpget returned an error status" msgstr "" #: plugins/check_snmp.c:513 #, c-format +msgid "Invalid critical threshold: %s\n" +msgstr "" + +#: plugins/check_snmp.c:524 +#, c-format msgid "Invalid warning threshold: %s\n" msgstr "" -#: plugins/check_snmp.c:525 +#: plugins/check_snmp.c:536 msgid "Retries interval must be a positive integer" msgstr "" -#: plugins/check_snmp.c:589 +#: plugins/check_snmp.c:600 #, c-format msgid "Could not reallocate labels[%d]" msgstr "" -#: plugins/check_snmp.c:601 +#: plugins/check_snmp.c:612 msgid "Could not reallocate labels\n" msgstr "" -#: plugins/check_snmp.c:618 +#: plugins/check_snmp.c:629 #, c-format msgid "Could not reallocate units [%d]\n" msgstr "" -#: plugins/check_snmp.c:630 +#: plugins/check_snmp.c:641 msgid "Could not realloc() units\n" msgstr "" -#: plugins/check_snmp.c:715 +#: plugins/check_snmp.c:726 #, c-format msgid "Missing secname (%s) or authpassword (%s) ! \n" msgstr "" -#: plugins/check_snmp.c:723 +#: plugins/check_snmp.c:734 #, c-format msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n" msgstr "" -#: plugins/check_snmp.c:732 +#: plugins/check_snmp.c:743 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:860 +#: plugins/check_snmp.c:871 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:909 +#: plugins/check_snmp.c:920 msgid "Check status of remote machines and obtain sustem information via SNMP" msgstr "" -#: plugins/check_snmp.c:921 +#: plugins/check_snmp.c:932 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:923 +#: plugins/check_snmp.c:934 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:925 +#: plugins/check_snmp.c:936 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:927 +#: plugins/check_snmp.c:938 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:931 +#: plugins/check_snmp.c:942 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:932 +#: plugins/check_snmp.c:943 #, c-format msgid "(default is \"%s\")" msgstr "" -#: plugins/check_snmp.c:934 +#: plugins/check_snmp.c:945 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:936 +#: plugins/check_snmp.c:947 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:938 +#: plugins/check_snmp.c:949 msgid "SNMPv3 crypt passwd (DES)" msgstr "" -#: plugins/check_snmp.c:942 +#: plugins/check_snmp.c:953 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:944 +#: plugins/check_snmp.c:955 msgid "" "List of MIBS to be loaded (default = none if using numeric oids or 'ALL'" msgstr "" -#: plugins/check_snmp.c:945 +#: plugins/check_snmp.c:956 msgid "for symbolic oids.)" msgstr "" -#: plugins/check_snmp.c:947 +#: plugins/check_snmp.c:958 #, c-format msgid " Delimiter to use when parsing returned data. Default is \"%s\"" msgstr "" -#: plugins/check_snmp.c:948 +#: plugins/check_snmp.c:959 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:949 +#: plugins/check_snmp.c:960 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:953 +#: plugins/check_snmp.c:964 msgid "Range(s) which will not result in a WARNING status" msgstr "" -#: plugins/check_snmp.c:955 +#: plugins/check_snmp.c:966 msgid "Range(s) which will not result in a CRITICAL status" msgstr "" -#: plugins/check_snmp.c:959 +#: plugins/check_snmp.c:970 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:961 +#: plugins/check_snmp.c:972 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:963 +#: plugins/check_snmp.c:974 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:965 +#: plugins/check_snmp.c:976 msgid "Prefix label for output from plugin (default -s 'SNMP')" msgstr "" -#: plugins/check_snmp.c:969 +#: plugins/check_snmp.c:980 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:971 +#: plugins/check_snmp.c:982 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:977 +#: plugins/check_snmp.c:988 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:978 +#: plugins/check_snmp.c:989 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:979 +#: plugins/check_snmp.c:990 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:981 +#: plugins/check_snmp.c:992 msgid "" "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists " "with" msgstr "" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:993 msgid " internal spaces must be quoted) [max 8 OIDs]" msgstr "" -#: plugins/check_snmp.c:984 +#: plugins/check_snmp.c:995 msgid "- Ranges are inclusive and are indicated with colons. When specified as" msgstr "" -#: plugins/check_snmp.c:985 +#: plugins/check_snmp.c:996 msgid "" " 'min:max' a STATE_OK will be returned if the result is within the indicated" msgstr "" -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:997 msgid " range or is equal to the upper or lower bound. A non-OK state will be" msgstr "" -#: plugins/check_snmp.c:987 +#: plugins/check_snmp.c:998 msgid " returned if the result is outside the specified range." msgstr "" -#: plugins/check_snmp.c:989 +#: plugins/check_snmp.c:1000 msgid "" "- If specified in the order 'max:min' a non-OK state will be returned if the" msgstr "" -#: plugins/check_snmp.c:990 +#: plugins/check_snmp.c:1001 msgid " result is within the (inclusive) range." msgstr "" -#: plugins/check_snmp.c:992 +#: plugins/check_snmp.c:1003 msgid "" "- Upper or lower bounds may be omitted to skip checking the respective limit." msgstr "" -#: plugins/check_snmp.c:993 +#: plugins/check_snmp.c:1004 msgid "- Bare integers are interpreted as upper limits." msgstr "" -#: plugins/check_snmp.c:994 +#: plugins/check_snmp.c:1005 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:995 +#: plugins/check_snmp.c:1006 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:996 +#: plugins/check_snmp.c:1007 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:997 +#: plugins/check_snmp.c:1008 msgid " returned from the SNMP query is an unsigned integer." msgstr "" @@ -3987,98 +4174,106 @@ msgstr "" msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n" msgstr "" -#: plugins/check_tcp.c:199 +#: plugins/check_tcp.c:202 msgid "CRITICAL - Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:220 +#: plugins/check_tcp.c:223 msgid "With UDP checks, a send/expect string must be specified." msgstr "" -#: plugins/check_tcp.c:239 +#: plugins/check_tcp.c:242 #, c-format msgid "CRITICAL - Cannot retrieve server certificate.\n" msgstr "" -#: plugins/check_tcp.c:428 +#: plugins/check_tcp.c:422 msgid "No arguments found" msgstr "" -#: plugins/check_tcp.c:530 +#: plugins/check_tcp.c:523 msgid "Maxbytes must be a positive integer" msgstr "" -#: plugins/check_tcp.c:548 +#: plugins/check_tcp.c:541 msgid "Refuse must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:558 +#: plugins/check_tcp.c:551 msgid "Mismatch must be one of ok, warn, crit" msgstr "" -#: plugins/check_tcp.c:564 +#: plugins/check_tcp.c:557 msgid "Delay must be a positive integer" msgstr "" -#: plugins/check_tcp.c:589 +#: plugins/check_tcp.c:585 msgid "You must provide a server address" msgstr "" -#: plugins/check_tcp.c:591 +#: plugins/check_tcp.c:587 msgid "Invalid hostname, address or socket" msgstr "" -#: plugins/check_tcp.c:605 +#: plugins/check_tcp.c:601 #, c-format msgid "" "This plugin tests %s connections with the specified host (or unix socket).\n" "\n" msgstr "" -#: plugins/check_tcp.c:617 +#: plugins/check_tcp.c:613 msgid "" "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " "quit option" msgstr "" -#: plugins/check_tcp.c:618 +#: plugins/check_tcp.c:614 msgid "Default: nothing added to send, \\r\\n added to end of quit" msgstr "" -#: plugins/check_tcp.c:620 +#: plugins/check_tcp.c:616 msgid "String to send to the server" msgstr "" -#: plugins/check_tcp.c:622 +#: plugins/check_tcp.c:618 msgid "String to expect in server response" msgstr "" -#: plugins/check_tcp.c:624 +#: plugins/check_tcp.c:618 +msgid "(may be repeated)" +msgstr "" + +#: plugins/check_tcp.c:620 +msgid "All expect strings need to occur in server response. Default is any" +msgstr "" + +#: plugins/check_tcp.c:622 msgid "String to send server to initiate a clean close of the connection" msgstr "" -#: plugins/check_tcp.c:626 +#: plugins/check_tcp.c:624 msgid "Accept tcp refusals with states ok, warn, crit (default: crit)" msgstr "" -#: plugins/check_tcp.c:628 +#: plugins/check_tcp.c:626 msgid "" "Accept expected string mismatches with states ok, warn, crit (default: warn)" msgstr "" -#: plugins/check_tcp.c:630 +#: plugins/check_tcp.c:628 msgid "Hide output from TCP socket" msgstr "" -#: plugins/check_tcp.c:632 +#: plugins/check_tcp.c:630 msgid "Close connection once more than this number of bytes are received" msgstr "" -#: plugins/check_tcp.c:634 +#: plugins/check_tcp.c:632 msgid "Seconds to wait between sending string and polling for response" msgstr "" -#: plugins/check_tcp.c:640 +#: plugins/check_tcp.c:638 msgid "Use SSL for the connection." msgstr "" @@ -4242,64 +4437,68 @@ msgstr "" msgid "Output of temperatures in Celsius" msgstr "" -#: plugins/check_ups.c:631 +#: plugins/check_ups.c:622 +msgid "Valid values for STRING are" +msgstr "" + +#: plugins/check_ups.c:635 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:632 +#: plugins/check_ups.c:636 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:633 +#: plugins/check_ups.c:637 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:634 +#: plugins/check_ups.c:638 msgid "" "state.If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:639 msgid "state." msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:641 msgid "" "You may also specify a variable to check [such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:642 msgid "" "battery load, etc.] as well as warning and critical thresholds for the " "value of" msgstr "" -#: plugins/check_ups.c:639 +#: plugins/check_ups.c:643 msgid "" "that variable. If the remote host has multiple UPS that are being monitored " "you" msgstr "" -#: plugins/check_ups.c:640 +#: plugins/check_ups.c:644 msgid "will have to use the [ups] option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:642 +#: plugins/check_ups.c:646 msgid "" "This plugin requires that the UPSD daemon distributed with Russel Kroll's" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:647 msgid "" "Smart UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:648 msgid "" "package installed on your system, you can download it from http://www." "networkupstools.org" @@ -4386,122 +4585,179 @@ msgstr "" msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n" msgstr "" -#: plugins/check_ide_smart.c:469 +#: plugins/check_ide_smart.c:452 #, c-format msgid "CRITICAL - %s: %s\n" msgstr "" -#: plugins/check_ide_smart.c:488 +#: plugins/check_ide_smart.c:471 #, c-format msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n" msgstr "" -#: plugins/check_ide_smart.c:505 +#: plugins/check_ide_smart.c:488 #, c-format msgid "" "This plugin checks a local hard drive with the (Linux specific) SMART " "interface [http://smartlinux.sourceforge.net/smart/index.php]." msgstr "" -#: plugins/check_ide_smart.c:514 +#: plugins/check_ide_smart.c:497 msgid "Select device DEVICE" msgstr "" -#: plugins/check_ide_smart.c:515 +#: plugins/check_ide_smart.c:498 msgid "" "Note: if the device is selected with this option, _no_ other options are " "accepted" msgstr "" -#: plugins/check_ide_smart.c:517 +#: plugins/check_ide_smart.c:500 msgid "Perform immediately offline tests" msgstr "" -#: plugins/check_ide_smart.c:519 +#: plugins/check_ide_smart.c:502 msgid "Returns the number of failed tests" msgstr "" -#: plugins/check_ide_smart.c:521 +#: plugins/check_ide_smart.c:504 msgid "Turn on automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:523 +#: plugins/check_ide_smart.c:506 msgid "Turn off automatic offline tests" msgstr "" -#: plugins/check_ide_smart.c:525 +#: plugins/check_ide_smart.c:508 msgid "Output suitable for Nagios" msgstr "" -#: plugins/negate.c:257 +#: plugins/negate.c:132 +msgid "No data returned from command\n" +msgstr "" + +#: plugins/negate.c:209 msgid "" -"Negates the status of a plugin (returns OK for CRITICAL, and vice-versa)." +"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-" +"4)." msgstr "" -#: plugins/negate.c:267 -msgid "[keep timeout than the plugin timeout to retain CRITICAL status]" +#: plugins/negate.c:215 +msgid "" +"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." msgstr "" -#: plugins/negate.c:271 +#: plugins/negate.c:220 +msgid "" +"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:225 +msgid "" +"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or " +"integer (0-3)." +msgstr "" + +#: plugins/negate.c:262 +msgid "Require path to command" +msgstr "" + +#: plugins/negate.c:298 +msgid "" +"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)." +msgstr "" + +#: plugins/negate.c:299 +msgid "Additional switches can be used to control which state becomes what." +msgstr "" + +#: plugins/negate.c:308 +msgid "Keep timeout lower than the plugin timeout to retain CRITICAL status." +msgstr "" + +#: plugins/negate.c:314 +#, c-format +msgid "" +" STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n" +msgstr "" + +#: plugins/negate.c:315 +#, c-format +msgid "" +" quotes. Numeric values are accepted. If nothing is specified, permutes\n" +msgstr "" + +#: plugins/negate.c:316 +#, c-format +msgid " OK and CRITICAL.\n" +msgstr "" + +#: plugins/negate.c:321 msgid "Run check_ping and invert result. Must use full path to plugin" msgstr "" -#: plugins/negate.c:273 -msgid "Use single quotes if you need to retain spaces" +#: plugins/negate.c:323 +msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL" msgstr "" -#: plugins/negate.c:277 +#: plugins/negate.c:326 msgid "" "This plugin is a wrapper to take the output of another plugin and invert it." msgstr "" -#: plugins/negate.c:278 +#: plugins/negate.c:327 +msgid "The full path of the plugin must be provided." +msgstr "" + +#: plugins/negate.c:328 msgid "" "If the wrapped plugin returns STATE_OK, the wrapper will return " "STATE_CRITICAL." msgstr "" -#: plugins/negate.c:279 +#: plugins/negate.c:329 msgid "" "If the wrapped plugin returns STATE_CRITICAL, the wrapper will return " "STATE_OK." msgstr "" -#: plugins/negate.c:280 +#: plugins/negate.c:330 msgid "Otherwise, the output state of the wrapped plugin is unchanged." msgstr "" -#: plugins/netutils.c:49 +#: plugins/netutils.c:53 #, c-format msgid "CRITICAL - Socket timeout after %d seconds\n" msgstr "" -#: plugins/netutils.c:51 +#: plugins/netutils.c:55 #, c-format msgid "CRITICAL - Abnormal timeout after %d seconds\n" msgstr "" -#: plugins/netutils.c:79 plugins/netutils.c:270 +#: plugins/netutils.c:83 plugins/netutils.c:274 msgid "Send failed" msgstr "" -#: plugins/netutils.c:96 plugins/netutils.c:285 +#: plugins/netutils.c:100 plugins/netutils.c:289 msgid "No data was received from host!" msgstr "" -#: plugins/netutils.c:193 plugins/netutils.c:229 +#: plugins/netutils.c:197 plugins/netutils.c:233 msgid "Socket creation failed" msgstr "" -#: plugins/netutils.c:222 +#: plugins/netutils.c:226 msgid "Supplied path too long unix domain socket" msgstr "" -#: plugins/netutils.c:294 +#: plugins/netutils.c:298 msgid "Receive failed" msgstr "" -#: plugins/netutils.c:320 +#: plugins/netutils.c:324 plugins-root/check_dhcp.c:1348 #, c-format msgid "Invalid hostname/address - %s" msgstr "" @@ -4514,20 +4770,20 @@ msgstr "" msgid "CRITICAL - You need more args!!!" msgstr "" -#: plugins/popen.c:207 +#: plugins/popen.c:215 msgid "Cannot catch SIGCHLD" msgstr "" -#: plugins/popen.c:302 plugins/utils.c:146 +#: plugins/popen.c:310 plugins/utils.c:145 #, c-format msgid "CRITICAL - Plugin timed out after %d seconds\n" msgstr "" -#: plugins/popen.c:305 +#: plugins/popen.c:313 msgid "CRITICAL - popen timeout received, but no child process" msgstr "" -#: plugins/popen.c:321 +#: plugins/popen.c:329 msgid "sysconf error for _SC_OPEN_MAX" msgstr "" @@ -4582,374 +4838,398 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:441 +#: plugins/utils.c:440 msgid "failed realloc in strpcpy\n" msgstr "" -#: plugins/utils.c:483 +#: plugins/utils.c:482 msgid "failed malloc in strscat\n" msgstr "" -#: plugins-root/check_dhcp.c:298 +#: plugins-root/check_dhcp.c:327 #, c-format msgid "Error: Could not get hardware address of interface '%s'\n" msgstr "" -#: plugins-root/check_dhcp.c:320 +#: plugins-root/check_dhcp.c:349 #, c-format msgid "Error: if_nametoindex error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:325 +#: plugins-root/check_dhcp.c:354 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:330 +#: plugins-root/check_dhcp.c:359 #, c-format msgid "" "Error: Couldn't get hardware address from interface %s. malloc error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:335 +#: plugins-root/check_dhcp.c:364 #, c-format msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:361 +#: plugins-root/check_dhcp.c:390 #, c-format msgid "" "Error: can't find unit number in interface_name (%s) - expecting TypeNumber " "eg lnc0.\n" msgstr "" -#: plugins-root/check_dhcp.c:366 plugins-root/check_dhcp.c:378 +#: plugins-root/check_dhcp.c:395 plugins-root/check_dhcp.c:407 #, c-format msgid "" "Error: can't read MAC address from DLPI streams interface for device %s unit " "%d.\n" msgstr "" -#: plugins-root/check_dhcp.c:384 +#: plugins-root/check_dhcp.c:413 #, c-format -msgid "Error: can't get MAC address for this architecture.\n" +msgid "" +"Error: can't get MAC address for this architecture. Use the --mac option.\n" msgstr "" -#: plugins-root/check_dhcp.c:389 +#: plugins-root/check_dhcp.c:432 #, c-format -msgid "Hardware address: " +msgid "Error: Cannot determine IP address of interface %s\n" msgstr "" -#: plugins-root/check_dhcp.c:464 +#: plugins-root/check_dhcp.c:440 +#, c-format +msgid "Error: Cannot get interface IP address on this platform.\n" +msgstr "" + +#: plugins-root/check_dhcp.c:445 +#, c-format +msgid "Pretending to be relay client %s\n" +msgstr "" + +#: plugins-root/check_dhcp.c:530 #, c-format msgid "DHCPDISCOVER to %s port %d\n" msgstr "" -#: plugins-root/check_dhcp.c:517 +#: plugins-root/check_dhcp.c:582 #, c-format msgid "Result=ERROR\n" msgstr "" -#: plugins-root/check_dhcp.c:523 +#: plugins-root/check_dhcp.c:588 #, c-format msgid "Result=OK\n" msgstr "" -#: plugins-root/check_dhcp.c:538 +#: plugins-root/check_dhcp.c:603 #, c-format msgid "DHCPOFFER from IP address %s" msgstr "" -#: plugins-root/check_dhcp.c:539 +#: plugins-root/check_dhcp.c:604 #, c-format msgid " via %s\n" msgstr "" -#: plugins-root/check_dhcp.c:546 +#: plugins-root/check_dhcp.c:611 #, c-format msgid "" -"DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n" +"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:568 +#: plugins-root/check_dhcp.c:633 #, c-format msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n" msgstr "" -#: plugins-root/check_dhcp.c:586 +#: plugins-root/check_dhcp.c:651 #, c-format msgid "Total responses seen on the wire: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:587 +#: plugins-root/check_dhcp.c:652 #, c-format msgid "Valid responses for this machine: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:603 +#: plugins-root/check_dhcp.c:667 #, c-format msgid "send_dhcp_packet result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:632 +#: plugins-root/check_dhcp.c:700 #, c-format -msgid "No (more) data received\n" +msgid "No (more) data received (nfound: %d)\n" msgstr "" -#: plugins-root/check_dhcp.c:651 +#: plugins-root/check_dhcp.c:719 #, c-format msgid "recvfrom() failed, " msgstr "" -#: plugins-root/check_dhcp.c:658 +#: plugins-root/check_dhcp.c:726 #, c-format msgid "receive_dhcp_packet() result: %d\n" msgstr "" -#: plugins-root/check_dhcp.c:659 +#: plugins-root/check_dhcp.c:727 #, c-format msgid "receive_dhcp_packet() source: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:688 +#: plugins-root/check_dhcp.c:757 #, c-format msgid "Error: Could not create socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:698 +#: plugins-root/check_dhcp.c:767 #, c-format msgid "Error: Could not set reuse address option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:704 +#: plugins-root/check_dhcp.c:773 #, c-format msgid "Error: Could not set broadcast option on DHCP socket!\n" msgstr "" -#: plugins-root/check_dhcp.c:712 +#: plugins-root/check_dhcp.c:782 #, c-format msgid "" "Error: Could not bind socket to interface %s. Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:722 +#: plugins-root/check_dhcp.c:793 #, c-format msgid "" "Error: Could not bind to DHCP socket (port %d)! Check your privileges...\n" msgstr "" -#: plugins-root/check_dhcp.c:756 +#: plugins-root/check_dhcp.c:827 #, c-format msgid "Requested server address: %s\n" msgstr "" -#: plugins-root/check_dhcp.c:812 +#: plugins-root/check_dhcp.c:888 #, c-format msgid "Lease Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:814 +#: plugins-root/check_dhcp.c:890 #, c-format msgid "Lease Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:816 +#: plugins-root/check_dhcp.c:892 #, c-format msgid "Renewal Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:818 +#: plugins-root/check_dhcp.c:894 #, c-format msgid "Renewal Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:820 +#: plugins-root/check_dhcp.c:896 #, c-format msgid "Rebinding Time: Infinite\n" msgstr "" -#: plugins-root/check_dhcp.c:821 +#: plugins-root/check_dhcp.c:897 #, c-format msgid "Rebinding Time: %lu seconds\n" msgstr "" -#: plugins-root/check_dhcp.c:837 +#: plugins-root/check_dhcp.c:925 #, c-format msgid "Added offer from server @ %s" msgstr "" -#: plugins-root/check_dhcp.c:838 +#: plugins-root/check_dhcp.c:926 #, c-format msgid " of IP address %s\n" msgstr "" -#: plugins-root/check_dhcp.c:905 +#: plugins-root/check_dhcp.c:993 #, c-format msgid "DHCP Server Match: Offerer=%s" msgstr "" -#: plugins-root/check_dhcp.c:906 +#: plugins-root/check_dhcp.c:994 #, c-format msgid " Requested=%s" msgstr "" -#: plugins-root/check_dhcp.c:908 +#: plugins-root/check_dhcp.c:996 #, c-format msgid " (duplicate)" msgstr "" -#: plugins-root/check_dhcp.c:909 +#: plugins-root/check_dhcp.c:997 #, c-format msgid "\n" msgstr "" -#: plugins-root/check_dhcp.c:957 +#: plugins-root/check_dhcp.c:1045 #, c-format msgid "No DHCPOFFERs were received.\n" msgstr "" -#: plugins-root/check_dhcp.c:961 +#: plugins-root/check_dhcp.c:1049 #, c-format msgid "Received %d DHCPOFFER(s)" msgstr "" -#: plugins-root/check_dhcp.c:964 +#: plugins-root/check_dhcp.c:1052 #, c-format msgid ", %s%d of %d requested servers responded" msgstr "" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 #, c-format msgid ", requested address (%s) was %soffered" msgstr "" -#: plugins-root/check_dhcp.c:967 +#: plugins-root/check_dhcp.c:1055 msgid "not " msgstr "" -#: plugins-root/check_dhcp.c:969 +#: plugins-root/check_dhcp.c:1057 #, c-format msgid ", max lease time = " msgstr "" -#: plugins-root/check_dhcp.c:971 +#: plugins-root/check_dhcp.c:1059 #, c-format msgid "Infinity" msgstr "" -#: plugins-root/check_dhcp.c:1148 +#: plugins-root/check_dhcp.c:1240 #, c-format msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1160 +#: plugins-root/check_dhcp.c:1252 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1173 +#: plugins-root/check_dhcp.c:1265 #, c-format msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n" msgstr "" -#: plugins-root/check_dhcp.c:1185 +#: plugins-root/check_dhcp.c:1277 #, c-format msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1209 +#: plugins-root/check_dhcp.c:1301 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" -#: plugins-root/check_dhcp.c:1257 +#: plugins-root/check_dhcp.c:1380 +#, c-format +msgid "Hardware address: " +msgstr "" + +#: plugins-root/check_dhcp.c:1396 msgid "This plugin tests the availability of DHCP servers on a network." msgstr "" -#: plugins-root/check_dhcp.c:1268 +#: plugins-root/check_dhcp.c:1407 msgid "IP address of DHCP server that we must hear from" msgstr "" -#: plugins-root/check_dhcp.c:1270 +#: plugins-root/check_dhcp.c:1409 msgid "IP address that should be offered by at least one DHCP server" msgstr "" -#: plugins-root/check_dhcp.c:1272 +#: plugins-root/check_dhcp.c:1411 msgid "Seconds to wait for DHCPOFFER before timeout occurs" msgstr "" -#: plugins-root/check_dhcp.c:1274 +#: plugins-root/check_dhcp.c:1413 msgid "Interface to to use for listening (i.e. eth0)" msgstr "" -#: plugins-root/check_icmp.c:1227 +#: plugins-root/check_dhcp.c:1415 +msgid "MAC address to use in the DHCP request" +msgstr "" + +#: plugins-root/check_dhcp.c:1417 +msgid "Unicast testing: mimic a DHCP relay, requires -s" +msgstr "" + +#: plugins-root/check_icmp.c:1223 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1229 +#: plugins-root/check_icmp.c:1225 msgid "warning threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1232 +#: plugins-root/check_icmp.c:1228 msgid "critical threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1235 +#: plugins-root/check_icmp.c:1231 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1238 +#: plugins-root/check_icmp.c:1234 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1241 +#: plugins-root/check_icmp.c:1237 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1244 +#: plugins-root/check_icmp.c:1240 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1247 +#: plugins-root/check_icmp.c:1243 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1250 +#: plugins-root/check_icmp.c:1246 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1253 +#: plugins-root/check_icmp.c:1249 msgid "icmp packet size (currenly ignored)" msgstr "" -#: plugins-root/check_icmp.c:1255 +#: plugins-root/check_icmp.c:1251 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1258 +#: plugins-root/check_icmp.c:1254 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1259 +#: plugins-root/check_icmp.c:1255 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1260 +#: plugins-root/check_icmp.c:1256 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1261 +#: plugins-root/check_icmp.c:1257 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1262 +#: plugins-root/check_icmp.c:1258 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1267 +#: plugins-root/check_icmp.c:1263 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" diff --git a/test.pl.in b/test.pl.in index f1535b6..6ede9fc 100755 --- a/test.pl.in +++ b/test.pl.in @@ -2,7 +2,7 @@ # # Wrapper for running the test harnesses # -# $Id: test.pl.in,v 1.3 2005/07/25 01:47:14 illumino Exp $ +# $Id: test.pl.in 1207 2005-07-25 01:47:15Z illumino $ # use strict; diff --git a/tools/build_perl_modules b/tools/build_perl_modules new file mode 100755 index 0000000..fb47145 --- /dev/null +++ b/tools/build_perl_modules @@ -0,0 +1,86 @@ +#!/usr/bin/perl +# SYNTAX: +# build_perl_modules -d dest_dir [-c] [-m] [-t] [-i] tarball_dir +# +# DESCRIPTION: +# Installs perl modules found in tarball_dir +# Expects a file called install_order, containing one line per distribution name +# Will take action against each distribution in turn +# -d is a necessary destination directory for the perl mods +# If -c is set, will remove the module build directories and exit +# If -m is set, will run perl Makefile.PL and make +# If -t is set, will run make test +# If -i is set, will run make install +# Options are discrete. This is because an overall ./configure, make, make test, make install +# are run in different invocations. Obviously, you can't run a -t without a -m, but there's no +# checking here for that + +# Can only use base modules +use warnings; +use strict; +use Config; +use Getopt::Std; +use Cwd; +use File::Path; + +my $opts = {}; +getopts('d:cmti', $opts) || die "Invalid options"; +my $moddir = shift @ARGV or die "Must specify a directory where tarballs exist"; + +my $destdir = $opts->{d}; +die "Must set a destination directory" unless $destdir; + +chdir $moddir or die "Cannot change to $moddir"; +open F, "install_order" or die "Cannot open install_order file"; +my @files = grep { ! /^#/ && chop } ; +close F; + +my @tarballs; +foreach my $f (@files) { + # Needs to be better. Also, what if there are two with same name? + my $tarball; + eval '$tarball = <'."$f".'*.tar.gz>'; + die unless ($tarball); + print "Got $f, with file: $tarball",$/; + push @tarballs, $tarball; + (my $dir = $tarball) =~ s/\.tar.gz//; + # Need to do cleaning before doing each module in turn + if ($opts->{c}) { + print "Cleaning $dir",$/; + rmtree($dir); + } +} + +if ($opts->{c}) { + print "Finished cleaning",$/; + exit; +} + +my $topdir = cwd(); +foreach my $tarball (@tarballs) { + (my $dir = $tarball) =~ s/\.tar.gz//; + if ($opts->{m}) { + # Don't compile if already done - this is because of invocating this + # script at different stages + unless (-e $dir) { + system("gunzip -c $tarball | tar -xf -") == 0 or die "Cannot extract $tarball"; + chdir $dir or die "Can't chdir into $dir"; + system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0 or die "Can't run perl Makefile.PL"; + system("make") == 0 or die "Can't run make"; + chdir $topdir or die "Can't chdir to top";; + } + } + + chdir $dir or die "Can't chdir into $dir"; + + # Need to add this so this module is found for subsequent ones + $ENV{PERL5LIB}="$topdir/$dir/blib/lib:$ENV{PERL5LIB}"; + + if ($opts->{t}) { + system("make test") == 0 or die "Can't run make test failed"; + } + if ($opts->{i}) { + system("make install SITEPREFIX=$destdir") == 0 or die "Can't run make install"; + } + chdir $topdir or die "Can't go back to $topdir"; +} diff --git a/tools/tinderbox_build b/tools/tinderbox_build index 926a960..4b61656 100755 --- a/tools/tinderbox_build +++ b/tools/tinderbox_build @@ -14,13 +14,14 @@ use Sys::Hostname; use Cwd; use Time::Local; -my $Version = '$Revision: 1.3 $'; +my $Version = '$Revision: 1767 $'; my $myhost = hostname; chomp($myhost); my ($host, $junk) = split(/\./, $myhost); my $BuildAdministrator = $ENV{TINDERBOX_BUILD_ADMIN} || "$ENV{'USER'}\@$myhost"; +my $TmpDir = $ENV{TMPDIR} || "/tmp"; #Default values of cmdline opts my $ReportStatus = 0; # Do not send results to server @@ -266,13 +267,15 @@ sub make { sub maketest { # Tests print LOG "LANG=C make test 2>&1\n"; - open( MAKE, "LANG=C make test 2>&1 |"); + open( MAKE, "LANG=C make test && make install DESTDIR=$TmpDir/tinderbox_build.$$ && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |"); while ( ) { print $_; print LOG $_; } close( MAKE); - return ! $?; + my $rc = $?; + system("rm -fr $TmpDir/tinderbox_build.$$ $TmpDir/tinderbox_build2.$$"); + return ! $rc; } # Main function