import of dnsmasq-2.49.tar.gz

CHANGELOG

+version 2.49
+            Fix regression in 2.48 which disables the lease-change
+            script. Thanks to Jose Luis Duran for spotting this.
+
+	    Log TFTP "file not found" errors. These were not logged,
+	    since a normal PXELinux boot generates many of them, but
+	    the lack of the messages seems to be more confusing than
+	    routinely seeing them when there is no real error.
+
+	    Update Spanish translation. Thanks to Chris Chatham.
+ 
+
 version 2.48
             Archived the extensive, backwards, changelog to
             CHANGELOG.archive. The current changelog now runs from

po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -708,7 +708,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %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: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -391,7 +391,7 @@ msgstr "Tratar pedidos DHCP en alias como si llegaran de la interface."
 
 #: option.c:296
 msgid "Disable ICMP echo address checking in the DHCP server."
-msgstr "Deshabilitar verificacin de direccines echo ICMP en el servidor DHCP."
+msgstr "Deshabilitar verificacin de direccines para echo ICMP en el servidor DHCP."
 
 #: option.c:297
 msgid "Script to run on DHCP lease creation and destruction."
@@ -476,7 +476,7 @@ msgstr "Siempre realizar b
 #: option.c:316
 #, fuzzy
 msgid "Set tag if client includes matching option in request."
-msgstr "Fijar etiqueta si cliente incluye opcin en pedido."
+msgstr "Fijar etiqueta si cliente incluye opcin coincidente en pedido."
 
 #: option.c:317
 msgid "Use alternative ports for DHCP."
@@ -506,15 +506,15 @@ msgstr "Especificar nombre alias para nombre DNS LOCAL."
 #: option.c:323
 #, fuzzy
 msgid "Prompt to send to PXE clients."
-msgstr "Especificar opciones para ser enviadas a clientes DHCP."
+msgstr "Aviso a ser enviado a clientes PXE."
 
 #: option.c:324
 msgid "Boot service for PXE menu."
-msgstr ""
+msgstr "Servico boot para men PXE."
 
 #: option.c:325
 msgid "Check configuration syntax."
-msgstr ""
+msgstr "Revisar sintaxis de configuracin."
 
 #: option.c:601
 #, c-format
@@ -559,7 +559,7 @@ msgstr "opci
 
 #: option.c:945
 msgid "illegal dhcp-match"
-msgstr ""
+msgstr "dhcp-match ilegal"
 
 #: option.c:981
 msgid "illegal repeated flag"
@@ -641,7 +641,7 @@ msgstr "n
 #: option.c:2238
 #, fuzzy
 msgid "invalid alias range"
-msgstr "peso invlido"
+msgstr "rango alias invlido"
 
 #: option.c:2250
 #, fuzzy
@@ -688,14 +688,14 @@ msgstr "peso inv
 
 #: option.c:2460
 msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)"
-msgstr ""
+msgstr "opcin no soportada (verificar que dnsmasq fue compilado con soporte para DHCP/TFTP/DBus)"
 
 #: option.c:2503
 #, c-format
 msgid "files nested too deep in %s"
 msgstr "archivos jerarquizados demasiado profundo en %s"
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "no se puede leer %s: %s"
@@ -801,7 +801,7 @@ msgstr "debe haber un dominio predeterminado cuando --dhcp-fqdn est
 
 #: option.c:2934
 msgid "syntax check OK"
-msgstr ""
+msgstr "revisin de sintaxis OK"
 
 #: forward.c:405
 #, c-format
@@ -1001,7 +1001,7 @@ msgstr "DHCP, arriendos est
 #: dnsmasq.c:498
 #, c-format
 msgid "DHCP, proxy on subnet %.0s%s%.0s"
-msgstr ""
+msgstr "DHCP, proxy en subred %.0s%s%.0s"
 
 #: dnsmasq.c:499
 #, c-format
@@ -1127,7 +1127,7 @@ msgstr "no se puede crear socket crudo ICMP: %s."
 #: dhcp.c:226
 #, c-format
 msgid "DHCP packet received on %s which has no address"
-msgstr "Paquete DHCP recibido en %s sin direccin"
+msgstr "Paquete DHCP recibido en %s que no tiene direccin"
 
 #: dhcp.c:385
 #, c-format
@@ -1233,7 +1233,7 @@ msgstr "no sobra ning
 #: rfc2131.c:558
 #, fuzzy, c-format
 msgid "%u client provides name: %s"
-msgstr "%u nombre de servidor: %s"
+msgstr "%u cliente provee nombre: %s"
 
 #: rfc2131.c:696
 #, c-format
@@ -1247,7 +1247,7 @@ msgstr "%u Clase de usuario: %s"
 
 #: rfc2131.c:733
 msgid "PXE BIS not supported"
-msgstr ""
+msgstr "no hay soporte para BIS PXE"
 
 #: rfc2131.c:849
 #, fuzzy, c-format
@@ -1337,7 +1337,7 @@ msgstr "no se puede enviar opci
 
 #: rfc2131.c:1903
 msgid "PXE menu too large"
-msgstr ""
+msgstr "men PXE demasiado grande"
 
 #: rfc2131.c:2018
 #, c-format

po/fi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -670,7 +670,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""

po/fr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.48\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-03 22:06+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+0100\n"
 "PO-Revision-Date: 2009-06-03 21:56+0100\n"
 "Last-Translator:  Gildas Le Nadan <3ntr0p13@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -694,7 +694,7 @@ msgstr "option non support
 msgid "files nested too deep in %s"
 msgstr "trop de niveaux de récursion pour les fichiers dans %s"
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "Ne peut pas lire %s : %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: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -795,7 +795,7 @@ msgid "files nested too deep in %s"
 msgstr ""
 
 # OK
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "tidak bisa membaca %s: %s"

po/it.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.32\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -670,7 +670,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""

po/no.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "kan ikke lese %s: %s"

po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+0100\n"
 "PO-Revision-Date: 2009-02-01 01:14+0100\n"
 "Last-Translator: Jan Psota <jasiu@belsznica.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -675,7 +675,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr "zbyt due zagbienie plikw w %s"
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "bd odczytu z pliku %s: %s"

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: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -670,7 +670,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""

po/ro.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dnsmasq 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 12:41+0100\n"
+"POT-Creation-Date: 2009-06-10 20:57+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"
@@ -692,7 +692,7 @@ msgstr ""
 msgid "files nested too deep in %s"
 msgstr ""
 
-#: option.c:2511 tftp.c:500
+#: option.c:2511 tftp.c:499
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "nu pot citi %s: %s"

src/config.h

@@ -14,7 +14,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define VERSION "2.48"
+#define VERSION "2.49"
 
 #define FTABSIZ 150 /* max number of outstanding requests (default) */
 #define MAX_PROCS 20 /* max no children for TCP requests */

src/dnsmasq.c

@@ -603,7 +603,7 @@ int main (int argc, char **argv)
       bump_maxfd(piperead, &maxfd);
 
 #ifdef HAVE_DHCP
-#  ifdef NO_FORK
+#  ifndef NO_FORK
       while (helper_buf_empty() && do_script_run(now));
 
       if (!helper_buf_empty())

src/tftp.c

@@ -489,8 +489,7 @@ static ssize_t tftp_err(int err, char *packet, char *message, char *file)
   mess->op = htons(OP_ERR);
   mess->err = htons(err);
   ret += (snprintf(mess->message, 500,  message, file, errstr) + 1);
-  if (err != ERR_FNF)
-    my_syslog(MS_TFTP | LOG_ERR, "TFTP %s", mess->message);
+  my_syslog(MS_TFTP | LOG_ERR, "TFTP %s", mess->message);
   
   return  ret;
 }