import of dnsmasq-2.44.tar.gzv2.44

19 files changed, 327 insertions, 269 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 5c89987..9803153 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2582,3 +2582,20 @@ version 2.43
 
 	    Updated French translation. Thanks to Gildas Le Nadan.
 
+version 2.44
+            Fix  crash when unknown client attempts to renew a DHCP
+            lease, problem introduced in version 2.43. Thanks to
+            Carlos Carvalho for help chasing this down.
+
+	    Fix potential crash when a host which doesn't have a lease
+	    does DHCPINFORM. Again introduced in 2.43. This bug has
+	    never been reported in the wild.
+
+            Fix crash in netlink code introduced in 2.43. Thanks to
+            Jean Wolter for finding this.
+
+	    Change implementation of min_port to work even if min-port
+	    as large.
+
+	    Patch to enable compilation of latest Mac OS X. Thanks to
+	    David Gilman.
diff --git a/man/es/dnsmasq.8 b/man/es/dnsmasq.8
index e2cc9cd..47b472d 100644
--- a/man/es/dnsmasq.8
+++ b/man/es/dnsmasq.8
@@ -132,12 +132,20 @@ máximo recomendado en RFC2671 para ethernet.
 .TP
 .B \-Q, --query-port=<puerto>
 Enviar búsquedas outbound desde, y escuchar por respuestas en,
-el puerto UDP <puerto> en vez de usar uno escojido a la hora
-de inicio. Esto es útil para simplificar las reglas del firewall;
-sin esto, su firewall tendría que permitir conecciones desde
-servidores DNS foráneos hacia un rango de puertos UDP, o
-adaptarse dinámicamente al puerto siendo usado por la actual
-instancia de dnsmasq.
+el puerto UDP <puerto> en vez de usar puertos aleatorios. Nótese
+que usar esta opción hace que dnsmasq sea menos seguro contra
+ataques de spoofing DNS, pero puede ser más rápido y usar menos
+recursos.
+Fijar esta opción a zero hace que dnsmasq use un solo puerto,
+asignado por el sistema operativo (esto era el comportamiento
+predeterminado en versiones anteriores a 2.43).
+.TP
+.B --min-port=<puerto>
+No usar puertos menores a <puerto> como remitentes para búsquedas
+DNS outbound. Dnsmasq escoje puertos aleatorios como remitentes
+para búsquedas DNS outbound. Cuando esta opción es brindada, los
+puertos usados siempre serán mayores que el especificado. Esto es
+útil para sistemas detras de firewalls.
 .TP
 .B \-i, --interface=<nombre de interface>
 Escuchar solo en las interfaces especificadas. Dnsmasq automáticamente
@@ -403,6 +411,9 @@ comas.
 .B --ptr-record=<nombre>[,<target>]
 Retornar un récord DNS PTR.
 .TP
+.B --naptr-record=<nombre>,<orden>,<preferencia>,<opciones>,<servicio>,<regexp>[,<remplazo>]
+Retornar un récord DNS NAPTR, como especificado en RFC3403.
+.TP
 .B --interface-name=<nombre>,<interface>
 Retornar un récord DNS, asociando el nombre con la dirección primaria
 en la interface brindada. Esta opción especifica un expediente tipo A
@@ -709,8 +720,16 @@ servidor DHCP en la red. Cambia el comportamiento de RFC de tal manera
 que pedidos desde hosts no conocidos no serán ignorados. Esto permite que
 hosts nuevos puedan conseguir un arriendo sin sin un timeout bajo toda
 circunstancia. También permite que dnsmasq reconstruya su base de datos
-de arriendos sin que cada cliente requiera un arriendo, si la base de datos
-es perdida.
+de arriendos sin que cada cliente necesite readquirir un arriendo
+si la base de datos es perdida.
+.TP
+.B --dhcp-alternate-port[=<puerto de servidor>[,<puerto de cliente>]]
+Cambiar del predeterminado los puertos usados para DHCP. Si esta opción
+es brindada sola, sin argumentos, cambia los puertos usados para DHCP
+de 67 y 68 a 1067 y 1068. Si un solo argumento es brindado, ese puerto
+es usado para el servidor y el número de puerto mas uno es usado
+para el cliente. Finalmente, dos números permiten que se especifiquen
+ambos los puertos de servidor y cliente para DHCP.
 .TP
 .B \-3, --bootp-dynamic
 Habilitar alocación dinámica de direcciones IP a clientes BOOTP. Usar
@@ -784,6 +803,11 @@ con "del" y otros con "old". <path> debe ser un path absoluto, ninguna
 búsqueda PATH ocurre. Cuando dnsmasq recibe una señal HUP, el guión será
 invocado para arriendos existentes con un evento "old".
 .TP
+.B --dhcp-scriptuser
+Especificar el usuario como el cual se debe correr el archivo
+guión de cambio de arriendos. Este es root por predeterminado,
+pero puede ser cambiado a otro usuario mediante esta opción.
+.TP
 .B \-9, --leasefile-ro
 Suprimir completamente el uso del archivo de arriendos. El archivo no será
 creado, leído, ni escrito. Cambiar la manera en la cuál el archivo guión de
@@ -801,7 +825,7 @@ cuando hay cambios hechos a el client-id y tiempos de arriendo y vencimiento.
 .B --bridge-interface=<nombre de interface>,<alias>[,<alias>]
 Tratar paquetes de pedidos DHCP que llegan a cualquiera de las interfaces <alias>
 como si hubieran llegado a la interface <nombre de interface>. Esta opción solo
-está disponible en FreeBSD y Dragonfly BSD, y es necesaria cuando se usan
+está disponible en plataformas BSD, y es necesaria cuando se usan
 puentes "estilo viejo", ya que los paquetes llegan a interfaces tap que no
 tienen una dirección IP.
 .TP
@@ -830,9 +854,9 @@ en /etc/resolv.conf (o equivalente).
 .TP
 .B --enable-tftp
 Habilitar la función de servidor TFTP. Esto está deliberadamente limitado
-a lo necesario para hacerle a un cliente un inicio vía red: solo lectura es
-permitida, y solo en modo binario/octeto. Las extensiones "tsize" y "blksize"
-están soportadas.
+a lo necesario para hacerle a un cliente un inicio vía red. Solo lectura es
+permitida; las extensiones tsize y blksize son soportadas (tsize solo es
+soportada en modo octeto).
 .TP
 .B --tftp-root=<directorio>
 Buscar, relativo al directorio brindado, archivos para transferir mediante el
diff --git a/po/de.po b/po/de.po
index 2fb0f40..04ab748 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -765,7 +765,7 @@ msgstr ""
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
@@ -775,12 +775,12 @@ msgstr ""
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -839,53 +839,53 @@ msgstr ""
 msgid "failed to create TFTP socket: %s"
 msgstr ""
 
-#: network.c:624
+#: network.c:626
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:668
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr ""
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:695
+#: network.c:697
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
@@ -1303,32 +1303,32 @@ msgstr ""
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, c-format
 msgid "requested options: %s"
 msgstr ""
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, c-format
 msgid "next server: %s"
 msgstr ""
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index c16cd8d..c807326 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -67,7 +67,7 @@ msgstr "servidor %s#%d: búsquedas enviadas %u, reintentadas o fallidas %u"
 #: util.c:58
 #, fuzzy, c-format
 msgid "failed to seed the random number generator: %s"
-msgstr "no se pudo escuchar en socket: %s"
+msgstr "no se pudo crear valor semilla para el generador de números aleatorios: %s"
 
 #: util.c:166
 msgid "could not get memory"
@@ -193,7 +193,7 @@ msgstr "Trazar subscriber-id (identificación de suscritor) RFC3993 a etiqueta."
 #: option.c:243
 #, fuzzy
 msgid "Don't do DHCP for hosts with tag set."
-msgstr "No hacer DHCP para hosts con la etiqueta fijada."
+msgstr "No hacer DHCP para hosts con etiqueta fijada."
 
 #: option.c:244
 #, fuzzy
@@ -260,12 +260,12 @@ msgstr "Tamaño máximo de paquetes UDP soportado para EDNS.0 (%s por predetermina
 #: option.c:258
 #, fuzzy
 msgid "Log DNS queries."
-msgstr "Bitacorear búsquedas."
+msgstr "Bitacorear búsquedas DNS."
 
 #: option.c:259
 #, fuzzy
 msgid "Force the originating port for upstream DNS queries."
-msgstr "Enforzar el puerto original para búsquedas upstream."
+msgstr "Enforzar el puerto original para búsquedas DNS upstream."
 
 #: option.c:260
 msgid "Do NOT read resolv.conf."
@@ -403,7 +403,7 @@ msgstr "Bitacorear a esta facilidad syslog o archivo. (DAEMON por predeterminado
 
 #: option.c:293
 msgid "Do not use leasefile."
-msgstr ""
+msgstr "No usar archivo de arriendos."
 
 #: option.c:294
 #, fuzzy, c-format
@@ -474,20 +474,20 @@ msgstr "Fijar etiqueta si cliente incluye opción en pedido."
 
 #: option.c:310
 msgid "Use alternative ports for DHCP."
-msgstr ""
+msgstr "Usar puertos alternativos para DHCP."
 
 #: option.c:311
 msgid "Run lease-change script as this user."
-msgstr ""
+msgstr "Correr archivo guión de cambio de arriendos como este usuario."
 
 #: option.c:312
 #, fuzzy
 msgid "Specify NAPTR DNS record."
-msgstr "Especificar expediente DNS PTR."
+msgstr "Especificar expediente DNS NAPTR."
 
 #: option.c:313
 msgid "Specify lowest port available for DNS query transmission."
-msgstr ""
+msgstr "Especificar puerto más bajo disponible para transmisión de búsquedas DNS."
 
 #: option.c:564
 #, c-format
@@ -532,11 +532,11 @@ msgstr "opción dhcp-option demasiado larga"
 
 #: option.c:922
 msgid "illegal repeated flag"
-msgstr ""
+msgstr "opción repetida ilegal"
 
 #: option.c:930
 msgid "illegal repeated keyword"
-msgstr ""
+msgstr "palabra clave repetida ilegal"
 
 #: option.c:964
 #, fuzzy, c-format
@@ -585,7 +585,7 @@ msgstr "vinculación de interface no está soportado"
 #: option.c:1464
 #, fuzzy
 msgid "bad port range"
-msgstr "puerto erróneo"
+msgstr "rango de puertos erróneo"
 
 #: option.c:1481
 msgid "bad bridge-interface"
@@ -625,7 +625,7 @@ msgstr "expediente PTR erróneo"
 #: option.c:2064
 #, fuzzy
 msgid "bad NAPTR record"
-msgstr "expediente PTR erróneo"
+msgstr "expediente NAPTR erróneo"
 
 #: option.c:2090
 msgid "TXT record string too long"
@@ -718,7 +718,7 @@ msgstr "Dnsmasq es software libre, y usted está bienvenido a redistribuirlo\n"
 #: option.c:2496
 #, fuzzy, c-format
 msgid "under the terms of the GNU General Public License, version 2 or 3.\n"
-msgstr "bajo los términos de la GNU General Public License, versión 2.\n"
+msgstr "bajo los términos de la GNU General Public License, versión 2 o 3.\n"
 
 #: option.c:2507
 msgid "try --help"
@@ -746,7 +746,7 @@ msgstr "solo un archivo resolv.conf permitido en modo no-poll."
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "debe haber exáctamente un resolv.conf desde donde leer dominio."
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "no se pudo leer %s: %s"
@@ -756,12 +756,12 @@ msgstr "no se pudo leer %s: %s"
 msgid "no search directive found in %s"
 msgstr "ninguna directiva de búsqueda encontrada en %s"
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "servidor DNS %s se reusó a hacer una búsqueda recursiva"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr "posible ataque de revinculación DNS detectado"
 
@@ -820,53 +820,53 @@ msgstr "no se pudo escuchar en socket: %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "no se pudo crear socket TFTP: %s"
 
-#: network.c:624
+#: network.c:626
 #, fuzzy, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "no se pudo acoplar socket escuchador para %s: %s"
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "ignorando servidor DNS %s - interface local"
 
-#: network.c:668
+#: network.c:670
 #, fuzzy, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "ignorando servidor DNS %s - no se puede crear/acoplar socket: %s"
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "no calificado"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr "nombres"
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr "predeterminado"
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "dominio"
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "usando direcciones locales solo para %s %s"
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "usando servidor DNS %s#%d para %s %s"
 
-#: network.c:695
+#: network.c:697
 #, fuzzy, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "usando servidor DNS %s#%d(vía %s)"
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "usando servidor DNS %s#%d"
@@ -916,7 +916,7 @@ msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h"
 #: dnsmasq.c:233
 #, c-format
 msgid "unknown user or group: %s"
-msgstr ""
+msgstr "usuario o grupo desconocido: %s"
 
 #: dnsmasq.c:290
 #, c-format
@@ -1024,22 +1024,22 @@ msgstr "no se pudo crear ayudante: %s"
 #: dnsmasq.c:756
 #, fuzzy, c-format
 msgid "setting capabilities failed: %s"
-msgstr "advertencia: configuración de capacidades ha fallado: %s"
+msgstr "configuración de capacidades ha fallado: %s"
 
 #: dnsmasq.c:760
 #, fuzzy, c-format
 msgid "failed to change user-id to %s: %s"
-msgstr "advertencia: no se pudo cambiar dueño de %s: %s"
+msgstr "no se pudo cambiar user-id a %s: %s"
 
 #: dnsmasq.c:765
 #, fuzzy, c-format
 msgid "failed to change group-id to %s: %s"
-msgstr "advertencia: no se pudo cambiar dueño de %s: %s"
+msgstr "no se pudo cambiar group-id a %s: %s"
 
 #: dnsmasq.c:768
 #, fuzzy, c-format
 msgid "failed to open pidfile %s: %s"
-msgstr "no se pudo leer %s: %s"
+msgstr "no se pudo abrir archivo PID %s: %s"
 
 #: dnsmasq.c:771
 #, fuzzy, c-format
@@ -1288,32 +1288,32 @@ msgstr "arriendo estático disponible"
 msgid "address reserved"
 msgstr "dirección reservada"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr "etiquetas: %s"
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, fuzzy, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr "no se puede enviar opción DHCP/BOOTP %d: no queda espacio en paquete"
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, fuzzy, c-format
 msgid "requested options: %s"
 msgstr "opciones solicitadas: %s"
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, fuzzy, c-format
 msgid "next server: %s"
 msgstr "siguiente servidor: %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr "nombre de bootfile: %s"
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr "nombre de servidor: %s"
diff --git a/po/fi.po b/po/fi.po
index 3b21381..6374f37 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -722,7 +722,7 @@ msgstr ""
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
@@ -732,12 +732,12 @@ msgstr ""
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -796,53 +796,53 @@ msgstr ""
 msgid "failed to create TFTP socket: %s"
 msgstr ""
 
-#: network.c:624
+#: network.c:626
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:668
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr ""
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:695
+#: network.c:697
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
@@ -1260,32 +1260,32 @@ msgstr ""
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, c-format
 msgid "requested options: %s"
 msgstr ""
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, c-format
 msgid "next server: %s"
 msgstr ""
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d98dcc3..214eab9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.34\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -747,7 +747,7 @@ msgstr "seul un fichier resolv.conf est autorisé dans le mode no-poll"
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "un fichier resolv.conf (et un seul) est nécessaire pour y récuperer le nom de domaine."
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "impossible de lire %s : %m"
@@ -757,12 +757,12 @@ msgstr "impossible de lire %s : %m"
 msgid "no search directive found in %s"
 msgstr "pas de directive de recherche trouvée dans %s"
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "le serveur de nom %s a refusé de faire une recherche récursive"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr "détection d'une possible attaque de type DNS-rebind"
 
@@ -821,53 +821,53 @@ msgstr "impossible de lire sur la socket : %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "impossible de créer une socket de lecture : %s"
 
-#: network.c:624
+#: network.c:626
 #, fuzzy, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "impossible de lier la socket de lecture pour %s : %s"
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "ignore le serveur de nom %s - interface locale"
 
-#: network.c:668
+#: network.c:670
 #, fuzzy, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "ignore le serveur de nom %s - ne peut construire/lier la socket : %m"
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "non-qualifié(e)"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr "noms"
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr "défaut"
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "domaine"
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "utilise les adresses locales seulement pour %s %s"
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "utilise le serveur de nom %s#%d pour %s %s"
 
-#: network.c:695
+#: network.c:697
 #, fuzzy, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "utilise le serveur de nom %s#%d (via %s)"
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "utilise le serveur de nom %s#%d"
@@ -1288,32 +1288,32 @@ msgstr "bail statique disponible"
 msgid "address reserved"
 msgstr "adresse reservée"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr "options: %s"
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, fuzzy, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr "Impossible d'envoyer l'option DHCP %d : pas assez d'espace dans le paquet"
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, fuzzy, c-format
 msgid "requested options: %s"
 msgstr "options demandées : %s"
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, fuzzy, c-format
 msgid "next server: %s"
 msgstr "serveur suivant : %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr "nom de fichier 'bootfile' : %s"
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr "nom du serveur : %s"
diff --git a/po/id.po b/po/id.po
index efade78..a9f7a00 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -862,7 +862,7 @@ msgid "must have exactly one resolv.conf to read domain from."
 msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain."
 
 # OK
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "gagal membaca %s: %m"
@@ -874,12 +874,12 @@ msgid "no search directive found in %s"
 msgstr "tidak ditemukan direktif search di %s"
 
 # OK
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "nameserver %s menolak melakukan resolusi rekursif"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -948,61 +948,61 @@ msgstr "gagal mendengarkan di socket: %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "gagal membuat socket: %s "
 
-#: network.c:624
+#: network.c:626
 #, fuzzy, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "gagal mem-bind socket untuk mendengarkan %s: %s"
 
 # OK
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "mengabaikan nameserver %s - antarmuka lokal"
 
 # OK
-#: network.c:668
+#: network.c:670
 #, fuzzy, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %m"
 
 # OK
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "tidak memenuhi syarat"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
 # OK
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "domain"
 
 # OK
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "menggunakan alamat lokal saja untuk %s %s"
 
 # OK
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "menggunakan nameserver %s#%d untuk %s %s"
 
 # OK
-#: network.c:695
+#: network.c:697
 #, fuzzy, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "menggunakan nameserver %s#%d"
 
 # OK
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "menggunakan nameserver %s#%d"
@@ -1485,34 +1485,34 @@ msgstr "lease statik tak tersedia"
 msgid "address reserved"
 msgstr "alamat telah dipesan"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
 # OK
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, fuzzy, c-format
 msgid "requested options: %s"
 msgstr "pilihan-pilihan saat kompilasi: %s"
 
 # OK
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, fuzzy, c-format
 msgid "next server: %s"
 msgstr "DBus error: %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d47755f..fbbca98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.32\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\n"
 "PO-Revision-Date: 2006-05-22 11:09+0100\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -722,7 +722,7 @@ msgstr ""
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
@@ -732,12 +732,12 @@ msgstr ""
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -796,53 +796,53 @@ msgstr ""
 msgid "failed to create TFTP socket: %s"
 msgstr ""
 
-#: network.c:624
+#: network.c:626
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:668
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr ""
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:695
+#: network.c:697
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
@@ -1260,32 +1260,32 @@ msgstr ""
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, c-format
 msgid "requested options: %s"
 msgstr ""
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, c-format
 msgid "next server: %s"
 msgstr ""
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 01178ef..30d7e73 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -746,7 +746,7 @@ msgstr "kun en resolv.conf fil tillat i no-poll modus."
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "må ha nøyaktig en resolv.conf å lese domene fra."
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "feilet å lese %s: %m"
@@ -756,12 +756,12 @@ msgstr "feilet å lese %s: %m"
 msgid "no search directive found in %s"
 msgstr "intet søke direktiv funnet i %s"
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "navnetjener %s nektet å gjøre et rekursivt oppslag"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -820,53 +820,53 @@ msgstr "feilet å lytte på socket: %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "feilet å lage lytte socket: %s"
 
-#: network.c:624
+#: network.c:626
 #, fuzzy, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "feilet å binde lytte socket for %s: %s"
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "ignorerer navnetjener %s - lokal tilknytning"
 
-#: network.c:668
+#: network.c:670
 #, fuzzy, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m"
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "ikke kvalifisert"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "domene"
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "benytter lokale adresser kun for %s %s"
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "benytter navnetjener %s#%d for %s %s"
 
-#: network.c:695
+#: network.c:697
 #, fuzzy, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "benytter navnetjener %s#%d"
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "benytter navnetjener %s#%d"
@@ -1287,32 +1287,32 @@ msgstr "statisk leie tilgjengelig"
 msgid "address reserved"
 msgstr "adresse reservert"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, fuzzy, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken"
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, fuzzy, c-format
 msgid "requested options: %s"
 msgstr "kompilerings opsjoner: %s"
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, fuzzy, c-format
 msgid "next server: %s"
 msgstr "DBus feil: %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 908570c..30d3ff4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\n"
 "PO-Revision-Date: 2008-07-10 22:40+0200\n"
 "Last-Translator: Jan Psota <jasiu@belsznica.pl>\n"
 "Language-Team: Polski <pl@li.org>\n"
@@ -729,7 +729,7 @@ msgstr "w trybie no-poll mo¿na wskazaæ najwy¿ej jeden plik resolv.conf."
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "musisz mieæ dok³adnie jeden plik resolv.conf do odczytu domen."
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, c-format
 msgid "failed to read %s: %s"
 msgstr "nie uda³o siê odczytaæ %s: %s"
@@ -739,12 +739,12 @@ msgstr "nie uda³o siê odczytaæ %s: %s"
 msgid "no search directive found in %s"
 msgstr "brak wytycznych wyszukiwania w %s"
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "serwer nazw %s odmawia wykonania zapytania rekurencyjnego"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr "prawdopodobnie wykryto atak DNS-rebind"
 
@@ -803,53 +803,53 @@ msgstr "b³±d przy w³±czaniu nas³uchu na gnie¼dzie: %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "nie powiod³o siê otwieranie gniazda dla us³ugi TFTP: %s"
 
-#: network.c:624
+#: network.c:626
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "b³±d przy przyznawaniu nazwy gniazdu serwera %s: %s"
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "ignorowanie serwera nazw %s - interfejs lokalny"
 
-#: network.c:668
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "ignorowanie serwera nazw %s - nie mo¿na utworzyæ/dowi±zaæ gniazda: %s"
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "niekwalifikowane(-a)"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr "nazwy"
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr "domy¶lne"
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "domena"
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "u¿ywam adresów lokalnych tylko dla %s %s"
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "u¿ywam serwera nazw %s#%d dla %s %s"
 
-#: network.c:695
+#: network.c:697
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "u¿ywam serwera nazw %s#%d (przez %s)"
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "u¿ywam serwera nazw %s#%d"
@@ -1267,32 +1267,32 @@ msgstr "dostêpna statyczna dzier¿awa"
 msgid "address reserved"
 msgstr "adres zarezerwowany"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr "znaczniki: %s"
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr "nie mam mo¿liwo¶ci wys³ania opcji %d DHCP/BOOTP: niedostateczna ilo¶æ miejsca w pakiecie"
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, c-format
 msgid "requested options: %s"
 msgstr "wskazane opcje: %s"
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, c-format
 msgid "next server: %s"
 msgstr "nastêpny serwer: %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr "nazwa pliku bootowania: %s"
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr "nazwa serwera: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3fdca98..e493a00 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\n"
 "PO-Revision-Date: 2006-01-16 20:42+0000\n"
 "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
 "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -722,7 +722,7 @@ msgstr ""
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr ""
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, c-format
 msgid "failed to read %s: %s"
 msgstr ""
@@ -732,12 +732,12 @@ msgstr ""
 msgid "no search directive found in %s"
 msgstr ""
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr ""
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -796,53 +796,53 @@ msgstr ""
 msgid "failed to create TFTP socket: %s"
 msgstr ""
 
-#: network.c:624
+#: network.c:626
 #, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr ""
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr ""
 
-#: network.c:668
+#: network.c:670
 #, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr ""
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr ""
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr ""
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr ""
 
-#: network.c:695
+#: network.c:697
 #, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr ""
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr ""
@@ -1260,32 +1260,32 @@ msgstr ""
 msgid "address reserved"
 msgstr ""
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr ""
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, c-format
 msgid "requested options: %s"
 msgstr ""
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, c-format
 msgid "next server: %s"
 msgstr ""
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index be89ecf..f70f19d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-11 10:05+0100\n"
+"POT-Creation-Date: 2008-07-20 09:38+0100\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"
@@ -744,7 +744,7 @@ msgstr "se permite un singur fişier resolv.conf în modul no-poll"
 msgid "must have exactly one resolv.conf to read domain from."
 msgstr "am nevoie de un singur resolv.conf din care să citesc numele domeniului."
 
-#: option.c:2594 network.c:717
+#: option.c:2594 network.c:719
 #, fuzzy, c-format
 msgid "failed to read %s: %s"
 msgstr "nu pot citi %s: %n"
@@ -754,12 +754,12 @@ msgstr "nu pot citi %s: %n"
 msgid "no search directive found in %s"
 msgstr "nu s-a găsit nici un criteriu de căutare în %s"
 
-#: forward.c:403
+#: forward.c:405
 #, c-format
 msgid "nameserver %s refused to do a recursive query"
 msgstr "serverul DNS %s refuză interogările recursive"
 
-#: forward.c:431
+#: forward.c:433
 msgid "possible DNS-rebind attack detected"
 msgstr ""
 
@@ -818,53 +818,53 @@ msgstr "ascultarea pe socket a eÅŸuat: %s"
 msgid "failed to create TFTP socket: %s"
 msgstr "creearea socket-ului de ascultare a eÅŸuat: %s"
 
-#: network.c:624
+#: network.c:626
 #, fuzzy, c-format
 msgid "failed to bind server socket for %s: %s"
 msgstr "activarea socket-ului de ascultare pentru %s a eÅŸuat: %s"
 
-#: network.c:657
+#: network.c:659
 #, c-format
 msgid "ignoring nameserver %s - local interface"
 msgstr "ignorăm serverul DNS %s - interfaţă locală"
 
-#: network.c:668
+#: network.c:670
 #, fuzzy, c-format
 msgid "ignoring nameserver %s - cannot make/bind socket: %s"
 msgstr "ignorăm serverul DNS %s - nu pot creea/activa socket-ul: %s"
 
-#: network.c:683
+#: network.c:685
 msgid "unqualified"
 msgstr "invalid"
 
-#: network.c:683
+#: network.c:685
 msgid "names"
 msgstr ""
 
-#: network.c:685
+#: network.c:687
 msgid "default"
 msgstr ""
 
-#: network.c:687
+#: network.c:689
 msgid "domain"
 msgstr "domeniu"
 
-#: network.c:690
+#: network.c:692
 #, c-format
 msgid "using local addresses only for %s %s"
 msgstr "folosim adresele locale doar pentru %S %s"
 
-#: network.c:692
+#: network.c:694
 #, c-format
 msgid "using nameserver %s#%d for %s %s"
 msgstr "folosim serverul DNS %s#%d pentru %s %s"
 
-#: network.c:695
+#: network.c:697
 #, fuzzy, c-format
 msgid "using nameserver %s#%d(via %s)"
 msgstr "folosim serverul DNS %s#%d"
 
-#: network.c:697
+#: network.c:699
 #, c-format
 msgid "using nameserver %s#%d"
 msgstr "folosim serverul DNS %s#%d"
@@ -1288,32 +1288,32 @@ msgstr "împrumut static este disponibil"
 msgid "address reserved"
 msgstr "adresă rezervată"
 
-#: rfc2131.c:1304
+#: rfc2131.c:1307
 #, c-format
 msgid "tags: %s"
 msgstr ""
 
-#: rfc2131.c:1391
+#: rfc2131.c:1394
 #, fuzzy, c-format
 msgid "cannot send DHCP/BOOTP option %d: no space left in packet"
 msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet"
 
-#: rfc2131.c:1561
+#: rfc2131.c:1564
 #, fuzzy, c-format
 msgid "requested options: %s"
 msgstr "compilat cu opţiunile: %s"
 
-#: rfc2131.c:1610
+#: rfc2131.c:1613
 #, fuzzy, c-format
 msgid "next server: %s"
 msgstr "eroare DBus: %s"
 
-#: rfc2131.c:1634
+#: rfc2131.c:1637
 #, c-format
 msgid "bootfile name: %s"
 msgstr ""
 
-#: rfc2131.c:1637
+#: rfc2131.c:1640
 #, c-format
 msgid "server name: %s"
 msgstr ""
diff --git a/src/config.h b/src/config.h
index 92c40bf..25074c0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -14,7 +14,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define VERSION "2.43"
+#define VERSION "2.44"
 
 #define FTABSIZ 150 /* max number of outstanding requests (default) */
 #define MAX_PROCS 20 /* max no children for TCP requests */
@@ -245,8 +245,6 @@ typedef unsigned long in_addr_t;
 #define HAVE_SOCKADDR_SA_LEN
 /* Define before sys/socket.h is included so we get socklen_t */
 #define _BSD_SOCKLEN_T_
-/* This is not defined in Mac OS X arpa/nameserv.h */
-#define IN6ADDRSZ 16
  
 #elif defined(__NetBSD__)
 #define HAVE_BSD_NETWORK
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 57ae0f3..7616a47 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -248,9 +248,9 @@ int main (int argc, char **argv)
      call safe_malloc */
   if (ent_pw && ent_pw->pw_uid != 0)
     {
-      hdr = safe_malloc(sizeof(*hdr));
       int capsize = 1; /* for header version 1 */
-      
+      hdr = safe_malloc(sizeof(*hdr));
+
       /* find version supported by kernel */
       memset(hdr, 0, sizeof(*hdr));
       capget(hdr, NULL);
diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index a9616b0..973d810 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -33,10 +33,11 @@
 #include <netinet/in.h>
 
 #ifdef __APPLE__
-/* need this before arpa/nameser.h */
-#  define BIND_8_COMPAT
+#  include <nameser.h>
+#  include <arpa/nameser_compat.h>
+#else
+#  include <arpa/nameser.h>
 #endif
-#include <arpa/nameser.h>
 
 /* and this. */
 #include <getopt.h>
@@ -614,7 +615,8 @@ extern struct daemon {
   struct server *last_server;
   struct server *srv_save; /* Used for resend on DoD */
   size_t packet_len;       /*      "        "        */
-  pid_t tcp_pids[MAX_PROCS];
+  struct randfd *rfd_save; /*      "        "        */
+pid_t tcp_pids[MAX_PROCS];
   struct randfd randomsocks[RANDOM_SOCKS];
 
   /* DHCP state */
diff --git a/src/forward.c b/src/forward.c
index 44624e2..9d9dd8c 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -302,6 +302,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
 		      if (!forward->rfd6 &&
 			  !(forward->rfd6 = allocate_rfd(AF_INET6)))
 			break;
+		      daemon->rfd_save = forward->rfd6;
 		      fd = forward->rfd6->fd;
 		    }
 		  else
@@ -310,6 +311,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
 		      if (!forward->rfd4 &&
 			  !(forward->rfd4 = allocate_rfd(AF_INET)))
 			break;
+		      daemon->rfd_save = forward->rfd4;
 		      fd = forward->rfd4->fd;
 		    }
 		}
diff --git a/src/netlink.c b/src/netlink.c
index 299f3f7..d205f55 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -240,10 +240,20 @@ static void nl_routechange(struct nlmsghdr *h)
   if (h->nlmsg_type == RTM_NEWROUTE && daemon->srv_save)
     {
       struct rtmsg *rtm = NLMSG_DATA(h);
-      if (rtm->rtm_type == RTN_UNICAST &&
-	  rtm->rtm_scope == RT_SCOPE_LINK) 
-	while(sendto(daemon->srv_save->sfd->fd, daemon->packet, daemon->packet_len, 0,
-		     &daemon->srv_save->addr.sa, sa_len(&daemon->srv_save->addr)) == -1 && retry_send()); 
+      int fd;
+
+      if (rtm->rtm_type != RTN_UNICAST || rtm->rtm_scope != RT_SCOPE_LINK)
+	return;
+
+      if (daemon->srv_save->sfd)
+	fd = daemon->srv_save->sfd->fd;
+      else if (daemon->rfd_save && daemon->rfd_save->refcount != 0)
+	fd = daemon->rfd_save->fd;
+      else
+	return;
+
+      while(sendto(fd, daemon->packet, daemon->packet_len, 0,
+		   &daemon->srv_save->addr.sa, sa_len(&daemon->srv_save->addr)) == -1 && retry_send()); 
     }
 }
 #endif
diff --git a/src/network.c b/src/network.c
index 9b290f9..90f556e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -450,23 +450,25 @@ int random_sock(int family)
 
   if ((fd = socket(family, SOCK_DGRAM, 0)) != -1)
     {
-      union  mysockaddr addr;
-      
+      union mysockaddr addr;
+      unsigned short ports_avail = 65536u - (unsigned short)daemon->min_port;
+      int i;
+
       memset(&addr, 0, sizeof(addr));
-      addr.in.sin_family = family;
+      addr.sa.sa_family = family;
 
       if (fix_fd(fd))
-	while (1)
+	for (i = ports_avail; i != 0; i--)
 	  {
 	    unsigned short port = rand16();
 	    
-	    if (port <= (unsigned short) daemon->min_port)
-	      continue;
+	    if (daemon->min_port != 0)
+	      port = htons(daemon->min_port + (port % ports_avail));
 	    
 	    if (family == AF_INET) 
 	      {
 		addr.in.sin_addr.s_addr = INADDR_ANY;
-		addr.in.sin_port = htons(port);
+		addr.in.sin_port = port;
 #ifdef HAVE_SOCKADDR_SA_LEN
 		addr.in.sin_len = sizeof(struct sockaddr_in);
 #endif
@@ -475,7 +477,7 @@ int random_sock(int family)
 	    else
 	      {
 		addr.in6.sin6_addr = in6addr_any; 
-		addr.in6.sin6_port = htons(port);
+		addr.in6.sin6_port = port;
 #ifdef HAVE_SOCKADDR_SA_LEN
 		addr.in6.sin6_len = sizeof(struct sockaddr_in6);
 #endif
diff --git a/src/rfc2131.c b/src/rfc2131.c
index 1da7b15..752d1f5 100644
--- a/src/rfc2131.c
+++ b/src/rfc2131.c
@@ -1040,12 +1040,15 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
 	  context->netid.next = netid;
 	  netid = &context->netid;
 	}
-       
-      if (lease && override.s_addr != 0)
-	lease->override = override;
-      else
-	override = lease->override;
       
+      if (lease)
+	{
+	  if (override.s_addr != 0)
+	    lease->override = override;
+	  else
+	    override = lease->override;
+	}
+
       clear_packet(mess, end, agent_id);
       option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
       option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override).s_addr));
@@ -1123,9 +1126,9 @@ static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *
 
 static struct in_addr server_id(struct dhcp_context *context, struct in_addr override)
 {
-  if (override.s_addr != 0)
+  if (override.s_addr != 0 || !context)
     return override;
-  else
+  else 
     return context->local;
 }