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
Expand all Show 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
This diff is collapsed.
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);
......@@ -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