diff --git a/CHANGELOG b/CHANGELOG index 95da9c2..6c9bf72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1785,3 +1785,23 @@ version 2.28 ignored, since this may be unreliable. This means that a DHCP client must use the standard port to do full configuration. +version 2.29 + Fixed compilation on OpenBSD (thanks to Tom Hensel for the + report). + + Fixed false "no interface" errors when --bind-interfaces is + set along with --interface=lo or --listen-address. Thanks + to Paul Wise for the report. + + Updated patch for SuSE rpm. Thanks to Steven Springl. + + It turns out that there are some Linux kernel + configurations which make using the capability system + impossible. If this situation occurs then continue, running + as root, and log a warning. Thanks to Scott Wehrenberg + for help tracking this down. + + + + + diff --git a/FAQ b/FAQ index 7eefbd4..40805c8 100644 --- a/FAQ +++ b/FAQ @@ -369,6 +369,7 @@ A: Yes, dynmaically allocated IP addresses are checked by sending an other DHCP requests during this time. To avoid dropping requests, the address probe may be skipped when dnsmasq is under heavy load. + Q: I'm using dnsmasq on a machine with the Firestarter firewall, and DHCP doesn't work. What's the problem? @@ -376,7 +377,13 @@ A: This a variant on the iptables problem. Explicit details on how to proceed can be found at http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2005q3/000431.html - + +Q: Dnsmasq logs "running as root because setting capabilities failed" + when it starts up. Why did that happen and what can do to fix it? + +A: Change your kernel configuration: either deselect CONFIG_SECURITY + _or_ select CONFIG_SECURITY_CAPABILITIES. + diff --git a/dnsmasq-rh.spec b/dnsmasq-rh.spec index cdc27c6..df2efcf 100644 --- a/dnsmasq-rh.spec +++ b/dnsmasq-rh.spec @@ -5,7 +5,7 @@ ############################################################################### Name: dnsmasq -Version: 2.28 +Version: 2.29 Release: 1 License: GPL Group: System Environment/Daemons diff --git a/dnsmasq-suse.spec b/dnsmasq-suse.spec index afdbf41..40fca66 100644 --- a/dnsmasq-suse.spec +++ b/dnsmasq-suse.spec @@ -5,7 +5,7 @@ ############################################################################### Name: dnsmasq -Version: 2.28 +Version: 2.29 Release: 1 Copyright: GPL Group: Productivity/Networking/DNS/Servers diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index 458bd8f..5b7959a 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -102,14 +102,11 @@ or options are given dnsmasq listens on all available interfaces except any given in .B \--except-interface -options. If IP alias interfaces (eg "eth1:0") are used with +options. IP alias interfaces (eg "eth1:0") cannot be used with .B --interface or .B --except-interface -options, then the -.B --bind-interfaces -option will be automatically set. This is required for deeply boring -sockets-API reasons. +options, use --listen-address instead. .TP .B \-I, --except-interface= Do not listen on the specified interface. Note that the order of @@ -148,9 +145,7 @@ working even when interfaces come and go and change address. This option forces dnsmasq to really bind only the interfaces it is listening on. About the only time when this is useful is when running another nameserver (or another instance of dnsmasq) on the -same machine or when using IP -alias. Specifying interfaces with IP alias automatically turns this -option on. Setting this option also enables multiple instances of +same machine. Setting this option also enables multiple instances of dnsmasq which provide DHCP service to run in the same machine. .TP .B \-y, --localise-queries diff --git a/po/de.po b/po/de.po index 03857c9..0f892ea 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-09-27 09:37+0100\n" "Last-Translator: Simon Kelley \n" "Language-Team: German \n" @@ -70,7 +70,7 @@ msgstr "" # @Simon: I would prefer to use "noch gültige" = "still valid", would that fit to the sense? Then it would be: # @Simon: msgstr "Cache Größe %d, %d/%d Cache-Einfügungen verwendeten noch gültige Cache-Einträge wieder." # @Simon: btw, what is the "%d/%d"-part? -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "Speicher nicht verfügbar" @@ -447,102 +447,102 @@ msgstr "" msgid "bad MX target" msgstr "" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "" -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "" @@ -556,7 +556,7 @@ msgstr "" msgid "forwarding table overflow: check for server loops." msgstr "" -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "" @@ -566,7 +566,7 @@ msgstr "" msgid "failed to load %s: %m" msgstr "" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "" @@ -581,157 +581,157 @@ msgstr "" msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:141 +#: dnsmasq.c:145 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "" @@ -894,12 +894,12 @@ msgstr "" msgid "More than one vendor class matches, using %s" msgstr "" -#: netlink.c:41 +#: netlink.c:51 #, c-format msgid "cannot create RTnetlink socket: %s" msgstr "" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/es.po b/po/es.po index 55e1c28..0c84c13 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-10-07 11:04+0100\n" "Last-Translator: Christopher Chatham \n" "Language-Team: Spanish \n" @@ -57,7 +57,7 @@ msgstr "" "tamaño de caché %d, %d/%d inserciónes de caché reutilizaron entradas no " "vencidas." -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "no se pudo conseguir memoria" @@ -417,102 +417,102 @@ msgstr "nombre MX err msgid "bad MX target" msgstr "destino MX erróneo" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "puerto erróneo" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "dhcp-range (rango DHCP) erróneo" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "rango DHCP inconsistente" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "dhcp-host erróneo" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "dhcp-option erróneo" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "dominio erróneo en dhcp-option" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "opción dhcp-option demasiado larga" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "récord TXT erróneo" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "récord TXT demasiado largo" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "récord SRV erróneo" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "destino SRV erróneo" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "número de puerto inválido" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "prioridad inválida" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "peso inválido" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "error" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "opciones de línea de comandos erróneas: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "no se puede obtener host-name (nombre de host): %s" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "solo un archivo resolv.conf permitido en modo no-poll." -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "debe haber exactamente un resolv.conf desde donde leer dominio." -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "no se pudo leer %s: %m" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "ninguna directiva de búsqueda encontrada en %s" @@ -527,7 +527,7 @@ msgid "forwarding table overflow: check for server loops." msgstr "" "desbordamiento en la tabla de reenvio: revisar si hay loops de servidor." -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "no se pudo accesar %s: %m" @@ -537,7 +537,7 @@ msgstr "no se pudo accesar %s: %m" msgid "failed to load %s: %m" msgstr "no se pudo cargar %s: %m" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "leyendo %s" @@ -553,159 +553,159 @@ msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "" "Ignorando arriendo DHCP para %s porque tiene una parte ilegal de dominio" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "no se pudo crear un socket escuchador: %s" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "no se pudo fijar opciones IPv6 sobre el socket escuchador: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "no se pudo acoplar socket escuchador para %s: %s" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "no se pudo escuchar en el socket: %s" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorando servidor DNS %s - interface local" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "ignorando servidor DNS %s - no se pudo crear/acoplar socket: %m" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "dominio" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "no calificado" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "dominios" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "usando direcciones locales solo para %s %s" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "usando servidor DNS %s#%d para %s %s" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "usando servidor DNS %s#%d" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "Integración dhcpd ISC no disponible: fijar HAVE_ISC_READER en src/config.h" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "no se pudo encontrar lista de interfaces: %s" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "interface desconocida %s" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "ninguna interface con dirección %s" -#: dnsmasq.c:141 +#: dnsmasq.c:145 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:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "error DBus: %s" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "no se puede leer %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "versión %s iniciada, tamaño de caché %d" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "versión %s iniciada, caché deshabilitado" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "opciones de compilación: %s" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "soporte DBus habilitado: conectado a bus de sistema" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "soporte DBus habilitado: conección a bus pendiente" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" "fijando opción --bind-interfaces debido a limitaciones de sistema operativo" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "advertencia: interface %s no existe actualmente" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, arriendos estáticos solo en %.0s%s, tiempo de arriendo %s" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, rango de IP %s -- %s, tiempo de arriendo %s" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "corriendo como root" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "haciendo exit al haber recibido SIGTERM" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "conectado a DBus de sistema" @@ -869,12 +869,12 @@ msgstr "no se puede enviar opci msgid "More than one vendor class matches, using %s" msgstr "Más de una clase de vendedor coincide, usando %s" -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "no se puede acoplar socket netlink: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/fi.po b/po/fi.po index 71ab12e..0e95737 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-11-28 22:05+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Finnish \n" @@ -53,7 +53,7 @@ msgid "" "entries." msgstr "" -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "" @@ -398,102 +398,102 @@ msgstr "" msgid "bad MX target" msgstr "" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "" -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "" @@ -507,7 +507,7 @@ msgstr "" msgid "forwarding table overflow: check for server loops." msgstr "" -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "" @@ -517,7 +517,7 @@ msgstr "" msgid "failed to load %s: %m" msgstr "" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "" @@ -532,157 +532,157 @@ msgstr "" msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:141 +#: dnsmasq.c:145 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "" @@ -845,12 +845,12 @@ msgstr "" msgid "More than one vendor class matches, using %s" msgstr "" -#: netlink.c:41 +#: netlink.c:51 #, c-format msgid "cannot create RTnetlink socket: %s" msgstr "" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/fr.po b/po/fr.po index 994efe8..7e9b019 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-10-02 19:05+0100\n" "Last-Translator: Lionel Tricon \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "" "taille de cache %d, %d/%d insertions dans le cache ont reutilisees des " "entrees qui n'ont pas expirees" -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "impossible d'allouer de la memoire" @@ -427,104 +427,104 @@ msgstr "mauvais nom MX" msgid "bad MX target" msgstr "mauvaise cible MX" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "mauvais port" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "mauvaise plage d'adresses DHCP (dhcp-range)" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "plage d'adresses DHCP incoherente" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "mauvais dhcp-host" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "mauvais dhcp-option" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "mauvais domaine dans dhcp-option" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "dhcp-option trop long" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "mauvais champ TXT" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "chaîne du champ TXT trop longue" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "mauvais champ SRV" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "mauvaise cible SRV" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "numero de port invalide" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "priorite invalide" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "poids invalide" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "erreur" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "mauvaises options en ligne de commande: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "ne peut pas obtenir le nom de la machine: %s" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "seul un fichier resolv.conf est autorise dans le mode no-poll" -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "" "on doit avoir exactement un seul fichier resolv.conf pour y recuperer le nom " "de domaine." -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "impossible de lire %s: %m" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "pas de directive de recherche trouvee dans %s" @@ -540,7 +540,7 @@ msgstr "" "Table de stockage des requetes DNS pleine : verifiez la configuration du " "serveur (risque de boucle recursive)." -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "impossible d'acceder a %s: %m" @@ -550,7 +550,7 @@ msgstr "impossible d'acceder a %s: %m" msgid "failed to load %s: %m" msgstr "impossible de charger %s: %m" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "Lecture %s" @@ -566,161 +566,161 @@ msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "" "On ignore le bail DHCP pour %s car il possede un nom de domaine illegal" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "impossible de creer une socket de lecture: %s" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "impossible d'activer les options IPV6 sur la socket de lecture: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "impossible de lier la socket de lecture pour %s: %s" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "impossible de lire sur la socket: %s" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "on ignore le serveur de nom %s - interface locale" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "on ignore le serveur de nom %s - ne peut construire/lier la socket: %m" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "domaine" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "non-qualifie" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "domaines" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "on utilise les adresses locales seulement pour %s %s" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "on utilise le serveur de nom %s#%d pour %s %s" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "on utilise le serveur de nom %s#%d" -#: dnsmasq.c:93 +#: dnsmasq.c:94 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:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "impossible de trouver la liste des interfaces: %s" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "interface %s inconnue" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "pas d'interface avec l'adresse %s" -#: dnsmasq.c:141 +#: dnsmasq.c:145 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:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "Erreur DBus: %s" -#: dnsmasq.c:157 +#: dnsmasq.c:161 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:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "Ne peut pas lire %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "demarre, version %s taille de cache %d" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "demarre, version %s cache desactive" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "options a la compilation: %s" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "Support DBus autorise: connecte au bus systeme" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "Support DBus autorise: connexion au bus en suspend" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "Active l'option --bind-interfaces a cause des limitations de l'OS" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "Attention: l'interface %s n'existe pas actuellement" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, 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:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, plage d'adresse %s -- %s, duree de bail %s" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "execute sous root" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "sortie sur reception du signal SIGTERM" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "connecte au systeme DBus" @@ -887,12 +887,12 @@ msgstr "" msgid "More than one vendor class matches, using %s" msgstr "Plus d'une seule classe de fournisseur correspond, on utilise %s" -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "ne peux lier une socket netlink: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/id.po b/po/id.po index d9695c0..eb32945 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-10-07 11:45+0100\n" "Last-Translator: Salman AS \n" "Language-Team: Indonesian \n" @@ -63,7 +63,7 @@ msgstr "" "ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa" # OK -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "tidak bisa mendapatkan memory" @@ -496,122 +496,122 @@ msgid "bad MX target" msgstr "target MX salah" # OK -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "port salah" # OK -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "dhcp-range salah" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" # OK -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "jangkauan DHCP tidak konsisten" # OK -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "dhcp-host salah" # OK -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "dhcp-option salah" # OK -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "domain dalam dhcp-option salah" # OK -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "dhcp-option terlalu panjang" # OK -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "rekord TXT salah" # OK -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "string rekord TXT terlalu panjang" # OK -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "rekord SRV salah" # OK -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "target SRV salah" # OK -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "nomor port tidak benar" # OK -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "prioritas tidak benar" # OK -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "weight tidak benar" # OK -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "kesalahan" # OK -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "pilihan baris perintah salah: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" # OK -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "tidak bisa mendapatkan host-name: %s" # OK -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "hanya satu file resolv.conf yang diperbolehkan dalam modus no-poll." # OK -#: option.c:1885 +#: option.c:1881 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:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "gagal membaca %s: %m" # OK -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "tidak ditemukan direktif search di %s" @@ -628,7 +628,7 @@ msgid "forwarding table overflow: check for server loops." msgstr "meneruskan tabel overflow: memeriksa apakah terjadi loop server." # OK -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "gagal mengakses %s: %m" @@ -640,7 +640,7 @@ msgid "failed to load %s: %m" msgstr "gagal memuat %S: %m" # OK -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "membaca %s" @@ -659,75 +659,75 @@ msgstr "" "Mengabaikan lease DHCP untuk %s sebab terdapat bagian domain yang tidak sah" # OK -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "gagal membuat socket: %s " # OK -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "gagal menyetel IPV6 pada socket: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "gagal mem-bind socket untuk mendengarkan %s: %s" # OK -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "gagal mendengarkan di socket: %s" # OK -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "mengabaikan nameserver %s - antarmuka lokal" # OK -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %m" # OK -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "domain" # OK -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "tidak memenuhi syarat" # OK -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "domain-domain" # OK -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "menggunakan alamat lokal saja untuk %s %s" # OK -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "menggunakan nameserver %s#%d untuk %s %s" # OK -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "menggunakan nameserver %s#%d" # OK -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" @@ -735,114 +735,114 @@ msgstr "" "config.h" # OK -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "gagal mendapatkan daftar antarmuka: %s" # OK -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "antarmuka tidak dikenal %s" # OK -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "tidak ada antarmuka dengan alamat %s" # OK -#: dnsmasq.c:141 +#: dnsmasq.c:145 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:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "DBus error: %s" # OK -#: dnsmasq.c:157 +#: dnsmasq.c:161 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:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "tidak bisa membaca %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - # OK -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "dimulai, versi %s ukuran cache %d" # OK -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "dimulai, cache versi %s di disable" # OK -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "pilihan-pilihan saat kompilasi: %s" # OK -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem" # OK -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda" # OK -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS" # OK -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "peringatan: antarmuka %s tidak ada" # OK -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, 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:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s" +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + # OK -#: dnsmasq.c:365 +#: dnsmasq.c:378 msgid "running as root" msgstr "berjalan menggunakan root" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "keluar karena menerima SIGTERM" # OK -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "terhubung ke sistem DBus" @@ -1039,12 +1039,12 @@ msgid "More than one vendor class matches, using %s" msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s" # OK -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "tidak bisa mem-bind netlink socket: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/no.po b/po/no.po index a0c39b1..931ef48 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2006-01-11 17:39+0000\n" "Last-Translator: Jan Erik Askildt \n" "Language-Team: Norwegian \n" @@ -59,7 +59,7 @@ msgstr "" "mellomlager størrelse %d, %d/%d mellomlager innsettinger re-bruker " "mellomlager plasser som ikke er utløpt" -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "kunne ikke få minne" @@ -409,102 +409,102 @@ msgstr "d msgid "bad MX target" msgstr "dårlig MX mål" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "dårlig port" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "dårlig dhcp-område" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "ikke konsistent DHCP område" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "dårlig dhcp-vert" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "dårlig dhcp-opsjon" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "dårlig domene i dhcp-opsjon" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "dhcp-opsjon for lang" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "dårlig TXT post" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "TXT post streng for lang" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "dårlig SRV post" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "dårlig SRV mål" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "ugyldig portnummer" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "ugyldig prioritet" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "ugyldig vekt" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "feil" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "dårlige kommandlinje opsjoner: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "klarer ikke å få vertsnavn: %s" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "kun en resolv.conf fil tillat i no-poll modus." -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "må ha nøyaktig en resolv.conf å lese domene fra." -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "feilet å lese %s: %m" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "intet søke direktiv funnet i %s" @@ -518,7 +518,7 @@ msgstr "navnetjener %s nektet msgid "forwarding table overflow: check for server loops." msgstr "fremsendelse (forwarding) tabell overflyt: sjekk etter tjener løkker." -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "feilet å få tilgang til %s: %m" @@ -528,7 +528,7 @@ msgstr "feilet msgid "failed to load %s: %m" msgstr "feilet å laste %s: %m" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "leser %s" @@ -543,158 +543,158 @@ msgstr "d msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "Ignorerer DHCP leie for %s siden den har en ulovlig domene del" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "feilet å lage lytte socket: %s" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "feilet å sette IPv6 opsjoner på lytte socket: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "feilet å binde lytte socket for %s: %s" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "feilet å lytte på socket: %s" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorerer navnetjener %s - lokal tilknytning" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %m" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "domene" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "ikke kvalifisert" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "domener" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "benytter lokale adresser kun for %s %s" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "benytter navnetjener %s#%d for %s %s" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "benytter navnetjener %s#%d" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "ISC dhcpf integrasjon ikke tilgjengelig: sett HAVE_ISC_READER i src/config.h" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "feilet å finne liste av tilknytninger (interfaces): %s" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "ukjent tilknytning (interface) %s" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "ingen tilknytning (interface) med adresse %s" -#: dnsmasq.c:141 +#: dnsmasq.c:145 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "må sette nøyaktig et interface på ødelagte systemer uten IP_RECVIF" -#: dnsmasq.c:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "DBus feil: %s" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "kan ikke lese %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "startet, versjon %s mellomlager størrelse %d" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "startet, versjon %s mellomlager deaktivert" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "kompilerings opsjoner: %s" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "DBus støtte aktivert: koblet til system buss" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "DBus støtte aktivert: avventer buss tilkobling" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "setter --bind-interfaces opsjon på grunn av OS begrensninger" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, statisk leie kun på %.0s%s, leie tid %s" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, IP område %s -- %s, leie tid %s" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "kjører som rot (root)" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "avslutter etter mottak av SIGTERM" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "tilkoblet til system DBus" @@ -857,12 +857,12 @@ msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" msgid "More than one vendor class matches, using %s" msgstr "Mer enn en produsent klasse som passer, bruker %s" -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "kan ikke binde netlink socket: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/pl.po b/po/pl.po index 9c02b1f..ba54d42 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dnsmasq 2.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-10-04 19:17+0100\n" "Last-Translator: Tomasz Sochañski \n" "Language-Team: Polish \n" @@ -57,7 +57,7 @@ msgid "" msgstr "" "wielko¶æ cache %d, %d/%d wpisów cache u¿yto ponownie z niewygas³ych wpisów" -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "nie mo¿na pobraæ pamiêci" @@ -418,102 +418,102 @@ msgstr "b msgid "bad MX target" msgstr "b³êdny cel MX" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "nieprawid³owy port" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "nieprawid³owy zakres dhcp-range" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "niespójny zakres DHCP" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "b³±d w dhcp-host" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "b³±d w dhcp-option" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "nieprawid³owa nazwa domeny w dhcp-option" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "zbyt d³uga nazwa w dhcp-option" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "nieprawid³owy rekord TX" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "zbyt d³ugi rekord TXT" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "b³±d w rekordzie SRV" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "nieprawid³owy cel SRV" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "nieprawid³owy port" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "nieprawid³owy priorytet" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "nieprawid³owe znaczenie" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "b³±d" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "nieprawid³owa opcja linii komend: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "nie mo¿na pobraæ nazwy hosta: %s" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll." -#: option.c:1885 +#: option.c:1881 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:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "b³±d w odczycie %s: %m" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "brak wytycznych wyszukiwania w %s" @@ -528,7 +528,7 @@ msgid "forwarding table overflow: check for server loops." msgstr "" "przekroczenie zakresu tablicy przekazywania: sprawd¼ zapêtlenie serwera." -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "b³±d w dostêpie do %s: %m" @@ -538,7 +538,7 @@ msgstr "b msgid "failed to load %s: %m" msgstr "b³±d ³adowania %s: %m" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "czytanie %s" @@ -555,159 +555,159 @@ msgstr "" "Ignorujê dzier¿awy DHCP dla %s poniewa¿ zawieraj± nieprawid³ow± czê¶æ " "domenow±" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "b³±d podczas tworzenia gniazda: %s" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "b³±d ustawienia opcji IPV6 na nas³uchuj±cym gnie¼dzie: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "b³±d pod³±czenia nas³uchuj±cego gniazda dla %s: %s" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "b³±d w³±czenia nas³uchiwania gniazda: %s" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorowanie serwera nazw %s - interfejs lokalny" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "ignorowanie serwera nazw %s - nie mo¿na utworzyæ/dowi±zaæ gniazda: %m" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "domena" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "niekwalifikowany(a/e)" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "domeny" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "w³±czenie u¿ywania lokalnych adresów tylko dla %s %s" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "u¿ywany serwer nazw: %s#%d dla %s %s" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "u¿ywany serwer nazw %s#%d" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" "Intergracja z ISC dhcpd nie jest dostêpna: ustaw HAVE_ISC_READER w src/" "config.h" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "b³±d w znalezieniu listy interfejsów sieciowych: %s" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "nieznany interfejs %s" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "brak interfejsu z adresem %s" -#: dnsmasq.c:141 +#: dnsmasq.c:145 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "musisz ustawiæ dok³adnie jeden interfejs w systemach bez IP_RECVIF" -#: dnsmasq.c:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "b³±d DBus: %s" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "DBus jest niedostêpny: ustaw HAVE_DBUS w src/config.h" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "b³±d odczytu z %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "uruchomiony, wersja %s wielko¶æ cache %d" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "uruchomiony, wersja %s cache wy³±czony" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "opcje kompilacji: %s" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "obs³uga DBus w³±czona: pod³±czono do szyny systemowej" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "obs³uga DBus w³±czona: pod³±czanie do szyny systemowej w toku" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "ustawiam opcjê --bind-interfaces z powodu limitów systemu operacyjnego" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "ostrze¿enie: interfejs %s obecnie nie istnieje" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "DHCP, statyczne dzier¿awy tylko na %.0s%s, czas dzier¿awy %s" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, zakres IP %s -- %s, czas dzier¿awy %s" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "pracuje z uprawnieniami u¿ytkownika root" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "wy³±czenie po otrzymaniu sygnalu SIGTERM" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "po³±czono do systemowego DBus" @@ -871,12 +871,12 @@ msgstr "" msgid "More than one vendor class matches, using %s" msgstr "Wiêcej ni¿ jeden dystrybutor pasuj±cy, u¿ywam %s" -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "nie mo¿na pod³±czyæ gniazda netlink: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index defe423..6278ba2 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2006-01-16 20:42+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Portuguese \n" @@ -53,7 +53,7 @@ msgid "" "entries." msgstr "" -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "" @@ -398,102 +398,102 @@ msgstr "" msgid "bad MX target" msgstr "" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "" -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "" -#: option.c:1885 +#: option.c:1881 msgid "must have exactly one resolv.conf to read domain from." msgstr "" -#: option.c:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "" @@ -507,7 +507,7 @@ msgstr "" msgid "forwarding table overflow: check for server loops." msgstr "" -#: isc.c:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "" @@ -517,7 +517,7 @@ msgstr "" msgid "failed to load %s: %m" msgstr "" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "" @@ -532,157 +532,157 @@ msgstr "" msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "" -#: dnsmasq.c:93 +#: dnsmasq.c:94 msgid "" "ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h" msgstr "" -#: dnsmasq.c:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "" -#: dnsmasq.c:141 +#: dnsmasq.c:145 msgid "must set exactly one interface on broken systems without IP_RECVIF" msgstr "" -#: dnsmasq.c:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "" -#: dnsmasq.c:157 +#: dnsmasq.c:161 msgid "DBus not available: set HAVE_DBUS in src/config.h" msgstr "" -#: dnsmasq.c:192 +#: dnsmasq.c:196 #, c-format msgid "cannot create pipe: %s" msgstr "" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, c-format msgid "DHCP, static leases only on %.0s%s, lease time %s" msgstr "" -#: dnsmasq.c:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "" @@ -845,12 +845,12 @@ msgstr "" msgid "More than one vendor class matches, using %s" msgstr "" -#: netlink.c:41 +#: netlink.c:51 #, c-format msgid "cannot create RTnetlink socket: %s" msgstr "" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/po/ro.po b/po/ro.po index 1fd9bfe..7fea725 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: 2006-04-17 11:36+0100\n" +"POT-Creation-Date: 2006-04-21 19:59+0100\n" "PO-Revision-Date: 2005-11-22 16:46+0000\n" "Last-Translator: Simon Kelley \n" "Language-Team: Romanian \n" @@ -57,7 +57,7 @@ msgstr "" "cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat " "locaÅ£ii neexpirate." -#: util.c:153 option.c:1298 +#: util.c:153 option.c:1294 msgid "could not get memory" msgstr "nu am putut aloca memorie" @@ -409,103 +409,103 @@ msgstr "nume MX invalid" msgid "bad MX target" msgstr "Å£intă MX invalidă" -#: option.c:806 option.c:817 +#: option.c:802 option.c:813 msgid "bad port" msgstr "port invalid" -#: option.c:959 +#: option.c:955 msgid "bad dhcp-range" msgstr "dhcp-range invalid" -#: option.c:988 +#: option.c:984 msgid "only one netid tag allowed" msgstr "" -#: option.c:1033 +#: option.c:1029 msgid "inconsistent DHCP range" msgstr "domeniu DHCP inconsistent" -#: option.c:1218 +#: option.c:1214 msgid "bad dhcp-host" msgstr "dhcp-host invalid" -#: option.c:1275 +#: option.c:1271 msgid "bad dhcp-option" msgstr "dhcp-option invalid" -#: option.c:1293 +#: option.c:1289 msgid "bad domain in dhcp-option" msgstr "domeniu DNS invalid în declaraÅ£ia dhcp-option" -#: option.c:1463 +#: option.c:1459 msgid "dhcp-option too long" msgstr "declararea dhcp-option este prea lungă" -#: option.c:1660 +#: option.c:1656 msgid "bad TXT record" msgstr "înregistrare TXT invalidă" -#: option.c:1692 +#: option.c:1688 msgid "TXT record string too long" msgstr "ÅŸirul de caractere pentru înregistrarea TXT este prea lung" -#: option.c:1731 +#: option.c:1727 msgid "bad SRV record" msgstr "înregistrare SRV invalidă" -#: option.c:1744 +#: option.c:1740 msgid "bad SRV target" msgstr "Å£intă SRV invalidă" -#: option.c:1756 +#: option.c:1752 msgid "invalid port number" msgstr "număr de port invalid" -#: option.c:1767 +#: option.c:1763 msgid "invalid priority" msgstr "prioritate invalidă" -#: option.c:1778 +#: option.c:1774 msgid "invalid weight" msgstr "pondere invalidă" -#: option.c:1803 +#: option.c:1799 msgid "error" msgstr "eroare" -#: option.c:1805 +#: option.c:1801 #, c-format msgid "bad command line options: %s." msgstr "opÅ£iuni în linie de comandă invalide: %s." -#: option.c:1807 +#: option.c:1803 msgid "try --help" msgstr "" -#: option.c:1809 +#: option.c:1805 msgid "try -w" msgstr "" -#: option.c:1849 +#: option.c:1845 #, c-format msgid "cannot get host-name: %s" msgstr "nu pot citi numele maÅŸinii: %s" -#: option.c:1878 +#: option.c:1874 msgid "only one resolv.conf file allowed in no-poll mode." msgstr "se permite un singur fiÅŸier resolv.conf în modul no-poll" -#: option.c:1885 +#: option.c:1881 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:1888 network.c:513 +#: option.c:1884 network.c:501 #, c-format msgid "failed to read %s: %m" msgstr "nu pot citi %s: %n" -#: option.c:1906 +#: option.c:1902 #, c-format msgid "no search directive found in %s" msgstr "nu s-a găsit nici un criteriu de căutare în %s" @@ -519,7 +519,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:73 dnsmasq.c:446 +#: isc.c:73 dnsmasq.c:460 #, c-format msgid "failed to access %s: %m" msgstr "accesarea serverului %s a eÅŸuat: %n" @@ -529,7 +529,7 @@ msgstr "accesarea serverului %s a eÅŸuat: %n" msgid "failed to load %s: %m" msgstr "nu pot încărca %s: %n" -#: isc.c:93 network.c:517 +#: isc.c:93 network.c:505 #, c-format msgid "reading %s" msgstr "citesc %s" @@ -544,161 +544,161 @@ msgstr "nume invalid în %s" msgid "Ignoring DHCP lease for %s because it has an illegal domain part" msgstr "ÃŽmprumutul DHCP pentru %s va fi ignorat deoarece are domeniu invalid" -#: network.c:340 +#: network.c:328 dnsmasq.c:129 #, c-format msgid "failed to create listening socket: %s" msgstr "creearea socket-ului de ascultare a eÅŸuat: %s" -#: network.c:347 +#: network.c:335 #, c-format msgid "failed to set IPV6 options on listening socket: %s" msgstr "configurarea opÅ£iunilor IPv6 a eÅŸuat pe socket-ul de ascultare: %s" -#: network.c:365 +#: network.c:353 #, c-format msgid "failed to bind listening socket for %s: %s" msgstr "activarea socket-ului de ascultare pentru %s a eÅŸuat: %s" -#: network.c:373 +#: network.c:361 #, c-format msgid "failed to listen on socket: %s" msgstr "ascultarea pe socket a eÅŸuat: %s" -#: network.c:443 +#: network.c:431 #, c-format msgid "ignoring nameserver %s - local interface" msgstr "ignorăm serverul DNS %s - interfaţă locală" -#: network.c:452 +#: network.c:440 #, c-format msgid "ignoring nameserver %s - cannot make/bind socket: %m" msgstr "ignorăm serverul DNS %s - nu pot creea/activa socket-ul: %s" -#: network.c:466 +#: network.c:454 msgid "domain" msgstr "domeniu" -#: network.c:468 +#: network.c:456 msgid "unqualified" msgstr "invalid" -#: network.c:468 +#: network.c:456 msgid "domains" msgstr "domenii" -#: network.c:471 +#: network.c:459 #, c-format msgid "using local addresses only for %s %s" msgstr "folosim adresele locale doar pentru %S %s" -#: network.c:473 +#: network.c:461 #, c-format msgid "using nameserver %s#%d for %s %s" msgstr "folosim serverul DNS %s#%d pentru %s %s" -#: network.c:476 +#: network.c:464 #, c-format msgid "using nameserver %s#%d" msgstr "folosim serverul DNS %s#%d" -#: dnsmasq.c:93 +#: dnsmasq.c:94 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:102 +#: dnsmasq.c:111 #, c-format msgid "failed to find list of interfaces: %s" msgstr "enumerarea interfeÅ£elor a eÅŸuat: %s" -#: dnsmasq.c:117 +#: dnsmasq.c:119 #, c-format msgid "unknown interface %s" msgstr "interfaţă necunoscută %s" -#: dnsmasq.c:123 +#: dnsmasq.c:125 #, c-format msgid "no interface with address %s" msgstr "nu exista interfaţă pentru adresa %s" -#: dnsmasq.c:141 +#: dnsmasq.c:145 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:154 dnsmasq.c:522 +#: dnsmasq.c:158 dnsmasq.c:536 #, c-format msgid "DBus error: %s" msgstr "eroare DBus: %s" -#: dnsmasq.c:157 +#: dnsmasq.c:161 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:192 +#: dnsmasq.c:196 #, fuzzy, c-format msgid "cannot create pipe: %s" msgstr "nu pot citi %s: %s" -#: dnsmasq.c:225 -#, c-format -msgid "Cannot set capabilities: %s" -msgstr "" - -#: dnsmasq.c:324 +#: dnsmasq.c:331 #, c-format msgid "started, version %s cachesize %d" msgstr "am ponit, versiunea %s memorie temporară %d" -#: dnsmasq.c:326 +#: dnsmasq.c:333 #, c-format msgid "started, version %s cache disabled" msgstr "am pornit, versiunea %s memorie temporară dezactivată" -#: dnsmasq.c:328 +#: dnsmasq.c:335 #, c-format msgid "compile time options: %s" msgstr "compilat cu opÅ£iunile: %s" -#: dnsmasq.c:334 +#: dnsmasq.c:341 msgid "DBus support enabled: connected to system bus" msgstr "suportul DBus activ: sunt conectat la magistrala sistem" -#: dnsmasq.c:336 +#: dnsmasq.c:343 msgid "DBus support enabled: bus connection pending" msgstr "suportul DBus activ: aÅŸtept conexiunea la magistrală" -#: dnsmasq.c:341 +#: dnsmasq.c:348 msgid "setting --bind-interfaces option because of OS limitations" msgstr "specific opÅ£iunea --bind-interfaces din cauza limitărilor SO" -#: dnsmasq.c:346 +#: dnsmasq.c:353 #, c-format msgid "warning: interface %s does not currently exist" msgstr "atenÅ£ie: interfaÅ£a %s nu există momentan" -#: dnsmasq.c:358 +#: dnsmasq.c:365 #, 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:359 +#: dnsmasq.c:366 #, c-format msgid "DHCP, IP range %s -- %s, lease time %s" msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s" -#: dnsmasq.c:365 +#: dnsmasq.c:376 +#, c-format +msgid "warning: setting capabilities failed: %m" +msgstr "" + +#: dnsmasq.c:378 msgid "running as root" msgstr "rulez ca root" -#: dnsmasq.c:497 +#: dnsmasq.c:511 msgid "exiting on receipt of SIGTERM" msgstr "am primit SIGTERM, am terminat" -#: dnsmasq.c:524 +#: dnsmasq.c:538 msgid "connected to system DBus" msgstr "magistrala sistem Dbus conectată" @@ -861,12 +861,12 @@ msgstr "nu pot trimite opÅ£iunea DHCP %d: nu mai este loc în pachet" msgid "More than one vendor class matches, using %s" msgstr "Se potrivesc mai multe clase de mărci de interfeÅ£e, folosim %s" -#: netlink.c:41 +#: netlink.c:51 #, fuzzy, c-format msgid "cannot create RTnetlink socket: %s" msgstr "nu pot să activez socket-ul netlink: %s" -#: netlink.c:208 +#: netlink.c:218 #, c-format msgid "RTnetlink returns error: %s" msgstr "" diff --git a/rpm/dnsmasq-SuSE.patch b/rpm/dnsmasq-SuSE.patch index a882ad4..626245f 100644 --- a/rpm/dnsmasq-SuSE.patch +++ b/rpm/dnsmasq-SuSE.patch @@ -17,7 +17,7 @@ #define CHUSER "nobody" -#define CHGRP "dip" +#define CHGRP "dialout" - #define IP6INTERFACES "/proc/net/if_inet6" - #define UPTIME "/proc/uptime" #define DHCP_SERVER_PORT 67 + #define DHCP_CLIENT_PORT 68 + diff --git a/src/bpf.c b/src/bpf.c index 562a438..3d95d63 100644 --- a/src/bpf.c +++ b/src/bpf.c @@ -141,7 +141,7 @@ void send_via_bpf(struct daemon *daemon, struct dhcp_packet *mess, size_t len, int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), int (*ipv6_callback)()) { char *ptr; - struct ifreq *ifr, ifaux; + struct ifreq *ifr; struct ifconf ifc; int fd, errsav, ret = 0; int lastlen = 0; @@ -186,14 +186,10 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i ifr = ifreq.iov_base; memcpy(ifr, ptr, len); - - strncpy(ifaux.ifr_name, ifr->ifr_name, IF_NAMESIZE); if (ifr->ifr_addr.sa_family == AF_INET && ipv4_callback) { struct in_addr addr, netmask, broadcast; - if (ioctl(fd, SIOCGIFINDEX, &ifaux) == -1) - continue; broadcast.s_addr = 0; addr = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr; if (ioctl(fd, SIOCGIFNETMASK, ifr) == -1) @@ -201,7 +197,10 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i netmask = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr; if (ioctl(fd, SIOCGIFBRDADDR, ifr) != -1) broadcast = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr; - if (!((*ipv4_callback)(daemon, addr, (int)ifaux.ifr_index, netmask, broadcast, parm))) + if (!((*ipv4_callback)(daemon, addr, + (int)if_nametoindex(ifr->ifr_name), + netmask, broadcast, + parm))) goto err; } #ifdef HAVE_IPV6 @@ -214,11 +213,9 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i addr->s6_addr[2] = 0; addr->s6_addr[3] = 0; } - if (ioctl(fd, SIOCGIFINDEX, &ifaux) == -1) - continue; if (!((*ipv6_callback)(daemon, addr, (int)((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_scope_id, - (int)ifaux.ifr_index, + (int)if_nametoindex(ifr->ifr_name), parm))) goto err; } diff --git a/src/config.h b/src/config.h index 9adba0d..3e9470e 100644 --- a/src/config.h +++ b/src/config.h @@ -10,7 +10,7 @@ GNU General Public License for more details. */ -#define VERSION "2.28" +#define VERSION "2.29" #define FTABSIZ 150 /* max number of outstanding requests */ #define MAX_PROCS 20 /* max no children for TCP requests */ @@ -165,10 +165,10 @@ NOTES: */ -/* platform independent options. */ -#undef HAVE_BROKEN_RTC -#undef HAVE_ISC_READER -#undef HAVE_DBUS +/* platform independent options- uncomment to enable */ +/* #define HAVE_BROKEN_RTC */ +/* #define HAVE_ISC_READER */ +/* #define HAVE_DBUS */ #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC diff --git a/src/dnsmasq.c b/src/dnsmasq.c index ad4796a..d7029ce 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -48,6 +48,7 @@ int main (int argc, char **argv) { struct daemon *daemon; int bind_fallback = 0; + int bad_capabilities = 0; time_t now, last = 0; struct sigaction sigact; struct iname *if_tmp; @@ -95,18 +96,19 @@ int main (int argc, char **argv) #ifdef HAVE_LINUX_NETWORK netlink_init(daemon); -#endif - - daemon->interfaces = NULL; - if (!enumerate_interfaces(daemon)) - die(_("failed to find list of interfaces: %s"), NULL); - - if (!(daemon->options & OPT_NOWILD) && - !(daemon->listeners = create_wildcard_listeners(daemon->port))) +#elif !(defined(IP_RECVDSTADDR) && \ + defined(IP_RECVIF) && \ + defined(IP_SENDSRCADDR)) + if (!(daemon->options & OPT_NOWILD)) { bind_fallback = 1; daemon->options |= OPT_NOWILD; } +#endif + + daemon->interfaces = NULL; + if (!enumerate_interfaces(daemon)) + die(_("failed to find list of interfaces: %s"), NULL); if (daemon->options & OPT_NOWILD) { @@ -123,6 +125,8 @@ int main (int argc, char **argv) die(_("no interface with address %s"), daemon->namebuff); } } + else if (!(daemon->listeners = create_wildcard_listeners(daemon->port))) + die(_("failed to create listening socket: %s"), NULL); forward_init(1); cache_init(daemon->cachesize, daemon->options & OPT_LOG); @@ -222,7 +226,10 @@ int main (int argc, char **argv) /* Tell kernel to not clear capabilities when dropping root */ if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1) - die(_("Cannot set capabilities: %s"), NULL); + { + bad_capabilities = errno; + ent_pw = NULL; + } } #endif @@ -362,7 +369,14 @@ int main (int argc, char **argv) } if (!(daemon->options & OPT_DEBUG) && (getuid() == 0 || geteuid() == 0)) - syslog(LOG_WARNING, _("running as root")); + { + if (bad_capabilities) + { + errno = bad_capabilities; + syslog(LOG_WARNING, _("warning: setting capabilities failed: %m")); + } + syslog(LOG_WARNING, _("running as root")); + } check_servers(daemon); diff --git a/src/netlink.c b/src/netlink.c index f97dae3..a396bb2 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -36,8 +36,18 @@ void netlink_init(struct daemon *daemon) addr.nl_groups = RTMGRP_IPV4_ROUTE; #endif - if ((daemon->netlinkfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) == -1 || - bind(daemon->netlinkfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) + /* May not be able to have permission to set multicast groups don't die in that case */ + if ((daemon->netlinkfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) != -1) + { + if (bind(daemon->netlinkfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) + { + addr.nl_groups = 0; + if (errno != EPERM || bind(daemon->netlinkfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) + daemon->netlinkfd = -1; + } + } + + if (daemon->netlinkfd == -1) die(_("cannot create RTnetlink socket: %s"), NULL); iov.iov_len = 200; diff --git a/src/network.c b/src/network.c index b135e82..ca6d9ce 100644 --- a/src/network.c +++ b/src/network.c @@ -15,43 +15,39 @@ int iface_check(struct daemon *daemon, int family, struct all_addr *addr, char *name) { struct iname *tmp; + int ret = 1; - for (tmp = daemon->if_except; tmp; tmp = tmp->next) - if (tmp->name && (strcmp(tmp->name, name) == 0)) - return 0; + /* Note: have to check all and not bail out early, so that we set the + "used" flags. */ if (daemon->if_names || daemon->if_addrs) { + ret = 0; + for (tmp = daemon->if_names; tmp; tmp = tmp->next) if (tmp->name && (strcmp(tmp->name, name) == 0)) - { - tmp->used = 1; - return 1; - } - + ret = tmp->used = 1; + for (tmp = daemon->if_addrs; tmp; tmp = tmp->next) if (tmp->addr.sa.sa_family == family) { if (family == AF_INET && tmp->addr.in.sin_addr.s_addr == addr->addr.addr4.s_addr) - { - tmp->used = 1; - return 1; - } + ret = tmp->used = 1; #ifdef HAVE_IPV6 else if (family == AF_INET6 && IN6_ARE_ADDR_EQUAL(&tmp->addr.in6.sin6_addr, &addr->addr.addr6)) - { - tmp->used = 1; - return 1; - } + ret = tmp->used = 1; #endif } - return 0; } - return 1; + for (tmp = daemon->if_except; tmp; tmp = tmp->next) + if (tmp->name && (strcmp(tmp->name, name) == 0)) + ret = 0; + + return ret; } static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_index, @@ -184,9 +180,7 @@ int enumerate_interfaces(struct daemon *daemon) #endif } -#if defined(HAVE_IPV6) && \ - (defined(HAVE_LINUX_NETWORK) || \ - (defined(IP_RECVDSTADDR) && defined(IP_RECVIF) && defined(IP_SENDSRCADDR))) +#if defined(HAVE_IPV6) static int create_ipv6_listener(struct listener **link, int port) { union mysockaddr addr; @@ -254,10 +248,6 @@ static int create_ipv6_listener(struct listener **link, int port) struct listener *create_wildcard_listeners(int port) { -#if !(defined(HAVE_LINUX_NETWORK) || (defined(IP_RECVDSTADDR) && defined(IP_RECVIF) && defined(IP_SENDSRCADDR))) - port = 0; /* eliminate warning */ - return NULL; -#else union mysockaddr addr; int opt = 1; struct listener *l, *l6 = NULL; @@ -311,8 +301,6 @@ struct listener *create_wildcard_listeners(int port) l->next = l6; return l; - -#endif } struct listener *create_bound_listeners(struct daemon *daemon) diff --git a/src/option.c b/src/option.c index 9a82f11..0457f7c 100644 --- a/src/option.c +++ b/src/option.c @@ -648,8 +648,6 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts) "interface=" to disable all interfaces except loop. */ new->name = safe_string_alloc(arg); new->isloop = new->used = 0; - if (safe_strchr(new->name, ':')) - daemon->options |= OPT_NOWILD; arg = comma; } while (arg); break; @@ -665,8 +663,6 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts) { new->next = daemon->if_except; daemon->if_except = new; - if (safe_strchr(new->name, ':')) - daemon->options |= OPT_NOWILD; } else { diff --git a/src/rfc1035.c b/src/rfc1035.c index 5703b6a..fd02f1d 100644 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -32,7 +32,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp, unsigned int label_type = l & 0xc0; if (label_type == 0xc0) /* pointer */ { - if (p - (unsigned char *)header + 1u >= plen) + if ((size_t)(p - (unsigned char *)header + 1) >= plen) return 0; /* get offset */ @@ -70,7 +70,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp, /* output is \[x/siz]. which is digs+9 chars */ if (cp - (unsigned char *)name + digs + 9 >= MAXDNAME) return 0; - if (p - (unsigned char *)header + ((count-1)>>3) + 1u >= plen) + if ((size_t)(p - (unsigned char *)header + ((count-1)>>3) + 1) >= plen) return 0; *cp++ = '\\'; @@ -94,7 +94,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp, { /* label_type = 0 -> label. */ if (cp - (unsigned char *)name + l + 1 >= MAXDNAME) return 0; - if (p - (unsigned char *)header + 1u >= plen) + if ((size_t)(p - (unsigned char *)header + 1) >= plen) return 0; for(j=0; j