import of dnsmasq-2.25.tar.gz

CHANGELOG

@@ -1610,3 +1610,24 @@ version 2.24
 	    
 	    Added Romanian translation, thanks to Sorin Panca for
 	    that.
+
+version 2.25
+            Fixed RedHat spec file for FC4 - thanks to Werner Hoelzl
+            and Andrew Bird.
+
+            Fixed Suse spec file - thanks to Steven Springl.
+
+	    Fixed DHCP bug when two distict subnets are on the same
+	    physical interface. Thanks to Pawel Zawora for finding
+	    this and suggesting the fix.
+
+	    Added logging to make it explicit when dnsmasq falls back
+	    from using RT-netlink sockets to the old ioctl API for
+	    getting information about interfaces. Doing this
+	    completely silently made remote debugging hard.
+
+	    Merged uclibc build fixes from the OpenWRT package into
+	    src/config.h 
+
+	    Added Norwegian translation - thanks to Jan Erik Askildt.
+

FAQ

@@ -358,6 +358,19 @@ A: Probably the nameserver is an authoritative nameserver for a
    configuration.
 
 
+Q: Does the dnsmasq DHCP server probe addresses before allocating
+   them, as recommended in RFC2131?
+
+A: Yes, dynmaically allocated IP addresses are checked by sending an
+   ICMP echo request (ping). If a reply is received, then dnsmasq
+   assumes that the address is in use, and attempts to allocate an
+   different address. The wait for a reply is between two and three
+   seconds. Because the DHCP server is not re-entrant, it cannot serve
+   other DHCP requests during this time. To avoid dropping requests,
+   the address probe may be skipped when dnsmasq is under heavy load.
+
+ 
+  
 
 
 

dnsmasq-rh.spec

@@ -5,9 +5,9 @@
 ###############################################################################
 
 Name: dnsmasq
-Version: 2.24
+Version: 2.25
 Release: 1
-Copyright: GPL
+License: GPL
 Group: System Environment/Daemons
 Vendor: Simon Kelley
 Packager: Simon Kelley

dnsmasq-suse.spec

@@ -5,7 +5,7 @@
 ###############################################################################
 
 Name: dnsmasq
-Version: 2.24
+Version: 2.25
 Release: 1
 Copyright: GPL
 Group: Productivity/Networking/DNS/Servers
@@ -104,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/dnsmasq.conf
 /usr/sbin/rcdnsmasq
 /usr/sbin/dnsmasq
+/usr/share/locale/*/LC_MESSAGES/*
 %doc %{_mandir}/man8/dnsmasq.8.gz
 
 

po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 20:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
@@ -20,19 +20,19 @@ msgstr ""
 msgid "failed to load names from %s: %m"
 msgstr ""
 
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, c-format
 msgid "bad address at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr ""
 
 # @Simon: Here I need an example to understand it :)
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "lese %s - %d Adressen"
@@ -534,7 +534,7 @@ msgstr ""
 msgid "forwarding table overflow: check for server loops."
 msgstr ""
 
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr ""
@@ -616,100 +616,100 @@ msgstr ""
 msgid "using nameserver %s#%d"
 msgstr ""
 
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr ""
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr ""
 
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr ""
 
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr ""
 
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr ""
 
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr ""
 
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr ""
 
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr ""
 
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr ""
 
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr ""
 
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr ""
 
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr ""
 
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr ""
 
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr ""
 
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr ""
 
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr ""
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr ""
 
@@ -755,27 +755,31 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr ""
 
-#: dhcp.c:384
+#: 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:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr ""
 
-#: dhcp.c:709
+#: dhcp.c:724
 #, c-format
 msgid "bad line at %s line %d"
 msgstr ""
 
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr ""
 
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -811,7 +815,7 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr ""
 
@@ -819,57 +823,57 @@ msgstr ""
 msgid "no address configured"
 msgstr ""
 
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr ""
 
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr ""
 
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr ""
+
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr ""
 
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr ""
 
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr ""
 
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr ""
 
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr ""
 
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr ""
-
-#: rfc2131.c:627
 msgid "address not available"
 msgstr ""
 
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr ""
 
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1132
+#: rfc2131.c:1146
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr ""

po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 20:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
@@ -20,17 +20,17 @@ msgstr ""
 msgid "failed to load names from %s: %m"
 msgstr "no se pudo cargar nombres desde %s: %m"
 
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "nombre err<72>neo en %s l<>nea %d"
 
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "nombre err<72>neo en %s l<>nea %d"
 
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "direcci<63>nes %s - %d le<6C>das"
@@ -504,7 +504,7 @@ msgid "forwarding table overflow: check for server loops."
 msgstr ""
 "desbordamiento en la tabla de reenvio: revisar si hay loops de servidor."
 
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "no se pudo accesar %s: %m"
@@ -587,102 +587,102 @@ msgstr "usando servidor DNS %s#%d para %s %s"
 msgid "using nameserver %s#%d"
 msgstr "usando servidor DNS %s#%d"
 
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Integraci<63>n dhcpd ISC no disponible: fijar HAVE_ISC_READER en src/config.h"
 
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "no se pudo encontrar lista de interfaces: %s"
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr "interface desconocida %s"
 
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr "ninguna interface con direcci<63>n %s"
 
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr "no se puede abrir %s:%s"
 
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr "debe fijarse exactamente una interface en sistemas rotos sin IP_RECVIF"
 
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr "error DBus: %s"
 
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h"
 
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "versi<73>n %s iniciada, tama<6D>o de cach<63> %d"
 
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "versi<73>n %s iniciada, cach<63> deshabilitado"
 
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr "opciones de compilaci<63>n: %s"
 
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr "soporte DBus habilitado: conectado a bus de sistema"
 
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr "soporte DBus habilitado: conecci<63>n a bus pendiente"
 
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr ""
 "fijando opci<63>n --bind-interfaces debido a limitaciones de sistema operativo"
 
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "advertencia: interface %s no existe actualmente"
 
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, arriendos est<73>ticos solo en %.0s%s, tiempo de arriendo %s"
 
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, rango de IP %s -- %s, tiempo de arriendo %s"
 
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr "DHCP, %s ser<65> escrito cada %s"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr "corriendo como root"
 
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr "conectado a DBus de sistema"
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr "haciendo exit al haber recibido SIGTERM"
 
@@ -730,27 +730,31 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "direcci<63>n IP duplicada en directiva dhcp-config."
 
-#: dhcp.c:384
+#: 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 "rango DHCP %s -- %s no coincide con m<>scara de red %s"
 
-#: dhcp.c:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr "no se pudo leer %s:%m"
 
-#: dhcp.c:709
+#: dhcp.c:724
 #, fuzzy, c-format
 msgid "bad line at %s line %d"
 msgstr "nombre err<72>neo en %s l<>nea %d"
 
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "direcci<63>n IP %s (%s) duplicada en directiva dhcp-config"
 
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -787,7 +791,7 @@ msgstr "v
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr "direcci<63>n en uso"
 
@@ -795,57 +799,57 @@ msgstr "direcci
 msgid "no address configured"
 msgstr "ninguna direcci<63>n configurada"
 
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr "ninguna direcci<63>n disponible"
 
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr "no queda ning<6E>n arriendo"
 
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "red equivocada"
+
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr "deshabilitando direcci<63>n DHCP est<73>tica %s"
 
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr "arriendo desconocido"
 
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr "ignorado"
 
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr "direcci<63>n equivocada"
 
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr "arriendo no encontrado"
 
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr "red equivocada"
-
-#: rfc2131.c:627
 msgid "address not available"
 msgstr "direcci<63>n no disponible"
 
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr "arriendo est<73>tico disponible"
 
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr "direcci<63>n reservada"
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr "no se puede enviar opci<63>n DHCP %d: no queda espacio en el paquete"
 
-#: rfc2131.c:1132
+#: rfc2131.c:1146
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr "M<>s de una clase de vendedor coincide, usando %s"

po/fi.po

@@ -0,0 +1,847 @@
+# Finnish translations for dnsmasq package.
+# This file is put in the public domain.
+# Simon Kelley <simon@thekelleys.org.uk>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dnsmasq 2.24\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
+"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:238 rfc2131.c:262
+msgid "disabled"
+msgstr ""
+
+#: rfc2131.c:272 rfc2131.c:658
+msgid "address in use"
+msgstr ""
+
+#: rfc2131.c:275
+msgid "no address configured"
+msgstr ""
+
+#: rfc2131.c:288 rfc2131.c:534
+msgid "no address available"
+msgstr ""
+
+#: rfc2131.c:295 rfc2131.c:661
+msgid "no leases left"
+msgstr ""
+
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr ""
+
+#: rfc2131.c:493
+#, c-format
+msgid "disabling DHCP static address %s"
+msgstr ""
+
+#: rfc2131.c:511
+msgid "unknown lease"
+msgstr ""
+
+#: rfc2131.c:524 rfc2131.c:732
+msgid "ignored"
+msgstr ""
+
+#: rfc2131.c:607
+msgid "wrong address"
+msgstr ""
+
+#: rfc2131.c:616
+msgid "lease not found"
+msgstr ""
+
+#: rfc2131.c:642
+msgid "address not available"
+msgstr ""
+
+#: rfc2131.c:651
+msgid "static lease available"
+msgstr ""
+
+#: rfc2131.c:655
+msgid "address reserved"
+msgstr ""
+
+#: rfc2131.c:851
+#, c-format
+msgid "cannot send DHCP option %d: no space left in packet"
+msgstr ""
+
+#: rfc2131.c:1146
+#, 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/fr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 20:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
@@ -20,17 +20,17 @@ msgstr ""
 msgid "failed to load names from %s: %m"
 msgstr "Impossible de charger les noms a partir de %s: %m"
 
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "mauvais nom dans %s ligne %d"
 
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "mauvais nom dans %s ligne %d"
 
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "lecture %s - %d adresses"
@@ -517,7 +517,7 @@ msgstr ""
 "Table de stockage des requetes DNS pleine : verifiez la configuration du "
 "serveur (risque de boucle recursive)."
 
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "impossible d'acceder a %s: %m"
@@ -600,104 +600,104 @@ msgstr "on utilise le serveur de nom %s#%d pour %s %s"
 msgid "using nameserver %s#%d"
 msgstr "on utilise le serveur de nom %s#%d"
 
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "L'integration DHCP ISC n'est pas disponible: activez HAVE_ISC_READER dans "
 "src/config.h"
 
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "impossible de trouver la liste des interfaces: %s"
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr "interface %s inconnue"
 
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr "pas d'interface avec l'adresse %s"
 
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr "ne peut pas ouvrir %s:%s"
 
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "on doit declarer exactement une interface sur les systemes sans IP_RECVIF"
 
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr "Erreur DBus: %s"
 
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus n'est pas disponible: declarez HAVE_DBUS dans src/config.h"
 
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "demarre, version %s taille de cache %d"
 
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "demarre, version %s cache desactive"
 
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr "options a la compilation: %s"
 
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr "Support DBus autorise: connecte au bus systeme"
 
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr "Support DBus autorise: connexion au bus en suspend"
 
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "Active l'option --bind-interfaces a cause des limitations de l'OS"
 
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "Attention: l'interface %s n'existe pas actuellement"
 
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr ""
 "DHCP, baux statiques seulement sur %.0s%s, duree de validite de bail %s"
 
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, plage d'adresse %s -- %s, duree de bail %s"
 
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr "DHCP, %s sera ecrit chaque %s"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr "execute sous root"
 
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr "connecte au systeme DBus"
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr "sortie sur reception du signal SIGTERM"
 
@@ -745,29 +745,33 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "adresse IP %s dupliquee dans la directive dhcp-config."
 
-#: dhcp.c:384
+#: 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 ""
 "La plage d'adresses DHCP %s -- %s n'est pas coherente avec le masque de "
 "reseau %s"
 
-#: dhcp.c:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr "impossible de lire %s:%m"
 
-#: dhcp.c:709
+#: dhcp.c:724
 #, fuzzy, c-format
 msgid "bad line at %s line %d"
 msgstr "mauvais nom dans %s ligne %d"
 
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "adresse IP %s (%s) dupliquee dans la directive dhcp-config."
 
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -805,7 +809,7 @@ msgstr "par l'intermediaire de"
 msgid "disabled"
 msgstr "desactive"
 
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr "adresse deja utilisee"
 
@@ -813,57 +817,57 @@ msgstr "adresse deja utilisee"
 msgid "no address configured"
 msgstr "pas d'adresse configuree"
 
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr "pas d'adresse disponible"
 
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr "aucun baux laisses"
 
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "mauvais reseau"
+
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr "desactive l'adresse statique DHCP %s"
 
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr "bail inconnu"
 
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr "ignore"
 
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr "mauvaise adresse"
 
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr "bail non trouve"
 
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr "mauvais reseau"
-
-#: rfc2131.c:627
 msgid "address not available"
 msgstr "adresse non disponible"
 
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr "bail statique disponible"
 
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr "adresse reservee"
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1132
+#: rfc2131.c:1146
 #, 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

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 20:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
@@ -21,19 +21,19 @@ msgid "failed to load names from %s: %m"
 msgstr "gagal memuat nama-nama dari %s: %m"
 
 # OK
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "membaca %s - %d alamat"
@@ -604,7 +604,7 @@ msgid "forwarding table overflow: check for server loops."
 msgstr "meneruskan tabel overflow: memeriksa apakah terjadi loop server."
 
 # OK
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "gagal mengakses %s: %m"
@@ -703,7 +703,7 @@ msgid "using nameserver %s#%d"
 msgstr "menggunakan nameserver %s#%d"
 
 # OK
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
@@ -711,115 +711,115 @@ msgstr ""
 "config.h"
 
 # OK
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "gagal mendapatkan daftar antarmuka: %s"
 
 # OK
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr "antarmuka tidak dikenal %s"
 
 # OK
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr "tidak ada antarmuka dengan alamat %s"
 
 # OK
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr "tidak bisa membuka %s:%s"
 
 # OK
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "harus menyetel satu antarmuka saja pada sistem yang tidak benar dengan "
 "IP_RECVIF"
 
 # OK
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr "DBus error: %s"
 
 # OK
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h"
 
 # OK
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "dimulai, versi %s ukuran cache %d"
 
 # OK
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "dimulai, cache versi %s di disable"
 
 # OK
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr "pilihan-pilihan saat kompilasi: %s"
 
 # OK
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem"
 
 # OK
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda"
 
 # OK
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS"
 
 # OK
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "peringatan: antarmuka %s tidak ada"
 
 # OK
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, lease static pada %.0s%s, waktu lease %s"
 
 # OK
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s"
 
 # OK
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr "DHCP, %s akan ditulis setiap %s"
 
 # OK
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr "berjalan menggunakan root"
 
 # OK
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr "terhubung ke sistem DBus"
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr "keluar karena menerima SIGTERM"
 
@@ -875,32 +875,36 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "alamat IP kembar %s dalam direktif dhcp-config"
 
+#: dhcp.c:233
+msgid "Cannot use RTnetlink socket, falling back to ioctl API"
+msgstr ""
+
 # OK
-#: dhcp.c:384
+#: dhcp.c:394
 #, c-format
 msgid "DHCP range %s -- %s is not consistent with netmask %s"
 msgstr "jangkauan DHCP %s -- %s tidak konsisten dengan netmask %s"
 
 # OK
-#: dhcp.c:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr "gagal membaca %s:%m"
 
 # OK
-#: dhcp.c:709
+#: dhcp.c:724
 #, fuzzy, c-format
 msgid "bad line at %s line %d"
 msgstr "kesalahan nama pada %s baris %d"
 
 # OK
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "alamat IP kembar %s (%s) dalam direktif dhcp-config"
 
 # OK
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -946,7 +950,7 @@ msgid "disabled"
 msgstr "di disable"
 
 # OK
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr "alamat telah digunakan"
 
@@ -956,68 +960,68 @@ msgid "no address configured"
 msgstr "tak ada alamat yang disetel"
 
 # OK
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr "tak ada alamat yang tersedia"
 
 # OK
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr "tak ada lease yang tersisa"
 
 # OK
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "jaringan yang salah"
+
+# OK
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr "men-disable alamat statik DHCP %s"
 
 # OK
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr "lease tidak diketahui"
 
 # OK
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr "diabaikan"
 
 # OK
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr "alamat salah"
 
 # OK
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr "lease tak ditemukan"
 
 # OK
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr "jaringan yang salah"
-
-# OK
-#: rfc2131.c:627
 msgid "address not available"
 msgstr "alamat tak tersedia"
 
 # OK
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr "lease statik tak tersedia"
 
 # OK
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr "alamat telah dipesan"
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
 # OK
-#: rfc2131.c:1132
+#: rfc2131.c:1146
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s"

po/no.po

@@ -0,0 +1,858 @@
+# Norwegian translations for dnsmasq package.
+# This file is put in the public domain.
+# Simon Kelley <simon@thekelleys.org.uk>, 2006.
+#
+# Current translator: Jan Erik Askildt <jeaskildt@gmail.com>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dnsmasq 2.25\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-04 20:43+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\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 "feilet <20> laste navn fra %s: %m"
+
+#: cache.c:601 dhcp.c:737
+#, c-format
+msgid "bad address at %s line %d"
+msgstr "d<>rlig adresse ved %s linje %d"
+
+#: cache.c:628 dhcp.c:751
+#, c-format
+msgid "bad name at %s line %d"
+msgstr "d<>rlig navn ved %s linje %d"
+
+#: cache.c:634 dhcp.c:802
+#, c-format
+msgid "read %s - %d addresses"
+msgstr "les %s - %d adresser"
+
+#: cache.c:670
+msgid "cleared cache"
+msgstr "mellomlager t<>mt"
+
+#: 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 ""
+"gir ikke navnet %s til DHCP leien for %s fordi navnet eksisterer i %s med "
+"adressen %s"
+
+#: cache.c:767
+#, c-format
+msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
+msgstr "mellomlager st<73>rrelse %d, %d/%d mellomlager innsettinger re-bruker "
+"mellomlager plasser som ikke er utl<74>pt"
+
+#: util.c:149 option.c:1284
+msgid "could not get memory"
+msgstr "kunne ikke f<> minne"
+
+#: util.c:172
+#, c-format
+msgid "%s at line %d of %%s"
+msgstr "%s p<> linje %d av %%s"
+
+#: util.c:179
+msgid "FAILED to start up"
+msgstr "FEILET <20> starte opp"
+
+#: util.c:305
+#, c-format
+msgid "infinite"
+msgstr "uendelig"
+
+#: option.c:124
+msgid "Specify local address(es) to listen on."
+msgstr "Spesifiser lokal(e) adresse(r) <20> lytte p<>."
+
+#: option.c:125
+msgid "Return ipaddr for all hosts in specified domains."
+msgstr "Returner ipaddr for alle verter i det spesifiserte domenet."
+
+#: option.c:126
+msgid "Fake reverse lookups for RFC1918 private address ranges."
+msgstr "Forfalsk revers oppslag for RFC1918 private adresse omr<6D>der."
+
+#: option.c:127
+msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
+msgstr "Behandle ipaddr som NXDOMAIN (omg<6D>r Verisign wildcard)."
+
+#: option.c:128
+#, c-format
+msgid "Specify the size of the cache in entries (defaults to %s)."
+msgstr "Spesifiser st<73>rrelsen p<> mellomlager plassene (standard er %s)."
+
+#: option.c:129
+#, c-format
+msgid "Specify configuration file (defaults to %s)."
+msgstr "Spesifiser konfigurasjonsfil (standard er %s)."
+
+#: option.c:130
+msgid "Do NOT fork into the background: run in debug mode."
+msgstr "IKKE legg (fork) som bakgrunnsprosess: kj<6B>r i debug modus."
+
+#: option.c:131
+msgid "Do NOT forward queries with no domain part."
+msgstr "IKKE videresend oppslag som mangler domene del."
+
+#: option.c:132
+msgid "Return self-pointing MX records for local hosts."
+msgstr "Returner selv-pekende MX post for lokale verter."
+
+#: option.c:133
+msgid "Expand simple names in /etc/hosts with domain-suffix."
+msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks."
+
+#: option.c:134
+msgid "Don't forward spurious DNS requests from Windows hosts."
+msgstr "Ikke videresend falske/uekte DNS foresp<73>rsler fra Windows verter."
+
+#: option.c:135
+msgid "Enable DHCP in the range given with lease duration."
+msgstr "Aktiver DHCP i det gitte omr<6D>det med leie varighet"
+
+#: option.c:136
+#, c-format
+msgid "Change to this group after startup (defaults to %s)."
+msgstr "Skift til denne gruppen etter oppstart (standard er %s)."
+
+#: option.c:137
+msgid "Set address or hostname for a specified machine."
+msgstr "Sett adresse eller vertsnavn for en spesifikk maskin."
+
+#: option.c:138
+#, c-format
+msgid "Do NOT load %s file."
+msgstr "IKKE last %s filen."
+
+#: option.c:139
+#, c-format
+msgid "Specify a hosts file to be read in addition to %s."
+msgstr "Spesifiser en verts (hosts) fil som skal leses i tilleg til %s."
+
+#: option.c:140
+msgid "Specify interface(s) to listen on."
+msgstr "Spesifiser nettverkskort det skal lyttes p<>."
+
+#: option.c:141
+msgid "Specify interface(s) NOT to listen on."
+msgstr "Spesifiser nettverkskort det IKKE skal lyttes p<>."
+
+#: option.c:142
+msgid "Map DHCP user class to option set."
+msgstr "Map DHCP bruker klasse til opsjon sett."
+
+#: option.c:143
+msgid "Don't do DHCP for hosts in option set."
+msgstr "Ikke utf<74>r DHCP for klienter i opsjon sett."
+
+#: option.c:144
+msgid "Do NOT fork into the background, do NOT run in debug mode."
+msgstr "IKKE last (fork) som bakgrunnsprosess, IKKE kj<6B>r i debug modus."
+
+#: option.c:145
+msgid "Assume we are the only DHCP server on the local network."
+msgstr "Anta at vi er den eneste DHCP tjeneren p<> det lokale nettverket."
+
+#: option.c:146
+#, c-format
+msgid "Specify where to store DHCP leases (defaults to %s)."
+msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)."
+
+#: option.c:147
+msgid "Return MX records for local hosts."
+msgstr "Returner MX records for lokale verter."
+
+#: option.c:148
+msgid "Specify an MX record."
+msgstr "Spesifiser en MX post."
+
+#: option.c:149
+msgid "Specify BOOTP options to DHCP server."
+msgstr "Spesifiser BOOTP opsjoner til DHCP tjener."
+
+#: option.c:150
+#, c-format
+msgid "Do NOT poll %s file, reload only on SIGHUP."
+msgstr "IKKE sp<73>r (poll) %s fil, les p<> nytt kun ved SIGHUP"
+
+#: option.c:151
+msgid "Do NOT cache failed search results."
+msgstr "IKKE mellomlagre s<>keresultater som feiler."
+
+#: option.c:152
+#, c-format
+msgid "Use nameservers strictly in the order given in %s."
+msgstr "Bruk navnetjenere kun som bestemt i rekkef<65>lgen gitt i %s."
+
+#: option.c:153
+msgid "Set extra options to be set to DHCP clients."
+msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene."
+
+#: option.c:154
+msgid "Specify port to listen for DNS requests on (defaults to 53)."
+msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)."
+
+#: option.c:155
+#, c-format
+msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
+msgstr "Maksimal st<73>ttet UDP pakkest<73>rrelse for EDNS.0 (standard er %s)."
+
+#: option.c:156
+msgid "Log queries."
+msgstr "Logg oppslag."
+
+#: option.c:157
+msgid "Force the originating port for upstream queries."
+msgstr "Tving bruk av opprinnelig port for oppstr<74>ms oppslag."
+
+#: option.c:158
+msgid "Do NOT read resolv.conf."
+msgstr "IKKE les resolv.conf."
+
+#: option.c:159
+#, c-format
+msgid "Specify path to resolv.conf (defaults to %s)."
+msgstr "Spesifiser stien til resolv.conf (standard er %s)."
+
+#: option.c:160
+msgid "Specify address(es) of upstream servers with optional domains."
+msgstr "Spesifiser adressen(e) til oppstr<74>ms tjenere med valgfrie domener."
+
+#: option.c:161
+msgid "Never forward queries to specified domains."
+msgstr "Aldri videresend oppslag til spesifiserte domener."
+
+#: option.c:162
+msgid "Specify the domain to be assigned in DHCP leases."
+msgstr "Spesifiser domenet som skal tildeles i DHCP leien."
+
+#: option.c:163
+msgid "Specify default target in an MX record."
+msgstr "Spesifiser default m<>l i en MX post."
+
+#: option.c:164
+msgid "Specify time-to-live in seconds for replies from /etc/hosts."
+msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts."
+
+#: option.c:165
+#, c-format
+msgid "Change to this user after startup. (defaults to %s)."
+msgstr "Skift til denne bruker etter oppstart (standard er %s)."
+
+#: option.c:166
+msgid "Map DHCP vendor class to option set."
+msgstr "Map DHCP produsent klasse til opsjon sett."
+
+#: option.c:167
+msgid "Display dnsmasq version and copyright information."
+msgstr "Vis dnsmasq versjon og copyright informasjon."
+
+#: option.c:168
+msgid "Translate IPv4 addresses from upstream servers."
+msgstr "Oversett IPv4 adresser fra oppstr<74>ms tjenere."
+
+#: option.c:169
+msgid "Specify a SRV record."
+msgstr "Spesifiser en SRV post."
+
+#: option.c:170
+msgid "Display this message."
+msgstr "Vis denne meldingen."
+
+#: option.c:171
+#, c-format
+msgid "Specify path of PID file. (defaults to %s)."
+msgstr "Spesifiser stien til PID fil. (standard er %s)."
+
+#: option.c:172
+#, c-format
+msgid "Specify maximum number of DHCP leases (defaults to %s)."
+msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)"
+
+#: option.c:173
+msgid "Answer DNS queries based on the interface a query was sent to."
+msgstr "Svar DNS oppslag basert p<> nettverkskortet oppslaget ble sendt til."
+
+#: option.c:174
+msgid "Specify TXT DNS record."
+msgstr "Spesifiser TXT DNS post."
+
+#: option.c:175
+msgid "Bind only to interfaces in use."
+msgstr "Bind kun til nettverkskort som er i bruk."
+
+#: option.c:176
+#, c-format
+msgid "Read DHCP static host information from %s."
+msgstr "Les DHCP statisk vert informasjon fra %s."
+
+#: option.c:177
+msgid "Enable the DBus interface for setting upstream servers, etc."
+msgstr "Aktiver DBus interface for <20> sette oppstr<74>ms tjenere, osv."
+
+#: option.c:178
+msgid "Do not provide DHCP on this interface, only provide DNS."
+msgstr "Ikke lever DHCP p<> dette nettverkskortet, kun lever DNS."
+
+#: option.c:179
+msgid "Enable dynamic address allocation for bootp."
+msgstr "Aktiver dynamisk adresse allokering for bootp."
+
+#: option.c:394
+msgid "missing \""
+msgstr "mangler \""
+
+#: option.c:423
+msgid "bad option"
+msgstr "d<>rlig opsjon"
+
+#: option.c:440
+#, c-format
+msgid "cannot read %s: %s"
+msgstr "kan ikke lese %s: %s"
+
+#: option.c:446
+#, c-format
+msgid ""
+"Usage: dnsmasq [options]\n"
+"\n"
+msgstr "Bruk: dnsmasq [opsjoner]\n"
+"\n"
+
+#: option.c:448
+#, c-format
+msgid "Use short options only on the command line.\n"
+msgstr "Bruk korte opsjoner kun p<> kommandolinjen.\n"
+
+#: option.c:450
+#, c-format
+msgid "Valid options are :\n"
+msgstr "Gyldige opsjoner er :\n"
+
+#: option.c:475
+#, c-format
+msgid "Dnsmasq version %s  %s\n"
+msgstr "Dnsmasq versjon %s %s\n"
+
+#: option.c:476
+#, c-format
+msgid ""
+"Compile time options %s\n"
+"\n"
+msgstr ""
+"Kompileringsopsjoner %s\n"
+"\n"
+
+#: option.c:477
+#, c-format
+msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
+msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n"
+
+#: option.c:478
+#, c-format
+msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
+msgstr "DNsmasq er fri programvare, du er velkommen til <20> redistribuere den\n"
+
+#: option.c:479
+#, c-format
+msgid "under the terms of the GNU General Public License, version 2.\n"
+msgstr "under vilk<6C>rene gitt i GNU General Public License, versjon 2.\n"
+
+#: option.c:489
+msgid "extraneous parameter"
+msgstr "overfl<66>dig parameter"
+
+#: option.c:497
+msgid "missing parameter"
+msgstr "mangler parameter"
+
+#: option.c:514
+msgid "nested includes not allowed"
+msgstr "n<>stede inkluderinger er ikke tillatt"
+
+#: option.c:574
+msgid "bad MX preference"
+msgstr "d<>rlig MX preferanse"
+
+#: option.c:583
+msgid "bad MX name"
+msgstr "d<>rlig MX navn"
+
+#: option.c:601
+msgid "bad MX target"
+msgstr "d<>rlig MX m<>l"
+
+#: option.c:803 option.c:814
+msgid "bad port"
+msgstr "d<>rlig port"
+
+#: option.c:954
+msgid "bad dhcp-range"
+msgstr "d<>rlig dhcp-omr<6D>de"
+
+#: option.c:1014
+msgid "inconsistent DHCP range"
+msgstr "ikke konsistent DHCP omr<6D>de"
+
+#: option.c:1201
+msgid "bad dhcp-host"
+msgstr "d<>rlig dhcp-vert"
+
+#: option.c:1261
+msgid "bad dhcp-option"
+msgstr "d<>rlig dhcp-opsjon"
+
+#: option.c:1279
+msgid "bad domain in dhcp-option"
+msgstr "d<>rlig domene i dhcp-opsjon"
+
+#: option.c:1425
+msgid "dhcp-option too long"
+msgstr "dhcp-opsjon for lang"
+
+#: option.c:1605
+msgid "bad TXT record"
+msgstr "d<>rlig TXT post"
+
+#: option.c:1637
+msgid "TXT record string too long"
+msgstr "TXT post streng for lang"
+
+#: option.c:1676
+msgid "bad SRV record"
+msgstr "d<>rlig SRV post"
+
+#: option.c:1689
+msgid "bad SRV target"
+msgstr "d<>rlig SRV m<>l"
+
+#: option.c:1701
+msgid "invalid port number"
+msgstr "ugyldig portnummer"
+
+#: option.c:1712
+msgid "invalid priority"
+msgstr "ugyldig prioritet"
+
+#: option.c:1723
+msgid "invalid weight"
+msgstr "ugyldig vekt"
+
+#: option.c:1748
+msgid "error"
+msgstr "feil"
+
+#: option.c:1750
+#, c-format
+msgid "bad command line options: %s."
+msgstr "d<>rlige kommandlinje opsjoner: %s."
+
+#: option.c:1794
+#, c-format
+msgid "cannot get host-name: %s"
+msgstr "klarer ikke <20> f<> vertsnavn: %s"
+
+#: option.c:1823
+msgid "only one resolv.conf file allowed in no-poll mode."
+msgstr "kun en resolv.conf fil tillat i no-poll modus."
+
+#: option.c:1830
+msgid "must have exactly one resolv.conf to read domain from."
+msgstr "m<> ha n<>yaktig en resolv.conf <20> lese domene fra."
+
+#: option.c:1833 network.c:591
+#, c-format
+msgid "failed to read %s: %m"
+msgstr "feilet <20> lese %s: %m"
+
+#: option.c:1851
+#, c-format
+msgid "no search directive found in %s"
+msgstr "intet s<>ke direktiv funnet i %s"
+
+#: forward.c:378
+#, c-format
+msgid "nameserver %s refused to do a recursive query"
+msgstr "navnetjener %s nektet <20> gj<67>re et rekursivt oppslag"
+
+#: forward.c:899
+msgid "forwarding table overflow: check for server loops."
+msgstr "fremsendelse (forwarding) tabell overflyt: sjekk etter tjener l<>kker."
+
+#: isc.c:71 dnsmasq.c:474
+#, c-format
+msgid "failed to access %s: %m"
+msgstr "feilet <20> f<> tilgang til %s: %m"
+
+#: isc.c:87
+#, c-format
+msgid "failed to load %s: %m"
+msgstr "feilet <20> laste %s: %m"
+
+#: isc.c:91 network.c:595
+#, c-format
+msgid "reading %s"
+msgstr "leser %s"
+
+#: isc.c:113
+#, c-format
+msgid "bad name in %s"
+msgstr "d<>rlig navn i %s"
+
+#: isc.c:175
+#, c-format
+msgid "Ignoring DHCP lease for %s because it has an illegal domain part"
+msgstr "Ignorerer DHCP leie for %s siden den har en ulovlig domene del"
+
+#: network.c:418
+#, c-format
+msgid "failed to create listening socket: %s"
+msgstr "feilet <20> lage lytte socket: %s"
+
+#: network.c:425
+#, c-format
+msgid "failed to set IPV6 options on listening socket: %s"
+msgstr "feilet <20> sette IPv6 opsjoner p<> lytte socket: %s"
+
+#: network.c:444
+#, c-format
+msgid "failed to bind listening socket for %s: %s"
+msgstr "feilet <20> binde lytte socket for %s: %s"
+
+#: network.c:451
+#, c-format
+msgid "failed to listen on socket: %s"
+msgstr "feilet <20> lytte p<> socket: %s"
+
+#: network.c:521
+#, c-format
+msgid "ignoring nameserver %s - local interface"
+msgstr "ignorerer navnetjener %s - lokal tilknytning"
+
+#: network.c:530
+#, c-format
+msgid "ignoring nameserver %s - cannot make/bind socket: %m"
+msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m"
+
+#: network.c:544
+msgid "domain"
+msgstr "domene"
+
+#: network.c:546
+msgid "unqualified"
+msgstr "ikke kvalifisert"
+
+#: network.c:546
+msgid "domains"
+msgstr "domener"
+
+#: network.c:549
+#, c-format
+msgid "using local addresses only for %s %s"
+msgstr "benytter lokale adresser kun for %s %s"
+
+#: network.c:551
+#, c-format
+msgid "using nameserver %s#%d for %s %s"
+msgstr "benytter navnetjener %s#%d for %s %s"
+
+#: network.c:554
+#, c-format
+msgid "using nameserver %s#%d"
+msgstr "benytter navnetjener %s#%d"
+
+#: dnsmasq.c:115
+msgid ""
+"ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
+msgstr ""
+"ISC dhcpf integrasjon ikke tilgjengelig: sett HAVE_ISC_READER i src/config.h"
+
+#: dnsmasq.c:119
+#, c-format
+msgid "failed to find list of interfaces: %s"
+msgstr "feilet <20> finne liste av tilknytninger (interfaces): %s"
+
+#: dnsmasq.c:134
+#, c-format
+msgid "unknown interface %s"
+msgstr "ukjent tilknytning (interface) %s"
+
+#: dnsmasq.c:140
+#, c-format
+msgid "no interface with address %s"
+msgstr "ingen tilknytning (interface) med adresse %s"
+
+#: dnsmasq.c:149
+#, c-format
+msgid "cannot open %s:%s"
+msgstr "kan ikke <20>pne %s:%s"
+
+#: dnsmasq.c:163
+msgid "must set exactly one interface on broken systems without IP_RECVIF"
+msgstr "m<> sette n<>yaktig et interface p<> <20>delagte systemer uten IP_RECVIF"
+
+#: dnsmasq.c:176 dnsmasq.c:507
+#, c-format
+msgid "DBus error: %s"
+msgstr "DBus feil: %s"
+
+#: dnsmasq.c:180
+msgid "DBus not available: set HAVE_DBUS in src/config.h"
+msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h"
+
+#: dnsmasq.c:293
+#, c-format
+msgid "started, version %s cachesize %d"
+msgstr "startet, versjon %s mellomlager st<73>rrelse %d"
+
+#: dnsmasq.c:295
+#, c-format
+msgid "started, version %s cache disabled"
+msgstr "startet, versjon %s mellomlager deaktivert"
+
+#: dnsmasq.c:297
+#, c-format
+msgid "compile time options: %s"
+msgstr "kompilerings opsjoner: %s"
+
+#: dnsmasq.c:303
+msgid "DBus support enabled: connected to system bus"
+msgstr "DBus st<73>tte aktivert: koblet til system buss"
+
+#: dnsmasq.c:305
+msgid "DBus support enabled: bus connection pending"
+msgstr "DBus st<73>tte aktivert: avventer buss tilkobling"
+
+#: dnsmasq.c:310
+msgid "setting --bind-interfaces option because of OS limitations"
+msgstr "setter --bind-interfaces opsjon p<> grunn av OS begrensninger"
+
+#: dnsmasq.c:315
+#, c-format
+msgid "warning: interface %s does not currently exist"
+msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden"
+
+#: dnsmasq.c:332
+#, c-format
+msgid "DHCP, static leases only on %.0s%s, lease time %s"
+msgstr "DHCP, statisk leie kun p<> %.0s%s, leie tid %s"
+
+#: dnsmasq.c:333
+#, c-format
+msgid "DHCP, IP range %s -- %s, lease time %s"
+msgstr "DHCP, IP omr<6D>de %s -- %s, leie tid %s"
+
+#: dnsmasq.c:344
+#, c-format
+msgid "DHCP, %s will be written every %s"
+msgstr "DHCP, %s vil bli skrevet hver %s"
+
+#: dnsmasq.c:349
+msgid "running as root"
+msgstr "kj<6B>rer som rot (root)"
+
+#: dnsmasq.c:509
+msgid "connected to system DBus"
+msgstr "tilkoblet til system DBus"
+
+#: dnsmasq.c:520
+msgid "exiting on receipt of SIGTERM"
+msgstr "avslutter etter mottak av SIGTERM"
+
+#: dhcp.c:25
+#, c-format
+msgid "cannot create DHCP socket : %s"
+msgstr "kan ikke lage DHCP socket : %s"
+
+#: dhcp.c:35
+#, c-format
+msgid "failed to set options on DHCP socket: %s"
+msgstr "feilet <20> sette opsjoner p<> DHCP socket: %s"
+
+#: dhcp.c:42
+#, c-format
+msgid "failed to set SO_REUSEADDR on DHCP socket: %s"
+msgstr "feilet <20> sette SO_REUSEADDR p<> DHCP socket: %s"
+
+#: dhcp.c:52
+#, c-format
+msgid "failed to bind DHCP server socket: %s"
+msgstr "feilet <20> binde DHCP tjener socket: %s"
+
+#: dhcp.c:61
+#, c-format
+msgid "cannot create ICMP raw socket: %s."
+msgstr "kan ikke lage ICMP raw socket: %s"
+
+#: dhcp.c:75
+#, c-format
+msgid "cannot create DHCP BPF socket: %s"
+msgstr "kan ikke lage DHCP BPF socket: %s"
+
+#: dhcp.c:86
+#, c-format
+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?"
+
+#: dhcp.c:98
+#, c-format
+msgid "duplicate IP address %s in dhcp-config directive."
+msgstr "dubliserte IP adresser i %s dhcp-config direktiv."
+
+#: dhcp.c:233
+msgid "Cannot use RTnetlink socket, falling back to ioctl API"
+msgstr "Kan ikke benytte RTnetlink socket, faller tilbake til ioctl API"
+
+#: dhcp.c:394
+#, c-format
+msgid "DHCP range %s -- %s is not consistent with netmask %s"
+msgstr "DHCP omr<6D>de %s -- %s er ikke konsistent med nettmaske %s"
+
+#: dhcp.c:705
+#, c-format
+msgid "failed to read %s:%m"
+msgstr "feilet <20> lese %s:%m"
+
+#: dhcp.c:724
+#, c-format
+msgid "bad line at %s line %d"
+msgstr "d<>rlig linje ved %s linje %d"
+
+#: dhcp.c:825
+#, c-format
+msgid "duplicate IP address %s (%s) in dhcp-config directive"
+msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv"
+
+#: dhcp.c:861
+#, c-format
+msgid "Ignoring DHCP host name %s because it has an illegal domain part"
+msgstr "Ignorerer DHCP verts navn %s p<> grunn av ulovlig domene del"
+
+#: lease.c:39
+#, c-format
+msgid "cannot open or create leases file: %s"
+msgstr "kan ikke <20>pne eller lage leie fil: %s"
+
+#: lease.c:77
+msgid "too many stored leases"
+msgstr "for mange lagrede leier"
+
+#: rfc2131.c:171
+#, c-format
+msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
+msgstr "DHCP krav for ikke st<73>ttet maskinvare type (%d) mottatt p<> %s"
+
+#: rfc2131.c:220
+#, c-format
+msgid "no address range available for DHCP request %s %s"
+msgstr "ingen adresse omr<6D>de tilgjengelig for DHCP krav %s %s"
+
+#: rfc2131.c:221
+msgid "with subnet selector"
+msgstr "med subnet velger"
+
+#: rfc2131.c:221
+msgid "via"
+msgstr "via"
+
+#: rfc2131.c:238 rfc2131.c:262
+msgid "disabled"
+msgstr "deaktivert"
+
+#: rfc2131.c:272 rfc2131.c:658
+msgid "address in use"
+msgstr "adresse i bruk"
+
+#: rfc2131.c:275
+msgid "no address configured"
+msgstr "ingen adresse konfigurert"
+
+#: rfc2131.c:288 rfc2131.c:534
+msgid "no address available"
+msgstr "ingen adresse tilgjengelig"
+
+#: rfc2131.c:295 rfc2131.c:661
+msgid "no leases left"
+msgstr "ingen leier igjen"
+
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "galt nettverk"
+
+#: rfc2131.c:493
+#, c-format
+msgid "disabling DHCP static address %s"
+msgstr "deaktiverer DHCP statisk adresse %s"
+
+#: rfc2131.c:511
+msgid "unknown lease"
+msgstr "ukjent leie"
+
+#: rfc2131.c:524 rfc2131.c:732
+msgid "ignored"
+msgstr "oversett"
+
+#: rfc2131.c:607
+msgid "wrong address"
+msgstr "gal adresse"
+
+#: rfc2131.c:616
+msgid "lease not found"
+msgstr "leie ikke funnet"
+
+#: rfc2131.c:642
+msgid "address not available"
+msgstr "adresse ikke tilgjengelig"
+
+#: rfc2131.c:651
+msgid "static lease available"
+msgstr "statisk leie tilgjengelig"
+
+#: rfc2131.c:655
+msgid "address reserved"
+msgstr "adresse reservert"
+
+#: rfc2131.c:851
+#, 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
+#, c-format
+msgid "More than one vendor class matches, using %s"
+msgstr "Mer enn en produsent klasse som passer, bruker %s"
+
+#: netlink.c:37
+#, c-format
+msgid "cannot bind netlink socket: %s"
+msgstr "kan ikke binde netlink socket: %s"
+
+#: dbus.c:112
+msgid "attempt to set an IPv6 server address via DBus - no IPv6 support"
+msgstr "fors<72>k p<> <20> sette en IPv6 tjener adresse via DBus - ingen IPv6 st<73>tte"
+
+#: dbus.c:237
+msgid "setting upstream servers from DBus"
+msgstr "setter oppstr<74>ms tjener fra DBus"
+
+#: dbus.c:273
+msgid "could not register a DBus message handler"
+msgstr "kunne ikke registrere en DBus meldingsh<73>ndterer"

po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 20:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+0000\n"
 "PO-Revision-Date: 2005-10-04 19:17+0100\n"
 "Last-Translator: Tomasz Socha<68>ski <nerdhero@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "failed to load names from %s: %m"
 msgstr "b<><62>d <20>adowania nazw z %s: %m"
 
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, fuzzy, c-format
 msgid "bad address at %s line %d"
 msgstr "b<><62>dna nazwa w %s, linia %d"
 
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "b<><62>dna nazwa w %s, linia %d"
 
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "przeczytano %s - %d adres<65>w"
@@ -505,7 +505,7 @@ msgid "forwarding table overflow: check for server loops."
 msgstr ""
 "przekroczenie zakresu tablicy przekazywania: sprawd<77> zap<61>tlenie serwera."
 
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "b<><62>d w dost<73>pie do %s: %m"
@@ -589,102 +589,102 @@ msgstr "u
 msgid "using nameserver %s#%d"
 msgstr "u<>ywany serwer nazw %s#%d"
 
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Intergracja z ISC dhcpd nie jest dost<73>pna: ustaw HAVE_ISC_READER w src/"
 "config.h"
 
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "b<><62>d w znalezieniu listy interfejs<6A>w sieciowych: %s"
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr "nieznany interfejs %s"
 
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr "brak interfejsu z adresem %s"
 
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr "nie mo<6D>na otworzy<7A> %s:%s"
 
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr "musisz ustawi<77> dok<6F>adnie jeden interfejs w systemach bez IP_RECVIF"
 
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr "b<><62>d DBus: %s"
 
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus jest niedost<73>pny: ustaw HAVE_DBUS w src/config.h"
 
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "uruchomiony, wersja %s wielko<6B><6F> cache %d"
 
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "uruchomiony, wersja %s cache wy<77><79>czony"
 
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr "opcje kompilacji: %s"
 
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr "obs<62>uga DBus w<><77>czona: pod<6F><64>czono do szyny systemowej"
 
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr "obs<62>uga DBus w<><77>czona: pod<6F><64>czanie do szyny systemowej w toku"
 
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "ustawiam opcj<63> --bind-interfaces z powodu limit<69>w systemu operacyjnego"
 
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "ostrze<7A>enie: interfejs %s obecnie nie istnieje"
 
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, statyczne dzier<65>awy tylko na %.0s%s, czas dzier<65>awy %s"
 
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, zakres IP %s -- %s, czas dzier<65>awy %s"
 
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr "DHCP, %s b<>dzie zapisywane co %s"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr "pracuje z uprawnieniami u<>ytkownika root"
 
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr "po<70><6F>czono do systemowego DBus"
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr "wy<77><79>czenie po otrzymaniu sygnalu SIGTERM"
 
@@ -732,27 +732,31 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "powt<77>rzenie adresu IP %s w opcji dhcp-config"
 
-#: dhcp.c:384
+#: 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 "zakres DHCP %s -- %s jest niesp<73>jny z mask<73> sieciow<6F> %s"
 
-#: dhcp.c:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr "b<><62>d odczytu %s:%m"
 
-#: dhcp.c:709
+#: dhcp.c:724
 #, fuzzy, c-format
 msgid "bad line at %s line %d"
 msgstr "b<><62>dna nazwa w %s, linia %d"
 
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "powt<77>rzenie adresu IP %s (%s) w opcji dhcp-config"
 
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr ""
@@ -789,7 +793,7 @@ msgstr "przez"
 msgid "disabled"
 msgstr "wy<77><79>czony(a)"
 
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr "adres w u<>yciu"
 
@@ -797,57 +801,57 @@ msgstr "adres w u
 msgid "no address configured"
 msgstr "brak skonfigurowanego adresu"
 
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr "brak dost<73>pnego adresu"
 
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr "brak wolnych dzier<65>aw"
 
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "nieprawid<69>owa sie<69>"
+
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr "wy<77><79>czanie statycznego adresu DHCP %s"
 
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr "nieznana dzier<65>awa"
 
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr "ignoruj<75>"
 
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr "b<><62>dny adres"
 
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr "dzier<65>awa nie znaleziona"
 
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr "nieprawid<69>owa sie<69>"
-
-#: rfc2131.c:627
 msgid "address not available"
 msgstr "adres niedost<73>pny"
 
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr "dost<73>pna statyczna dzier<65>awa"
 
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr "adres zarezerwowany"
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, c-format
 msgid "cannot send DHCP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1132
+#: rfc2131.c:1146
 #, c-format
 msgid "More than one vendor class matches, using %s"
 msgstr "Wi<57>cej ni<6E> jeden dystrybutor pasuj<75>cy, u<>ywam %s"

po/ro.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-24 21:10+0000\n"
+"POT-Creation-Date: 2006-01-13 16:01+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"
@@ -20,17 +20,17 @@ msgstr ""
 msgid "failed to load names from %s: %m"
 msgstr "încărcarea numelor din %s: %m a eşuat"
 
-#: cache.c:601 dhcp.c:722
+#: cache.c:601 dhcp.c:737
 #, c-format
 msgid "bad address at %s line %d"
 msgstr "adresă greşită în %s, linia %d"
 
-#: cache.c:628 dhcp.c:736
+#: cache.c:628 dhcp.c:751
 #, c-format
 msgid "bad name at %s line %d"
 msgstr "nume greşit în %s linia %d"
 
-#: cache.c:634 dhcp.c:787
+#: cache.c:634 dhcp.c:802
 #, c-format
 msgid "read %s - %d addresses"
 msgstr "citesc %s - %d adrese"
@@ -496,7 +496,7 @@ msgstr "serverul DNS %s refuză interogările recursive"
 msgid "forwarding table overflow: check for server loops."
 msgstr "depăşire de memorie în tabela cu înaintări DNS: verificaţi de bucle."
 
-#: isc.c:71 dnsmasq.c:471
+#: isc.c:71 dnsmasq.c:474
 #, c-format
 msgid "failed to access %s: %m"
 msgstr "accesarea serverului %s a eşuat: %n"
@@ -578,104 +578,104 @@ msgstr "folosim serverul DNS %s#%d pentru %s %s"
 msgid "using nameserver %s#%d"
 msgstr "folosim serverul DNS %s#%d"
 
-#: dnsmasq.c:112
+#: dnsmasq.c:115
 msgid ""
 "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h"
 msgstr ""
 "Integrarea cu ISC dhcpd nu este disponibilă:puneţi HAVE_ISC_HEADER în src/"
 "config.h"
 
-#: dnsmasq.c:116
+#: dnsmasq.c:119
 #, c-format
 msgid "failed to find list of interfaces: %s"
 msgstr "enumerarea interfeţelor a eşuat: %s"
 
-#: dnsmasq.c:131
+#: dnsmasq.c:134
 #, c-format
 msgid "unknown interface %s"
 msgstr "interfaţă necunoscută %s"
 
-#: dnsmasq.c:137
+#: dnsmasq.c:140
 #, c-format
 msgid "no interface with address %s"
 msgstr "nu exista interfaţă pentru adresa %s"
 
-#: dnsmasq.c:146
+#: dnsmasq.c:149
 #, c-format
 msgid "cannot open %s:%s"
 msgstr "nu pot deschide %s:%s"
 
-#: dnsmasq.c:160
+#: dnsmasq.c:163
 msgid "must set exactly one interface on broken systems without IP_RECVIF"
 msgstr ""
 "trebuie specificată exact o singură interfaţă pe sistemele defectece nu au "
 "IP_RECVIF"
 
-#: dnsmasq.c:173 dnsmasq.c:504
+#: dnsmasq.c:176 dnsmasq.c:507
 #, c-format
 msgid "DBus error: %s"
 msgstr "eroare DBus: %s"
 
-#: dnsmasq.c:177
+#: dnsmasq.c:180
 msgid "DBus not available: set HAVE_DBUS in src/config.h"
 msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h"
 
-#: dnsmasq.c:290
+#: dnsmasq.c:293
 #, c-format
 msgid "started, version %s cachesize %d"
 msgstr "am ponit, versiunea %s memorie temporară %d"
 
-#: dnsmasq.c:292
+#: dnsmasq.c:295
 #, c-format
 msgid "started, version %s cache disabled"
 msgstr "am pornit, versiunea %s memorie temporară dezactivată"
 
-#: dnsmasq.c:294
+#: dnsmasq.c:297
 #, c-format
 msgid "compile time options: %s"
 msgstr "compilat cu opţiunile: %s"
 
-#: dnsmasq.c:300
+#: dnsmasq.c:303
 msgid "DBus support enabled: connected to system bus"
 msgstr "suportul DBus activ: sunt conectat la magistrala sistem"
 
-#: dnsmasq.c:302
+#: dnsmasq.c:305
 msgid "DBus support enabled: bus connection pending"
 msgstr "suportul DBus activ: aştept conexiunea la magistrală"
 
-#: dnsmasq.c:307
+#: dnsmasq.c:310
 msgid "setting --bind-interfaces option because of OS limitations"
 msgstr "specific opţiunea --bind-interfaces din cauza limitărilor SO"
 
-#: dnsmasq.c:312
+#: dnsmasq.c:315
 #, c-format
 msgid "warning: interface %s does not currently exist"
 msgstr "atenţie: interfaţa %s nu există momentan"
 
-#: dnsmasq.c:329
+#: dnsmasq.c:332
 #, c-format
 msgid "DHCP, static leases only on %.0s%s, lease time %s"
 msgstr "DHCP, împrumuturi statice doar către  %.0s%s, timpul reînoirii %s"
 
-#: dnsmasq.c:330
+#: dnsmasq.c:333
 #, c-format
 msgid "DHCP, IP range %s -- %s, lease time %s"
 msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s"
 
-#: dnsmasq.c:341
+#: dnsmasq.c:344
 #, c-format
 msgid "DHCP, %s will be written every %s"
 msgstr "DHCP, %s va fi rescris odată la fiecare %s"
 
-#: dnsmasq.c:346
+#: dnsmasq.c:349
 msgid "running as root"
 msgstr "rulez ca root"
 
-#: dnsmasq.c:506
+#: dnsmasq.c:509
 msgid "connected to system DBus"
 msgstr "magistrala sistem Dbus conectată"
 
-#: dnsmasq.c:517
+#: dnsmasq.c:520
 msgid "exiting on receipt of SIGTERM"
 msgstr "am primit SIGTERM, am terminat"
 
@@ -723,27 +723,31 @@ msgstr ""
 msgid "duplicate IP address %s in dhcp-config directive."
 msgstr "adresă IP duplicat %s în declaraţia dhcp-config."
 
-#: dhcp.c:384
+#: 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 "domeniu DHCP %s -- %s nu este consistent cu masca de reţea %s"
 
-#: dhcp.c:690
+#: dhcp.c:705
 #, c-format
 msgid "failed to read %s:%m"
 msgstr "citirea %s:%n a eşuat"
 
-#: dhcp.c:709
+#: dhcp.c:724
 #, c-format
 msgid "bad line at %s line %d"
 msgstr "linie invalidă în %s rândul %d"
 
-#: dhcp.c:810
+#: dhcp.c:825
 #, c-format
 msgid "duplicate IP address %s (%s) in dhcp-config directive"
 msgstr "adresă IP duplicat %s (%s) în declaraţia dhcp-config."
 
-#: dhcp.c:846
+#: dhcp.c:861
 #, c-format
 msgid "Ignoring DHCP host name %s because it has an illegal domain part"
 msgstr "Ignor numele DHCP al maşinii %s deoarece are domeniu DNS ilegal"
@@ -779,7 +783,7 @@ msgstr "prin"
 msgid "disabled"
 msgstr "dezactivat"
 
-#: rfc2131.c:272 rfc2131.c:643
+#: rfc2131.c:272 rfc2131.c:658
 msgid "address in use"
 msgstr "adresa este folosită"
 
@@ -787,57 +791,57 @@ msgstr "adresa este folosită"
 msgid "no address configured"
 msgstr "adresă lipsă"
 
-#: rfc2131.c:281 rfc2131.c:522
+#: rfc2131.c:288 rfc2131.c:534
 msgid "no address available"
 msgstr "nici o adresă disponibilă"
 
-#: rfc2131.c:285 rfc2131.c:646
+#: rfc2131.c:295 rfc2131.c:661
 msgid "no leases left"
 msgstr "nu mai am de unde să împrumut"
 
-#: rfc2131.c:481
+#: rfc2131.c:298 rfc2131.c:634
+msgid "wrong network"
+msgstr "reţea greşită"
+
+#: rfc2131.c:493
 #, c-format
 msgid "disabling DHCP static address %s"
 msgstr "dezactivăm adresele DHCP statice %s"
 
-#: rfc2131.c:499
+#: rfc2131.c:511
 msgid "unknown lease"
 msgstr "împrumut necunoscut"
 
-#: rfc2131.c:512 rfc2131.c:718
+#: rfc2131.c:524 rfc2131.c:732
 msgid "ignored"
 msgstr "ignorat"
 
-#: rfc2131.c:592
+#: rfc2131.c:607
 msgid "wrong address"
 msgstr "adresă greşită"
 
-#: rfc2131.c:601
+#: rfc2131.c:616
 msgid "lease not found"
 msgstr "împrumutul nu a fost găsit"
 
-#: rfc2131.c:619
+#: rfc2131.c:642
-msgid "wrong network"
-msgstr "reţea greşită"
-
-#: rfc2131.c:627
 msgid "address not available"
 msgstr "adresă indisponibilă"
 
-#: rfc2131.c:636
+#: rfc2131.c:651
 msgid "static lease available"
 msgstr "împrumut static este disponibil"
 
-#: rfc2131.c:640
+#: rfc2131.c:655
 msgid "address reserved"
 msgstr "adresă rezervată"
 
-#: rfc2131.c:837
+#: rfc2131.c:851
 #, 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:1132
+#: rfc2131.c:1146
 #, 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

@@ -1,5 +1,5 @@
---- dnsmasq.8	2004-08-08 20:57:56.000000000 +0200
+--- man/dnsmasq.8	2004-08-08 20:57:56.000000000 +0200
-+++ dnsmasq.8	2004-08-12 00:40:01.000000000 +0200
++++ man/dnsmasq.8	2004-08-12 00:40:01.000000000 +0200
 @@ -69,7 +69,7 @@
  .TP
  .B \-g, --group=<groupname> 

src/config.h

@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
 
    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
@@ -12,7 +12,7 @@
 
 /* Author's email: simon@thekelleys.org.uk */
 
-#define VERSION "2.24"
+#define VERSION "2.25"
 
 #define FTABSIZ 150 /* max number of outstanding requests */
 #define MAX_PROCS 20 /* max no children for TCP requests */
@@ -78,26 +78,6 @@
 #  define T_OPT 41
 #endif
 
-/* Decide if we're going to support IPv6 */
-/* We assume that systems which don't have IPv6
-   headers don't have ntop and pton either */
-
-#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
-#  define HAVE_IPV6
-#  define ADDRSTRLEN INET6_ADDRSTRLEN
-#  if defined(SOL_IPV6)
-#    define IPV6_LEVEL SOL_IPV6
-#  else
-#    define IPV6_LEVEL IPPROTO_IPV6
-#  endif
-#elif defined(INET_ADDRSTRLEN)
-#  undef HAVE_IPV6
-#  define ADDRSTRLEN INET_ADDRSTRLEN
-#else
-#  undef HAVE_IPV6
-#  define ADDRSTRLEN 16 /* 4*3 + 3 dots + NULL */
-#endif
-
 /* Get linux C library versions. */
 #if defined(__linux__) && !defined(__UCLIBC__) && !defined(__uClinux__)
 #  include <libio.h> 
@@ -205,18 +185,17 @@ NOTES:
 /* platform independent options. */
 #undef HAVE_BROKEN_RTC
 #define 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
 #endif
 
-#undef HAVE_DBUS
-
 /* platform dependent options. */
 
 /* Must preceed __linux__ since uClinux defines __linux__ too. */
-#if defined(__uClinux__) || defined(__UCLIBC__)
+#if defined(__uClinux__)
-#undef HAVE_LINUX_IPV6_PROC
+#define HAVE_LINUX_IPV6_PROC
 #define HAVE_GETOPT_LONG
 #define HAVE_RTNETLINK
 #undef HAVE_ARC4RANDOM
@@ -225,12 +204,32 @@ NOTES:
 #define HAVE_DEV_RANDOM
 #undef HAVE_SOCKADDR_SA_LEN
 #undef HAVE_PSELECT
-#if defined(__uClinux__)
 /* Never use fork() on uClinux. Note that this is subtly different from the
    --keep-in-foreground option, since it also  suppresses forking new 
    processes for TCP connections. It's intended for use on MMU-less kernels. */
+#define NO_FORK
+
+#elif defined(__UCLIBC__)
+#define HAVE_LINUX_IPV6_PROC
+#if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
+   ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
+#    define HAVE_GETOPT_LONG
+#  else
+#    undef HAVE_GETOPT_LONG
+#  endif
+#define HAVE_RTNETLINK
+#undef HAVE_ARC4RANDOM
+#define HAVE_RANDOM
+#define HAVE_DEV_URANDOM
+#define HAVE_DEV_RANDOM
+#undef HAVE_SOCKADDR_SA_LEN
+#undef HAVE_PSELECT
+#if !defined(__ARCH_HAS_MMU__)
 #  define NO_FORK
 #endif
+#if !defined(__UCLIBC_HAS_IPV6__)
+#  define NO_IPV6
+#endif
 
 /* libc5 - must precede __linux__ too */
 /* Note to build a libc5 binary on a modern Debian system:
@@ -271,10 +270,8 @@ typedef size_t socklen_t;
 #if defined(__GLIBC__) && (__GLIBC__ == 2) && \
     defined(__GLIBC_MINOR__) && (__GLIBC_MINOR__ < 2)
 typedef unsigned long in_addr_t; 
-#if defined(HAVE_IPV6)
 #   define HAVE_BROKEN_SOCKADDR_IN6
 #endif
-#endif
 
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
 #undef HAVE_LINUX_IPV6_PROC
@@ -334,5 +331,25 @@ typedef unsigned long in_addr_t;
 #endif
 
 
+/* Decide if we're going to support IPv6 */
+/* We assume that systems which don't have IPv6
+   headers don't have ntop and pton either */
+
+#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
+#  define HAVE_IPV6
+#  define ADDRSTRLEN INET6_ADDRSTRLEN
+#  if defined(SOL_IPV6)
+#    define IPV6_LEVEL SOL_IPV6
+#  else
+#    define IPV6_LEVEL IPPROTO_IPV6
+#  endif
+#elif defined(INET_ADDRSTRLEN)
+#  undef HAVE_IPV6
+#  define ADDRSTRLEN INET_ADDRSTRLEN
+#else
+#  undef HAVE_IPV6
+#  define ADDRSTRLEN 16 /* 4*3 + 3 dots + NULL */
+#endif
+
 
 

src/dhcp.c

@@ -225,6 +225,16 @@ void dhcp_packet(struct daemon *daemon, time_t now)
     {
       struct in_addr iface_netmask, iface_broadcast;
 
+#ifdef HAVE_RTNETLINK
+      static int warned = 0;
+
+      if (!warned)
+	{
+	  syslog(LOG_WARNING, _("Cannot use RTnetlink socket, falling back to ioctl API"));
+	  warned = 1;
+	}
+#endif
+
       if (ioctl(daemon->dhcpfd, SIOCGIFNETMASK, &ifr) < 0)
 	return;
       iface_netmask = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
@@ -447,24 +457,29 @@ struct dhcp_context *address_available(struct dhcp_context *context, struct in_a
 
 struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr)
 {
-  /* We start of with a set of possible contexts, all on the current subnet.
+  /* We start of with a set of possible contexts, all on the current physical interface.
      These are chained on ->current.
      Here we have an address, and return the actual context correponding to that
      address. Note that none may fit, if the address came a dhcp-host and is outside
-     any dhcp-range. In that case we return a static range is possible, or failing that,
+     any dhcp-range. In that case we return a static range if possible, or failing that,
-     any context on the subnet. (If there's more than one, this is a dodgy configuration: 
+     any context on the correct subnet. (If there's more than one, this is a dodgy 
-     maybe there should be a warning.) */
+     configuration: maybe there should be a warning.) */
   
-  struct dhcp_context *tmp = address_available(context, taddr);
+  struct dhcp_context *tmp;
 
-  if (tmp)
+  if ((tmp = address_available(context, taddr)))
     return tmp;
   
   for (tmp = context; tmp; tmp = tmp->current)
-    if (tmp->flags & CONTEXT_STATIC)
+    if (is_same_net(taddr, tmp->start, tmp->netmask) && 
+	(tmp->flags & CONTEXT_STATIC))
       return tmp;
 
-  return context;
+  for (tmp = context; tmp; tmp = tmp->current)
+    if (is_same_net(taddr, tmp->start, tmp->netmask))
+      return tmp;
+
+  return NULL;
 }
 
 struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr)

src/dnsmasq.c

@@ -26,6 +26,9 @@ static char *compile_opts =
 #ifdef HAVE_BROKEN_RTC
 "no-RTC "
 #endif
+#ifdef HAVE_RTNETLINK
+"RTNetlink "
+#endif
 #ifndef HAVE_ISC_READER
 "no-"
 #endif
@@ -37,7 +40,7 @@ static char *compile_opts =
 #ifdef NO_GETTEXT
 "no-"
 #endif
-"i18n";
+"I18N ";
 
 static volatile int sigterm, sighup, sigusr1, sigalarm, num_kids, in_child;
 

src/dnsmasq.h

@@ -12,7 +12,7 @@
 
 /* Author's email: simon@thekelleys.org.uk */
 
-#define COPYRIGHT "Copyright (C) 2000-2005 Simon Kelley" 
+#define COPYRIGHT "Copyright (C) 2000-2006 Simon Kelley" 
 
 #ifdef __linux__
 /* for pselect.... */

src/rfc1035.c

@@ -1049,11 +1049,15 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon
 	      if (t->class == qclass && hostname_isequal(name, t->name))
 		{
 		  ans = 1;
-		  log_query(F_CNAME | F_FORWARD | F_CONFIG | F_NXDOMAIN, name, NULL, 0, NULL, 0);
+		  if (!dryrun)
-		  if (!dryrun &&
+		    {
-		      add_resource_record(header, limit, &trunc, nameoffset, &ansp, 0, NULL,
+		      log_query(F_CNAME | F_FORWARD | F_CONFIG | F_NXDOMAIN, name, NULL, 0, NULL, 0);
-					  T_TXT, t->class, "t", t->len, t->txt))
+		      if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
-		    anscount++;
+					      daemon->local_ttl, NULL,
+					      T_TXT, t->class, "t", t->len, t->txt))
+			anscount++;
+
+		    }
 		}
 	    }
 	}

src/rfc2131.c

@@ -275,19 +275,31 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
 	    message = _("no address configured");
 	  else
 	    {
-	      if ((lease = lease_find_by_client(mess->chaddr, NULL, 0)))
+	      if (!(lease = lease_find_by_client(mess->chaddr, NULL, 0)) ||
+		  !address_available(context, lease->addr))
+		{
+		   if (lease)
+		     {
+		       /* lease exists, wrong network. */
+		       lease_prune(lease, now);
+		       lease = NULL;
+		     }
+		   if (!address_allocate(context, daemon, &mess->yiaddr, chaddr, netid, now))
+		     message = _("no address available");
+		}
+	      else
 		mess->yiaddr = lease->addr;
-	      else if (!address_allocate(context, daemon, &mess->yiaddr, chaddr, netid, now))
-		message = _("no address available");
 	    }
 	  
 	  if (!message && !lease && (!(lease = lease_allocate(chaddr, NULL, 0, mess->yiaddr))))
 	    message = _("no leases left");
 	  
+	  if (!message && !(context = narrow_context(context, mess->yiaddr)))
+	    message = _("wrong network");
+	      
 	  if (!message)
 	    {
 	      logaddr = &mess->yiaddr;
-	      context = narrow_context(context, mess->yiaddr);
 		
 	      if (context->netid.net && !(context->flags & CONTEXT_FILTER))
 		{
@@ -523,10 +535,9 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
 	log_packet("DISCOVER", opt ? &addr : NULL, chaddr, iface_name, message);          
       }
 
-      if (message)
+      if (message || !(context = narrow_context(context, mess->yiaddr)))
 	return 0;
 
-      context = narrow_context(context, mess->yiaddr);
       if (context->netid.net && !(context->flags & CONTEXT_FILTER))
 	{
 	  context->netid.next = netid;
@@ -572,7 +583,11 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
 	  if ((opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER, INADDRSZ)))
 	    {
 	      /* SELECTING */
-	      if (context->local.s_addr != option_addr(opt).s_addr)
+	      for (; context; context = context->current)
+		if (context->local.s_addr == option_addr(opt).s_addr)
+		  break;
+
+	      if (!context)
 		return 0;
 	      
 	      /* If a lease exists for this host and another address, squash it. */
@@ -613,9 +628,9 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
 	{
 	  struct dhcp_config *addr_config;
 
-	  /* If a machine moves networks whilst it has a lease, we catch that here. */
+	  if (!(context = narrow_context(context, mess->yiaddr)))
-	  if (!is_same_net(mess->yiaddr, context->start, context->netmask))
 	    {
+	      /* If a machine moves networks whilst it has a lease, we catch that here. */
 	      message = _("wrong network");
 	      /* ensure we broadcast NAK */
 	      unicast_dest = 0;
@@ -674,7 +689,6 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
 
 	  log_packet("ACK", &mess->yiaddr, chaddr, iface_name, hostname);
       
-	  context = narrow_context(context, mess->yiaddr);
 	  if (context->netid.net && !(context->flags & CONTEXT_FILTER))
 	    {
 	      context->netid.next = netid;
@@ -719,10 +733,10 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
       
       log_packet("INFORM", &mess->ciaddr, chaddr, iface_name, message);
      
-      if (message || mess->ciaddr.s_addr == 0)
+      if (message || mess->ciaddr.s_addr == 0 || 
+	  !(context = narrow_context(context, mess->ciaddr)))
 	return 0;
       
-      context = narrow_context(context, mess->ciaddr);
       if (context->netid.net)
 	{
 	  context->netid.next = netid;