Skip to content

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

import of dnsmasq-2.25.tar.gz

parent b8187c80
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2171 additions and 354 deletions
CHANGELOG
View file @ e17fb629
......@@ -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
View file @ e17fb629
......@@ -357,6 +357,19 @@ A: Probably the nameserver is an authoritative nameserver for a
may work for sometime with a broken upstream nameserver
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
View file @ e17fb629
......@@ -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
View file @ e17fb629
......@@ -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
View file @ e17fb629
......@@ -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
msgid "wrong network"
msgstr ""
#: rfc2131.c:627
#: rfc2131.c:642
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
View file @ e17fb629
......@@ -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 errneo en %s lnea %d"
#: cache.c:628 dhcp.c:736
#: cache.c:628 dhcp.c:751
#, c-format
msgid "bad name at %s line %d"
msgstr "nombre errneo en %s lnea %d"
#: cache.c:634 dhcp.c:787
#: cache.c:634 dhcp.c:802
#, c-format
msgid "read %s - %d addresses"
msgstr "direccines %s - %d ledas"
......@@ -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 ""
"Integracin 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 direccin %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 "versin %s iniciada, tamao de cach %d"
#: dnsmasq.c:292
#: dnsmasq.c:295
#, c-format
msgid "started, version %s cache disabled"
msgstr "versin %s iniciada, cach deshabilitado"
#: dnsmasq.c:294
#: dnsmasq.c:297
#, c-format
msgid "compile time options: %s"
msgstr "opciones de compilacin: %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: coneccin a bus pendiente"
#: dnsmasq.c:307
#: dnsmasq.c:310
msgid "setting --bind-interfaces option because of OS limitations"
msgstr ""
"fijando opcin --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 estticos 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 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 "direccin 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 mscara 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 errneo en %s lnea %d"
#: dhcp.c:810
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "direccin 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 "direccin en uso"
......@@ -795,57 +799,57 @@ msgstr "direcci
msgid "no address configured"
msgstr "ninguna direccin configurada"
#: rfc2131.c:281 rfc2131.c:522
#: rfc2131.c:288 rfc2131.c:534
msgid "no address available"
msgstr "ninguna direccin disponible"
#: rfc2131.c:285 rfc2131.c:646
#: rfc2131.c:295 rfc2131.c:661
msgid "no leases left"
msgstr "no queda ningn 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 direccin DHCP esttica %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 "direccin equivocada"
#: rfc2131.c:601
#: rfc2131.c:616
msgid "lease not found"
msgstr "arriendo no encontrado"
#: rfc2131.c:619
msgid "wrong network"
msgstr "red equivocada"
#: rfc2131.c:627
#: rfc2131.c:642
msgid "address not available"
msgstr "direccin no disponible"
#: rfc2131.c:636
#: rfc2131.c:651
msgid "static lease available"
msgstr "arriendo esttico disponible"
#: rfc2131.c:640
#: rfc2131.c:655
msgid "address reserved"
msgstr "direccin 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 opcin 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 "Ms de una clase de vendedor coincide, usando %s"
......
po/fi.po 0 → 100644
View file @ e17fb629
This diff is collapsed.
po/fr.po
View file @ e17fb629
......@@ -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
msgid "wrong network"
msgstr "mauvais reseau"
#: rfc2131.c:627
#: rfc2131.c:642
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
View file @ e17fb629
......@@ -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
msgid "wrong network"
msgstr "jaringan yang salah"
# OK
#: rfc2131.c:627
#: rfc2131.c:642
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 → 100644
View file @ e17fb629
This diff is collapsed.
po/pl.po
View file @ e17fb629
......@@ -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 Sochaski <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 "bd 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 "bdna 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 "bdna 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 adresw"
......@@ -505,7 +505,7 @@ msgid "forwarding table overflow: check for server loops."
msgstr ""
"przekroczenie zakresu tablicy przekazywania: sprawd zaptlenie serwera."
#: isc.c:71 dnsmasq.c:471
#: isc.c:71 dnsmasq.c:474
#, c-format
msgid "failed to access %s: %m"
msgstr "bd w dostpie do %s: %m"
......@@ -589,102 +589,102 @@ msgstr "u
msgid "using nameserver %s#%d"
msgstr "uywany 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 dostpna: 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 "bd w znalezieniu listy interfejsw 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 mona otworzy %s:%s"
#: dnsmasq.c:160
#: dnsmasq.c:163
msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "musisz ustawi dokadnie 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 "bd DBus: %s"
#: dnsmasq.c:177
#: dnsmasq.c:180
msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus jest niedostpny: 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 cache %d"
#: dnsmasq.c:292
#: dnsmasq.c:295
#, c-format
msgid "started, version %s cache disabled"
msgstr "uruchomiony, wersja %s cache wyczony"
#: 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 "obsuga DBus wczona: podczono do szyny systemowej"
#: dnsmasq.c:302
#: dnsmasq.c:305
msgid "DBus support enabled: bus connection pending"
msgstr "obsuga DBus wczona: podczanie do szyny systemowej w toku"
#: dnsmasq.c:307
#: dnsmasq.c:310
msgid "setting --bind-interfaces option because of OS limitations"
msgstr "ustawiam opcj --bind-interfaces z powodu limitw systemu operacyjnego"
#: dnsmasq.c:312
#: dnsmasq.c:315
#, c-format
msgid "warning: interface %s does not currently exist"
msgstr "ostrzeenie: 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 dzierawy tylko na %.0s%s, czas dzierawy %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 dzierawy %s"
#: dnsmasq.c:341
#: dnsmasq.c:344
#, c-format
msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s bdzie zapisywane co %s"
#: dnsmasq.c:346
#: dnsmasq.c:349
msgid "running as root"
msgstr "pracuje z uprawnieniami uytkownika root"
#: dnsmasq.c:506
#: dnsmasq.c:509
msgid "connected to system DBus"
msgstr "poczono do systemowego DBus"
#: dnsmasq.c:517
#: dnsmasq.c:520
msgid "exiting on receipt of SIGTERM"
msgstr "wyczenie po otrzymaniu sygnalu SIGTERM"
......@@ -732,27 +732,31 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive."
msgstr "powtrzenie 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 niespjny z mask sieciow %s"
#: dhcp.c:690
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr "bd odczytu %s:%m"
#: dhcp.c:709
#: dhcp.c:724
#, fuzzy, c-format
msgid "bad line at %s line %d"
msgstr "bdna nazwa w %s, linia %d"
#: dhcp.c:810
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "powtrzenie 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 "wyczony(a)"
#: rfc2131.c:272 rfc2131.c:643
#: rfc2131.c:272 rfc2131.c:658
msgid "address in use"
msgstr "adres w uyciu"
......@@ -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 dostpnego adresu"
#: rfc2131.c:285 rfc2131.c:646
#: rfc2131.c:295 rfc2131.c:661
msgid "no leases left"
msgstr "brak wolnych dzieraw"
#: rfc2131.c:481
#: rfc2131.c:298 rfc2131.c:634
msgid "wrong network"
msgstr "nieprawidowa sie"
#: rfc2131.c:493
#, c-format
msgid "disabling DHCP static address %s"
msgstr "wyczanie statycznego adresu DHCP %s"
#: rfc2131.c:499
#: rfc2131.c:511
msgid "unknown lease"
msgstr "nieznana dzierawa"
#: rfc2131.c:512 rfc2131.c:718
#: rfc2131.c:524 rfc2131.c:732
msgid "ignored"
msgstr "ignoruj"
#: rfc2131.c:592
#: rfc2131.c:607
msgid "wrong address"
msgstr "bdny adres"
#: rfc2131.c:601
#: rfc2131.c:616
msgid "lease not found"
msgstr "dzierawa nie znaleziona"
#: rfc2131.c:619
msgid "wrong network"
msgstr "nieprawidowa sie"
#: rfc2131.c:627
#: rfc2131.c:642
msgid "address not available"
msgstr "adres niedostpny"
#: rfc2131.c:636
#: rfc2131.c:651
msgid "static lease available"
msgstr "dostpna statyczna dzierawa"
#: 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 "Wicej ni jeden dystrybutor pasujcy, uywam %s"
......
po/ro.po
View file @ e17fb629
......@@ -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
msgid "wrong network"
msgstr "reţea greşită"
#: rfc2131.c:627
#: rfc2131.c:642
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
View file @ e17fb629
--- 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-08 20:57:56.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
View file @ e17fb629
/* 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__)
#undef HAVE_LINUX_IPV6_PROC
#if defined(__uClinux__)
#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
View file @ e17fb629
......@@ -224,7 +224,17 @@ void dhcp_packet(struct daemon *daemon, time_t now)
#endif
{
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 context on the subnet. (If there's more than one, this is a dodgy configuration:
maybe there should be a warning.) */
any dhcp-range. In that case we return a static range if possible, or failing that,
any context on the correct subnet. (If there's more than one, this is a dodgy
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;
for (tmp = context; tmp; tmp = tmp->current)
if (is_same_net(taddr, tmp->start, tmp->netmask))
return tmp;
return context;
return NULL;
}
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr)
......
src/dnsmasq.c
View file @ e17fb629
......@@ -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
View file @ e17fb629
......@@ -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
View file @ e17fb629
......@@ -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 &&
add_resource_record(header, limit, &trunc, nameoffset, &ansp, 0, NULL,
T_TXT, t->class, "t", t->len, t->txt))
anscount++;
if (!dryrun)
{
log_query(F_CNAME | F_FORWARD | F_CONFIG | F_NXDOMAIN, name, NULL, 0, NULL, 0);
if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
daemon->local_ttl, NULL,
T_TXT, t->class, "t", t->len, t->txt))
anscount++;
}
}
}
}
......
src/rfc2131.c
View file @ e17fb629
......@@ -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. */
......@@ -608,14 +623,14 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
}
log_packet("REQUEST", &mess->yiaddr, chaddr, iface_name, NULL);
if (!message)
{
struct dhcp_config *addr_config;
/* If a machine moves networks whilst it has a lease, we catch that here. */
if (!is_same_net(mess->yiaddr, context->start, context->netmask))
if (!(context = narrow_context(context, mess->yiaddr)))
{
/* If a machine moves networks whilst it has a lease, we catch that here. */
message = _("wrong network");
/* ensure we broadcast NAK */
unicast_dest = 0;
......@@ -625,7 +640,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else if (!address_available(context, mess->yiaddr) &&
(!have_config(config, CONFIG_ADDR) || config->addr.s_addr != mess->yiaddr.s_addr))
message = _("address not available");
/* Check if a new static address has been configured. Be very sure that
when the client does DISCOVER, it will get the static address, otherwise
an endless protocol loop will ensue. */
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment