Skip to content

D
Dnsmasq
Commit aedef830 authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

import of dnsmasq-2.26.tar.gz

parent e17fb629
Hide whitespace changes
Inline Side-by-side
Showing with 1008 additions and 147 deletions
CHANGELOG
View file @ aedef830
......@@ -1631,3 +1631,11 @@ version 2.25
Added Norwegian translation - thanks to Jan Erik Askildt.
version 2.26
Fixed SuSe rpm patch problem - thanks to Steven Springl.
Fixed crash when attempting to send a DHCP NAK to a host
which believes it has a lease on an unknown
network. Thanks to Lutz Pressler for the bug report and
patch.
dnsmasq-rh.spec
View file @ aedef830
......@@ -5,7 +5,7 @@
###############################################################################
Name: dnsmasq
Version: 2.25
Version: 2.26
Release: 1
License: GPL
Group: System Environment/Daemons
......
dnsmasq-suse.spec
View file @ aedef830
......@@ -5,7 +5,7 @@
###############################################################################
Name: dnsmasq
Version: 2.25
Version: 2.26
Release: 1
Copyright: GPL
Group: Productivity/Networking/DNS/Servers
......
po/de.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-09-27 09:37+0100\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: German <de@li.org>\n"
......@@ -811,69 +811,69 @@ msgstr ""
msgid "via"
msgstr ""
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr ""
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr ""
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr ""
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr ""
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr ""
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr ""
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr ""
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr ""
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr ""
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr ""
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr ""
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr ""
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr ""
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr ""
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr ""
......
po/es.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-10-07 11:04+0100\n"
"Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
......@@ -787,69 +787,69 @@ msgstr "con selector de subred"
msgid "via"
msgstr "va"
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "deshabilitado"
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "direccin en uso"
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "ninguna direccin configurada"
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "ninguna direccin disponible"
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "no queda ningn arriendo"
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "red equivocada"
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "deshabilitando direccin DHCP esttica %s"
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "arriendo desconocido"
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "ignorado"
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "direccin equivocada"
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "arriendo no encontrado"
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "direccin no disponible"
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "arriendo esttico disponible"
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "direccin reservada"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr "no se puede enviar opcin DHCP %d: no queda espacio en el paquete"
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Ms de una clase de vendedor coincide, usando %s"
......
po/fi.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-11-28 22:05+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
......@@ -762,69 +762,69 @@ msgstr ""
msgid "via"
msgstr ""
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr ""
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr ""
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr ""
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr ""
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr ""
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr ""
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr ""
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr ""
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr ""
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr ""
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr ""
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr ""
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr ""
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr ""
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr ""
......
po/fr.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-10-02 19:05+0100\n"
"Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
......@@ -805,69 +805,69 @@ msgstr "avec selecteur de sous-reseau"
msgid "via"
msgstr "par l'intermediaire de"
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "desactive"
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "adresse deja utilisee"
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "pas d'adresse configuree"
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "pas d'adresse disponible"
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "aucun baux laisses"
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "mauvais reseau"
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "desactive l'adresse statique DHCP %s"
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "bail inconnu"
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "ignore"
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "mauvaise adresse"
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "bail non trouve"
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "adresse non disponible"
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "bail statique disponible"
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "adresse reservee"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Plus d'une seule classe de fournisseur correspond, on utilise %s"
......
po/id.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-10-07 11:45+0100\n"
"Last-Translator: Salman AS <sas@salman.or.id>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
......@@ -945,83 +945,83 @@ msgid "via"
msgstr "lewat"
# OK
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "di disable"
# OK
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "alamat telah digunakan"
# OK
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "tak ada alamat yang disetel"
# OK
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "tak ada alamat yang tersedia"
# OK
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "tak ada lease yang tersisa"
# OK
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "jaringan yang salah"
# OK
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "men-disable alamat statik DHCP %s"
# OK
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "lease tidak diketahui"
# OK
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "diabaikan"
# OK
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "alamat salah"
# OK
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "lease tak ditemukan"
# OK
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "alamat tak tersedia"
# OK
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "lease statik tak tersedia"
# OK
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "alamat telah dipesan"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
# OK
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s"
......
po/no.po
View file @ aedef830
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.25\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-04 20:43+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2006-01-11 17:39+0000\n"
"Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
......@@ -53,7 +53,8 @@ msgstr ""
#: cache.c:767
#, c-format
msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr "mellomlager strrelse %d, %d/%d mellomlager innsettinger re-bruker "
msgstr ""
"mellomlager strrelse %d, %d/%d mellomlager innsettinger re-bruker "
"mellomlager plasser som ikke er utlpt"
#: util.c:149 option.c:1284
......@@ -330,7 +331,8 @@ msgstr "kan ikke lese %s: %s"
msgid ""
"Usage: dnsmasq [options]\n"
"\n"
msgstr "Bruk: dnsmasq [opsjoner]\n"
msgstr ""
"Bruk: dnsmasq [opsjoner]\n"
"\n"
#: option.c:448
......@@ -709,8 +711,7 @@ msgid ""
"cannot create DHCP packet socket: %s. Is CONFIG_PACKET enabled in your "
"kernel?"
msgstr ""
"kan ikke lage DHCP pakke socket: %s. Er CONFIG_PACKET aktivert i din "
"kjerne?"
"kan ikke lage DHCP pakke socket: %s. Er CONFIG_PACKET aktivert i din kjerne?"
#: dhcp.c:98
#, c-format
......@@ -773,69 +774,69 @@ msgstr "med subnet velger"
msgid "via"
msgstr "via"
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "deaktivert"
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "adresse i bruk"
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "ingen adresse konfigurert"
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "ingen adresse tilgjengelig"
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "ingen leier igjen"
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "galt nettverk"
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "deaktiverer DHCP statisk adresse %s"
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "ukjent leie"
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "oversett"
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "gal adresse"
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "leie ikke funnet"
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "adresse ikke tilgjengelig"
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "statisk leie tilgjengelig"
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "adresse reservert"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken"
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Mer enn en produsent klasse som passer, bruker %s"
......
po/pl.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-10-04 19:17+0100\n"
"Last-Translator: Tomasz Sochaski <nerdhero@gmail.com>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
......@@ -789,69 +789,69 @@ msgstr "z selekcj
msgid "via"
msgstr "przez"
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "wyczony(a)"
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "adres w uyciu"
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "brak skonfigurowanego adresu"
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "brak dostpnego adresu"
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "brak wolnych dzieraw"
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "nieprawidowa sie"
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "wyczanie statycznego adresu DHCP %s"
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "nieznana dzierawa"
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "ignoruj"
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "bdny adres"
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "dzierawa nie znaleziona"
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "adres niedostpny"
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "dostpna statyczna dzierawa"
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "adres zarezerwowany"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Wicej ni jeden dystrybutor pasujcy, uywam %s"
......
po/pt_BR.po 0 → 100644
View file @ aedef830
# Portuguese translations for dnsmasq package.
# This file is put in the public domain.
# Simon Kelley <simon@thekelleys.org.uk>, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.26\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2006-01-16 20:42+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: cache.c:565
#, c-format
msgid "failed to load names from %s: %m"
msgstr ""
#: cache.c:601 dhcp.c:737
#, c-format
msgid "bad address at %s line %d"
msgstr ""
#: cache.c:628 dhcp.c:751
#, c-format
msgid "bad name at %s line %d"
msgstr ""
#: cache.c:634 dhcp.c:802
#, c-format
msgid "read %s - %d addresses"
msgstr ""
#: cache.c:670
msgid "cleared cache"
msgstr ""
#: cache.c:723
#, c-format
msgid ""
"not giving name %s to the DHCP lease of %s because the name exists in %s "
"with address %s"
msgstr ""
#: cache.c:767
#, c-format
msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr ""
#: util.c:149 option.c:1284
msgid "could not get memory"
msgstr ""
#: util.c:172
#, c-format
msgid "%s at line %d of %%s"
msgstr ""
#: util.c:179
msgid "FAILED to start up"
msgstr ""
#: util.c:305
#, c-format
msgid "infinite"
msgstr ""
#: option.c:124
msgid "Specify local address(es) to listen on."
msgstr ""
#: option.c:125
msgid "Return ipaddr for all hosts in specified domains."
msgstr ""
#: option.c:126
msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr ""
#: option.c:127
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr ""
#: option.c:128
#, c-format
msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr ""
#: option.c:129
#, c-format
msgid "Specify configuration file (defaults to %s)."
msgstr ""
#: option.c:130
msgid "Do NOT fork into the background: run in debug mode."
msgstr ""
#: option.c:131
msgid "Do NOT forward queries with no domain part."
msgstr ""
#: option.c:132
msgid "Return self-pointing MX records for local hosts."
msgstr ""
#: option.c:133
msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr ""
#: option.c:134
msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr ""
#: option.c:135
msgid "Enable DHCP in the range given with lease duration."
msgstr ""
#: option.c:136
#, c-format
msgid "Change to this group after startup (defaults to %s)."
msgstr ""
#: option.c:137
msgid "Set address or hostname for a specified machine."
msgstr ""
#: option.c:138
#, c-format
msgid "Do NOT load %s file."
msgstr ""
#: option.c:139
#, c-format
msgid "Specify a hosts file to be read in addition to %s."
msgstr ""
#: option.c:140
msgid "Specify interface(s) to listen on."
msgstr ""
#: option.c:141
msgid "Specify interface(s) NOT to listen on."
msgstr ""
#: option.c:142
msgid "Map DHCP user class to option set."
msgstr ""
#: option.c:143
msgid "Don't do DHCP for hosts in option set."
msgstr ""
#: option.c:144
msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr ""
#: option.c:145
msgid "Assume we are the only DHCP server on the local network."
msgstr ""
#: option.c:146
#, c-format
msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr ""
#: option.c:147
msgid "Return MX records for local hosts."
msgstr ""
#: option.c:148
msgid "Specify an MX record."
msgstr ""
#: option.c:149
msgid "Specify BOOTP options to DHCP server."
msgstr ""
#: option.c:150
#, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr ""
#: option.c:151
msgid "Do NOT cache failed search results."
msgstr ""
#: option.c:152
#, c-format
msgid "Use nameservers strictly in the order given in %s."
msgstr ""
#: option.c:153
msgid "Set extra options to be set to DHCP clients."
msgstr ""
#: option.c:154
msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr ""
#: option.c:155
#, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr ""
#: option.c:156
msgid "Log queries."
msgstr ""
#: option.c:157
msgid "Force the originating port for upstream queries."
msgstr ""
#: option.c:158
msgid "Do NOT read resolv.conf."
msgstr ""
#: option.c:159
#, c-format
msgid "Specify path to resolv.conf (defaults to %s)."
msgstr ""
#: option.c:160
msgid "Specify address(es) of upstream servers with optional domains."
msgstr ""
#: option.c:161
msgid "Never forward queries to specified domains."
msgstr ""
#: option.c:162
msgid "Specify the domain to be assigned in DHCP leases."
msgstr ""
#: option.c:163
msgid "Specify default target in an MX record."
msgstr ""
#: option.c:164
msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr ""
#: option.c:165
#, c-format
msgid "Change to this user after startup. (defaults to %s)."
msgstr ""
#: option.c:166
msgid "Map DHCP vendor class to option set."
msgstr ""
#: option.c:167
msgid "Display dnsmasq version and copyright information."
msgstr ""
#: option.c:168
msgid "Translate IPv4 addresses from upstream servers."
msgstr ""
#: option.c:169
msgid "Specify a SRV record."
msgstr ""
#: option.c:170
msgid "Display this message."
msgstr ""
#: option.c:171
#, c-format
msgid "Specify path of PID file. (defaults to %s)."
msgstr ""
#: option.c:172
#, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr ""
#: option.c:173
msgid "Answer DNS queries based on the interface a query was sent to."
msgstr ""
#: option.c:174
msgid "Specify TXT DNS record."
msgstr ""
#: option.c:175
msgid "Bind only to interfaces in use."
msgstr ""
#: option.c:176
#, c-format
msgid "Read DHCP static host information from %s."
msgstr ""
#: option.c:177
msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr ""
#: option.c:178
msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr ""
#: option.c:179
msgid "Enable dynamic address allocation for bootp."
msgstr ""
#: option.c:394
msgid "missing \""
msgstr ""
#: option.c:423
msgid "bad option"
msgstr ""
#: option.c:440
#, c-format
msgid "cannot read %s: %s"
msgstr ""
#: option.c:446
#, c-format
msgid ""
"Usage: dnsmasq [options]\n"
"\n"
msgstr ""
#: option.c:448
#, c-format
msgid "Use short options only on the command line.\n"
msgstr ""
#: option.c:450
#, c-format
msgid "Valid options are :\n"
msgstr ""
#: option.c:475
#, c-format
msgid "Dnsmasq version %s %s\n"
msgstr ""
#: option.c:476
#, c-format
msgid ""
"Compile time options %s\n"
"\n"
msgstr ""
#: option.c:477
#, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr ""
#: option.c:478
#, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr ""
#: option.c:479
#, c-format
msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr ""
#: option.c:489
msgid "extraneous parameter"
msgstr ""
#: option.c:497
msgid "missing parameter"
msgstr ""
#: option.c:514
msgid "nested includes not allowed"
msgstr ""
#: option.c:574
msgid "bad MX preference"
msgstr ""
#: option.c:583
msgid "bad MX name"
msgstr ""
#: option.c:601
msgid "bad MX target"
msgstr ""
#: option.c:803 option.c:814
msgid "bad port"
msgstr ""
#: option.c:954
msgid "bad dhcp-range"
msgstr ""
#: option.c:1014
msgid "inconsistent DHCP range"
msgstr ""
#: option.c:1201
msgid "bad dhcp-host"
msgstr ""
#: option.c:1261
msgid "bad dhcp-option"
msgstr ""
#: option.c:1279
msgid "bad domain in dhcp-option"
msgstr ""
#: option.c:1425
msgid "dhcp-option too long"
msgstr ""
#: option.c:1605
msgid "bad TXT record"
msgstr ""
#: option.c:1637
msgid "TXT record string too long"
msgstr ""
#: option.c:1676
msgid "bad SRV record"
msgstr ""
#: option.c:1689
msgid "bad SRV target"
msgstr ""
#: option.c:1701
msgid "invalid port number"
msgstr ""
#: option.c:1712
msgid "invalid priority"
msgstr ""
#: option.c:1723
msgid "invalid weight"
msgstr ""
#: option.c:1748
msgid "error"
msgstr ""
#: option.c:1750
#, c-format
msgid "bad command line options: %s."
msgstr ""
#: option.c:1794
#, c-format
msgid "cannot get host-name: %s"
msgstr ""
#: option.c:1823
msgid "only one resolv.conf file allowed in no-poll mode."
msgstr ""
#: option.c:1830
msgid "must have exactly one resolv.conf to read domain from."
msgstr ""
#: option.c:1833 network.c:591
#, c-format
msgid "failed to read %s: %m"
msgstr ""
#: option.c:1851
#, c-format
msgid "no search directive found in %s"
msgstr ""
#: forward.c:378
#, c-format
msgid "nameserver %s refused to do a recursive query"
msgstr ""
#: forward.c:899
msgid "forwarding table overflow: check for server loops."
msgstr ""
#: isc.c:71 dnsmasq.c:474
#, c-format
msgid "failed to access %s: %m"
msgstr ""
#: isc.c:87
#, c-format
msgid "failed to load %s: %m"
msgstr ""
#: isc.c:91 network.c:595
#, c-format
msgid "reading %s"
msgstr ""
#: isc.c:113
#, c-format
msgid "bad name in %s"
msgstr ""
#: isc.c:175
#, c-format
msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
msgstr ""
#: network.c:418
#, c-format
msgid "failed to create listening socket: %s"
msgstr ""
#: network.c:425
#, c-format
msgid "failed to set IPV6 options on listening socket: %s"
msgstr ""
#: network.c:444
#, c-format
msgid "failed to bind listening socket for %s: %s"
msgstr ""
#: network.c:451
#, c-format
msgid "failed to listen on socket: %s"
msgstr ""
#: network.c:521
#, c-format
msgid "ignoring nameserver %s - local interface"
msgstr ""
#: network.c:530
#, c-format
msgid "ignoring nameserver %s - cannot make/bind socket: %m"
msgstr ""
#: network.c:544
msgid "domain"
msgstr ""
#: network.c:546
msgid "unqualified"
msgstr ""
#: network.c:546
msgid "domains"
msgstr ""
#: network.c:549
#, c-format
msgid "using local addresses only for %s %s"
msgstr ""
#: network.c:551
#, c-format
msgid "using nameserver %s#%d for %s %s"
msgstr ""
#: network.c:554
#, c-format
msgid "using nameserver %s#%d"
msgstr ""
#: dnsmasq.c:115
msgid ""
"ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
msgstr ""
#: dnsmasq.c:119
#, c-format
msgid "failed to find list of interfaces: %s"
msgstr ""
#: dnsmasq.c:134
#, c-format
msgid "unknown interface %s"
msgstr ""
#: dnsmasq.c:140
#, c-format
msgid "no interface with address %s"
msgstr ""
#: dnsmasq.c:149
#, c-format
msgid "cannot open %s:%s"
msgstr ""
#: dnsmasq.c:163
msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr ""
#: dnsmasq.c:176 dnsmasq.c:507
#, c-format
msgid "DBus error: %s"
msgstr ""
#: dnsmasq.c:180
msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr ""
#: dnsmasq.c:293
#, c-format
msgid "started, version %s cachesize %d"
msgstr ""
#: dnsmasq.c:295
#, c-format
msgid "started, version %s cache disabled"
msgstr ""
#: dnsmasq.c:297
#, c-format
msgid "compile time options: %s"
msgstr ""
#: dnsmasq.c:303
msgid "DBus support enabled: connected to system bus"
msgstr ""
#: dnsmasq.c:305
msgid "DBus support enabled: bus connection pending"
msgstr ""
#: dnsmasq.c:310
msgid "setting --bind-interfaces option because of OS limitations"
msgstr ""
#: dnsmasq.c:315
#, c-format
msgid "warning: interface %s does not currently exist"
msgstr ""
#: dnsmasq.c:332
#, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr ""
#: dnsmasq.c:333
#, c-format
msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr ""
#: dnsmasq.c:344
#, c-format
msgid "DHCP, %s will be written every %s"
msgstr ""
#: dnsmasq.c:349
msgid "running as root"
msgstr ""
#: dnsmasq.c:509
msgid "connected to system DBus"
msgstr ""
#: dnsmasq.c:520
msgid "exiting on receipt of SIGTERM"
msgstr ""
#: dhcp.c:25
#, c-format
msgid "cannot create DHCP socket : %s"
msgstr ""
#: dhcp.c:35
#, c-format
msgid "failed to set options on DHCP socket: %s"
msgstr ""
#: dhcp.c:42
#, c-format
msgid "failed to set SO_REUSEADDR on DHCP socket: %s"
msgstr ""
#: dhcp.c:52
#, c-format
msgid "failed to bind DHCP server socket: %s"
msgstr ""
#: dhcp.c:61
#, c-format
msgid "cannot create ICMP raw socket: %s."
msgstr ""
#: dhcp.c:75
#, c-format
msgid "cannot create DHCP BPF socket: %s"
msgstr ""
#: dhcp.c:86
#, c-format
msgid ""
"cannot create DHCP packet socket: %s. Is CONFIG_PACKET enabled in your "
"kernel?"
msgstr ""
#: dhcp.c:98
#, c-format
msgid "duplicate IP address %s in dhcp-config directive."
msgstr ""
#: dhcp.c:233
msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr ""
#: dhcp.c:394
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:77
msgid "too many stored leases"
msgstr ""
#: rfc2131.c:171
#, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr ""
#: rfc2131.c:220
#, c-format
msgid "no address range available for DHCP request %s %s"
msgstr ""
#: rfc2131.c:221
msgid "with subnet selector"
msgstr ""
#: rfc2131.c:221
msgid "via"
msgstr ""
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr ""
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr ""
#: rfc2131.c:278
msgid "no address configured"
msgstr ""
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr ""
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr ""
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr ""
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr ""
#: rfc2131.c:514
msgid "unknown lease"
msgstr ""
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr ""
#: rfc2131.c:610
msgid "wrong address"
msgstr ""
#: rfc2131.c:619
msgid "lease not found"
msgstr ""
#: rfc2131.c:645
msgid "address not available"
msgstr ""
#: rfc2131.c:654
msgid "static lease available"
msgstr ""
#: rfc2131.c:658
msgid "address reserved"
msgstr ""
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr ""
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr ""
#: netlink.c:37
#, c-format
msgid "cannot bind netlink socket: %s"
msgstr ""
#: dbus.c:112
msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
msgstr ""
#: dbus.c:237
msgid "setting upstream servers from DBus"
msgstr ""
#: dbus.c:273
msgid "could not register a DBus message handler"
msgstr ""
po/ro.po
View file @ aedef830
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-13 16:01+0000\n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n"
"PO-Revision-Date: 2005-11-22 16:46+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
......@@ -779,69 +779,69 @@ msgstr "cu selectorul de subreţea"
msgid "via"
msgstr "prin"
#: rfc2131.c:238 rfc2131.c:262
#: rfc2131.c:241 rfc2131.c:265
msgid "disabled"
msgstr "dezactivat"
#: rfc2131.c:272 rfc2131.c:658
#: rfc2131.c:275 rfc2131.c:661
msgid "address in use"
msgstr "adresa este folosită"
#: rfc2131.c:275
#: rfc2131.c:278
msgid "no address configured"
msgstr "adresă lipsă"
#: rfc2131.c:288 rfc2131.c:534
#: rfc2131.c:291 rfc2131.c:537
msgid "no address available"
msgstr "nici o adresă disponibilă"
#: rfc2131.c:295 rfc2131.c:661
#: rfc2131.c:298 rfc2131.c:664
msgid "no leases left"
msgstr "nu mai am de unde să împrumut"
#: rfc2131.c:298 rfc2131.c:634
#: rfc2131.c:301 rfc2131.c:637
msgid "wrong network"
msgstr "reţea greşită"
#: rfc2131.c:493
#: rfc2131.c:496
#, c-format
msgid "disabling DHCP static address %s"
msgstr "dezactivăm adresele DHCP statice %s"
#: rfc2131.c:511
#: rfc2131.c:514
msgid "unknown lease"
msgstr "împrumut necunoscut"
#: rfc2131.c:524 rfc2131.c:732
#: rfc2131.c:527 rfc2131.c:736
msgid "ignored"
msgstr "ignorat"
#: rfc2131.c:607
#: rfc2131.c:610
msgid "wrong address"
msgstr "adresă greşită"
#: rfc2131.c:616
#: rfc2131.c:619
msgid "lease not found"
msgstr "împrumutul nu a fost găsit"
#: rfc2131.c:642
#: rfc2131.c:645
msgid "address not available"
msgstr "adresă indisponibilă"
#: rfc2131.c:651
#: rfc2131.c:654
msgid "static lease available"
msgstr "împrumut static este disponibil"
#: rfc2131.c:655
#: rfc2131.c:658
msgid "address reserved"
msgstr "adresă rezervată"
#: rfc2131.c:851
#: rfc2131.c:855
#, c-format
msgid "cannot send DHCP option %d: no space left in packet"
msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet"
#: rfc2131.c:1146
#: rfc2131.c:1150
#, c-format
msgid "More than one vendor class matches, using %s"
msgstr "Se potrivesc mai multe clase de mărci de interfeţe, folosim %s"
......
rpm/dnsmasq-SuSE.patch
View file @ aedef830
......@@ -20,12 +20,13 @@
#define IP6INTERFACES "/proc/net/if_inet6"
#define UPTIME "/proc/uptime"
#define DHCP_SERVER_PORT 67
@@ -195,7 +195,7 @@
@@ -195,8 +195,8 @@
/* platform independent options. */
#undef HAVE_BROKEN_RTC
-#define HAVE_ISC_READER
+#undef HAVE_ISC_READER
#undef HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
src/config.h
View file @ aedef830
......@@ -12,7 +12,7 @@
/* Author's email: simon@thekelleys.org.uk */
#define VERSION "2.25"
#define VERSION "2.26"
#define FTABSIZ 150 /* max number of outstanding requests */
#define MAX_PROCS 20 /* max no children for TCP requests */
......
src/rfc2131.c
View file @ aedef830
......@@ -96,7 +96,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
unsigned int time;
struct dhcp_config *config;
struct dhcp_netid *netid = NULL;
struct in_addr subnet_addr;
struct in_addr subnet_addr, fallback;
unsigned short fuzz = 0;
unsigned int mess_type = 0;
u8 *chaddr;
......@@ -223,6 +223,9 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
return 0;
}
/* keep _a_ local address available. */
fallback = context->local;
mess->op = BOOTREPLY;
config = find_config(daemon->dhcp_conf, context, clid, clid_len, chaddr, NULL);
......@@ -627,7 +630,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
if (!message)
{
struct dhcp_config *addr_config;
if (!(context = narrow_context(context, mess->yiaddr)))
{
/* If a machine moves networks whilst it has a lease, we catch that here. */
......@@ -668,7 +671,8 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
mess->siaddr.s_addr = mess->yiaddr.s_addr = 0;
bootp_option_put(mess, NULL, NULL);
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr));
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ,
ntohl(context ? context->local.s_addr : fallback.s_addr));
p = option_put_string(p, end, OPTION_MESSAGE, message);
/* This fixes a problem with the DHCP spec, broadcasting a NAK to a host on
a distant subnet which unicast a REQ to us won't work. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment