Compare commits

...
1 Commits
Author SHA1 Message Date
Simon Kelley cdeda28f82 import of dnsmasq-2.27.tar.gz 2012-01-05 17:31:11 +00:00
27 changed files with 2295 additions and 1834 deletions

No files matched your search

+55
View File
@@ -1639,3 +1639,58 @@ version 2.26
network. Thanks to Lutz Pressler for the bug report and network. Thanks to Lutz Pressler for the bug report and
patch. patch.
version 2.27
Tweaked DHCP behaviour when a client attempts to renew a lease
which dnsmasq doesn't know about. Previously that would always
result in a DHCPNAK. Now, in dhcp-authoritative mode, the
lease will be created, if it's legal. This makes dnsmasq work
better if the lease database is lost, for example on an OpenWRT
system which reboots. Thanks to Stephen Rose for work on
this.
Added the ability to support RFC-3442 style destination
descriptors in dhcp-options. This makes classless static
routes easy to do, eg dhcp-option=121,192.168.1.0/24,1.2.3.4
Added error-checking to the code which writes the lease
file. If this fails for any reason, an error is logged,
and a retry occurs after one minute. This should improve
things eg when a filesystem is full. Thanks to Jens Holze
for the bug report.
Fixed breakage of the "/#/ matches any domain" facility
which happened in 2.24. Thanks to Peter Surda for the bug
report.
Use "size_t" and "ssize_t" types where appropriate in the
code.
Fix buggy CNAME handling in mixed IPv4 and IPv6
queries. Thanks to Andreas Pelme for help finding that.
Added some code to attempt to re-transmit DNS queries when
a network interface comes up. This helps on DoD links,
where frequently the packet which triggers dialling is
a DNS query, which then gets lost. By re-sending, we can
avoid the lookup failing. This function is only active
when netlink support is compiled in, and therefore only
under Linux. Thanks to Jean Wolter for help with this.
Tweaked the DHCP tag-matching code to work correctly with
NOT-tag conditions. Thanks to Lutz Pressler for finding
the bug.
Generalised netid-tag matching in dhcp-range statements to
allow more than one tag.
Added --dhcp-mac to do MAC address matching in the same
way as vendorclass and userclass matching. A good
suggestion from Lutz Pressler.
Add workaround for buggy early Microsoft DHCP clients
which need zero-termination in string options.
Thanks to Fabiano Pires for help with this.
Generalised the DHCP code to cope with any hardware
address type, at least on Linux. *BSD is still limited to
ethernet only.
+2 -2
View File
@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.26 Version: 2.27
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@@ -127,7 +127,7 @@ fi
%attr(0755,root,root) /etc/rc.d/init.d/dnsmasq %attr(0755,root,root) /etc/rc.d/init.d/dnsmasq
%attr(0664,root,root) /etc/dnsmasq.conf %attr(0664,root,root) /etc/dnsmasq.conf
%attr(0755,root,root) /usr/sbin/dnsmasq %attr(0755,root,root) /usr/sbin/dnsmasq
%attr(0644,root,root) /usr/share/man/*/man8/dnsmasq* #%attr(0644,root,root) /usr/share/man/*/man8/dnsmasq*
%attr(0644,root,root) /usr/share/man/man8/dnsmasq* %attr(0644,root,root) /usr/share/man/man8/dnsmasq*
%attr(0644,root,root) /usr/share/locale/*/LC_MESSAGES/* %attr(0644,root,root) /usr/share/locale/*/LC_MESSAGES/*
+1 -1
View File
@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.26 Version: 2.27
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers
+11
View File
@@ -184,6 +184,10 @@ bogus-priv
# of whose DHCP userclass strings includes the substring "accounts" # of whose DHCP userclass strings includes the substring "accounts"
#dhcp-userclass=red,accounts #dhcp-userclass=red,accounts
# Send extra options which are tagged as "red" to any machine whose
# MAC address matches the pattern.
#dhcp-mac=red,00:60:8C:*:*:*
# If this line is uncommented, dnsmasq will read /etc/ethers and act # If this line is uncommented, dnsmasq will read /etc/ethers and act
# on the ethernet-address/IP pairs found there just as if they had # on the ethernet-address/IP pairs found there just as if they had
# been given as --dhcp-host options. Useful if you keep # been given as --dhcp-host options. Useful if you keep
@@ -204,6 +208,10 @@ bogus-priv
# DNS server - 6 # DNS server - 6
# broadcast address - 28 # broadcast address - 28
# Override the default route supplied by dnsmasq, which assumes the
# router is the same machine as the one running dnsmasq.
#dhcp-option=3,1.2.3.4
# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 # Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
#dhcp-option=42,192.168.0.4,10.10.0.5 #dhcp-option=42,192.168.0.4,10.10.0.5
@@ -244,6 +252,9 @@ bogus-priv
# probably doesn't support this...... # probably doesn't support this......
#dhcp-option=119,eng.apple.com,marketing.apple.com #dhcp-option=119,eng.apple.com,marketing.apple.com
# Send RFC-3442 classless static routes (note the netmask encoding)
#dhcp-option=121,192.168.1.0/24,1.2.3.4,10.0.0.0/8,5.6.7.8
# Send encapsulated vendor-class specific options. The vendor-class # Send encapsulated vendor-class specific options. The vendor-class
# is sent as DHCP option 60, and all the options marked with the # is sent as DHCP option 60, and all the options marked with the
# vendor class are send encapsulated in DHCP option 43. The meaning of # vendor class are send encapsulated in DHCP option 43. The meaning of
+25 -6
View File
@@ -349,7 +349,7 @@ allowed to have more than one dhcp-range in a single subnet. The optional
network-id is a alphanumeric label which marks this network so that network-id is a alphanumeric label which marks this network so that
dhcp options may be specified on a per-network basis. dhcp options may be specified on a per-network basis.
When it is prefixed with 'net:' then its meaning changes from setting When it is prefixed with 'net:' then its meaning changes from setting
a tag to matching it. a tag to matching it. Only one tag may be set, but more than one tag may be matched.
The end address may be replaced by the keyword The end address may be replaced by the keyword
.B static .B static
which tells dnsmasq to enable DHCP for the network specified, but not which tells dnsmasq to enable DHCP for the network specified, but not
@@ -368,7 +368,7 @@ which case the IP address and lease times will apply to any machine
claiming that name. For example claiming that name. For example
.B --dhcp-host=00:20:e0:3b:13:af,wap,infinite .B --dhcp-host=00:20:e0:3b:13:af,wap,infinite
tells dnsmasq to give tells dnsmasq to give
the machine with ethernet address 00:20:e0:3b:13:af the name wap, and the machine with hardware address 00:20:e0:3b:13:af the name wap, and
an infinite DHCP lease. an infinite DHCP lease.
.B --dhcp-host=lap,192.168.0.199 .B --dhcp-host=lap,192.168.0.199
tells tells
@@ -401,9 +401,15 @@ for this host.
Ethernet addresses (but not client-ids) may have Ethernet addresses (but not client-ids) may have
wildcard bytes, so for example wildcard bytes, so for example
.B --dhcp-host=00:20:e0:3b:13:*,ignore .B --dhcp-host=00:20:e0:3b:13:*,ignore
will cause dnsmasq to ignore a range of ethernet addresses. Note that will cause dnsmasq to ignore a range of hardware addresses. Note that
the "*" will need to be escaped or quoted on a command line, but not the "*" will need to be escaped or quoted on a command line, but not
in the configuration file. in the configuration file. Hardware addresses normally match any
network (ARP) type, but it is possible to restrict them to a single
ARP type by preceding them with the ARP-type (in HEX) and "-". so
.B --dhcp-host=06-00:20:e0:3b:13:af,1.2.3.4
will only match a
Token-Ring hardware address, since the ARP-address type for token ring
is 6.
.TP .TP
.B \-Z, --read-ethers .B \-Z, --read-ethers
Read /etc/ethers for information about hosts for the DHCP server. The Read /etc/ethers for information about hosts for the DHCP server. The
@@ -432,6 +438,11 @@ dotted-quad IP addresses, a decimal number, colon-separated hex digits
and a text string. If the optional network-ids are given then and a text string. If the optional network-ids are given then
this option is only sent when all the network-ids are matched. this option is only sent when all the network-ids are matched.
Special processing is done on a text argument for option 119, to
conform with RFC 3397, and dotted-quad IP addresses which are followed
by a slash and then a netmask size are encoded as described in RFC
3442.
Be careful: no checking is done that the correct type of data for the Be careful: no checking is done that the correct type of data for the
option number is sent, it is quite possible to option number is sent, it is quite possible to
persuade dnsmasq to generate illegal DHCP packets with injudicious use persuade dnsmasq to generate illegal DHCP packets with injudicious use
@@ -476,7 +487,13 @@ to different classes of hosts. It is possible, for instance to use
this to set a different printer server for hosts in the class this to set a different printer server for hosts in the class
"accounts" than for hosts in the class "engineering". "accounts" than for hosts in the class "engineering".
.TP .TP
.B \ -J, --dhcp-ignore=<network-id>[,<network-id>] .B \-4, --dhcp-mac=<network-id>,<MAC address>
Map from a MAC address to a network-id. The MAC address may include
wildcards. For example
.B --dhcp-mac=3com,01:34:23:*:*:*
will set the tag "3com" for any host whose MAC address matches the pattern.
.TP
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
When all the given network-ids match the set of network-ids derived When all the given network-ids match the set of network-ids derived
from the net, host, vendor and user classes, ignore the host and do from the net, host, vendor and user classes, ignore the host and do
not allocate it a DHCP lease. not allocate it a DHCP lease.
@@ -498,7 +515,9 @@ process.
Should be set when dnsmasq is definately the only DHCP server on a network. Should be set when dnsmasq is definately the only DHCP server on a network.
It changes the behaviour from strict RFC compliance so that DHCP requests on It changes the behaviour from strict RFC compliance so that DHCP requests on
unknown leases from unknown hosts are not ignored. This allows new hosts unknown leases from unknown hosts are not ignored. This allows new hosts
to get a lease without a tedious timeout under all circumstances. to get a lease without a tedious timeout under all circumstances. It also
allows dnsmasq to rebuild its lease database without each client needing to
reaquire a lease, if the database is lost.
.TP .TP
.B \-3, --bootp-dynamic .B \-3, --bootp-dynamic
Enable dynamic allocation of IP addresses to BOOTP clients. Use this Enable dynamic allocation of IP addresses to BOOTP clients. Use this
+190 -178
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-09-27 09:37+0100\n" "PO-Revision-Date: 2005-09-27 09:37+0100\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
# @Simon: Here I need an example to understand it :) # @Simon: Here I need an example to understand it :)
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
# @Simon: Here I need an example to understand it :) # @Simon: Here I need an example to understand it :)
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "lese %s - %d Adressen" msgstr "lese %s - %d Adressen"
@@ -68,7 +68,7 @@ msgstr ""
# @Simon: I would prefer to use "noch gültige" = "still valid", would that fit to the sense? Then it would be: # @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: 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? # @Simon: btw, what is the "%d/%d"-part?
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "Speicher nicht verfügbar" msgstr "Speicher nicht verfügbar"
@@ -95,26 +95,26 @@ msgstr "Start gescheitert"
msgid "infinite" msgid "infinite"
msgstr "unendlich" msgstr "unendlich"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Lokale abzuhörende Adresse(n) angeben." msgstr "Lokale abzuhörende Adresse(n) angeben."
# @Simon: Quite literal translation, sounds not too polite in german. # @Simon: Quite literal translation, sounds not too polite in german.
# @Simon: How about: "Bitte die lokalen abzuhörende Adresse(n) angeben." # @Simon: How about: "Bitte die lokalen abzuhörende Adresse(n) angeben."
# @Simon: = "Please specify the local address(es) to listen on." # @Simon: = "Please specify the local address(es) to listen on."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "Rückkehr-IP-Adresse für alle Geräte in angebenen Domänen" msgstr "Rückkehr-IP-Adresse für alle Geräte in angebenen Domänen"
# @Simon: I hope "Return ipaddr" is similar to "Return-ipaddr" and not "Return the ipaddr ... !" # @Simon: I hope "Return ipaddr" is similar to "Return-ipaddr" and not "Return the ipaddr ... !"
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "" msgstr ""
"'Gefälschte' Rückwärts-Ergebnisse für private Adressbereiche nach RFC1918" "'Gefälschte' Rückwärts-Ergebnisse für private Adressbereiche nach RFC1918"
# @Simon: I'm a bit unsure about the meaning of "Fake" here, and the best word for "lookup" is "Nachsehen" # @Simon: I'm a bit unsure about the meaning of "Fake" here, and the best word for "lookup" is "Nachsehen"
# @Simon: (that is "looking-for") but I think that cannot be used. "Ergebnisse" = "results", is that near enough? # @Simon: (that is "looking-for") but I think that cannot be used. "Ergebnisse" = "results", is that near enough?
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)." msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)."
@@ -125,17 +125,17 @@ msgstr "Behandle IP-Adr als NXDOMAIN (wehrt Verisign-Platzhalter ab)."
# @Simon: "Behandle IP-Adr als NXDOMAIN (gegen Verisigns Platzhalter-Gebrauch)." # @Simon: "Behandle IP-Adr als NXDOMAIN (gegen Verisigns Platzhalter-Gebrauch)."
# @Simon: = "Treat ipaddr as NXDOMAIN (defeats Verisigns wildcard usage)." ? # @Simon: = "Treat ipaddr as NXDOMAIN (defeats Verisigns wildcard usage)." ?
# @Simon: But the explanatory(?) effect is only a very tiny bit better, I believe - what do U think? # @Simon: But the explanatory(?) effect is only a very tiny bit better, I believe - what do U think?
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Angabe der Größe des Caches in Einträgen (Voreinstellung: %s)." msgstr "Angabe der Größe des Caches in Einträgen (Voreinstellung: %s)."
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)." msgstr "Angabe der Konfigurationsdatei (Voreinstellung: %s)."
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus" msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus"
@@ -143,398 +143,406 @@ msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus"
# @Simon: I know it sounds a bit clumsy in english, but "fork" would be hard to understand # @Simon: I know it sounds a bit clumsy in english, but "fork" would be hard to understand
# @Simon: and then I get a problem between "go" and "run" - so... # @Simon: and then I get a problem between "go" and "run" - so...
# @Simon: "Debug-mode" = "Fehlersuch-Modus", literally, but I think "Debug-Modus" is better :) # @Simon: "Debug-mode" = "Fehlersuch-Modus", literally, but I think "Debug-Modus" is better :)
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "Anfragen ohne Domänen-Teil NICHT weiterschicken" msgstr "Anfragen ohne Domänen-Teil NICHT weiterschicken"
# @Simon: "weiterschicken" is rather "pass on" (I hope) but that's the best I found. # @Simon: "weiterschicken" is rather "pass on" (I hope) but that's the best I found.
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Rückgabe auf sich selbst zeigender MX-Einträge für lokale Geräte" msgstr "Rückgabe auf sich selbst zeigender MX-Einträge für lokale Geräte"
# @Simon: "self-pointing" is a bit difficult, the meaning is clear but takes 3-4 words to express it in german. # @Simon: "self-pointing" is a bit difficult, the meaning is clear but takes 3-4 words to express it in german.
# @Simon: "Geräte" is about "hard-devices". There is a word for "host" (it is "Wirt") but it would be misleading. # @Simon: "Geräte" is about "hard-devices". There is a word for "host" (it is "Wirt") but it would be misleading.
# @Simon: My online dict suggest "Rechner" (= Computer), but I think "hard-devices" is better because it's more general. # @Simon: My online dict suggest "Rechner" (= Computer), but I think "hard-devices" is better because it's more general.
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "Erweitere einfache Namen in /etc/hosts mit der Domänen-Endung" msgstr "Erweitere einfache Namen in /etc/hosts mit der Domänen-Endung"
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "'unechte' DNS-Anfragen von Windows-Rechnern nicht weiterleiten" msgstr "'unechte' DNS-Anfragen von Windows-Rechnern nicht weiterleiten"
# @Simon: I'm a bit unsure about "spurious" # @Simon: I'm a bit unsure about "spurious"
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "" msgstr ""
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "" msgstr ""
#: option.c:137
msgid "Set address or hostname for a specified machine."
msgstr ""
#: option.c:138 #: option.c:138
#, c-format msgid "Set address or hostname for a specified machine."
msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:139 #: option.c:139
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:140 #: option.c:140
msgid "Specify interface(s) to listen on." #, c-format
msgid "Specify a hosts file to be read in addition to %s."
msgstr "" msgstr ""
#: option.c:141 #: option.c:141
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) to listen on."
msgstr "" msgstr ""
#: option.c:142 #: option.c:142
msgid "Map DHCP user class to option set." msgid "Specify interface(s) NOT to listen on."
msgstr "" msgstr ""
#: option.c:143 #: option.c:143
msgid "Don't do DHCP for hosts in option set." msgid "Map DHCP user class to option set."
msgstr "" msgstr ""
#: option.c:144 #: option.c:144
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Don't do DHCP for hosts in option set."
msgstr "" msgstr ""
#: option.c:145 #: option.c:145
msgid "Assume we are the only DHCP server on the local network." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "" msgstr ""
#: option.c:146 #: option.c:146
msgid "Assume we are the only DHCP server on the local network."
msgstr ""
#: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "" msgstr ""
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "" msgstr ""
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "" msgstr ""
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "" msgstr ""
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "" msgstr ""
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "" msgstr ""
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "" msgstr ""
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "" msgstr ""
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "" msgstr ""
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "" msgstr ""
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "" msgstr ""
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "" msgstr ""
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "" msgstr ""
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "" msgstr ""
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "" msgstr ""
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "" msgstr ""
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "" msgstr ""
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "" msgstr ""
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "" msgstr ""
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "" msgstr ""
#: option.c:170
msgid "Display this message."
msgstr ""
#: option.c:171 #: option.c:171
#, c-format msgid "Display this message."
msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:172 #: option.c:172
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:173 #: option.c:173
msgid "Answer DNS queries based on the interface a query was sent to." #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:174 #: option.c:174
msgid "Specify TXT DNS record." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
#: option.c:175 #: option.c:175
msgid "Bind only to interfaces in use." msgid "Specify TXT DNS record."
msgstr "" msgstr ""
#: option.c:176 #: option.c:176
msgid "Bind only to interfaces in use."
msgstr ""
#: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "" msgstr ""
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "" msgstr ""
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "" msgstr ""
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "" msgstr ""
#: option.c:394 #: option.c:181
msgid "Map MAC address (with wildcards) to option set."
msgstr ""
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "" msgstr ""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "" msgstr ""
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "" msgstr ""
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "" msgstr ""
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "" msgstr ""
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "" msgstr ""
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "" msgstr ""
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "" msgstr ""
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "" msgstr ""
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "" msgstr ""
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "" msgstr ""
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "" msgstr ""
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "" msgstr ""
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "" msgstr ""
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "" msgstr ""
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "" msgstr ""
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "" msgstr ""
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "" msgstr ""
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "" msgstr ""
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "" msgstr ""
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "" msgstr ""
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "" msgstr ""
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "" msgstr ""
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "" msgstr ""
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "" msgstr ""
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "" msgstr ""
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "" msgstr ""
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "" msgstr ""
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "" msgstr ""
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "" msgstr ""
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "" msgstr ""
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "" msgstr ""
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "" msgstr ""
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "" msgstr ""
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "" msgstr ""
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "" msgstr ""
@@ -645,71 +653,71 @@ msgstr ""
msgid "must set exactly one interface on broken systems without IP_RECVIF" msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "" msgstr ""
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "" msgstr ""
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "" msgstr ""
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "" msgstr ""
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "" msgstr ""
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "" msgstr ""
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "" msgstr ""
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "" msgstr ""
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "" msgstr ""
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "" msgstr ""
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "" msgstr ""
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "" msgstr ""
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "" msgstr ""
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "" msgstr ""
@@ -755,67 +763,71 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:77
msgid "too many stored leases"
msgstr ""
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "" msgstr ""
#: rfc2131.c:220 #: dhcp.c:413
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:722
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:741
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:845
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:881
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:80
msgid "too many stored leases"
msgstr ""
#: lease.c:179
msgid "failed to write"
msgstr ""
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "" msgstr ""
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "" msgstr ""
@@ -823,62 +835,62 @@ msgstr ""
msgid "no address configured" msgid "no address configured"
msgstr "" msgstr ""
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "" msgstr ""
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "" msgstr ""
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "" msgstr ""
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "" msgstr ""
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "" msgstr ""
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "" msgstr ""
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "" msgstr ""
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "" msgstr ""
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "" msgstr ""
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "" msgstr ""
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "" msgstr ""
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "" msgstr ""
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "" msgstr ""
+162 -148
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-10-07 11:04+0100\n" "PO-Revision-Date: 2005-10-07 11:04+0100\n"
"Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n" "Last-Translator: Christopher Chatham <chrislinux@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n" "Language-Team: Spanish <es@li.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "no se pudo cargar nombres desde %s: %m" msgstr "no se pudo cargar nombres desde %s: %m"
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "nombre erróneo en %s línea %d" msgstr "nombre erróneo en %s línea %d"
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "nombre erróneo en %s línea %d" msgstr "nombre erróneo en %s línea %d"
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "direcciónes %s - %d leídas" msgstr "direcciónes %s - %d leídas"
@@ -55,7 +55,7 @@ msgstr ""
"tamaño de caché %d, %d/%d inserciónes de caché reutilizaron entradas no " "tamaño de caché %d, %d/%d inserciónes de caché reutilizaron entradas no "
"vencidas." "vencidas."
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "no se pudo conseguir memoria" msgstr "no se pudo conseguir memoria"
@@ -73,268 +73,273 @@ msgstr "el intento de inicio ha FALLADO"
msgid "infinite" msgid "infinite"
msgstr "infinito" msgstr "infinito"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Especificar dirección(es) locales dónde escuchar." msgstr "Especificar dirección(es) locales dónde escuchar."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "" msgstr ""
"Retornar ipaddr (dirección IP) para todos los hosts en los dominios " "Retornar ipaddr (dirección IP) para todos los hosts en los dominios "
"especificados." "especificados."
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "" msgstr ""
"Falsificar búsquedas reversas para rangos de dirección privados RFC1918." "Falsificar búsquedas reversas para rangos de dirección privados RFC1918."
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Tratar ipaddr (dirección IP) como NXDOMAIN (derrota comodín Verisign)." msgstr "Tratar ipaddr (dirección IP) como NXDOMAIN (derrota comodín Verisign)."
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "" msgstr ""
"Especificar tamaño de caché en cuanto a entradas (%s por predeterminado)." "Especificar tamaño de caché en cuanto a entradas (%s por predeterminado)."
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Especificar archivo de configuración (%s por predeterminado)." msgstr "Especificar archivo de configuración (%s por predeterminado)."
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "NO hacer un fork hacia el fondo: correr en modo debug." msgstr "NO hacer un fork hacia el fondo: correr en modo debug."
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "NO reenviar búsquedas sin parte de dominio." msgstr "NO reenviar búsquedas sin parte de dominio."
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Retornar records MX auto-señaladores para hosts locales." msgstr "Retornar records MX auto-señaladores para hosts locales."
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "" msgstr ""
"Expandir nombres simples en /etc/hosts con domain-suffix (sufijo de dominio)." "Expandir nombres simples en /etc/hosts con domain-suffix (sufijo de dominio)."
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "No reenviar pedidos DNS falsos desde máquinas Windows." msgstr "No reenviar pedidos DNS falsos desde máquinas Windows."
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "Habilitar DHCP dentro del rango brindado con duración del arriendo." msgstr "Habilitar DHCP dentro del rango brindado con duración del arriendo."
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "Cambiar a este grupo después del inicio (%s por predeterminado)." msgstr "Cambiar a este grupo después del inicio (%s por predeterminado)."
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "Fijar dirección o nombre de host para una máquina específica." msgstr "Fijar dirección o nombre de host para una máquina específica."
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "NO cargar archivo %s." msgstr "NO cargar archivo %s."
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "Especificar un archivo de hosts para leer adicionalmente a %s." msgstr "Especificar un archivo de hosts para leer adicionalmente a %s."
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Especificar interface(s) donde escuchar." msgstr "Especificar interface(s) donde escuchar."
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Especificar interface(s) donde NO escuchar." msgstr "Especificar interface(s) donde NO escuchar."
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "Trazar clase de usuario DHCP a la opción fijada." msgstr "Trazar clase de usuario DHCP a la opción fijada."
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "No hacer DHCP para hosts en la opción fijada." msgstr "No hacer DHCP para hosts en la opción fijada."
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "NO hacer un fork hacia el fondo, NO correr en modo debug." msgstr "NO hacer un fork hacia el fondo, NO correr en modo debug."
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "Asumir que somos el único servidor DHCP en la red local." msgstr "Asumir que somos el único servidor DHCP en la red local."
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "Especificar donde guardar arriendos DHCP (%s por predeterminado)." msgstr "Especificar donde guardar arriendos DHCP (%s por predeterminado)."
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "Retornar récords MX para hosts locales." msgstr "Retornar récords MX para hosts locales."
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Especificar un récord MX." msgstr "Especificar un récord MX."
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Especificar opciónes BOOTP a servidor DHCP." msgstr "Especificar opciónes BOOTP a servidor DHCP."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "NO revisar archivo %s periodicamente, recargar solo con SIGHUP." msgstr "NO revisar archivo %s periodicamente, recargar solo con SIGHUP."
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "NO cachear resultados de búsquedas fallidas." msgstr "NO cachear resultados de búsquedas fallidas."
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "Usar servidores DNS estrictamente en el órden dado en %s." msgstr "Usar servidores DNS estrictamente en el órden dado en %s."
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "Fijar opciones extra para ser enviadas a clientes DHCP." msgstr "Fijar opciones extra para ser enviadas a clientes DHCP."
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "" msgstr ""
"Especificar puerto donde escuchar por búsquedas DNS (53 por predeterminado)." "Especificar puerto donde escuchar por búsquedas DNS (53 por predeterminado)."
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "" msgstr ""
"Máximo tamaño soportado de paquetes UDP para EDNS.0 (%s por predeterminado)." "Máximo tamaño soportado de paquetes UDP para EDNS.0 (%s por predeterminado)."
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Bitacorear búsquedas." msgstr "Bitacorear búsquedas."
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "Enforzar el puerto original para búsquedas upstream." msgstr "Enforzar el puerto original para búsquedas upstream."
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "NO leer resolv.conf." msgstr "NO leer resolv.conf."
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Especificar el destino hacia resolv.conf (%s por predeterminado)." msgstr "Especificar el destino hacia resolv.conf (%s por predeterminado)."
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
"Especificar dirección(es) de servidor upstream con dominios opcionales." "Especificar dirección(es) de servidor upstream con dominios opcionales."
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "Nunca reenviar búsquedas a dominios especificados." msgstr "Nunca reenviar búsquedas a dominios especificados."
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Especificar dominio para asignar en arriendos DHCP." msgstr "Especificar dominio para asignar en arriendos DHCP."
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Especificar destino predeterminado en un récord MX." msgstr "Especificar destino predeterminado en un récord MX."
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
"Especificar tiempo de vida en segundos para respuestas desde /etc/hosts." "Especificar tiempo de vida en segundos para respuestas desde /etc/hosts."
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Cambiar a este usuario despues de iniciar (%s por predeterminado)." msgstr "Cambiar a este usuario despues de iniciar (%s por predeterminado)."
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Trazar clase de vendedor DHCP a opción fijada." msgstr "Trazar clase de vendedor DHCP a opción fijada."
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "Mostrar información sobre la versión y copyright de dnsmasq." msgstr "Mostrar información sobre la versión y copyright de dnsmasq."
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "Traducir direcciones IPv4 desde servidores upstream." msgstr "Traducir direcciones IPv4 desde servidores upstream."
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "Especificar un récord SRV." msgstr "Especificar un récord SRV."
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Mostrar este mensaje." msgstr "Mostrar este mensaje."
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Especificar path de archivo PID (%s por predeterminado)." msgstr "Especificar path de archivo PID (%s por predeterminado)."
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Especificar número máximo de arriendos DHCP (%s por predeterminado)." msgstr "Especificar número máximo de arriendos DHCP (%s por predeterminado)."
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
"Responder a búsquedas DNS en base a la interface donde fueron enviadas." "Responder a búsquedas DNS en base a la interface donde fueron enviadas."
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Especificar récord DNS TXT." msgstr "Especificar récord DNS TXT."
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "Acoplar solo a interfaces en uso." msgstr "Acoplar solo a interfaces en uso."
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Leer información sobre hosts DHCP estáticos desde %s." msgstr "Leer información sobre hosts DHCP estáticos desde %s."
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "Habilitar la interface DBus para fijar servidores upstream, etc." msgstr "Habilitar la interface DBus para fijar servidores upstream, etc."
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "No proveer DHCP en esta interface, solo proveer DNS." msgstr "No proveer DHCP en esta interface, solo proveer DNS."
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "Habilitar alocación dinámica de direcciónes para BOOTP." msgstr "Habilitar alocación dinámica de direcciónes para BOOTP."
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Trazar clase de vendedor DHCP a opción fijada."
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "falta \"" msgstr "falta \""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "opción errónea" msgstr "opción errónea"
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "no se puede leer %s: %s" msgstr "no se puede leer %s: %s"
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -343,22 +348,22 @@ msgstr ""
"Modo de uso: dnsmasq [opciones]\n" "Modo de uso: dnsmasq [opciones]\n"
"\n" "\n"
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Usar opciones cortas solo en la línea de comandos.\n" msgstr "Usar opciones cortas solo en la línea de comandos.\n"
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Opciones válidas son :\n" msgstr "Opciones válidas son :\n"
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "Dnsmasq versión %s %s\n" msgstr "Dnsmasq versión %s %s\n"
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -367,144 +372,148 @@ msgstr ""
"Opciones de compilación %s\n" "Opciones de compilación %s\n"
"\n" "\n"
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Este software viene SIN NINGUNA GARANTIA.\n" msgstr "Este software viene SIN NINGUNA GARANTIA.\n"
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "Dnsmasq es software libre, y usted está bienvenido a redistribuirlo\n" msgstr "Dnsmasq es software libre, y usted está bienvenido a redistribuirlo\n"
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "bajo los términos de la GNU General Public License, versión 2.\n" msgstr "bajo los términos de la GNU General Public License, versión 2.\n"
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "parámetro extraño" msgstr "parámetro extraño"
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "parámetro ausente" msgstr "parámetro ausente"
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "inclusiones jerarquizadas no permitidas" msgstr "inclusiones jerarquizadas no permitidas"
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "preferencia MX errónea" msgstr "preferencia MX errónea"
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "nombre MX erróneo" msgstr "nombre MX erróneo"
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "destino MX erróneo" msgstr "destino MX erróneo"
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "puerto erróneo" msgstr "puerto erróneo"
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "dhcp-range (rango DHCP) erróneo" msgstr "dhcp-range (rango DHCP) erróneo"
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "rango DHCP inconsistente" msgstr "rango DHCP inconsistente"
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "dhcp-host erróneo" msgstr "dhcp-host erróneo"
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "dhcp-option erróneo" msgstr "dhcp-option erróneo"
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "dominio erróneo en dhcp-option" msgstr "dominio erróneo en dhcp-option"
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "opción dhcp-option demasiado larga" msgstr "opción dhcp-option demasiado larga"
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "récord TXT erróneo" msgstr "récord TXT erróneo"
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "récord TXT demasiado largo" msgstr "récord TXT demasiado largo"
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "récord SRV erróneo" msgstr "récord SRV erróneo"
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "destino SRV erróneo" msgstr "destino SRV erróneo"
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "número de puerto inválido" msgstr "número de puerto inválido"
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "prioridad inválida" msgstr "prioridad inválida"
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "peso inválido" msgstr "peso inválido"
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "error" msgstr "error"
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "opciones de línea de comandos erróneas: %s." msgstr "opciones de línea de comandos erróneas: %s."
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "no se puede obtener host-name (nombre de host): %s" msgstr "no se puede obtener host-name (nombre de host): %s"
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "solo un archivo resolv.conf permitido en modo no-poll." msgstr "solo un archivo resolv.conf permitido en modo no-poll."
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "debe haber exactamente un resolv.conf desde donde leer dominio." msgstr "debe haber exactamente un resolv.conf desde donde leer dominio."
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "no se pudo leer %s: %m" msgstr "no se pudo leer %s: %m"
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "ninguna directiva de búsqueda encontrada en %s" msgstr "ninguna directiva de búsqueda encontrada en %s"
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "servidor DNS %s se reuso a hacer una búsqueda recursiva" msgstr "servidor DNS %s se reuso a hacer una búsqueda recursiva"
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
"desbordamiento en la tabla de reenvio: revisar si hay loops de servidor." "desbordamiento en la tabla de reenvio: revisar si hay loops de servidor."
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "no se pudo accesar %s: %m" msgstr "no se pudo accesar %s: %m"
@@ -617,72 +626,72 @@ msgstr "no se puede abrir %s:%s"
msgid "must set exactly one interface on broken systems without IP_RECVIF" msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "debe fijarse exactamente una interface en sistemas rotos sin IP_RECVIF" msgstr "debe fijarse exactamente una interface en sistemas rotos sin IP_RECVIF"
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "error DBus: %s" msgstr "error DBus: %s"
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h"
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "versión %s iniciada, tamaño de caché %d" msgstr "versión %s iniciada, tamaño de caché %d"
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "versión %s iniciada, caché deshabilitado" msgstr "versión %s iniciada, caché deshabilitado"
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "opciones de compilación: %s" msgstr "opciones de compilación: %s"
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "soporte DBus habilitado: conectado a bus de sistema" msgstr "soporte DBus habilitado: conectado a bus de sistema"
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "soporte DBus habilitado: conección a bus pendiente" msgstr "soporte DBus habilitado: conección a bus pendiente"
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "" msgstr ""
"fijando opción --bind-interfaces debido a limitaciones de sistema operativo" "fijando opción --bind-interfaces debido a limitaciones de sistema operativo"
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "advertencia: interface %s no existe actualmente" msgstr "advertencia: interface %s no existe actualmente"
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "DHCP, arriendos estáticos solo en %.0s%s, tiempo de arriendo %s" msgstr "DHCP, arriendos estáticos solo en %.0s%s, tiempo de arriendo %s"
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, rango de IP %s -- %s, tiempo de arriendo %s" msgstr "DHCP, rango de IP %s -- %s, tiempo de arriendo %s"
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s será escrito cada %s" msgstr "DHCP, %s será escrito cada %s"
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "corriendo como root" msgstr "corriendo como root"
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "conectado a DBus de sistema" msgstr "conectado a DBus de sistema"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "haciendo exit al haber recibido SIGTERM" msgstr "haciendo exit al haber recibido SIGTERM"
@@ -730,68 +739,73 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "dirección IP duplicada en directiva dhcp-config." msgstr "dirección IP duplicada en directiva dhcp-config."
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "pedido DHCP por hardware no soportado tipo (%d) recibido en %s"
#: dhcp.c:413
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "rango DHCP %s -- %s no coincide con máscara de red %s" msgstr "rango DHCP %s -- %s no coincide con máscara de red %s"
#: dhcp.c:705 #: dhcp.c:722
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "no se pudo leer %s:%m" msgstr "no se pudo leer %s:%m"
#: dhcp.c:724 #: dhcp.c:741
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "nombre erróneo en %s línea %d" msgstr "nombre erróneo en %s línea %d"
#: dhcp.c:825 #: dhcp.c:845
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "dirección IP %s (%s) duplicada en directiva dhcp-config" msgstr "dirección IP %s (%s) duplicada en directiva dhcp-config"
#: dhcp.c:861 #: dhcp.c:881
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""
"Ignorando nombre de host DHCP %s porque contiene una parte ilegal de dominio." "Ignorando nombre de host DHCP %s porque contiene una parte ilegal de dominio."
#: lease.c:39 #: lease.c:38
#, c-format #, c-format
msgid "cannot open or create leases file: %s" msgid "cannot open or create leases file: %s"
msgstr "no se puede abrir o crear archivo de arriendos: %s" msgstr "no se puede abrir o crear archivo de arriendos: %s"
#: lease.c:77 #: lease.c:80
msgid "too many stored leases" msgid "too many stored leases"
msgstr "demasiados arriendos almacenados" msgstr "demasiados arriendos almacenados"
#: rfc2131.c:171 #: lease.c:179
#, c-format #, fuzzy
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "failed to write"
msgstr "pedido DHCP por hardware no soportado tipo (%d) recibido en %s" msgstr "no se pudo leer %s:%m"
#: rfc2131.c:220 #: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "ningún rango de direcciónes disponible para pedido DHCP %s %s" msgstr "ningún rango de direcciónes disponible para pedido DHCP %s %s"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "con selector de subred" msgstr "con selector de subred"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "vía" msgstr "vía"
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "deshabilitado" msgstr "deshabilitado"
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "dirección en uso" msgstr "dirección en uso"
@@ -799,62 +813,62 @@ msgstr "direcci
msgid "no address configured" msgid "no address configured"
msgstr "ninguna dirección configurada" msgstr "ninguna dirección configurada"
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "ninguna dirección disponible" msgstr "ninguna dirección disponible"
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "no queda ningún arriendo" msgstr "no queda ningún arriendo"
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "red equivocada" msgstr "red equivocada"
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "deshabilitando dirección DHCP estática %s" msgstr "deshabilitando dirección DHCP estática %s"
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "arriendo desconocido" msgstr "arriendo desconocido"
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "ignorado" msgstr "ignorado"
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "dirección equivocada" msgstr "dirección equivocada"
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "arriendo no encontrado" msgstr "arriendo no encontrado"
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "dirección no disponible" msgstr "dirección no disponible"
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "arriendo estático disponible" msgstr "arriendo estático disponible"
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "dirección reservada" msgstr "dirección reservada"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete" msgstr "no se puede enviar opción DHCP %d: no queda espacio en el paquete"
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Más de una clase de vendedor coincide, usando %s" msgstr "Más de una clase de vendedor coincide, usando %s"
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "no se puede acoplar socket netlink: %s" msgstr "no se puede acoplar socket netlink: %s"
+193 -181
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-11-28 22:05+0000\n" "PO-Revision-Date: 2005-11-28 22:05+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "" msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr "" msgstr ""
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "" msgstr ""
@@ -69,423 +69,431 @@ msgstr ""
msgid "infinite" msgid "infinite"
msgstr "" msgstr ""
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "" msgstr ""
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "" msgstr ""
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "" msgstr ""
#: option.c:127
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr ""
#: option.c:128 #: option.c:128
#, c-format msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "" msgstr ""
#: option.c:129 #: option.c:129
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "" msgstr ""
#: option.c:130 #: option.c:130
msgid "Do NOT fork into the background: run in debug mode." #, c-format
msgid "Specify configuration file (defaults to %s)."
msgstr "" msgstr ""
#: option.c:131 #: option.c:131
msgid "Do NOT forward queries with no domain part." msgid "Do NOT fork into the background: run in debug mode."
msgstr "" msgstr ""
#: option.c:132 #: option.c:132
msgid "Return self-pointing MX records for local hosts." msgid "Do NOT forward queries with no domain part."
msgstr "" msgstr ""
#: option.c:133 #: option.c:133
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Return self-pointing MX records for local hosts."
msgstr "" msgstr ""
#: option.c:134 #: option.c:134
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "" msgstr ""
#: option.c:135 #: option.c:135
msgid "Enable DHCP in the range given with lease duration." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "" msgstr ""
#: option.c:136 #: option.c:136
msgid "Enable DHCP in the range given with lease duration."
msgstr ""
#: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "" msgstr ""
#: option.c:137
msgid "Set address or hostname for a specified machine."
msgstr ""
#: option.c:138 #: option.c:138
#, c-format msgid "Set address or hostname for a specified machine."
msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:139 #: option.c:139
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:140 #: option.c:140
msgid "Specify interface(s) to listen on." #, c-format
msgid "Specify a hosts file to be read in addition to %s."
msgstr "" msgstr ""
#: option.c:141 #: option.c:141
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) to listen on."
msgstr "" msgstr ""
#: option.c:142 #: option.c:142
msgid "Map DHCP user class to option set." msgid "Specify interface(s) NOT to listen on."
msgstr "" msgstr ""
#: option.c:143 #: option.c:143
msgid "Don't do DHCP for hosts in option set." msgid "Map DHCP user class to option set."
msgstr "" msgstr ""
#: option.c:144 #: option.c:144
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Don't do DHCP for hosts in option set."
msgstr "" msgstr ""
#: option.c:145 #: option.c:145
msgid "Assume we are the only DHCP server on the local network." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "" msgstr ""
#: option.c:146 #: option.c:146
msgid "Assume we are the only DHCP server on the local network."
msgstr ""
#: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "" msgstr ""
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "" msgstr ""
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "" msgstr ""
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "" msgstr ""
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "" msgstr ""
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "" msgstr ""
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "" msgstr ""
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "" msgstr ""
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "" msgstr ""
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "" msgstr ""
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "" msgstr ""
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "" msgstr ""
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "" msgstr ""
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "" msgstr ""
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "" msgstr ""
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "" msgstr ""
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "" msgstr ""
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "" msgstr ""
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "" msgstr ""
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "" msgstr ""
#: option.c:170
msgid "Display this message."
msgstr ""
#: option.c:171 #: option.c:171
#, c-format msgid "Display this message."
msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:172 #: option.c:172
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:173 #: option.c:173
msgid "Answer DNS queries based on the interface a query was sent to." #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:174 #: option.c:174
msgid "Specify TXT DNS record." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
#: option.c:175 #: option.c:175
msgid "Bind only to interfaces in use." msgid "Specify TXT DNS record."
msgstr "" msgstr ""
#: option.c:176 #: option.c:176
msgid "Bind only to interfaces in use."
msgstr ""
#: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "" msgstr ""
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "" msgstr ""
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "" msgstr ""
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "" msgstr ""
#: option.c:394 #: option.c:181
msgid "Map MAC address (with wildcards) to option set."
msgstr ""
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "" msgstr ""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "" msgstr ""
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "" msgstr ""
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "" msgstr ""
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "" msgstr ""
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "" msgstr ""
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "" msgstr ""
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "" msgstr ""
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "" msgstr ""
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "" msgstr ""
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "" msgstr ""
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "" msgstr ""
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "" msgstr ""
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "" msgstr ""
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "" msgstr ""
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "" msgstr ""
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "" msgstr ""
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "" msgstr ""
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "" msgstr ""
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "" msgstr ""
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "" msgstr ""
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "" msgstr ""
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "" msgstr ""
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "" msgstr ""
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "" msgstr ""
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "" msgstr ""
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "" msgstr ""
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "" msgstr ""
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "" msgstr ""
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "" msgstr ""
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "" msgstr ""
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "" msgstr ""
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "" msgstr ""
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "" msgstr ""
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "" msgstr ""
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "" msgstr ""
@@ -596,71 +604,71 @@ msgstr ""
msgid "must set exactly one interface on broken systems without IP_RECVIF" msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "" msgstr ""
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "" msgstr ""
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "" msgstr ""
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "" msgstr ""
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "" msgstr ""
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "" msgstr ""
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "" msgstr ""
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "" msgstr ""
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "" msgstr ""
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "" msgstr ""
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "" msgstr ""
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "" msgstr ""
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "" msgstr ""
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "" msgstr ""
@@ -706,67 +714,71 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:77
msgid "too many stored leases"
msgstr ""
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "" msgstr ""
#: rfc2131.c:220 #: dhcp.c:413
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:722
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:741
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:845
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:881
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:80
msgid "too many stored leases"
msgstr ""
#: lease.c:179
msgid "failed to write"
msgstr ""
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "" msgstr ""
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "" msgstr ""
@@ -774,62 +786,62 @@ msgstr ""
msgid "no address configured" msgid "no address configured"
msgstr "" msgstr ""
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "" msgstr ""
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "" msgstr ""
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "" msgstr ""
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "" msgstr ""
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "" msgstr ""
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "" msgstr ""
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "" msgstr ""
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "" msgstr ""
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "" msgstr ""
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "" msgstr ""
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "" msgstr ""
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "" msgstr ""
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "" msgstr ""
+162 -148
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-10-02 19:05+0100\n" "PO-Revision-Date: 2005-10-02 19:05+0100\n"
"Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n" "Last-Translator: Lionel Tricon <lionel.tricon@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "Impossible de charger les noms a partir de %s: %m" msgstr "Impossible de charger les noms a partir de %s: %m"
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "lecture %s - %d adresses" msgstr "lecture %s - %d adresses"
@@ -55,7 +55,7 @@ msgstr ""
"taille de cache %d, %d/%d insertions dans le cache ont reutilisees des " "taille de cache %d, %d/%d insertions dans le cache ont reutilisees des "
"entrees qui n'ont pas expirees" "entrees qui n'ont pas expirees"
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "impossible d'allouer de la memoire" msgstr "impossible d'allouer de la memoire"
@@ -73,277 +73,282 @@ msgstr "IMPOSSIBLE de demarrer"
msgid "infinite" msgid "infinite"
msgstr "illimite" msgstr "illimite"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "" msgstr ""
"Specifie la ou les adresse(s) locales ou le demon doit se mettre a l'ecoute." "Specifie la ou les adresse(s) locales ou le demon doit se mettre a l'ecoute."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "" msgstr ""
"Retourne les adresses IP pour toutes les machines presentent dans les " "Retourne les adresses IP pour toutes les machines presentent dans les "
"domaines specifies" "domaines specifies"
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "Traduction inverse truquee pour la plage d'adresse privee RFC1918" msgstr "Traduction inverse truquee pour la plage d'adresse privee RFC1918"
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "" msgstr ""
"Traite l'adresse IP comme un domaine inexistant NXDOMAIN (contourne le " "Traite l'adresse IP comme un domaine inexistant NXDOMAIN (contourne le "
"systemede redirection de Verisign)" "systemede redirection de Verisign)"
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Specifie la taille du cache en entree (par defaut a %s)." msgstr "Specifie la taille du cache en entree (par defaut a %s)."
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Specifie le nom du fichier de configuration (par defaut %s)" msgstr "Specifie le nom du fichier de configuration (par defaut %s)"
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "Ne passe pas en tache de fond: demarre en mode debug" msgstr "Ne passe pas en tache de fond: demarre en mode debug"
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "Ne retransmet pas les requetes qui n'ont pas de domaine." msgstr "Ne retransmet pas les requetes qui n'ont pas de domaine."
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Retourne les champs MX pour les machines locales." msgstr "Retourne les champs MX pour les machines locales."
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "" msgstr ""
"Etend les noms uniques des machines dans /etc/hosts avec le suffixe du " "Etend les noms uniques des machines dans /etc/hosts avec le suffixe du "
"domaine." "domaine."
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "" msgstr ""
"Ne retransmet pas les fausses requetes DNS en provenance des machines " "Ne retransmet pas les fausses requetes DNS en provenance des machines "
"Windows." "Windows."
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "" msgstr ""
"Autorise DHCP dans la plage d'adresses donnee sur la duree de validite du " "Autorise DHCP dans la plage d'adresses donnee sur la duree de validite du "
"bail." "bail."
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "On change pour ce groupe apres le demarrage (par defaut a %s)." msgstr "On change pour ce groupe apres le demarrage (par defaut a %s)."
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "On assigne une adresse ou un nom pour une machine specifiee." msgstr "On assigne une adresse ou un nom pour une machine specifiee."
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "Ne charge PAS le fichier %s." msgstr "Ne charge PAS le fichier %s."
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "Specifie un nom de fichier hosts a lire en complement de %s" msgstr "Specifie un nom de fichier hosts a lire en complement de %s"
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Specifie la ou les interface(s) ou le demon doit se mettre a l'ecoute." msgstr "Specifie la ou les interface(s) ou le demon doit se mettre a l'ecoute."
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Specifie la ou les interface(s) que le demon ne doit PAS traiter." msgstr "Specifie la ou les interface(s) que le demon ne doit PAS traiter."
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "Associe les 'user class' DHCP aux options." msgstr "Associe les 'user class' DHCP aux options."
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "Ne pas autoriser DHCP pour les machines enumerees dans les options." msgstr "Ne pas autoriser DHCP pour les machines enumerees dans les options."
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "Ne passe pas en tache de fond, ne s'execute pas en mode debug." msgstr "Ne passe pas en tache de fond, ne s'execute pas en mode debug."
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "On considere que l'on est le seul serveur DHCP sur le reseau local." msgstr "On considere que l'on est le seul serveur DHCP sur le reseau local."
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "Specifie ou il faut sauvegarder les baux DHCP (par defaut a %s)." msgstr "Specifie ou il faut sauvegarder les baux DHCP (par defaut a %s)."
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "Retourne les champs MX pour les machines locales." msgstr "Retourne les champs MX pour les machines locales."
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Specifie un champ MX." msgstr "Specifie un champ MX."
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Specifie les options BOOTP pour le serveur DHCP." msgstr "Specifie les options BOOTP pour le serveur DHCP."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "" msgstr ""
"Ne pas scruter le fichier %s, recharger les modifications seulement sur " "Ne pas scruter le fichier %s, recharger les modifications seulement sur "
"reception du signal SIGHUP." "reception du signal SIGHUP."
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "Ne place pas en cache le resultat des requetes qui ont echouees." msgstr "Ne place pas en cache le resultat des requetes qui ont echouees."
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "Utilise les serveurs de noms dans l'ordre donne dans %s." msgstr "Utilise les serveurs de noms dans l'ordre donne dans %s."
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "Options supplementaires a associer aux clients DHCP." msgstr "Options supplementaires a associer aux clients DHCP."
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "" msgstr ""
"Specifie le port ou il faut ecouter les requetes DNS (par defaut a 53)." "Specifie le port ou il faut ecouter les requetes DNS (par defaut a 53)."
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "" msgstr ""
"Taille maximale des paquets UDP supportee pour EDNS.0 (par defaut a %s)." "Taille maximale des paquets UDP supportee pour EDNS.0 (par defaut a %s)."
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Logue les requetes." msgstr "Logue les requetes."
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "Force le port d'origine des requetes vers les serveurs amonts." msgstr "Force le port d'origine des requetes vers les serveurs amonts."
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "Ne pas lire le fichier resolv.conf." msgstr "Ne pas lire le fichier resolv.conf."
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Specifie le chemin pour le fichier resolv.conf (par defaut a %s)." msgstr "Specifie le chemin pour le fichier resolv.conf (par defaut a %s)."
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
"Specifie la ou les adresses des serveurs amonts avec des domaines optionels." "Specifie la ou les adresses des serveurs amonts avec des domaines optionels."
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "Ne jamais retransmettre les requetes pour les domaines specifies." msgstr "Ne jamais retransmettre les requetes pour les domaines specifies."
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Specifie le domaine qui doit etre assigne aux baux DHCP." msgstr "Specifie le domaine qui doit etre assigne aux baux DHCP."
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Speficie la cible par defaut dans un champ MX." msgstr "Speficie la cible par defaut dans un champ MX."
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
"Specifie le TTL en secondes pour les reponses qui utilisent /etc/hosts." "Specifie le TTL en secondes pour les reponses qui utilisent /etc/hosts."
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Change pour cet utilisateur apres le demarrage (par defaut a %s)." msgstr "Change pour cet utilisateur apres le demarrage (par defaut a %s)."
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Associe les 'vendor class' DHCP aux options." msgstr "Associe les 'vendor class' DHCP aux options."
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "Affiche la version de Dnsmasq et les informations liees au copyright." msgstr "Affiche la version de Dnsmasq et les informations liees au copyright."
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "Traduit les adresses IPV4 des serveurs amonts." msgstr "Traduit les adresses IPV4 des serveurs amonts."
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr " Specifie un champ SRV." msgstr " Specifie un champ SRV."
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Affiche ce message." msgstr "Affiche ce message."
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Specifie un chemin pour le fichier PID (par defaut a %s)." msgstr "Specifie un chemin pour le fichier PID (par defaut a %s)."
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Specifie le nombre maximum de baux DHCP (par defaut a %s)." msgstr "Specifie le nombre maximum de baux DHCP (par defaut a %s)."
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
"Repond aux requetes DNS en se basant sur l'interface ou a ete envoyee la " "Repond aux requetes DNS en se basant sur l'interface ou a ete envoyee la "
"requete." "requete."
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Specifie un champ DNS TXT" msgstr "Specifie un champ DNS TXT"
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "Associe seulement aux interfaces en utilisation." msgstr "Associe seulement aux interfaces en utilisation."
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Lecture des informations de DHCP statique a partir de %s." msgstr "Lecture des informations de DHCP statique a partir de %s."
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "Autorise l'interface DBus a configurer les serveurs amonts, etc." msgstr "Autorise l'interface DBus a configurer les serveurs amonts, etc."
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "Ne fourni pas DHCP pour cette interface, mais seulement DNS." msgstr "Ne fourni pas DHCP pour cette interface, mais seulement DNS."
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "Autorise l'allocation dynamique d'adresse pour bootp." msgstr "Autorise l'allocation dynamique d'adresse pour bootp."
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Associe les 'vendor class' DHCP aux options."
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "il manque \"" msgstr "il manque \""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "mauvaise option" msgstr "mauvaise option"
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "Ne peut pas lire %s: %s" msgstr "Ne peut pas lire %s: %s"
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -352,22 +357,22 @@ msgstr ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
"\n" "\n"
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Utilisez les options courtes uniquement sur la ligne de commande.\n" msgstr "Utilisez les options courtes uniquement sur la ligne de commande.\n"
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Les options valides sont :\n" msgstr "Les options valides sont :\n"
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "Version de Dnsmasq %s %s\n" msgstr "Version de Dnsmasq %s %s\n"
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -376,148 +381,152 @@ msgstr ""
"Options a la compilation %s\n" "Options a la compilation %s\n"
"\n" "\n"
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Ce logiciel est fourni sans GARANTIE aucune.\n" msgstr "Ce logiciel est fourni sans GARANTIE aucune.\n"
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "Dnsmasq est un logiciel libre, et vous etes invite a le redistribuer\n" msgstr "Dnsmasq est un logiciel libre, et vous etes invite a le redistribuer\n"
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "" msgstr ""
"sous les termes de la licence GPL (GNU General Public License), version 2.\n" "sous les termes de la licence GPL (GNU General Public License), version 2.\n"
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "parametre supplementaire" msgstr "parametre supplementaire"
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "parametre manquant" msgstr "parametre manquant"
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "Inclusions d'inclusions non autorisees" msgstr "Inclusions d'inclusions non autorisees"
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "Mauvaise preference MX" msgstr "Mauvaise preference MX"
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "mauvais nom MX" msgstr "mauvais nom MX"
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "mauvaise cible MX" msgstr "mauvaise cible MX"
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "mauvais port" msgstr "mauvais port"
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "mauvaise plage d'adresses DHCP (dhcp-range)" msgstr "mauvaise plage d'adresses DHCP (dhcp-range)"
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "plage d'adresses DHCP incoherente" msgstr "plage d'adresses DHCP incoherente"
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "mauvais dhcp-host" msgstr "mauvais dhcp-host"
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "mauvais dhcp-option" msgstr "mauvais dhcp-option"
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "mauvais domaine dans dhcp-option" msgstr "mauvais domaine dans dhcp-option"
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "dhcp-option trop long" msgstr "dhcp-option trop long"
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "mauvais champ TXT" msgstr "mauvais champ TXT"
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "chaîne du champ TXT trop longue" msgstr "chaîne du champ TXT trop longue"
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "mauvais champ SRV" msgstr "mauvais champ SRV"
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "mauvaise cible SRV" msgstr "mauvaise cible SRV"
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "numero de port invalide" msgstr "numero de port invalide"
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "priorite invalide" msgstr "priorite invalide"
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "poids invalide" msgstr "poids invalide"
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "erreur" msgstr "erreur"
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "mauvaises options en ligne de commande: %s." msgstr "mauvaises options en ligne de commande: %s."
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "ne peut pas obtenir le nom de la machine: %s" msgstr "ne peut pas obtenir le nom de la machine: %s"
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "seul un fichier resolv.conf est autorise dans le mode no-poll" msgstr "seul un fichier resolv.conf est autorise dans le mode no-poll"
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
"on doit avoir exactement un seul fichier resolv.conf pour y recuperer le nom " "on doit avoir exactement un seul fichier resolv.conf pour y recuperer le nom "
"de domaine." "de domaine."
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "impossible de lire %s: %m" msgstr "impossible de lire %s: %m"
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "pas de directive de recherche trouvee dans %s" msgstr "pas de directive de recherche trouvee dans %s"
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "le serveur de nom %s a refuse de faire une recherche recursive" msgstr "le serveur de nom %s a refuse de faire une recherche recursive"
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
"Table de stockage des requetes DNS pleine : verifiez la configuration du " "Table de stockage des requetes DNS pleine : verifiez la configuration du "
"serveur (risque de boucle recursive)." "serveur (risque de boucle recursive)."
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "impossible d'acceder a %s: %m" msgstr "impossible d'acceder a %s: %m"
@@ -632,72 +641,72 @@ msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "" msgstr ""
"on doit declarer exactement une interface sur les systemes sans IP_RECVIF" "on doit declarer exactement une interface sur les systemes sans IP_RECVIF"
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "Erreur DBus: %s" msgstr "Erreur DBus: %s"
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus n'est pas disponible: declarez HAVE_DBUS dans src/config.h" msgstr "DBus n'est pas disponible: declarez HAVE_DBUS dans src/config.h"
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "demarre, version %s taille de cache %d" msgstr "demarre, version %s taille de cache %d"
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "demarre, version %s cache desactive" msgstr "demarre, version %s cache desactive"
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "options a la compilation: %s" msgstr "options a la compilation: %s"
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "Support DBus autorise: connecte au bus systeme" msgstr "Support DBus autorise: connecte au bus systeme"
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "Support DBus autorise: connexion au bus en suspend" msgstr "Support DBus autorise: connexion au bus en suspend"
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "Active l'option --bind-interfaces a cause des limitations de l'OS" msgstr "Active l'option --bind-interfaces a cause des limitations de l'OS"
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "Attention: l'interface %s n'existe pas actuellement" msgstr "Attention: l'interface %s n'existe pas actuellement"
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "" msgstr ""
"DHCP, baux statiques seulement sur %.0s%s, duree de validite de bail %s" "DHCP, baux statiques seulement sur %.0s%s, duree de validite de bail %s"
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, plage d'adresse %s -- %s, duree de bail %s" msgstr "DHCP, plage d'adresse %s -- %s, duree de bail %s"
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s sera ecrit chaque %s" msgstr "DHCP, %s sera ecrit chaque %s"
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "execute sous root" msgstr "execute sous root"
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "connecte au systeme DBus" msgstr "connecte au systeme DBus"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "sortie sur reception du signal SIGTERM" msgstr "sortie sur reception du signal SIGTERM"
@@ -745,71 +754,76 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "adresse IP %s dupliquee dans la directive dhcp-config." msgstr "adresse IP %s dupliquee dans la directive dhcp-config."
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "requete DHCP pour un type de materiel non supporte (%d) recue sur %s"
#: dhcp.c:413
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "" msgstr ""
"La plage d'adresses DHCP %s -- %s n'est pas coherente avec le masque de " "La plage d'adresses DHCP %s -- %s n'est pas coherente avec le masque de "
"reseau %s" "reseau %s"
#: dhcp.c:705 #: dhcp.c:722
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "impossible de lire %s:%m" msgstr "impossible de lire %s:%m"
#: dhcp.c:724 #: dhcp.c:741
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "mauvais nom dans %s ligne %d" msgstr "mauvais nom dans %s ligne %d"
#: dhcp.c:825 #: dhcp.c:845
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "adresse IP %s (%s) dupliquee dans la directive dhcp-config." msgstr "adresse IP %s (%s) dupliquee dans la directive dhcp-config."
#: dhcp.c:861 #: dhcp.c:881
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""
"On ignore le nom de machine DHCP %s parce-qu'il possede un nom de domaine " "On ignore le nom de machine DHCP %s parce-qu'il possede un nom de domaine "
"illegal" "illegal"
#: lease.c:39 #: lease.c:38
#, c-format #, c-format
msgid "cannot open or create leases file: %s" msgid "cannot open or create leases file: %s"
msgstr "ne peut ouvrir ou creer des fichiers de baux: %s" msgstr "ne peut ouvrir ou creer des fichiers de baux: %s"
#: lease.c:77 #: lease.c:80
msgid "too many stored leases" msgid "too many stored leases"
msgstr "beaucoup trop de baux enregistres" msgstr "beaucoup trop de baux enregistres"
#: rfc2131.c:171 #: lease.c:179
#, c-format #, fuzzy
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "failed to write"
msgstr "requete DHCP pour un type de materiel non supporte (%d) recue sur %s" msgstr "impossible de lire %s:%m"
#: rfc2131.c:220 #: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "pas de plage d'adresse disponible pour la requete DHCP %s %s" msgstr "pas de plage d'adresse disponible pour la requete DHCP %s %s"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "avec selecteur de sous-reseau" msgstr "avec selecteur de sous-reseau"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "par l'intermediaire de" msgstr "par l'intermediaire de"
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "desactive" msgstr "desactive"
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "adresse deja utilisee" msgstr "adresse deja utilisee"
@@ -817,62 +831,62 @@ msgstr "adresse deja utilisee"
msgid "no address configured" msgid "no address configured"
msgstr "pas d'adresse configuree" msgstr "pas d'adresse configuree"
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "pas d'adresse disponible" msgstr "pas d'adresse disponible"
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "aucun baux laisses" msgstr "aucun baux laisses"
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "mauvais reseau" msgstr "mauvais reseau"
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "desactive l'adresse statique DHCP %s" msgstr "desactive l'adresse statique DHCP %s"
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "bail inconnu" msgstr "bail inconnu"
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "ignore" msgstr "ignore"
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "mauvaise adresse" msgstr "mauvaise adresse"
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "bail non trouve" msgstr "bail non trouve"
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "adresse non disponible" msgstr "adresse non disponible"
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "bail statique disponible" msgstr "bail statique disponible"
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "adresse reservee" msgstr "adresse reservee"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Plus d'une seule classe de fournisseur correspond, on utilise %s" msgstr "Plus d'une seule classe de fournisseur correspond, on utilise %s"
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "ne peux lier une socket netlink: %s" msgstr "ne peux lier une socket netlink: %s"
+196 -180
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-10-07 11:45+0100\n" "PO-Revision-Date: 2005-10-07 11:45+0100\n"
"Last-Translator: Salman AS <sas@salman.or.id>\n" "Last-Translator: Salman AS <sas@salman.or.id>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\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" msgstr "gagal memuat nama-nama dari %s: %m"
# OK # OK
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "kesalahan nama pada %s baris %d" msgstr "kesalahan nama pada %s baris %d"
# OK # OK
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "kesalahan nama pada %s baris %d" msgstr "kesalahan nama pada %s baris %d"
# OK # OK
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "membaca %s - %d alamat" msgstr "membaca %s - %d alamat"
@@ -61,7 +61,7 @@ msgstr ""
"ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa" "ukuran cache %d, %d/%d penyisipan cache menimpa cache yang belum kadaluwarsa"
# OK # OK
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "tidak bisa mendapatkan memory" msgstr "tidak bisa mendapatkan memory"
@@ -83,320 +83,326 @@ msgid "infinite"
msgstr "tak terbatas" msgstr "tak terbatas"
# OK # OK
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Tentukan alamat lokal untuk mendengarkan." msgstr "Tentukan alamat lokal untuk mendengarkan."
# OK # OK
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "Menghasilkan ipaddr untuk semua host dalam domain yang dipilih." msgstr "Menghasilkan ipaddr untuk semua host dalam domain yang dipilih."
# OK # OK
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "Fake pencarian balik untuk alamat private sesuai dengan RFC1918." msgstr "Fake pencarian balik untuk alamat private sesuai dengan RFC1918."
# OK # OK
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Perlakukan ipaddr sebagai NXDOMAIN (mengalahkan wildcard Verisign)." msgstr "Perlakukan ipaddr sebagai NXDOMAIN (mengalahkan wildcard Verisign)."
# OK # OK
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Tentukan ukuran cache, dalam jumlah isian (default %s)." msgstr "Tentukan ukuran cache, dalam jumlah isian (default %s)."
# OK # OK
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Tentukan file konfigurasi (default %s)." msgstr "Tentukan file konfigurasi (default %s)."
# OK # OK
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "JANGAN berjalan di background: berjalan dalam modus debug." msgstr "JANGAN berjalan di background: berjalan dalam modus debug."
# OK # OK
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "JANGAN teruskan permintaan tanpa bagian domain." msgstr "JANGAN teruskan permintaan tanpa bagian domain."
# OK # OK
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Mengembalikan record MX untuk diri sendiri host-host lokal." msgstr "Mengembalikan record MX untuk diri sendiri host-host lokal."
# OK # OK
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "Melengkapi nama-nama di /etc/hosts dengan akhiran domain." msgstr "Melengkapi nama-nama di /etc/hosts dengan akhiran domain."
# OK # OK
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "Jangan meneruskan permintaan DNS spurious dari host-host Windows." msgstr "Jangan meneruskan permintaan DNS spurious dari host-host Windows."
# OK # OK
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "Bolehkan DHCP dalam jangkauan yang diberikan dengan durasi lease." msgstr "Bolehkan DHCP dalam jangkauan yang diberikan dengan durasi lease."
# OK # OK
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "Ubah ke group ini setelah mulai (default %s)." msgstr "Ubah ke group ini setelah mulai (default %s)."
# OK # OK
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "Setel alamat atau nama host untuk mesin yang disebutkan." msgstr "Setel alamat atau nama host untuk mesin yang disebutkan."
# OK # OK
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "JANGAN muat file %s." msgstr "JANGAN muat file %s."
# OK # OK
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "" msgstr ""
"Sebutkan sebuah file hosts yang harus dibaca sebagai tambahan untuk %s." "Sebutkan sebuah file hosts yang harus dibaca sebagai tambahan untuk %s."
# OK # OK
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Sebutkan antarmuka untuk mendengarkan." msgstr "Sebutkan antarmuka untuk mendengarkan."
# OK # OK
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Sebutkan antarmuka untuk TIDAK mendengarkan." msgstr "Sebutkan antarmuka untuk TIDAK mendengarkan."
# OK # OK
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "Petakan kelas user DHCP ke setelan yang dipilih." msgstr "Petakan kelas user DHCP ke setelan yang dipilih."
# OK # OK
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih."
# OK # OK
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "JANGAN berjalan di background, jangan berjalan dalam modus debug." msgstr "JANGAN berjalan di background, jangan berjalan dalam modus debug."
# OK # OK
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "Berpikir bahwa kita satu-satunya DHCP server dalam jaringan." msgstr "Berpikir bahwa kita satu-satunya DHCP server dalam jaringan."
# OK # OK
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "Sebutkan lokasi untuk menyimpan lease DHCP (default %s)." msgstr "Sebutkan lokasi untuk menyimpan lease DHCP (default %s)."
# OK # OK
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "Kembalikan rekord MX untuk host-host lokal." msgstr "Kembalikan rekord MX untuk host-host lokal."
# OK # OK
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Sebutkan sebuah rekord MX." msgstr "Sebutkan sebuah rekord MX."
# OK # OK
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Sebutkan pilihan-pilihan BOOTP untuk DHCP server." msgstr "Sebutkan pilihan-pilihan BOOTP untuk DHCP server."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "Jangan kumpulkan file %s, muat kembali saat SIGHUP." msgstr "Jangan kumpulkan file %s, muat kembali saat SIGHUP."
# OK # OK
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "JANGAN menyimpan hasil pencarian yang gagal." msgstr "JANGAN menyimpan hasil pencarian yang gagal."
# OK # OK
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "Gunakan secara ketat namaserver yang disebutkan sesuai urutan di %s." msgstr "Gunakan secara ketat namaserver yang disebutkan sesuai urutan di %s."
# OK # OK
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "" msgstr ""
"Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP." "Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP."
# OK # OK
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "Sebutkan port untuk mendengarkan permintaan DNS (default port 53)." msgstr "Sebutkan port untuk mendengarkan permintaan DNS (default port 53)."
# OK # OK
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "Ukuran maksimum paket UDP yang didukung untuk EDNS.0 (default %s)." msgstr "Ukuran maksimum paket UDP yang didukung untuk EDNS.0 (default %s)."
# OK # OK
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Permintaan log." msgstr "Permintaan log."
# OK # OK
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "Paksa port asal untuk permintaan ke atas." msgstr "Paksa port asal untuk permintaan ke atas."
# OK # OK
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "JANGAN baca resolv.conf." msgstr "JANGAN baca resolv.conf."
# OK # OK
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Sebutkan path ke resolv.conf (default %s)." msgstr "Sebutkan path ke resolv.conf (default %s)."
# OK # OK
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
"Sebutkan alamat-alamat server di atas, boleh dilengkapi dengan nama domain." "Sebutkan alamat-alamat server di atas, boleh dilengkapi dengan nama domain."
# OK # OK
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "JANGAN pernah meneruskan permintaan ke domain yang disebutkan." msgstr "JANGAN pernah meneruskan permintaan ke domain yang disebutkan."
# OK # OK
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Sebutkan domain yang digunakan dalam lease DHCP." msgstr "Sebutkan domain yang digunakan dalam lease DHCP."
# OK # OK
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Sebutkan tujuan default dalam rekord MX." msgstr "Sebutkan tujuan default dalam rekord MX."
# OK # OK
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts."
# OK # OK
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Ubah ke user ini setelah mulai. (default %s)." msgstr "Ubah ke user ini setelah mulai. (default %s)."
# OK # OK
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." msgstr "Memetakan kelas vendor DHCP ke daftar pilihan."
# OK # OK
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "Menampilkan versi dan informasi hak cipta dnsmasq." msgstr "Menampilkan versi dan informasi hak cipta dnsmasq."
# OK # OK
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas." msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas."
# OK # OK
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "Sebutkan rekord SRV." msgstr "Sebutkan rekord SRV."
# OK # OK
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Menampilkan pesan ini." msgstr "Menampilkan pesan ini."
# OK # OK
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Sebutkan path file PID. (default %s)." msgstr "Sebutkan path file PID. (default %s)."
# OK # OK
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)."
# OK # OK
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
"Jawab permintaan DNS berdasarkan antarmuka dimana permintaan dikirimkan." "Jawab permintaan DNS berdasarkan antarmuka dimana permintaan dikirimkan."
# OK # OK
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Sebutkan rekord TXT DNS." msgstr "Sebutkan rekord TXT DNS."
# OK # OK
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "Hanya kaitkan ke antarmuka yang sedang digunakan saja." msgstr "Hanya kaitkan ke antarmuka yang sedang digunakan saja."
# OK # OK
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Baca informasi statik host DHCP dari %s." msgstr "Baca informasi statik host DHCP dari %s."
# OK # OK
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "Mungkinkan antar muka DBus untuk menyetel server-server di atas, dsb." msgstr "Mungkinkan antar muka DBus untuk menyetel server-server di atas, dsb."
# OK # OK
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "JANGAN menyediakan DHCP pada antarmuka ini, hanya menyediakan DNS." msgstr "JANGAN menyediakan DHCP pada antarmuka ini, hanya menyediakan DNS."
# OK # OK
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "Mungkinkan alokasi alamat dinamis untuk bootp." msgstr "Mungkinkan alokasi alamat dinamis untuk bootp."
# OK # OK
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Memetakan kelas vendor DHCP ke daftar pilihan."
# OK
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "kurang \"" msgstr "kurang \""
# OK # OK
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "pilihan salah" msgstr "pilihan salah"
# OK # OK
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "tidak bisa membaca %s: %s" msgstr "tidak bisa membaca %s: %s"
# OK # OK
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -406,25 +412,25 @@ msgstr ""
"\n" "\n"
# OK # OK
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Gunakan pilihan pendek saja pada perintah baris.\n" msgstr "Gunakan pilihan pendek saja pada perintah baris.\n"
# OK # OK
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Pilihan yang boleh adalah:\n" msgstr "Pilihan yang boleh adalah:\n"
# OK # OK
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "Dnsmasq versi %s %s\n" msgstr "Dnsmasq versi %s %s\n"
# OK # OK
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -434,13 +440,13 @@ msgstr ""
"\n" "\n"
# OK # OK
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n" msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n"
# OK # OK
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "" msgstr ""
@@ -448,163 +454,167 @@ msgstr ""
"membagikannya\n" "membagikannya\n"
# OK # OK
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "dengan aturan GNU General Public License, versi 2.\n" msgstr "dengan aturan GNU General Public License, versi 2.\n"
# OK # OK
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "parameter berlebihan" msgstr "parameter berlebihan"
# OK # OK
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "parameter kurang" msgstr "parameter kurang"
# OK # OK
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "includes bersarang tidak diijinkan" msgstr "includes bersarang tidak diijinkan"
# OK # OK
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "kesukaan MX salah" msgstr "kesukaan MX salah"
# OK # OK
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "nama MX salah" msgstr "nama MX salah"
# OK # OK
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "target MX salah" msgstr "target MX salah"
# OK # OK
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "port salah" msgstr "port salah"
# OK # OK
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "dhcp-range salah" msgstr "dhcp-range salah"
#: option.c:986
msgid "only one netid tag allowed"
msgstr ""
# OK # OK
#: option.c:1014 #: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "jangkauan DHCP tidak konsisten" msgstr "jangkauan DHCP tidak konsisten"
# OK # OK
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "dhcp-host salah" msgstr "dhcp-host salah"
# OK # OK
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "dhcp-option salah" msgstr "dhcp-option salah"
# OK # OK
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "domain dalam dhcp-option salah" msgstr "domain dalam dhcp-option salah"
# OK # OK
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "dhcp-option terlalu panjang" msgstr "dhcp-option terlalu panjang"
# OK # OK
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "rekord TXT salah" msgstr "rekord TXT salah"
# OK # OK
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "string rekord TXT terlalu panjang" msgstr "string rekord TXT terlalu panjang"
# OK # OK
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "rekord SRV salah" msgstr "rekord SRV salah"
# OK # OK
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "target SRV salah" msgstr "target SRV salah"
# OK # OK
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "nomor port tidak benar" msgstr "nomor port tidak benar"
# OK # OK
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "prioritas tidak benar" msgstr "prioritas tidak benar"
# OK # OK
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "weight tidak benar" msgstr "weight tidak benar"
# OK # OK
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "kesalahan" msgstr "kesalahan"
# OK # OK
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "pilihan baris perintah salah: %s." msgstr "pilihan baris perintah salah: %s."
# OK # OK
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "tidak bisa mendapatkan host-name: %s" msgstr "tidak bisa mendapatkan host-name: %s"
# OK # OK
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "hanya satu file resolv.conf yang diperbolehkan dalam modus no-poll." msgstr "hanya satu file resolv.conf yang diperbolehkan dalam modus no-poll."
# OK # OK
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain." msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain."
# OK # OK
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "gagal membaca %s: %m" msgstr "gagal membaca %s: %m"
# OK # OK
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "tidak ditemukan direktif search di %s" msgstr "tidak ditemukan direktif search di %s"
# OK # OK
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "nameserver %s menolak melakukan resolusi rekursif" msgstr "nameserver %s menolak melakukan resolusi rekursif"
# OK # OK
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "meneruskan tabel overflow: memeriksa apakah terjadi loop server." msgstr "meneruskan tabel overflow: memeriksa apakah terjadi loop server."
# OK # OK
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "gagal mengakses %s: %m" msgstr "gagal mengakses %s: %m"
@@ -742,84 +752,84 @@ msgstr ""
"IP_RECVIF" "IP_RECVIF"
# OK # OK
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "DBus error: %s" msgstr "DBus error: %s"
# OK # OK
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h"
# OK # OK
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "dimulai, versi %s ukuran cache %d" msgstr "dimulai, versi %s ukuran cache %d"
# OK # OK
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "dimulai, cache versi %s di disable" msgstr "dimulai, cache versi %s di disable"
# OK # OK
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "pilihan-pilihan saat kompilasi: %s" msgstr "pilihan-pilihan saat kompilasi: %s"
# OK # OK
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem" msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem"
# OK # OK
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda" msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda"
# OK # OK
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS" msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS"
# OK # OK
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "peringatan: antarmuka %s tidak ada" msgstr "peringatan: antarmuka %s tidak ada"
# OK # OK
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "DHCP, lease static pada %.0s%s, waktu lease %s" msgstr "DHCP, lease static pada %.0s%s, waktu lease %s"
# OK # OK
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s" msgstr "DHCP, jangkaun IP %s -- %s, waktu lease %s"
# OK # OK
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s akan ditulis setiap %s" msgstr "DHCP, %s akan ditulis setiap %s"
# OK # OK
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "berjalan menggunakan root" msgstr "berjalan menggunakan root"
# OK # OK
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "terhubung ke sistem DBus" msgstr "terhubung ke sistem DBus"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "keluar karena menerima SIGTERM" msgstr "keluar karena menerima SIGTERM"
@@ -875,82 +885,88 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "alamat IP kembar %s dalam direktif dhcp-config" msgstr "alamat IP kembar %s dalam direktif dhcp-config"
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
# OK # OK
#: dhcp.c:394 #: dhcp.c:345
#, 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:705
#, c-format
msgid "failed to read %s:%m"
msgstr "gagal membaca %s:%m"
# OK
#: dhcp.c:724
#, fuzzy, c-format
msgid "bad line at %s line %d"
msgstr "kesalahan nama pada %s baris %d"
# OK
#: 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:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
"Mengabaikan nama host DHCP %s sebab memiliki bagian domain yang tidak sah"
# OK
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "tidak dapat membuka atau membuat file lease: %s"
# OK
#: lease.c:77
msgid "too many stored leases"
msgstr "terlalu banyak lease yang disimpan"
# OK
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "" msgstr ""
"permintaan DHCP untuk tipe hardware yang tidak didukung (%d) diterima pada %s" "permintaan DHCP untuk tipe hardware yang tidak didukung (%d) diterima pada %s"
# OK # OK
#: rfc2131.c:220 #: dhcp.c:413
#, 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:722
#, c-format
msgid "failed to read %s:%m"
msgstr "gagal membaca %s:%m"
# OK
#: dhcp.c:741
#, fuzzy, c-format
msgid "bad line at %s line %d"
msgstr "kesalahan nama pada %s baris %d"
# OK
#: dhcp.c:845
#, 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:881
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
"Mengabaikan nama host DHCP %s sebab memiliki bagian domain yang tidak sah"
# OK
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "tidak dapat membuka atau membuat file lease: %s"
# OK
#: lease.c:80
msgid "too many stored leases"
msgstr "terlalu banyak lease yang disimpan"
# OK
#: lease.c:179
#, fuzzy
msgid "failed to write"
msgstr "gagal membaca %s:%m"
# OK
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s" msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s"
# OK # OK
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "dengan pemilih subnet" msgstr "dengan pemilih subnet"
# OK # OK
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "lewat" msgstr "lewat"
# OK # OK
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "di disable" msgstr "di disable"
# OK # OK
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "alamat telah digunakan" msgstr "alamat telah digunakan"
@@ -960,74 +976,74 @@ msgid "no address configured"
msgstr "tak ada alamat yang disetel" msgstr "tak ada alamat yang disetel"
# OK # OK
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "tak ada alamat yang tersedia" msgstr "tak ada alamat yang tersedia"
# OK # OK
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "tak ada lease yang tersisa" msgstr "tak ada lease yang tersisa"
# OK # OK
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "jaringan yang salah" msgstr "jaringan yang salah"
# OK # OK
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "men-disable alamat statik DHCP %s" msgstr "men-disable alamat statik DHCP %s"
# OK # OK
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "lease tidak diketahui" msgstr "lease tidak diketahui"
# OK # OK
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "diabaikan" msgstr "diabaikan"
# OK # OK
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "alamat salah" msgstr "alamat salah"
# OK # OK
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "lease tak ditemukan" msgstr "lease tak ditemukan"
# OK # OK
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "alamat tak tersedia" msgstr "alamat tak tersedia"
# OK # OK
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "lease statik tak tersedia" msgstr "lease statik tak tersedia"
# OK # OK
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "alamat telah dipesan" msgstr "alamat telah dipesan"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
# OK # OK
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s" msgstr "Lebih dari satu kelas vendor yang sesuai, menggunakan %s"
# OK # OK
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "tidak bisa mem-bind netlink socket: %s" msgstr "tidak bisa mem-bind netlink socket: %s"
+186 -172
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.25\n" "Project-Id-Version: dnsmasq 2.25\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2006-01-11 17:39+0000\n" "PO-Revision-Date: 2006-01-11 17:39+0000\n"
"Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n" "Last-Translator: Jan Erik Askildt <jeaskildt@gmail.com>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -22,17 +22,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "feilet å laste navn fra %s: %m" msgstr "feilet å laste navn fra %s: %m"
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "dårlig adresse ved %s linje %d" msgstr "dårlig adresse ved %s linje %d"
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "dårlig navn ved %s linje %d" msgstr "dårlig navn ved %s linje %d"
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "les %s - %d adresser" msgstr "les %s - %d adresser"
@@ -57,7 +57,7 @@ msgstr ""
"mellomlager størrelse %d, %d/%d mellomlager innsettinger re-bruker " "mellomlager størrelse %d, %d/%d mellomlager innsettinger re-bruker "
"mellomlager plasser som ikke er utløpt" "mellomlager plasser som ikke er utløpt"
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "kunne ikke få minne" msgstr "kunne ikke få minne"
@@ -75,258 +75,263 @@ msgstr "FEILET
msgid "infinite" msgid "infinite"
msgstr "uendelig" msgstr "uendelig"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Spesifiser lokal(e) adresse(r) å lytte på." msgstr "Spesifiser lokal(e) adresse(r) å lytte på."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "Returner ipaddr for alle verter i det spesifiserte domenet." msgstr "Returner ipaddr for alle verter i det spesifiserte domenet."
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "Forfalsk revers oppslag for RFC1918 private adresse områder." msgstr "Forfalsk revers oppslag for RFC1918 private adresse områder."
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Behandle ipaddr som NXDOMAIN (omgår Verisign wildcard)." msgstr "Behandle ipaddr som NXDOMAIN (omgår Verisign wildcard)."
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Spesifiser størrelsen på mellomlager plassene (standard er %s)." msgstr "Spesifiser størrelsen på mellomlager plassene (standard er %s)."
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Spesifiser konfigurasjonsfil (standard er %s)." msgstr "Spesifiser konfigurasjonsfil (standard er %s)."
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "IKKE legg (fork) som bakgrunnsprosess: kjør i debug modus." msgstr "IKKE legg (fork) som bakgrunnsprosess: kjør i debug modus."
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "IKKE videresend oppslag som mangler domene del." msgstr "IKKE videresend oppslag som mangler domene del."
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Returner selv-pekende MX post for lokale verter." msgstr "Returner selv-pekende MX post for lokale verter."
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks." msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks."
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "Ikke videresend falske/uekte DNS forespørsler fra Windows verter." msgstr "Ikke videresend falske/uekte DNS forespørsler fra Windows verter."
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "Aktiver DHCP i det gitte området med leie varighet" msgstr "Aktiver DHCP i det gitte området med leie varighet"
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "Skift til denne gruppen etter oppstart (standard er %s)." msgstr "Skift til denne gruppen etter oppstart (standard er %s)."
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "Sett adresse eller vertsnavn for en spesifikk maskin." msgstr "Sett adresse eller vertsnavn for en spesifikk maskin."
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "IKKE last %s filen." msgstr "IKKE last %s filen."
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "Spesifiser en verts (hosts) fil som skal leses i tilleg til %s." msgstr "Spesifiser en verts (hosts) fil som skal leses i tilleg til %s."
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Spesifiser nettverkskort det skal lyttes på." msgstr "Spesifiser nettverkskort det skal lyttes på."
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Spesifiser nettverkskort det IKKE skal lyttes på." msgstr "Spesifiser nettverkskort det IKKE skal lyttes på."
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "Map DHCP bruker klasse til opsjon sett." msgstr "Map DHCP bruker klasse til opsjon sett."
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "Ikke utfør DHCP for klienter i opsjon sett." msgstr "Ikke utfør DHCP for klienter i opsjon sett."
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "IKKE last (fork) som bakgrunnsprosess, IKKE kjør i debug modus." msgstr "IKKE last (fork) som bakgrunnsprosess, IKKE kjør i debug modus."
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "Anta at vi er den eneste DHCP tjeneren på det lokale nettverket." msgstr "Anta at vi er den eneste DHCP tjeneren på det lokale nettverket."
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)." msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)."
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "Returner MX records for lokale verter." msgstr "Returner MX records for lokale verter."
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Spesifiser en MX post." msgstr "Spesifiser en MX post."
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Spesifiser BOOTP opsjoner til DHCP tjener." msgstr "Spesifiser BOOTP opsjoner til DHCP tjener."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "IKKE spør (poll) %s fil, les på nytt kun ved SIGHUP" msgstr "IKKE spør (poll) %s fil, les på nytt kun ved SIGHUP"
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "IKKE mellomlagre søkeresultater som feiler." msgstr "IKKE mellomlagre søkeresultater som feiler."
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "Bruk navnetjenere kun som bestemt i rekkefølgen gitt i %s." msgstr "Bruk navnetjenere kun som bestemt i rekkefølgen gitt i %s."
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene." msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene."
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)." msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)."
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "Maksimal støttet UDP pakkestørrelse for EDNS.0 (standard er %s)." msgstr "Maksimal støttet UDP pakkestørrelse for EDNS.0 (standard er %s)."
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Logg oppslag." msgstr "Logg oppslag."
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "Tving bruk av opprinnelig port for oppstrøms oppslag." msgstr "Tving bruk av opprinnelig port for oppstrøms oppslag."
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "IKKE les resolv.conf." msgstr "IKKE les resolv.conf."
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Spesifiser stien til resolv.conf (standard er %s)." msgstr "Spesifiser stien til resolv.conf (standard er %s)."
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "Spesifiser adressen(e) til oppstrøms tjenere med valgfrie domener." msgstr "Spesifiser adressen(e) til oppstrøms tjenere med valgfrie domener."
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "Aldri videresend oppslag til spesifiserte domener." msgstr "Aldri videresend oppslag til spesifiserte domener."
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Spesifiser domenet som skal tildeles i DHCP leien." msgstr "Spesifiser domenet som skal tildeles i DHCP leien."
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Spesifiser default mål i en MX post." msgstr "Spesifiser default mål i en MX post."
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts."
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Skift til denne bruker etter oppstart (standard er %s)." msgstr "Skift til denne bruker etter oppstart (standard er %s)."
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Map DHCP produsent klasse til opsjon sett." msgstr "Map DHCP produsent klasse til opsjon sett."
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "Vis dnsmasq versjon og copyright informasjon." msgstr "Vis dnsmasq versjon og copyright informasjon."
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "Oversett IPv4 adresser fra oppstrøms tjenere." msgstr "Oversett IPv4 adresser fra oppstrøms tjenere."
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "Spesifiser en SRV post." msgstr "Spesifiser en SRV post."
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Vis denne meldingen." msgstr "Vis denne meldingen."
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Spesifiser stien til PID fil. (standard er %s)." msgstr "Spesifiser stien til PID fil. (standard er %s)."
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)"
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "Svar DNS oppslag basert på nettverkskortet oppslaget ble sendt til." msgstr "Svar DNS oppslag basert på nettverkskortet oppslaget ble sendt til."
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Spesifiser TXT DNS post." msgstr "Spesifiser TXT DNS post."
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "Bind kun til nettverkskort som er i bruk." msgstr "Bind kun til nettverkskort som er i bruk."
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Les DHCP statisk vert informasjon fra %s." msgstr "Les DHCP statisk vert informasjon fra %s."
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "Aktiver DBus interface for å sette oppstrøms tjenere, osv." msgstr "Aktiver DBus interface for å sette oppstrøms tjenere, osv."
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "Ikke lever DHCP på dette nettverkskortet, kun lever DNS." msgstr "Ikke lever DHCP på dette nettverkskortet, kun lever DNS."
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "Aktiver dynamisk adresse allokering for bootp." msgstr "Aktiver dynamisk adresse allokering for bootp."
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Map DHCP produsent klasse til opsjon sett."
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "mangler \"" msgstr "mangler \""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "dårlig opsjon" msgstr "dårlig opsjon"
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "kan ikke lese %s: %s" msgstr "kan ikke lese %s: %s"
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -335,22 +340,22 @@ msgstr ""
"Bruk: dnsmasq [opsjoner]\n" "Bruk: dnsmasq [opsjoner]\n"
"\n" "\n"
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Bruk korte opsjoner kun på kommandolinjen.\n" msgstr "Bruk korte opsjoner kun på kommandolinjen.\n"
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Gyldige opsjoner er :\n" msgstr "Gyldige opsjoner er :\n"
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "Dnsmasq versjon %s %s\n" msgstr "Dnsmasq versjon %s %s\n"
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -359,143 +364,147 @@ msgstr ""
"Kompileringsopsjoner %s\n" "Kompileringsopsjoner %s\n"
"\n" "\n"
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n" msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n"
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "DNsmasq er fri programvare, du er velkommen til å redistribuere den\n" msgstr "DNsmasq er fri programvare, du er velkommen til å redistribuere den\n"
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n" msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n"
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "overflødig parameter" msgstr "overflødig parameter"
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "mangler parameter" msgstr "mangler parameter"
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "nøstede inkluderinger er ikke tillatt" msgstr "nøstede inkluderinger er ikke tillatt"
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "dårlig MX preferanse" msgstr "dårlig MX preferanse"
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "dårlig MX navn" msgstr "dårlig MX navn"
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "dårlig MX mål" msgstr "dårlig MX mål"
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "dårlig port" msgstr "dårlig port"
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "dårlig dhcp-område" msgstr "dårlig dhcp-område"
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "ikke konsistent DHCP område" msgstr "ikke konsistent DHCP område"
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "dårlig dhcp-vert" msgstr "dårlig dhcp-vert"
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "dårlig dhcp-opsjon" msgstr "dårlig dhcp-opsjon"
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "dårlig domene i dhcp-opsjon" msgstr "dårlig domene i dhcp-opsjon"
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "dhcp-opsjon for lang" msgstr "dhcp-opsjon for lang"
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "dårlig TXT post" msgstr "dårlig TXT post"
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "TXT post streng for lang" msgstr "TXT post streng for lang"
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "dårlig SRV post" msgstr "dårlig SRV post"
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "dårlig SRV mål" msgstr "dårlig SRV mål"
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "ugyldig portnummer" msgstr "ugyldig portnummer"
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "ugyldig prioritet" msgstr "ugyldig prioritet"
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "ugyldig vekt" msgstr "ugyldig vekt"
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "feil" msgstr "feil"
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "dårlige kommandlinje opsjoner: %s." msgstr "dårlige kommandlinje opsjoner: %s."
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "klarer ikke å få vertsnavn: %s" msgstr "klarer ikke å få vertsnavn: %s"
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "kun en resolv.conf fil tillat i no-poll modus." msgstr "kun en resolv.conf fil tillat i no-poll modus."
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "må ha nøyaktig en resolv.conf å lese domene fra." msgstr "må ha nøyaktig en resolv.conf å lese domene fra."
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "feilet å lese %s: %m" msgstr "feilet å lese %s: %m"
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "intet søke direktiv funnet i %s" msgstr "intet søke direktiv funnet i %s"
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "navnetjener %s nektet å gjøre et rekursivt oppslag" msgstr "navnetjener %s nektet å gjøre et rekursivt oppslag"
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "fremsendelse (forwarding) tabell overflyt: sjekk etter tjener løkker." msgstr "fremsendelse (forwarding) tabell overflyt: sjekk etter tjener løkker."
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "feilet å få tilgang til %s: %m" msgstr "feilet å få tilgang til %s: %m"
@@ -607,71 +616,71 @@ msgstr "kan ikke
msgid "must set exactly one interface on broken systems without IP_RECVIF" 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" msgstr "må sette nøyaktig et interface på ødelagte systemer uten IP_RECVIF"
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "DBus feil: %s" msgstr "DBus feil: %s"
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h"
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "startet, versjon %s mellomlager størrelse %d" msgstr "startet, versjon %s mellomlager størrelse %d"
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "startet, versjon %s mellomlager deaktivert" msgstr "startet, versjon %s mellomlager deaktivert"
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "kompilerings opsjoner: %s" msgstr "kompilerings opsjoner: %s"
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "DBus støtte aktivert: koblet til system buss" msgstr "DBus støtte aktivert: koblet til system buss"
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "DBus støtte aktivert: avventer buss tilkobling" msgstr "DBus støtte aktivert: avventer buss tilkobling"
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "setter --bind-interfaces opsjon på grunn av OS begrensninger" msgstr "setter --bind-interfaces opsjon på grunn av OS begrensninger"
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden" msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden"
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "DHCP, statisk leie kun på %.0s%s, leie tid %s" msgstr "DHCP, statisk leie kun på %.0s%s, leie tid %s"
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, IP område %s -- %s, leie tid %s" msgstr "DHCP, IP område %s -- %s, leie tid %s"
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s vil bli skrevet hver %s" msgstr "DHCP, %s vil bli skrevet hver %s"
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "kjører som rot (root)" msgstr "kjører som rot (root)"
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "tilkoblet til system DBus" msgstr "tilkoblet til system DBus"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "avslutter etter mottak av SIGTERM" msgstr "avslutter etter mottak av SIGTERM"
@@ -718,67 +727,72 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "dubliserte IP adresser i %s dhcp-config direktiv." msgstr "dubliserte IP adresser i %s dhcp-config direktiv."
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "Kan ikke benytte RTnetlink socket, faller tilbake til ioctl API" msgstr "Kan ikke benytte RTnetlink socket, faller tilbake til ioctl API"
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "DHCP område %s -- %s er ikke konsistent med nettmaske %s"
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr "feilet å lese %s:%m"
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr "dårlig linje ved %s linje %d"
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv"
#: dhcp.c:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "Ignorerer DHCP verts navn %s på grunn av ulovlig domene del"
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "kan ikke åpne eller lage leie fil: %s"
#: lease.c:77
msgid "too many stored leases"
msgstr "for mange lagrede leier"
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "DHCP krav for ikke støttet maskinvare type (%d) mottatt på %s" msgstr "DHCP krav for ikke støttet maskinvare type (%d) mottatt på %s"
#: rfc2131.c:220 #: dhcp.c:413
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "DHCP område %s -- %s er ikke konsistent med nettmaske %s"
#: dhcp.c:722
#, c-format
msgid "failed to read %s:%m"
msgstr "feilet å lese %s:%m"
#: dhcp.c:741
#, c-format
msgid "bad line at %s line %d"
msgstr "dårlig linje ved %s linje %d"
#: dhcp.c:845
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "dubliserte IP adresser i %s (%s) i dhcp-config direktiv"
#: dhcp.c:881
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "Ignorerer DHCP verts navn %s på grunn av ulovlig domene del"
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "kan ikke åpne eller lage leie fil: %s"
#: lease.c:80
msgid "too many stored leases"
msgstr "for mange lagrede leier"
#: lease.c:179
#, fuzzy
msgid "failed to write"
msgstr "feilet å lese %s:%m"
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "ingen adresse område tilgjengelig for DHCP krav %s %s" msgstr "ingen adresse område tilgjengelig for DHCP krav %s %s"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "med subnet velger" msgstr "med subnet velger"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "via" msgstr "via"
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "deaktivert" msgstr "deaktivert"
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "adresse i bruk" msgstr "adresse i bruk"
@@ -786,62 +800,62 @@ msgstr "adresse i bruk"
msgid "no address configured" msgid "no address configured"
msgstr "ingen adresse konfigurert" msgstr "ingen adresse konfigurert"
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "ingen adresse tilgjengelig" msgstr "ingen adresse tilgjengelig"
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "ingen leier igjen" msgstr "ingen leier igjen"
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "galt nettverk" msgstr "galt nettverk"
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "deaktiverer DHCP statisk adresse %s" msgstr "deaktiverer DHCP statisk adresse %s"
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "ukjent leie" msgstr "ukjent leie"
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "oversett" msgstr "oversett"
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "gal adresse" msgstr "gal adresse"
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "leie ikke funnet" msgstr "leie ikke funnet"
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "adresse ikke tilgjengelig" msgstr "adresse ikke tilgjengelig"
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "statisk leie tilgjengelig" msgstr "statisk leie tilgjengelig"
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "adresse reservert" msgstr "adresse reservert"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken"
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Mer enn en produsent klasse som passer, bruker %s" msgstr "Mer enn en produsent klasse som passer, bruker %s"
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "kan ikke binde netlink socket: %s" msgstr "kan ikke binde netlink socket: %s"
+162 -148
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-10-04 19:17+0100\n" "PO-Revision-Date: 2005-10-04 19:17+0100\n"
"Last-Translator: Tomasz Sochañski <nerdhero@gmail.com>\n" "Last-Translator: Tomasz Sochañski <nerdhero@gmail.com>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -21,17 +21,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "b³±d ³adowania nazw z %s: %m" msgstr "b³±d ³adowania nazw z %s: %m"
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "b³êdna nazwa w %s, linia %d" msgstr "b³êdna nazwa w %s, linia %d"
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "b³êdna nazwa w %s, linia %d" msgstr "b³êdna nazwa w %s, linia %d"
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "przeczytano %s - %d adresów" msgstr "przeczytano %s - %d adresów"
@@ -55,7 +55,7 @@ msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr "" msgstr ""
"wielko¶æ cache %d, %d/%d wpisów cache u¿yto ponownie z niewygas³ych wpisów" "wielko¶æ cache %d, %d/%d wpisów cache u¿yto ponownie z niewygas³ych wpisów"
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "nie mo¿na pobraæ pamiêci" msgstr "nie mo¿na pobraæ pamiêci"
@@ -73,269 +73,274 @@ msgstr "B
msgid "infinite" msgid "infinite"
msgstr "nieskoñczona" msgstr "nieskoñczona"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Adres(y) lokalne do nas³uchiwania." msgstr "Adres(y) lokalne do nas³uchiwania."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "Zwracanie adresu IP dla wszystkich hostów w podanych domenach." msgstr "Zwracanie adresu IP dla wszystkich hostów w podanych domenach."
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "Symulacja reverse lookups dla adresów prywatnych opisanych w RFC1918." msgstr "Symulacja reverse lookups dla adresów prywatnych opisanych w RFC1918."
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Adres IP traktowany jak NXDOMAIN" msgstr "Adres IP traktowany jak NXDOMAIN"
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Wielko¶æ pamiêci cache we wpisach (domy¶lna: %s)" msgstr "Wielko¶æ pamiêci cache we wpisach (domy¶lna: %s)"
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "¦cie¿ka do pliku konfiguracyjnego (domy¶lna: %s)" msgstr "¦cie¿ka do pliku konfiguracyjnego (domy¶lna: %s)"
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "NIE twórz procesu potomnego w tle: dzia³anie w trybie debugowania." msgstr "NIE twórz procesu potomnego w tle: dzia³anie w trybie debugowania."
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "Wy³±czenie przekazywania zapytañ bez czê¶ci domenowej." msgstr "Wy³±czenie przekazywania zapytañ bez czê¶ci domenowej."
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Zwracanie samowskazuj±cego rekordu MX dla lokalnych hostów." msgstr "Zwracanie samowskazuj±cego rekordu MX dla lokalnych hostów."
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "Rozwijanie prostych nazw z /etc/hosts przyrostkiem domenowym." msgstr "Rozwijanie prostych nazw z /etc/hosts przyrostkiem domenowym."
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "Wy³±czenie przekazywania pozornych zapytañ DNS z komputerów Windows" msgstr "Wy³±czenie przekazywania pozornych zapytañ DNS z komputerów Windows"
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "Enable DHCP w zakresie okre¶lonym czasem dzier¿awy." msgstr "Enable DHCP w zakresie okre¶lonym czasem dzier¿awy."
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "Po starcie zmiana grupy procesu na podan± (domy¶lnie: %s)." msgstr "Po starcie zmiana grupy procesu na podan± (domy¶lnie: %s)."
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "Ustawienie adresu lub nazwy hosta dla okre¶lonej maszyny." msgstr "Ustawienie adresu lub nazwy hosta dla okre¶lonej maszyny."
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "Ignorowanie pliku %s." msgstr "Ignorowanie pliku %s."
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "Dodatkowy plik hostów poza %s." msgstr "Dodatkowy plik hostów poza %s."
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Interfejs(y) do nas³uchiwania." msgstr "Interfejs(y) do nas³uchiwania."
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Interfejs(y), na których nie nas³uchiwaæ." msgstr "Interfejs(y), na których nie nas³uchiwaæ."
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "W³±czenie mapowania klasy u¿ytkownika DHCP do option set." msgstr "W³±czenie mapowania klasy u¿ytkownika DHCP do option set."
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "" msgstr ""
"Wy³±czenie odpowiadania na ¿adania DHCP hostów okre¶lonych w option set" "Wy³±czenie odpowiadania na ¿adania DHCP hostów okre¶lonych w option set"
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "" msgstr ""
"Wy³±czenie tworzenia procesu potomnego w tle, wy³±czenie dzia³ania w trybie " "Wy³±czenie tworzenia procesu potomnego w tle, wy³±czenie dzia³ania w trybie "
"debug." "debug."
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "Za³o¿enie, ¿e jeste¶my jedynym serwerem DHCP w sieci lokalnej." msgstr "Za³o¿enie, ¿e jeste¶my jedynym serwerem DHCP w sieci lokalnej."
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "¦cie¿ka przechowywania pliku dzier¿aw DHCP (domy¶lna: %s)" msgstr "¦cie¿ka przechowywania pliku dzier¿aw DHCP (domy¶lna: %s)"
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "W³±czenie zwracania rekord MX dla hostów lokalnych." msgstr "W³±czenie zwracania rekord MX dla hostów lokalnych."
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Specyfikacja rekordu MX." msgstr "Specyfikacja rekordu MX."
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Okre¶lenie opcji BOOTP serwera DHCP." msgstr "Okre¶lenie opcji BOOTP serwera DHCP."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "" msgstr ""
"Wy³aczenie analizy pliku %s, ponownie ³adowanie tylko po otrzymaniu sygna³u " "Wy³aczenie analizy pliku %s, ponownie ³adowanie tylko po otrzymaniu sygna³u "
"HUP" "HUP"
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "" msgstr ""
"Wy³±czenie zapisywania w pamiêci podrêcznej nieudanych wyników wyszukiwania." "Wy³±czenie zapisywania w pamiêci podrêcznej nieudanych wyników wyszukiwania."
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "W³±czenie u¿ywania serwerów nazw w kolejno¶ci podanej w %s." msgstr "W³±czenie u¿ywania serwerów nazw w kolejno¶ci podanej w %s."
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "Dodatkowe opcje ustawieñ dla klientów DHCP." msgstr "Dodatkowe opcje ustawieñ dla klientów DHCP."
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "Port nas³uchiwania zapytañ DNS (domy¶lnie: 53)." msgstr "Port nas³uchiwania zapytañ DNS (domy¶lnie: 53)."
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "Maksymalna obs³ugiwana wielko¶æ pakietu EDNS.0 (domy¶lnie: %s)." msgstr "Maksymalna obs³ugiwana wielko¶æ pakietu EDNS.0 (domy¶lnie: %s)."
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Zapytania zapisywane w pliku log." msgstr "Zapytania zapisywane w pliku log."
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "" msgstr ""
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "Wy³±czenie czytania pliku resolv.conf" msgstr "Wy³±czenie czytania pliku resolv.conf"
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Podaj ¶cie¿kê do pliku resolv.conf (domy¶lnie: %s)." msgstr "Podaj ¶cie¿kê do pliku resolv.conf (domy¶lnie: %s)."
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "Wy³±czenie przekazywania zapytañ do okre¶lonych domen." msgstr "Wy³±czenie przekazywania zapytañ do okre¶lonych domen."
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Nazwa domeny, która bêdzie przypisana w dzier¿awach DHCP." msgstr "Nazwa domeny, która bêdzie przypisana w dzier¿awach DHCP."
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Okre¶lenie domy¶lnego celu w rekordzie MX." msgstr "Okre¶lenie domy¶lnego celu w rekordzie MX."
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
"Okre¶lenie czasu wa¿no¶ci (time-to-live) w sekundach odpowiedzi branych z /" "Okre¶lenie czasu wa¿no¶ci (time-to-live) w sekundach odpowiedzi branych z /"
"etc/hosts." "etc/hosts."
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Po starcie zmiana u¿ytkownika procesu na podanego. (domy¶lnie: %s)." msgstr "Po starcie zmiana u¿ytkownika procesu na podanego. (domy¶lnie: %s)."
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Mapowanie nazwy dystrybutora DHCP do ustawieñ opcji." msgstr "Mapowanie nazwy dystrybutora DHCP do ustawieñ opcji."
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "" msgstr ""
"W³±czenie pokazywania wersji dnsmasq i informacji o ochronie praw autorskich." "W³±czenie pokazywania wersji dnsmasq i informacji o ochronie praw autorskich."
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "" msgstr ""
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "Okre¶lenie rekordu SRV." msgstr "Okre¶lenie rekordu SRV."
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Wy¶wietlenie tych informacji." msgstr "Wy¶wietlenie tych informacji."
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Okre¶lenie ¶cie¿ki do pliku PID. (domy¶lnie: %s)." msgstr "Okre¶lenie ¶cie¿ki do pliku PID. (domy¶lnie: %s)."
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Maksymalna liczba dzier¿aw DHCP. (domy¶lnie: %s)." msgstr "Maksymalna liczba dzier¿aw DHCP. (domy¶lnie: %s)."
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
"Odpowiedzi na zapytania DNS uzale¿nione od interfejsu, który odebra³ " "Odpowiedzi na zapytania DNS uzale¿nione od interfejsu, który odebra³ "
"zapytanie." "zapytanie."
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Rekord TXT DNS." msgstr "Rekord TXT DNS."
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "W³±czenie nas³uchiwania tylko na u¿ywanych interfejsach." msgstr "W³±czenie nas³uchiwania tylko na u¿ywanych interfejsach."
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Statycznych informacji DHCP hosta z pliku %s." msgstr "Statycznych informacji DHCP hosta z pliku %s."
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "" msgstr ""
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "Wy³±czenie DHCP na tym interfejsie, w³±czenie tylko DNS." msgstr "Wy³±czenie DHCP na tym interfejsie, w³±czenie tylko DNS."
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "W³±czenie automatycznej alokacji adresu dla BOOTP." msgstr "W³±czenie automatycznej alokacji adresu dla BOOTP."
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Mapowanie nazwy dystrybutora DHCP do ustawieñ opcji."
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "brakuje \"" msgstr "brakuje \""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "nieprawid³owa opcja" msgstr "nieprawid³owa opcja"
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "b³±d odczytu z %s: %s" msgstr "b³±d odczytu z %s: %s"
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -344,22 +349,22 @@ msgstr ""
"U¿ycie: dnsmasq [opcje]\n" "U¿ycie: dnsmasq [opcje]\n"
"\n" "\n"
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Tylko krótkie opcje w linii komend.\n" msgstr "Tylko krótkie opcje w linii komend.\n"
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Obs³ugiwane opcje:\n" msgstr "Obs³ugiwane opcje:\n"
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "Dnsmasq, wersja %s %s\n" msgstr "Dnsmasq, wersja %s %s\n"
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -368,144 +373,148 @@ msgstr ""
"Wkompilowane opcje %s\n" "Wkompilowane opcje %s\n"
"\n" "\n"
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Oprogramowanie to nie zawiera ¿adnych gwarancji.\n" msgstr "Oprogramowanie to nie zawiera ¿adnych gwarancji.\n"
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "Dnsmasq jest wolnym oprogramowaniem, mo¿esz je rozprowadzaæ\n" msgstr "Dnsmasq jest wolnym oprogramowaniem, mo¿esz je rozprowadzaæ\n"
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "na warunkach okre¶lonych w GNU General Public Licence, wersja 2.\n" msgstr "na warunkach okre¶lonych w GNU General Public Licence, wersja 2.\n"
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "dodatkowy parametr" msgstr "dodatkowy parametr"
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "brak parametru" msgstr "brak parametru"
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "zagnie¿d¿one do³±czanie plików jest niedozwolone" msgstr "zagnie¿d¿one do³±czanie plików jest niedozwolone"
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "" msgstr ""
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "b³êdna nazwa MX" msgstr "b³êdna nazwa MX"
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "b³êdny cel MX" msgstr "b³êdny cel MX"
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "nieprawid³owy port" msgstr "nieprawid³owy port"
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "nieprawid³owy zakres dhcp-range" msgstr "nieprawid³owy zakres dhcp-range"
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "niespójny zakres DHCP" msgstr "niespójny zakres DHCP"
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "b³±d w dhcp-host" msgstr "b³±d w dhcp-host"
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "b³±d w dhcp-option" msgstr "b³±d w dhcp-option"
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "nieprawid³owa nazwa domeny w dhcp-option" msgstr "nieprawid³owa nazwa domeny w dhcp-option"
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "zbyt d³uga nazwa w dhcp-option" msgstr "zbyt d³uga nazwa w dhcp-option"
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "nieprawid³owy rekord TX" msgstr "nieprawid³owy rekord TX"
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "zbyt d³ugi rekord TXT" msgstr "zbyt d³ugi rekord TXT"
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "b³±d w rekordzie SRV" msgstr "b³±d w rekordzie SRV"
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "nieprawid³owy cel SRV" msgstr "nieprawid³owy cel SRV"
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "nieprawid³owy port" msgstr "nieprawid³owy port"
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "nieprawid³owy priorytet" msgstr "nieprawid³owy priorytet"
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "nieprawid³owe znaczenie" msgstr "nieprawid³owe znaczenie"
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "b³±d" msgstr "b³±d"
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "nieprawid³owa opcja linii komend: %s." msgstr "nieprawid³owa opcja linii komend: %s."
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "nie mo¿na pobraæ nazwy hosta: %s" msgstr "nie mo¿na pobraæ nazwy hosta: %s"
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll." msgstr "tylko jeden plik resolv.conf jest dopuszczany w trybie no-poll."
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "musisz mieæ dok³adnie jeden plik resolv.conf do odczytu domen." msgstr "musisz mieæ dok³adnie jeden plik resolv.conf do odczytu domen."
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "b³±d w odczycie %s: %m" msgstr "b³±d w odczycie %s: %m"
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "brak wytycznych wyszukiwania w %s" msgstr "brak wytycznych wyszukiwania w %s"
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "serwer nazw %s odmawia wykonania zapytania rekursywnego" msgstr "serwer nazw %s odmawia wykonania zapytania rekursywnego"
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
"przekroczenie zakresu tablicy przekazywania: sprawd¼ zapêtlenie serwera." "przekroczenie zakresu tablicy przekazywania: sprawd¼ zapêtlenie serwera."
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "b³±d w dostêpie do %s: %m" msgstr "b³±d w dostêpie do %s: %m"
@@ -620,71 +629,71 @@ msgstr "nie mo
msgid "must set exactly one interface on broken systems without IP_RECVIF" msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "musisz ustawiæ dok³adnie jeden interfejs w systemach bez IP_RECVIF" msgstr "musisz ustawiæ dok³adnie jeden interfejs w systemach bez IP_RECVIF"
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "b³±d DBus: %s" msgstr "b³±d DBus: %s"
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus jest niedostêpny: ustaw HAVE_DBUS w src/config.h" msgstr "DBus jest niedostêpny: ustaw HAVE_DBUS w src/config.h"
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "uruchomiony, wersja %s wielko¶æ cache %d" msgstr "uruchomiony, wersja %s wielko¶æ cache %d"
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "uruchomiony, wersja %s cache wy³±czony" msgstr "uruchomiony, wersja %s cache wy³±czony"
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "opcje kompilacji: %s" msgstr "opcje kompilacji: %s"
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "obs³uga DBus w³±czona: pod³±czono do szyny systemowej" msgstr "obs³uga DBus w³±czona: pod³±czono do szyny systemowej"
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "obs³uga DBus w³±czona: pod³±czanie do szyny systemowej w toku" msgstr "obs³uga DBus w³±czona: pod³±czanie do szyny systemowej w toku"
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "ustawiam opcjê --bind-interfaces z powodu limitów systemu operacyjnego" msgstr "ustawiam opcjê --bind-interfaces z powodu limitów systemu operacyjnego"
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "ostrze¿enie: interfejs %s obecnie nie istnieje" msgstr "ostrze¿enie: interfejs %s obecnie nie istnieje"
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "DHCP, statyczne dzier¿awy tylko na %.0s%s, czas dzier¿awy %s" msgstr "DHCP, statyczne dzier¿awy tylko na %.0s%s, czas dzier¿awy %s"
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, zakres IP %s -- %s, czas dzier¿awy %s" msgstr "DHCP, zakres IP %s -- %s, czas dzier¿awy %s"
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s bêdzie zapisywane co %s" msgstr "DHCP, %s bêdzie zapisywane co %s"
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "pracuje z uprawnieniami u¿ytkownika root" msgstr "pracuje z uprawnieniami u¿ytkownika root"
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "po³±czono do systemowego DBus" msgstr "po³±czono do systemowego DBus"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "wy³±czenie po otrzymaniu sygnalu SIGTERM" msgstr "wy³±czenie po otrzymaniu sygnalu SIGTERM"
@@ -732,68 +741,73 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "powtórzenie adresu IP %s w opcji dhcp-config" msgstr "powtórzenie adresu IP %s w opcji dhcp-config"
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "¿±danie DHCP nieobs³ugiwanego typu sprzêtowego (%d) otrzymane na %s"
#: dhcp.c:413
#, c-format #, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s" msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr "zakres DHCP %s -- %s jest niespójny z mask± sieciow± %s" msgstr "zakres DHCP %s -- %s jest niespójny z mask± sieciow± %s"
#: dhcp.c:705 #: dhcp.c:722
#, c-format #, c-format
msgid "failed to read %s:%m" msgid "failed to read %s:%m"
msgstr "b³±d odczytu %s:%m" msgstr "b³±d odczytu %s:%m"
#: dhcp.c:724 #: dhcp.c:741
#, fuzzy, c-format #, fuzzy, c-format
msgid "bad line at %s line %d" msgid "bad line at %s line %d"
msgstr "b³êdna nazwa w %s, linia %d" msgstr "b³êdna nazwa w %s, linia %d"
#: dhcp.c:825 #: dhcp.c:845
#, c-format #, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive" msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr "powtórzenie adresu IP %s (%s) w opcji dhcp-config" msgstr "powtórzenie adresu IP %s (%s) w opcji dhcp-config"
#: dhcp.c:861 #: dhcp.c:881
#, c-format #, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part" msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr "" msgstr ""
"Ignorujê nazwê hosta DHCP %s, poniewa¿ posiada nieprawid³ow± czê¶æ domenow±" "Ignorujê nazwê hosta DHCP %s, poniewa¿ posiada nieprawid³ow± czê¶æ domenow±"
#: lease.c:39 #: lease.c:38
#, c-format #, c-format
msgid "cannot open or create leases file: %s" msgid "cannot open or create leases file: %s"
msgstr "b³±d otwarcia lub utworzenia pliku dzier¿aw: %s" msgstr "b³±d otwarcia lub utworzenia pliku dzier¿aw: %s"
#: lease.c:77 #: lease.c:80
msgid "too many stored leases" msgid "too many stored leases"
msgstr "zbyt du¿a ilo¶æ zapisanych dzier¿aw" msgstr "zbyt du¿a ilo¶æ zapisanych dzier¿aw"
#: rfc2131.c:171 #: lease.c:179
#, c-format #, fuzzy
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "failed to write"
msgstr "¿±danie DHCP nieobs³ugiwanego typu sprzêtowego (%d) otrzymane na %s" msgstr "b³±d odczytu %s:%m"
#: rfc2131.c:220 #: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "¿aden zakres adresowy nie jest dostêpny dla ¿adania DHCP %s %s" msgstr "¿aden zakres adresowy nie jest dostêpny dla ¿adania DHCP %s %s"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "z selekcj± podsieci" msgstr "z selekcj± podsieci"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "przez" msgstr "przez"
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "wy³±czony(a)" msgstr "wy³±czony(a)"
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "adres w u¿yciu" msgstr "adres w u¿yciu"
@@ -801,62 +815,62 @@ msgstr "adres w u
msgid "no address configured" msgid "no address configured"
msgstr "brak skonfigurowanego adresu" msgstr "brak skonfigurowanego adresu"
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "brak dostêpnego adresu" msgstr "brak dostêpnego adresu"
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "brak wolnych dzier¿aw" msgstr "brak wolnych dzier¿aw"
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "nieprawid³owa sieæ" msgstr "nieprawid³owa sieæ"
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "wy³±czanie statycznego adresu DHCP %s" msgstr "wy³±czanie statycznego adresu DHCP %s"
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "nieznana dzier¿awa" msgstr "nieznana dzier¿awa"
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "ignorujê" msgstr "ignorujê"
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "b³êdny adres" msgstr "b³êdny adres"
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "dzier¿awa nie znaleziona" msgstr "dzier¿awa nie znaleziona"
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "adres niedostêpny" msgstr "adres niedostêpny"
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "dostêpna statyczna dzier¿awa" msgstr "dostêpna statyczna dzier¿awa"
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "adres zarezerwowany" msgstr "adres zarezerwowany"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Wiêcej ni¿ jeden dystrybutor pasuj±cy, u¿ywam %s" msgstr "Wiêcej ni¿ jeden dystrybutor pasuj±cy, u¿ywam %s"
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "nie mo¿na pod³±czyæ gniazda netlink: %s" msgstr "nie mo¿na pod³±czyæ gniazda netlink: %s"
+193 -181
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.26\n" "Project-Id-Version: dnsmasq 2.26\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2006-01-16 20:42+0000\n" "PO-Revision-Date: 2006-01-16 20:42+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n" "Language-Team: Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "" msgstr ""
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "" msgstr ""
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "" msgstr ""
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "" msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries." msgid "cache size %d, %d/%d cache insertions re-used unexpired cache entries."
msgstr "" msgstr ""
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "" msgstr ""
@@ -69,423 +69,431 @@ msgstr ""
msgid "infinite" msgid "infinite"
msgstr "" msgstr ""
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "" msgstr ""
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "" msgstr ""
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "" msgstr ""
#: option.c:127
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr ""
#: option.c:128 #: option.c:128
#, c-format msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "" msgstr ""
#: option.c:129 #: option.c:129
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "" msgstr ""
#: option.c:130 #: option.c:130
msgid "Do NOT fork into the background: run in debug mode." #, c-format
msgid "Specify configuration file (defaults to %s)."
msgstr "" msgstr ""
#: option.c:131 #: option.c:131
msgid "Do NOT forward queries with no domain part." msgid "Do NOT fork into the background: run in debug mode."
msgstr "" msgstr ""
#: option.c:132 #: option.c:132
msgid "Return self-pointing MX records for local hosts." msgid "Do NOT forward queries with no domain part."
msgstr "" msgstr ""
#: option.c:133 #: option.c:133
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Return self-pointing MX records for local hosts."
msgstr "" msgstr ""
#: option.c:134 #: option.c:134
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "" msgstr ""
#: option.c:135 #: option.c:135
msgid "Enable DHCP in the range given with lease duration." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "" msgstr ""
#: option.c:136 #: option.c:136
msgid "Enable DHCP in the range given with lease duration."
msgstr ""
#: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "" msgstr ""
#: option.c:137
msgid "Set address or hostname for a specified machine."
msgstr ""
#: option.c:138 #: option.c:138
#, c-format msgid "Set address or hostname for a specified machine."
msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:139 #: option.c:139
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Do NOT load %s file."
msgstr "" msgstr ""
#: option.c:140 #: option.c:140
msgid "Specify interface(s) to listen on." #, c-format
msgid "Specify a hosts file to be read in addition to %s."
msgstr "" msgstr ""
#: option.c:141 #: option.c:141
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) to listen on."
msgstr "" msgstr ""
#: option.c:142 #: option.c:142
msgid "Map DHCP user class to option set." msgid "Specify interface(s) NOT to listen on."
msgstr "" msgstr ""
#: option.c:143 #: option.c:143
msgid "Don't do DHCP for hosts in option set." msgid "Map DHCP user class to option set."
msgstr "" msgstr ""
#: option.c:144 #: option.c:144
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Don't do DHCP for hosts in option set."
msgstr "" msgstr ""
#: option.c:145 #: option.c:145
msgid "Assume we are the only DHCP server on the local network." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "" msgstr ""
#: option.c:146 #: option.c:146
msgid "Assume we are the only DHCP server on the local network."
msgstr ""
#: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "" msgstr ""
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "" msgstr ""
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "" msgstr ""
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "" msgstr ""
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "" msgstr ""
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "" msgstr ""
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "" msgstr ""
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "" msgstr ""
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "" msgstr ""
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "" msgstr ""
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "" msgstr ""
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "" msgstr ""
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "" msgstr ""
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "" msgstr ""
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "" msgstr ""
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "" msgstr ""
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "" msgstr ""
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "" msgstr ""
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "" msgstr ""
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "" msgstr ""
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "" msgstr ""
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "" msgstr ""
#: option.c:170
msgid "Display this message."
msgstr ""
#: option.c:171 #: option.c:171
#, c-format msgid "Display this message."
msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:172 #: option.c:172
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "" msgstr ""
#: option.c:173 #: option.c:173
msgid "Answer DNS queries based on the interface a query was sent to." #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "" msgstr ""
#: option.c:174 #: option.c:174
msgid "Specify TXT DNS record." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
#: option.c:175 #: option.c:175
msgid "Bind only to interfaces in use." msgid "Specify TXT DNS record."
msgstr "" msgstr ""
#: option.c:176 #: option.c:176
msgid "Bind only to interfaces in use."
msgstr ""
#: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "" msgstr ""
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "" msgstr ""
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "" msgstr ""
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "" msgstr ""
#: option.c:394 #: option.c:181
msgid "Map MAC address (with wildcards) to option set."
msgstr ""
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "" msgstr ""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "" msgstr ""
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "" msgstr ""
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "" msgstr ""
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "" msgstr ""
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "" msgstr ""
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
"\n" "\n"
msgstr "" msgstr ""
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "" msgstr ""
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "" msgstr ""
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "" msgstr ""
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "" msgstr ""
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "" msgstr ""
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "" msgstr ""
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "" msgstr ""
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "" msgstr ""
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "" msgstr ""
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "" msgstr ""
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "" msgstr ""
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "" msgstr ""
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "" msgstr ""
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "" msgstr ""
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "" msgstr ""
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "" msgstr ""
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "" msgstr ""
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "" msgstr ""
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "" msgstr ""
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "" msgstr ""
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "" msgstr ""
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "" msgstr ""
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "" msgstr ""
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "" msgstr ""
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "" msgstr ""
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "" msgstr ""
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "" msgstr ""
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "" msgstr ""
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "" msgstr ""
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "" msgstr ""
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "" msgstr ""
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "" msgstr ""
@@ -596,71 +604,71 @@ msgstr ""
msgid "must set exactly one interface on broken systems without IP_RECVIF" msgid "must set exactly one interface on broken systems without IP_RECVIF"
msgstr "" msgstr ""
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "" msgstr ""
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "" msgstr ""
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "" msgstr ""
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "" msgstr ""
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "" msgstr ""
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "" msgstr ""
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "" msgstr ""
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "" msgstr ""
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "" msgstr ""
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "" msgstr ""
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "" msgstr ""
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "" msgstr ""
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "" msgstr ""
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "" msgstr ""
@@ -706,67 +714,71 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "" msgstr ""
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:705
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:825
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:861
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:77
msgid "too many stored leases"
msgstr ""
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "" msgstr ""
#: rfc2131.c:220 #: dhcp.c:413
#, c-format
msgid "DHCP range %s -- %s is not consistent with netmask %s"
msgstr ""
#: dhcp.c:722
#, c-format
msgid "failed to read %s:%m"
msgstr ""
#: dhcp.c:741
#, c-format
msgid "bad line at %s line %d"
msgstr ""
#: dhcp.c:845
#, c-format
msgid "duplicate IP address %s (%s) in dhcp-config directive"
msgstr ""
#: dhcp.c:881
#, c-format
msgid "Ignoring DHCP host name %s because it has an illegal domain part"
msgstr ""
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr ""
#: lease.c:80
msgid "too many stored leases"
msgstr ""
#: lease.c:179
msgid "failed to write"
msgstr ""
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "" msgstr ""
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "" msgstr ""
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "" msgstr ""
@@ -774,62 +786,62 @@ msgstr ""
msgid "no address configured" msgid "no address configured"
msgstr "" msgstr ""
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "" msgstr ""
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "" msgstr ""
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "" msgstr ""
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "" msgstr ""
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "" msgstr ""
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "" msgstr ""
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "" msgstr ""
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "" msgstr ""
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "" msgstr ""
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "" msgstr ""
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "" msgstr ""
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" msgid "cannot send DHCP option %d: no space left in packet"
msgstr "" msgstr ""
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "" msgstr ""
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "" msgstr ""
+186 -172
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dnsmasq 2.24\n" "Project-Id-Version: dnsmasq 2.24\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-22 13:12+0000\n" "POT-Creation-Date: 2006-03-16 20:04+0000\n"
"PO-Revision-Date: 2005-11-22 16:46+0000\n" "PO-Revision-Date: 2005-11-22 16:46+0000\n"
"Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n" "Last-Translator: Simon Kelley <simon@thekelleys.org.uk>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -20,17 +20,17 @@ msgstr ""
msgid "failed to load names from %s: %m" msgid "failed to load names from %s: %m"
msgstr "încărcarea numelor din %s: %m a eşuat" msgstr "încărcarea numelor din %s: %m a eşuat"
#: cache.c:601 dhcp.c:737 #: cache.c:601 dhcp.c:754
#, c-format #, c-format
msgid "bad address at %s line %d" msgid "bad address at %s line %d"
msgstr "adresă greşită în %s, linia %d" msgstr "adresă greşită în %s, linia %d"
#: cache.c:628 dhcp.c:751 #: cache.c:628 dhcp.c:768
#, c-format #, c-format
msgid "bad name at %s line %d" msgid "bad name at %s line %d"
msgstr "nume greşit în %s linia %d" msgstr "nume greşit în %s linia %d"
#: cache.c:634 dhcp.c:802 #: cache.c:634 dhcp.c:822
#, c-format #, c-format
msgid "read %s - %d addresses" msgid "read %s - %d addresses"
msgstr "citesc %s - %d adrese" msgstr "citesc %s - %d adrese"
@@ -55,7 +55,7 @@ msgstr ""
"cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat " "cantitate de memorie temporară %d, %d/%d stocări temporare aureutilizat "
"locaţii neexpirate." "locaţii neexpirate."
#: util.c:149 option.c:1284 #: util.c:149 option.c:1302
msgid "could not get memory" msgid "could not get memory"
msgstr "nu am putut aloca memorie" msgstr "nu am putut aloca memorie"
@@ -73,260 +73,265 @@ msgstr "pornirea A EŞUAT"
msgid "infinite" msgid "infinite"
msgstr "infinit" msgstr "infinit"
#: option.c:124 #: option.c:125
msgid "Specify local address(es) to listen on." msgid "Specify local address(es) to listen on."
msgstr "Specificaţi adresele locale deservite." msgstr "Specificaţi adresele locale deservite."
#: option.c:125 #: option.c:126
msgid "Return ipaddr for all hosts in specified domains." msgid "Return ipaddr for all hosts in specified domains."
msgstr "Afişează adresele IP ale maşinilor în domeniul dat." msgstr "Afişează adresele IP ale maşinilor în domeniul dat."
#: option.c:126 #: option.c:127
msgid "Fake reverse lookups for RFC1918 private address ranges." msgid "Fake reverse lookups for RFC1918 private address ranges."
msgstr "" msgstr ""
"Simulează căutări după adresă pentru domenii de adresă private (RFC1918)." "Simulează căutări după adresă pentru domenii de adresă private (RFC1918)."
#: option.c:127 #: option.c:128
msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)."
msgstr "Interpretează adresa IP ca NXDOMAIN (împotriva manipulărilor Verisign)" msgstr "Interpretează adresa IP ca NXDOMAIN (împotriva manipulărilor Verisign)"
#: option.c:128 #: option.c:129
#, c-format #, c-format
msgid "Specify the size of the cache in entries (defaults to %s)." msgid "Specify the size of the cache in entries (defaults to %s)."
msgstr "Specifică mărimea înregistrărilor temporare (implicit e %s)." msgstr "Specifică mărimea înregistrărilor temporare (implicit e %s)."
#: option.c:129 #: option.c:130
#, c-format #, c-format
msgid "Specify configuration file (defaults to %s)." msgid "Specify configuration file (defaults to %s)."
msgstr "Specifică fişier de configurare (implicit e %s)." msgstr "Specifică fişier de configurare (implicit e %s)."
#: option.c:130 #: option.c:131
msgid "Do NOT fork into the background: run in debug mode." msgid "Do NOT fork into the background: run in debug mode."
msgstr "NU porneşte în fundal: rulează în modul depanare." msgstr "NU porneşte în fundal: rulează în modul depanare."
#: option.c:131 #: option.c:132
msgid "Do NOT forward queries with no domain part." msgid "Do NOT forward queries with no domain part."
msgstr "NU înainta cererile ce nu conţin domeniu DNS." msgstr "NU înainta cererile ce nu conţin domeniu DNS."
#: option.c:132 #: option.c:133
msgid "Return self-pointing MX records for local hosts." msgid "Return self-pointing MX records for local hosts."
msgstr "Răspunde cu înregistrări MX spre el însuşi pentru maşini locale." msgstr "Răspunde cu înregistrări MX spre el însuşi pentru maşini locale."
#: option.c:133 #: option.c:134
msgid "Expand simple names in /etc/hosts with domain-suffix." msgid "Expand simple names in /etc/hosts with domain-suffix."
msgstr "Adaugă numelor simple din /etc/hosts numele domeniului ca sufix." msgstr "Adaugă numelor simple din /etc/hosts numele domeniului ca sufix."
#: option.c:134 #: option.c:135
msgid "Don't forward spurious DNS requests from Windows hosts." msgid "Don't forward spurious DNS requests from Windows hosts."
msgstr "Nu inainta cereri DNS defecte provenite de la maşini Windows." msgstr "Nu inainta cereri DNS defecte provenite de la maşini Windows."
#: option.c:135 #: option.c:136
msgid "Enable DHCP in the range given with lease duration." msgid "Enable DHCP in the range given with lease duration."
msgstr "Activează DHCP în domeniul dat cu durată limitată de împrumut." msgstr "Activează DHCP în domeniul dat cu durată limitată de împrumut."
#: option.c:136 #: option.c:137
#, c-format #, c-format
msgid "Change to this group after startup (defaults to %s)." msgid "Change to this group after startup (defaults to %s)."
msgstr "Rulează sub acest grup după pornire (implicit e %s)." msgstr "Rulează sub acest grup după pornire (implicit e %s)."
#: option.c:137 #: option.c:138
msgid "Set address or hostname for a specified machine." msgid "Set address or hostname for a specified machine."
msgstr "Schimbă adresa sau numele maşinii specificate." msgstr "Schimbă adresa sau numele maşinii specificate."
#: option.c:138 #: option.c:139
#, c-format #, c-format
msgid "Do NOT load %s file." msgid "Do NOT load %s file."
msgstr "Nu încarcă fişierul %s." msgstr "Nu încarcă fişierul %s."
#: option.c:139 #: option.c:140
#, c-format #, c-format
msgid "Specify a hosts file to be read in addition to %s." msgid "Specify a hosts file to be read in addition to %s."
msgstr "Specifică spre citire un fişier hosts adiţional la %s." msgstr "Specifică spre citire un fişier hosts adiţional la %s."
#: option.c:140 #: option.c:141
msgid "Specify interface(s) to listen on." msgid "Specify interface(s) to listen on."
msgstr "Specifică interfeţele deservite." msgstr "Specifică interfeţele deservite."
#: option.c:141 #: option.c:142
msgid "Specify interface(s) NOT to listen on." msgid "Specify interface(s) NOT to listen on."
msgstr "Specifică interfeţele NE-deservite." msgstr "Specifică interfeţele NE-deservite."
#: option.c:142 #: option.c:143
msgid "Map DHCP user class to option set." msgid "Map DHCP user class to option set."
msgstr "Leagă clasa de utilizator DHCP cu grup de opţiuni." msgstr "Leagă clasa de utilizator DHCP cu grup de opţiuni."
#: option.c:143 #: option.c:144
msgid "Don't do DHCP for hosts in option set." msgid "Don't do DHCP for hosts in option set."
msgstr "Nu furniza DHCP maşinilor din grupul de opţiuni." msgstr "Nu furniza DHCP maşinilor din grupul de opţiuni."
#: option.c:144 #: option.c:145
msgid "Do NOT fork into the background, do NOT run in debug mode." msgid "Do NOT fork into the background, do NOT run in debug mode."
msgstr "NU porneşte în fundal, NU rulează în modul depanare." msgstr "NU porneşte în fundal, NU rulează în modul depanare."
#: option.c:145 #: option.c:146
msgid "Assume we are the only DHCP server on the local network." msgid "Assume we are the only DHCP server on the local network."
msgstr "Presupune că suntem singurul server DHCP din reţeaua locală." msgstr "Presupune că suntem singurul server DHCP din reţeaua locală."
#: option.c:146 #: option.c:147
#, c-format #, c-format
msgid "Specify where to store DHCP leases (defaults to %s)." msgid "Specify where to store DHCP leases (defaults to %s)."
msgstr "Specifică fişierul de stocare a împrumuturilor DHCP (implicit e %s)." msgstr "Specifică fişierul de stocare a împrumuturilor DHCP (implicit e %s)."
#: option.c:147 #: option.c:148
msgid "Return MX records for local hosts." msgid "Return MX records for local hosts."
msgstr "Răspunde cu întregistrări MX pentru maşini locale." msgstr "Răspunde cu întregistrări MX pentru maşini locale."
#: option.c:148 #: option.c:149
msgid "Specify an MX record." msgid "Specify an MX record."
msgstr "Specifică o înregistrare MX." msgstr "Specifică o înregistrare MX."
#: option.c:149 #: option.c:150
msgid "Specify BOOTP options to DHCP server." msgid "Specify BOOTP options to DHCP server."
msgstr "Specifică opţiuni BOOTP serverului DHCP." msgstr "Specifică opţiuni BOOTP serverului DHCP."
#: option.c:150 #: option.c:151
#, c-format #, c-format
msgid "Do NOT poll %s file, reload only on SIGHUP." msgid "Do NOT poll %s file, reload only on SIGHUP."
msgstr "Nu încărca fişierul %s, citeşte-l doar la SIGHUP." msgstr "Nu încărca fişierul %s, citeşte-l doar la SIGHUP."
#: option.c:151 #: option.c:152
msgid "Do NOT cache failed search results." msgid "Do NOT cache failed search results."
msgstr "NU memora rezultatele de căutare DNS eşuatată." msgstr "NU memora rezultatele de căutare DNS eşuatată."
#: option.c:152 #: option.c:153
#, c-format #, c-format
msgid "Use nameservers strictly in the order given in %s." msgid "Use nameservers strictly in the order given in %s."
msgstr "Foloseşte servere DNS strict în ordinea dată în %s." msgstr "Foloseşte servere DNS strict în ordinea dată în %s."
#: option.c:153 #: option.c:154
msgid "Set extra options to be set to DHCP clients." msgid "Set extra options to be set to DHCP clients."
msgstr "Configurează opţiuni în plusce trebuie trimise clienţilor DHCP." msgstr "Configurează opţiuni în plusce trebuie trimise clienţilor DHCP."
#: option.c:154 #: option.c:155
msgid "Specify port to listen for DNS requests on (defaults to 53)." msgid "Specify port to listen for DNS requests on (defaults to 53)."
msgstr "Specifică numărul portului pentru cereri DNS (implicit e 53)." msgstr "Specifică numărul portului pentru cereri DNS (implicit e 53)."
#: option.c:155 #: option.c:156
#, c-format #, c-format
msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)."
msgstr "Marimea maximă a pachetului UDP pentru EDNS.0 (implicit e %s)." msgstr "Marimea maximă a pachetului UDP pentru EDNS.0 (implicit e %s)."
#: option.c:156 #: option.c:157
msgid "Log queries." msgid "Log queries."
msgstr "Înregistrează tranzacţiile." msgstr "Înregistrează tranzacţiile."
#: option.c:157 #: option.c:158
msgid "Force the originating port for upstream queries." msgid "Force the originating port for upstream queries."
msgstr "Forţează acest port pentru datele ce pleacă." msgstr "Forţează acest port pentru datele ce pleacă."
#: option.c:158 #: option.c:159
msgid "Do NOT read resolv.conf." msgid "Do NOT read resolv.conf."
msgstr "NU citi fişierul resolv.conf" msgstr "NU citi fişierul resolv.conf"
#: option.c:159 #: option.c:160
#, c-format #, c-format
msgid "Specify path to resolv.conf (defaults to %s)." msgid "Specify path to resolv.conf (defaults to %s)."
msgstr "Specifică calea către resolv.conf (implicit e %s)." msgstr "Specifică calea către resolv.conf (implicit e %s)."
#: option.c:160 #: option.c:161
msgid "Specify address(es) of upstream servers with optional domains." msgid "Specify address(es) of upstream servers with optional domains."
msgstr "Specifică adresele server(elor) superioare cu domenii opţionale." msgstr "Specifică adresele server(elor) superioare cu domenii opţionale."
#: option.c:161 #: option.c:162
msgid "Never forward queries to specified domains." msgid "Never forward queries to specified domains."
msgstr "Nu înaintează cererile spre domeniile specificate." msgstr "Nu înaintează cererile spre domeniile specificate."
#: option.c:162 #: option.c:163
msgid "Specify the domain to be assigned in DHCP leases." msgid "Specify the domain to be assigned in DHCP leases."
msgstr "Specifică domeniul de transmis prin DHCP." msgstr "Specifică domeniul de transmis prin DHCP."
#: option.c:163 #: option.c:164
msgid "Specify default target in an MX record." msgid "Specify default target in an MX record."
msgstr "Specifică o ţintă într-o înregistrare MX." msgstr "Specifică o ţintă într-o înregistrare MX."
#: option.c:164 #: option.c:165
msgid "Specify time-to-live in seconds for replies from /etc/hosts." msgid "Specify time-to-live in seconds for replies from /etc/hosts."
msgstr "Specifică TTL în secunde pentru răspunsurile din /etc/hosts." msgstr "Specifică TTL în secunde pentru răspunsurile din /etc/hosts."
#: option.c:165 #: option.c:166
#, c-format #, c-format
msgid "Change to this user after startup. (defaults to %s)." msgid "Change to this user after startup. (defaults to %s)."
msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)." msgstr "Rulează sub acest utilizator după pornire. (implicit e %s)."
#: option.c:166 #: option.c:167
msgid "Map DHCP vendor class to option set." msgid "Map DHCP vendor class to option set."
msgstr "Trimite opţiuni DHCP în funcţie de marca plăcii de reţea." msgstr "Trimite opţiuni DHCP în funcţie de marca plăcii de reţea."
#: option.c:167 #: option.c:168
msgid "Display dnsmasq version and copyright information." msgid "Display dnsmasq version and copyright information."
msgstr "Afişează versiunea dnsmasq şi drepturile de autor." msgstr "Afişează versiunea dnsmasq şi drepturile de autor."
#: option.c:168 #: option.c:169
msgid "Translate IPv4 addresses from upstream servers." msgid "Translate IPv4 addresses from upstream servers."
msgstr "Traduce adresele IPv4 de la serverele DNS superioare." msgstr "Traduce adresele IPv4 de la serverele DNS superioare."
#: option.c:169 #: option.c:170
msgid "Specify a SRV record." msgid "Specify a SRV record."
msgstr "Specifică o înregistrare SRV." msgstr "Specifică o înregistrare SRV."
#: option.c:170 #: option.c:171
msgid "Display this message." msgid "Display this message."
msgstr "Afişează acest mesaj." msgstr "Afişează acest mesaj."
#: option.c:171 #: option.c:172
#, c-format #, c-format
msgid "Specify path of PID file. (defaults to %s)." msgid "Specify path of PID file. (defaults to %s)."
msgstr "Specifică o cale pentru fişierul PID. (implicit %s)." msgstr "Specifică o cale pentru fişierul PID. (implicit %s)."
#: option.c:172 #: option.c:173
#, c-format #, c-format
msgid "Specify maximum number of DHCP leases (defaults to %s)." msgid "Specify maximum number of DHCP leases (defaults to %s)."
msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)." msgstr "Specifică numărul maxim de împrumuturi DHCP (implicit %s)."
#: option.c:173 #: option.c:174
msgid "Answer DNS queries based on the interface a query was sent to." msgid "Answer DNS queries based on the interface a query was sent to."
msgstr "" msgstr ""
"Răspunde cererilor DNS în funcţie de interfaţa pe care a venit cererea." "Răspunde cererilor DNS în funcţie de interfaţa pe care a venit cererea."
#: option.c:174 #: option.c:175
msgid "Specify TXT DNS record." msgid "Specify TXT DNS record."
msgstr "Specifică o înregistrare TXT." msgstr "Specifică o înregistrare TXT."
#: option.c:175 #: option.c:176
msgid "Bind only to interfaces in use." msgid "Bind only to interfaces in use."
msgstr "Ascultă doar pe interfeţele active." msgstr "Ascultă doar pe interfeţele active."
#: option.c:176 #: option.c:177
#, c-format #, c-format
msgid "Read DHCP static host information from %s." msgid "Read DHCP static host information from %s."
msgstr "Citeşte informaţii DHCP statice despre maşină din %s." msgstr "Citeşte informaţii DHCP statice despre maşină din %s."
#: option.c:177 #: option.c:178
msgid "Enable the DBus interface for setting upstream servers, etc." msgid "Enable the DBus interface for setting upstream servers, etc."
msgstr "Activeaza interfaţa DBus pentru configurarea serverelor superioare." msgstr "Activeaza interfaţa DBus pentru configurarea serverelor superioare."
#: option.c:178 #: option.c:179
msgid "Do not provide DHCP on this interface, only provide DNS." msgid "Do not provide DHCP on this interface, only provide DNS."
msgstr "Nu activează DHCP ci doar DNS pe această interfaţă." msgstr "Nu activează DHCP ci doar DNS pe această interfaţă."
#: option.c:179 #: option.c:180
msgid "Enable dynamic address allocation for bootp." msgid "Enable dynamic address allocation for bootp."
msgstr "Activează alocarea dinamică a adreselor pentru BOOTP." msgstr "Activează alocarea dinamică a adreselor pentru BOOTP."
#: option.c:394 #: option.c:181
#, fuzzy
msgid "Map MAC address (with wildcards) to option set."
msgstr "Trimite opţiuni DHCP în funcţie de marca plăcii de reţea."
#: option.c:396
msgid "missing \"" msgid "missing \""
msgstr "lipseşte \"" msgstr "lipseşte \""
#: option.c:423 #: option.c:425
msgid "bad option" msgid "bad option"
msgstr "opţiune invalidă" msgstr "opţiune invalidă"
#: option.c:440 #: option.c:442
#, c-format #, c-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "nu pot citi %s: %s" msgstr "nu pot citi %s: %s"
#: option.c:446 #: option.c:448
#, c-format #, c-format
msgid "" msgid ""
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n"
@@ -335,22 +340,22 @@ msgstr ""
"Utilizare: dnsmasq [opţiuni]\n" "Utilizare: dnsmasq [opţiuni]\n"
"\n" "\n"
#: option.c:448 #: option.c:450
#, c-format #, c-format
msgid "Use short options only on the command line.\n" msgid "Use short options only on the command line.\n"
msgstr "Folosiţi opţiunile prescurtate doar în linie de comandă.\n" msgstr "Folosiţi opţiunile prescurtate doar în linie de comandă.\n"
#: option.c:450 #: option.c:452
#, c-format #, c-format
msgid "Valid options are :\n" msgid "Valid options are :\n"
msgstr "Opţiunile valide sunt:\n" msgstr "Opţiunile valide sunt:\n"
#: option.c:475 #: option.c:477
#, c-format #, c-format
msgid "Dnsmasq version %s %s\n" msgid "Dnsmasq version %s %s\n"
msgstr "dnsmasq versiunea %s %s\n" msgstr "dnsmasq versiunea %s %s\n"
#: option.c:476 #: option.c:478
#, c-format #, c-format
msgid "" msgid ""
"Compile time options %s\n" "Compile time options %s\n"
@@ -359,144 +364,148 @@ msgstr ""
"Opţiuni cu care a fost compilat %s\n" "Opţiuni cu care a fost compilat %s\n"
"\n" "\n"
#: option.c:477 #: option.c:479
#, c-format #, c-format
msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" msgid "This software comes with ABSOLUTELY NO WARRANTY.\n"
msgstr "Acest program vine FĂRĂ NICI O GARANŢIE.\n" msgstr "Acest program vine FĂRĂ NICI O GARANŢIE.\n"
#: option.c:478 #: option.c:480
#, c-format #, c-format
msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" msgid "Dnsmasq is free software, and you are welcome to redistribute it\n"
msgstr "Dnsmasq este un program gratuit, sunteţi invitaţi să-l redistribuiţi\n" msgstr "Dnsmasq este un program gratuit, sunteţi invitaţi să-l redistribuiţi\n"
#: option.c:479 #: option.c:481
#, c-format #, c-format
msgid "under the terms of the GNU General Public License, version 2.\n" msgid "under the terms of the GNU General Public License, version 2.\n"
msgstr "în termenii Licenţei publice generale GNU, versiunea 2.\n" msgstr "în termenii Licenţei publice generale GNU, versiunea 2.\n"
#: option.c:489 #: option.c:491
msgid "extraneous parameter" msgid "extraneous parameter"
msgstr "parametru nerecunoscut" msgstr "parametru nerecunoscut"
#: option.c:497 #: option.c:499
msgid "missing parameter" msgid "missing parameter"
msgstr "parametru lipsa" msgstr "parametru lipsa"
#: option.c:514 #: option.c:516
msgid "nested includes not allowed" msgid "nested includes not allowed"
msgstr "incluziunile locale nu sunt permise" msgstr "incluziunile locale nu sunt permise"
#: option.c:574 #: option.c:576
msgid "bad MX preference" msgid "bad MX preference"
msgstr "preferinţă MX invalidă" msgstr "preferinţă MX invalidă"
#: option.c:583 #: option.c:585
msgid "bad MX name" msgid "bad MX name"
msgstr "nume MX invalid" msgstr "nume MX invalid"
#: option.c:601 #: option.c:603
msgid "bad MX target" msgid "bad MX target"
msgstr "ţintă MX invalidă" msgstr "ţintă MX invalidă"
#: option.c:803 option.c:814 #: option.c:805 option.c:816
msgid "bad port" msgid "bad port"
msgstr "port invalid" msgstr "port invalid"
#: option.c:954 #: option.c:957
msgid "bad dhcp-range" msgid "bad dhcp-range"
msgstr "dhcp-range invalid" msgstr "dhcp-range invalid"
#: option.c:1014 #: option.c:986
msgid "only one netid tag allowed"
msgstr ""
#: option.c:1031
msgid "inconsistent DHCP range" msgid "inconsistent DHCP range"
msgstr "domeniu DHCP inconsistent" msgstr "domeniu DHCP inconsistent"
#: option.c:1201 #: option.c:1219
msgid "bad dhcp-host" msgid "bad dhcp-host"
msgstr "dhcp-host invalid" msgstr "dhcp-host invalid"
#: option.c:1261 #: option.c:1279
msgid "bad dhcp-option" msgid "bad dhcp-option"
msgstr "dhcp-option invalid" msgstr "dhcp-option invalid"
#: option.c:1279 #: option.c:1297
msgid "bad domain in dhcp-option" msgid "bad domain in dhcp-option"
msgstr "domeniu DNS invalid în declaraţia dhcp-option" msgstr "domeniu DNS invalid în declaraţia dhcp-option"
#: option.c:1425 #: option.c:1467
msgid "dhcp-option too long" msgid "dhcp-option too long"
msgstr "declararea dhcp-option este prea lungă" msgstr "declararea dhcp-option este prea lungă"
#: option.c:1605 #: option.c:1664
msgid "bad TXT record" msgid "bad TXT record"
msgstr "înregistrare TXT invalidă" msgstr "înregistrare TXT invalidă"
#: option.c:1637 #: option.c:1696
msgid "TXT record string too long" msgid "TXT record string too long"
msgstr "şirul de caractere pentru înregistrarea TXT este prea lung" msgstr "şirul de caractere pentru înregistrarea TXT este prea lung"
#: option.c:1676 #: option.c:1735
msgid "bad SRV record" msgid "bad SRV record"
msgstr "înregistrare SRV invalidă" msgstr "înregistrare SRV invalidă"
#: option.c:1689 #: option.c:1748
msgid "bad SRV target" msgid "bad SRV target"
msgstr "ţintă SRV invalidă" msgstr "ţintă SRV invalidă"
#: option.c:1701 #: option.c:1760
msgid "invalid port number" msgid "invalid port number"
msgstr "număr de port invalid" msgstr "număr de port invalid"
#: option.c:1712 #: option.c:1771
msgid "invalid priority" msgid "invalid priority"
msgstr "prioritate invalidă" msgstr "prioritate invalidă"
#: option.c:1723 #: option.c:1782
msgid "invalid weight" msgid "invalid weight"
msgstr "pondere invalidă" msgstr "pondere invalidă"
#: option.c:1748 #: option.c:1807
msgid "error" msgid "error"
msgstr "eroare" msgstr "eroare"
#: option.c:1750 #: option.c:1809
#, c-format #, c-format
msgid "bad command line options: %s." msgid "bad command line options: %s."
msgstr "opţiuni în linie de comandă invalide: %s." msgstr "opţiuni în linie de comandă invalide: %s."
#: option.c:1794 #: option.c:1853
#, c-format #, c-format
msgid "cannot get host-name: %s" msgid "cannot get host-name: %s"
msgstr "nu pot citi numele maşinii: %s" msgstr "nu pot citi numele maşinii: %s"
#: option.c:1823 #: option.c:1882
msgid "only one resolv.conf file allowed in no-poll mode." msgid "only one resolv.conf file allowed in no-poll mode."
msgstr "se permite un singur fişier resolv.conf în modul no-poll" msgstr "se permite un singur fişier resolv.conf în modul no-poll"
#: option.c:1830 #: option.c:1889
msgid "must have exactly one resolv.conf to read domain from." msgid "must have exactly one resolv.conf to read domain from."
msgstr "" msgstr ""
"am nevoie de un singur resolv.conf din care să citesc numele domeniului." "am nevoie de un singur resolv.conf din care să citesc numele domeniului."
#: option.c:1833 network.c:591 #: option.c:1892 network.c:591
#, c-format #, c-format
msgid "failed to read %s: %m" msgid "failed to read %s: %m"
msgstr "nu pot citi %s: %n" msgstr "nu pot citi %s: %n"
#: option.c:1851 #: option.c:1910
#, c-format #, c-format
msgid "no search directive found in %s" msgid "no search directive found in %s"
msgstr "nu s-a găsit nici un criteriu de căutare în %s" msgstr "nu s-a găsit nici un criteriu de căutare în %s"
#: forward.c:378 #: forward.c:383
#, c-format #, c-format
msgid "nameserver %s refused to do a recursive query" msgid "nameserver %s refused to do a recursive query"
msgstr "serverul DNS %s refuză interogările recursive" msgstr "serverul DNS %s refuză interogările recursive"
#: forward.c:899 #: forward.c:914
msgid "forwarding table overflow: check for server loops." msgid "forwarding table overflow: check for server loops."
msgstr "depăşire de memorie în tabela cu înaintări DNS: verificaţi de bucle." msgstr "depăşire de memorie în tabela cu înaintări DNS: verificaţi de bucle."
#: isc.c:71 dnsmasq.c:474 #: isc.c:71 dnsmasq.c:482
#, c-format #, c-format
msgid "failed to access %s: %m" msgid "failed to access %s: %m"
msgstr "accesarea serverului %s a eşuat: %n" msgstr "accesarea serverului %s a eşuat: %n"
@@ -611,71 +620,71 @@ msgstr ""
"trebuie specificată exact o singură interfaţă pe sistemele defectece nu au " "trebuie specificată exact o singură interfaţă pe sistemele defectece nu au "
"IP_RECVIF" "IP_RECVIF"
#: dnsmasq.c:176 dnsmasq.c:507 #: dnsmasq.c:176 dnsmasq.c:520
#, c-format #, c-format
msgid "DBus error: %s" msgid "DBus error: %s"
msgstr "eroare DBus: %s" msgstr "eroare DBus: %s"
#: dnsmasq.c:180 #: dnsmasq.c:179
msgid "DBus not available: set HAVE_DBUS in src/config.h" msgid "DBus not available: set HAVE_DBUS in src/config.h"
msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h" msgstr "DBus nu este disponibil: puneţi HAVE_DBUS in src/config.h"
#: dnsmasq.c:293 #: dnsmasq.c:292
#, c-format #, c-format
msgid "started, version %s cachesize %d" msgid "started, version %s cachesize %d"
msgstr "am ponit, versiunea %s memorie temporară %d" msgstr "am ponit, versiunea %s memorie temporară %d"
#: dnsmasq.c:295 #: dnsmasq.c:294
#, c-format #, c-format
msgid "started, version %s cache disabled" msgid "started, version %s cache disabled"
msgstr "am pornit, versiunea %s memorie temporară dezactivată" msgstr "am pornit, versiunea %s memorie temporară dezactivată"
#: dnsmasq.c:297 #: dnsmasq.c:296
#, c-format #, c-format
msgid "compile time options: %s" msgid "compile time options: %s"
msgstr "compilat cu opţiunile: %s" msgstr "compilat cu opţiunile: %s"
#: dnsmasq.c:303 #: dnsmasq.c:302
msgid "DBus support enabled: connected to system bus" msgid "DBus support enabled: connected to system bus"
msgstr "suportul DBus activ: sunt conectat la magistrala sistem" msgstr "suportul DBus activ: sunt conectat la magistrala sistem"
#: dnsmasq.c:305 #: dnsmasq.c:304
msgid "DBus support enabled: bus connection pending" msgid "DBus support enabled: bus connection pending"
msgstr "suportul DBus activ: aştept conexiunea la magistrală" msgstr "suportul DBus activ: aştept conexiunea la magistrală"
#: dnsmasq.c:310 #: dnsmasq.c:309
msgid "setting --bind-interfaces option because of OS limitations" msgid "setting --bind-interfaces option because of OS limitations"
msgstr "specific opţiunea --bind-interfaces din cauza limitărilor SO" msgstr "specific opţiunea --bind-interfaces din cauza limitărilor SO"
#: dnsmasq.c:315 #: dnsmasq.c:314
#, c-format #, c-format
msgid "warning: interface %s does not currently exist" msgid "warning: interface %s does not currently exist"
msgstr "atenţie: interfaţa %s nu există momentan" msgstr "atenţie: interfaţa %s nu există momentan"
#: dnsmasq.c:332 #: dnsmasq.c:331
#, c-format #, c-format
msgid "DHCP, static leases only on %.0s%s, lease time %s" msgid "DHCP, static leases only on %.0s%s, lease time %s"
msgstr "DHCP, împrumuturi statice doar către %.0s%s, timpul reînoirii %s" msgstr "DHCP, împrumuturi statice doar către %.0s%s, timpul reînoirii %s"
#: dnsmasq.c:333 #: dnsmasq.c:332
#, c-format #, c-format
msgid "DHCP, IP range %s -- %s, lease time %s" msgid "DHCP, IP range %s -- %s, lease time %s"
msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s" msgstr "DHCP, domeniu IP %s -- %s, timpul reînoirii %s"
#: dnsmasq.c:344 #: dnsmasq.c:343
#, c-format #, c-format
msgid "DHCP, %s will be written every %s" msgid "DHCP, %s will be written every %s"
msgstr "DHCP, %s va fi rescris odată la fiecare %s" msgstr "DHCP, %s va fi rescris odată la fiecare %s"
#: dnsmasq.c:349 #: dnsmasq.c:348
msgid "running as root" msgid "running as root"
msgstr "rulez ca root" msgstr "rulez ca root"
#: dnsmasq.c:509 #: dnsmasq.c:522
msgid "connected to system DBus" msgid "connected to system DBus"
msgstr "magistrala sistem Dbus conectată" msgstr "magistrala sistem Dbus conectată"
#: dnsmasq.c:520 #: dnsmasq.c:533
msgid "exiting on receipt of SIGTERM" msgid "exiting on receipt of SIGTERM"
msgstr "am primit SIGTERM, am terminat" msgstr "am primit SIGTERM, am terminat"
@@ -723,67 +732,72 @@ msgstr ""
msgid "duplicate IP address %s in dhcp-config directive." msgid "duplicate IP address %s in dhcp-config directive."
msgstr "adresă IP duplicat %s în declaraţia dhcp-config." msgstr "adresă IP duplicat %s în declaraţia dhcp-config."
#: dhcp.c:233 #: dhcp.c:234
msgid "Cannot use RTnetlink socket, falling back to ioctl API" msgid "Cannot use RTnetlink socket, falling back to ioctl API"
msgstr "" msgstr ""
#: dhcp.c:394 #: dhcp.c:345
#, 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:705
#, c-format
msgid "failed to read %s:%m"
msgstr "citirea %s:%n a eşuat"
#: dhcp.c:724
#, c-format
msgid "bad line at %s line %d"
msgstr "linie invalidă în %s rândul %d"
#: 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: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"
#: lease.c:39
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "nu pot creea sau deschide fişierul cu împrumuturi: %s"
#: lease.c:77
msgid "too many stored leases"
msgstr "prea multe împrumuturi stocate"
#: rfc2131.c:171
#, c-format #, c-format
msgid "DHCP request for unsupported hardware type (%d) recieved on %s" msgid "DHCP request for unsupported hardware type (%d) recieved on %s"
msgstr "cerere DHCP pentru dispozitiv nesuportat (%d) recepţionată prin %s" msgstr "cerere DHCP pentru dispozitiv nesuportat (%d) recepţionată prin %s"
#: rfc2131.c:220 #: dhcp.c:413
#, 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:722
#, c-format
msgid "failed to read %s:%m"
msgstr "citirea %s:%n a eşuat"
#: dhcp.c:741
#, c-format
msgid "bad line at %s line %d"
msgstr "linie invalidă în %s rândul %d"
#: dhcp.c:845
#, 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:881
#, 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"
#: lease.c:38
#, c-format
msgid "cannot open or create leases file: %s"
msgstr "nu pot creea sau deschide fişierul cu împrumuturi: %s"
#: lease.c:80
msgid "too many stored leases"
msgstr "prea multe împrumuturi stocate"
#: lease.c:179
#, fuzzy
msgid "failed to write"
msgstr "citirea %s:%n a eşuat"
#: rfc2131.c:218
#, c-format #, c-format
msgid "no address range available for DHCP request %s %s" msgid "no address range available for DHCP request %s %s"
msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s" msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "with subnet selector" msgid "with subnet selector"
msgstr "cu selectorul de subreţea" msgstr "cu selectorul de subreţea"
#: rfc2131.c:221 #: rfc2131.c:219
msgid "via" msgid "via"
msgstr "prin" msgstr "prin"
#: rfc2131.c:241 rfc2131.c:265 #: rfc2131.c:240 rfc2131.c:264
msgid "disabled" msgid "disabled"
msgstr "dezactivat" msgstr "dezactivat"
#: rfc2131.c:275 rfc2131.c:661 #: rfc2131.c:275 rfc2131.c:674
msgid "address in use" msgid "address in use"
msgstr "adresa este folosită" msgstr "adresa este folosită"
@@ -791,62 +805,62 @@ msgstr "adresa este folosită"
msgid "no address configured" msgid "no address configured"
msgstr "adresă lipsă" msgstr "adresă lipsă"
#: rfc2131.c:291 rfc2131.c:537 #: rfc2131.c:291 rfc2131.c:546
msgid "no address available" msgid "no address available"
msgstr "nici o adresă disponibilă" msgstr "nici o adresă disponibilă"
#: rfc2131.c:298 rfc2131.c:664 #: rfc2131.c:298 rfc2131.c:677
msgid "no leases left" msgid "no leases left"
msgstr "nu mai am de unde să împrumut" msgstr "nu mai am de unde să împrumut"
#: rfc2131.c:301 rfc2131.c:637 #: rfc2131.c:301 rfc2131.c:650
msgid "wrong network" msgid "wrong network"
msgstr "reţea greşită" msgstr "reţea greşită"
#: rfc2131.c:496 #: rfc2131.c:505
#, c-format #, c-format
msgid "disabling DHCP static address %s" msgid "disabling DHCP static address %s"
msgstr "dezactivăm adresele DHCP statice %s" msgstr "dezactivăm adresele DHCP statice %s"
#: rfc2131.c:514 #: rfc2131.c:523
msgid "unknown lease" msgid "unknown lease"
msgstr "împrumut necunoscut" msgstr "împrumut necunoscut"
#: rfc2131.c:527 rfc2131.c:736 #: rfc2131.c:536 rfc2131.c:749
msgid "ignored" msgid "ignored"
msgstr "ignorat" msgstr "ignorat"
#: rfc2131.c:610 #: rfc2131.c:619
msgid "wrong address" msgid "wrong address"
msgstr "adresă greşită" msgstr "adresă greşită"
#: rfc2131.c:619 #: rfc2131.c:632
msgid "lease not found" msgid "lease not found"
msgstr "împrumutul nu a fost găsit" msgstr "împrumutul nu a fost găsit"
#: rfc2131.c:645 #: rfc2131.c:658
msgid "address not available" msgid "address not available"
msgstr "adresă indisponibilă" msgstr "adresă indisponibilă"
#: rfc2131.c:654 #: rfc2131.c:667
msgid "static lease available" msgid "static lease available"
msgstr "împrumut static este disponibil" msgstr "împrumut static este disponibil"
#: rfc2131.c:658 #: rfc2131.c:671
msgid "address reserved" msgid "address reserved"
msgstr "adresă rezervată" msgstr "adresă rezervată"
#: rfc2131.c:855 #: rfc2131.c:871
#, c-format #, c-format
msgid "cannot send DHCP option %d: no space left in packet" 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" msgstr "nu pot trimite opţiunea DHCP %d: nu mai este loc în pachet"
#: rfc2131.c:1150 #: rfc2131.c:1174
#, c-format #, c-format
msgid "More than one vendor class matches, using %s" msgid "More than one vendor class matches, using %s"
msgstr "Se potrivesc mai multe clase de mărci de interfeţe, folosim %s" msgstr "Se potrivesc mai multe clase de mărci de interfeţe, folosim %s"
#: netlink.c:37 #: netlink.c:41
#, c-format #, c-format
msgid "cannot bind netlink socket: %s" msgid "cannot bind netlink socket: %s"
msgstr "nu pot să activez socket-ul netlink: %s" msgstr "nu pot să activez socket-ul netlink: %s"
+1 -1
View File
@@ -194,7 +194,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign
} }
} }
else if ((crecp->flags & F_FORWARD) && else if ((crecp->flags & F_FORWARD) &&
((flags & crecp->flags & (F_IPV4 | F_IPV6)) || (crecp->flags & F_CNAME)) && ((flags & crecp->flags & (F_IPV4 | F_IPV6)) || ((crecp->flags | flags) & F_CNAME)) &&
hostname_isequal(cache_get_name(crecp), name)) hostname_isequal(cache_get_name(crecp), name))
{ {
if (crecp->flags & (F_HOSTS | F_DHCP)) if (crecp->flags & (F_HOSTS | F_DHCP))
+2 -1
View File
@@ -12,13 +12,14 @@
/* Author's email: simon@thekelleys.org.uk */ /* Author's email: simon@thekelleys.org.uk */
#define VERSION "2.26" #define VERSION "2.27"
#define FTABSIZ 150 /* max number of outstanding requests */ #define FTABSIZ 150 /* max number of outstanding requests */
#define MAX_PROCS 20 /* max no children for TCP requests */ #define MAX_PROCS 20 /* max no children for TCP requests */
#define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */
#define EDNS_PKTSZ 1280 /* default max EDNS.0 UDP packet from RFC2671 */ #define EDNS_PKTSZ 1280 /* default max EDNS.0 UDP packet from RFC2671 */
#define TIMEOUT 20 /* drop UDP queries after TIMEOUT seconds */ #define TIMEOUT 20 /* drop UDP queries after TIMEOUT seconds */
#define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */
#define LOGRATE 120 /* log table overflows every LOGRATE seconds */ #define LOGRATE 120 /* log table overflows every LOGRATE seconds */
#define CACHESIZ 150 /* default cache size */ #define CACHESIZ 150 /* default cache size */
#define MAXTOK 50 /* token in DHCP leases */ #define MAXTOK 50 /* token in DHCP leases */
+57 -37
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley /* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -115,8 +115,9 @@ void dhcp_packet(struct daemon *daemon, time_t now)
struct msghdr msg; struct msghdr msg;
struct iovec iov[2]; struct iovec iov[2];
struct cmsghdr *cmptr; struct cmsghdr *cmptr;
int sz, newlen, iface_index = 0; ssize_t sz;
int unicast_dest = 0; size_t newlen;
int iface_index = 0, unicast_dest = 0;
struct in_addr iface_addr; struct in_addr iface_addr;
#ifdef HAVE_BPF #ifdef HAVE_BPF
unsigned char iface_hwaddr[ETHER_ADDR_LEN]; unsigned char iface_hwaddr[ETHER_ADDR_LEN];
@@ -144,7 +145,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
sz = recvmsg(daemon->dhcpfd, &msg, 0); sz = recvmsg(daemon->dhcpfd, &msg, 0);
if (sz < (int)(sizeof(*mess) - sizeof(mess->options))) if (sz < (ssize_t)(sizeof(*mess) - sizeof(mess->options)))
return; return;
#if defined (IP_PKTINFO) #if defined (IP_PKTINFO)
@@ -248,8 +249,8 @@ void dhcp_packet(struct daemon *daemon, time_t now)
} }
lease_prune(NULL, now); /* lose any expired leases */ lease_prune(NULL, now); /* lose any expired leases */
newlen = dhcp_reply(daemon, context, ifr.ifr_name, sz, now, unicast_dest); newlen = dhcp_reply(daemon, context, ifr.ifr_name, (size_t)sz, now, unicast_dest);
lease_update_file(0, now); lease_update_file(daemon, 0, now);
lease_update_dns(daemon); lease_update_dns(daemon);
if (newlen == 0) if (newlen == 0)
@@ -289,16 +290,16 @@ void dhcp_packet(struct daemon *daemon, time_t now)
the kernel IP stack */ the kernel IP stack */
u32 i, sum; u32 i, sum;
unsigned char hwdest[ETHER_ADDR_LEN]; unsigned char hwdest[DHCP_CHADDR_MAX];
if (ntohs(mess->flags) & 0x8000) if (ntohs(mess->flags) & 0x8000)
{ {
memset(hwdest, 255, ETHER_ADDR_LEN); memset(hwdest, 255, mess->hlen);
rawpacket->ip.ip_dst.s_addr = INADDR_BROADCAST; rawpacket->ip.ip_dst.s_addr = INADDR_BROADCAST;
} }
else else
{ {
memcpy(hwdest, mess->chaddr, ETHER_ADDR_LEN); memcpy(hwdest, mess->chaddr, mess->hlen);
rawpacket->ip.ip_dst.s_addr = mess->yiaddr.s_addr; rawpacket->ip.ip_dst.s_addr = mess->yiaddr.s_addr;
} }
@@ -322,6 +323,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
rawpacket->udp.uh_sport = htons(DHCP_SERVER_PORT); rawpacket->udp.uh_sport = htons(DHCP_SERVER_PORT);
rawpacket->udp.uh_dport = htons(DHCP_CLIENT_PORT); rawpacket->udp.uh_dport = htons(DHCP_CLIENT_PORT);
if (newlen & 1)
((u8 *)&rawpacket->data)[newlen] = 0; /* for checksum, in case length is odd. */ ((u8 *)&rawpacket->data)[newlen] = 0; /* for checksum, in case length is odd. */
rawpacket->udp.uh_sum = 0; rawpacket->udp.uh_sum = 0;
rawpacket->udp.uh_ulen = sum = htons(sizeof(struct udphdr) + newlen); rawpacket->udp.uh_ulen = sum = htons(sizeof(struct udphdr) + newlen);
@@ -338,6 +340,12 @@ void dhcp_packet(struct daemon *daemon, time_t now)
#ifdef HAVE_BPF #ifdef HAVE_BPF
struct ether_header header; struct ether_header header;
/* Only know how to do ethernet on *BSD */
if (mess->htype != ARPHRD_ETHER || mess->hlen != ETHER_ADDR_LEN)
syslog(LOG_WARNING, _("DHCP request for unsupported hardware type (%d) recieved on %s"),
mess->htype, ifr.ifr_name);
else
{
header.ether_type = htons(ETHERTYPE_IP); header.ether_type = htons(ETHERTYPE_IP);
memcpy(header.ether_shost, iface_hwaddr, ETHER_ADDR_LEN); memcpy(header.ether_shost, iface_hwaddr, ETHER_ADDR_LEN);
memcpy(header.ether_dhost, hwdest, ETHER_ADDR_LEN); memcpy(header.ether_dhost, hwdest, ETHER_ADDR_LEN);
@@ -349,15 +357,26 @@ void dhcp_packet(struct daemon *daemon, time_t now)
iov[1].iov_base = (char *)rawpacket; iov[1].iov_base = (char *)rawpacket;
iov[1].iov_len = ntohs(rawpacket->ip.ip_len); iov[1].iov_len = ntohs(rawpacket->ip.ip_len);
while (writev(daemon->dhcp_raw_fd, iov, 2) == -1 && retry_send()); while (writev(daemon->dhcp_raw_fd, iov, 2) == -1 && retry_send());
}
#else #else
struct sockaddr_ll dest; /* Most definitions of this only include 8 bytes of address,
so we roll our own, since later kernels allow more. */
struct {
unsigned short int sll_family;
unsigned short int sll_protocol;
int sll_ifindex;
unsigned short int sll_hatype;
unsigned char sll_pkttype;
unsigned char sll_halen;
unsigned char sll_addr[DHCP_CHADDR_MAX];
} dest;
memset(&dest, 0, sizeof(dest)); memset(&dest, 0, sizeof(dest));
dest.sll_family = AF_PACKET; dest.sll_family = AF_PACKET;
dest.sll_halen = ETHER_ADDR_LEN; dest.sll_halen = mess->hlen;
dest.sll_ifindex = iface_index; dest.sll_ifindex = iface_index;
dest.sll_protocol = htons(ETHERTYPE_IP); dest.sll_protocol = htons(ETHERTYPE_IP);
memcpy(dest.sll_addr, hwdest, ETHER_ADDR_LEN); memcpy(dest.sll_addr, hwdest, mess->hlen);
while (sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len), while (sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len),
0, (struct sockaddr *)&dest, sizeof(dest)) == -1 && 0, (struct sockaddr *)&dest, sizeof(dest)) == -1 &&
retry_send()); retry_send());
@@ -493,12 +512,13 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i
return NULL; return NULL;
} }
/* Is every member of check matched by a member of pool? */ /* Is every member of check matched by a member of pool?
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool) If negonly, match unless there's a negative tag which matches. */
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly)
{ {
struct dhcp_netid *tmp1; struct dhcp_netid *tmp1;
if (!check) if (!check && !negonly)
return 0; return 0;
for (; check; check = check->next) for (; check; check = check->next)
@@ -508,7 +528,7 @@ int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool)
for (tmp1 = pool; tmp1; tmp1 = tmp1->next) for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
if (strcmp(check->net, tmp1->net) == 0) if (strcmp(check->net, tmp1->net) == 0)
break; break;
if (!tmp1) if (!tmp1 || negonly)
return 0; return 0;
} }
else else
@@ -520,30 +540,28 @@ int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool)
} }
int address_allocate(struct dhcp_context *context, struct daemon *daemon, int address_allocate(struct dhcp_context *context, struct daemon *daemon,
struct in_addr *addrp, unsigned char *hwaddr, struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
struct dhcp_netid *netids, time_t now) struct dhcp_netid *netids, time_t now)
{ {
/* Find a free address: exclude anything in use and anything allocated to /* Find a free address: exclude anything in use and anything allocated to
a particular hwaddr/clientid/hostname in our configuration. a particular hwaddr/clientid/hostname in our configuration.
Try to return from contexts which mathc netis first. */ Try to return from contexts which match netids first. */
struct in_addr start, addr ; struct in_addr start, addr ;
struct dhcp_context *c; struct dhcp_context *c;
unsigned int i, j; int i, pass;
unsigned int j;
for (pass = 0; pass <= 1; pass++)
for (c = context; c; c = c->current) for (c = context; c; c = c->current)
if (c->flags & CONTEXT_STATIC) if (c->flags & CONTEXT_STATIC)
continue; continue;
else if (netids && !(c->flags & CONTEXT_FILTER)) else if (!match_netid(c->filter, netids, pass))
continue;
else if (!netids && (c->flags & CONTEXT_FILTER))
continue;
else if (netids && (c->flags & CONTEXT_FILTER) && !match_netid(&c->netid, netids))
continue; continue;
else else
{ {
/* pick a seed based on hwaddr then iterate until we find a free address. */ /* pick a seed based on hwaddr then iterate until we find a free address. */
for (j = c->addr_epoch, i = 0; i < ETHER_ADDR_LEN; i++) for (j = c->addr_epoch, i = 0; i < hw_len; i++)
j += hwaddr[i] + (hwaddr[i] << 8) + (hwaddr[i] << 16); j += hwaddr[i] + (hwaddr[i] << 8) + (hwaddr[i] << 16);
start.s_addr = addr.s_addr = start.s_addr = addr.s_addr =
@@ -607,10 +625,6 @@ int address_allocate(struct dhcp_context *context, struct daemon *daemon,
} while (addr.s_addr != start.s_addr); } while (addr.s_addr != start.s_addr);
} }
if (netids)
return address_allocate(context, daemon, addrp, hwaddr, NULL, now);
return 0; return 0;
} }
@@ -631,7 +645,8 @@ static int is_addr_in_context(struct dhcp_context *context, struct dhcp_config *
struct dhcp_config *find_config(struct dhcp_config *configs, struct dhcp_config *find_config(struct dhcp_config *configs,
struct dhcp_context *context, struct dhcp_context *context,
unsigned char *clid, int clid_len, unsigned char *clid, int clid_len,
unsigned char *hwaddr, char *hostname) unsigned char *hwaddr, int hw_len,
int hw_type, char *hostname)
{ {
struct dhcp_config *config; struct dhcp_config *config;
@@ -653,11 +668,12 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
} }
if (hwaddr)
for (config = configs; config; config = config->next) for (config = configs; config; config = config->next)
if ((config->flags & CONFIG_HWADDR) && if ((config->flags & CONFIG_HWADDR) &&
config->wildcard_mask == 0 && config->wildcard_mask == 0 &&
memcmp(config->hwaddr, hwaddr, ETHER_ADDR_LEN) == 0 && config->hwaddr_len == hw_len &&
(config->hwaddr_type == hw_type || config->hwaddr_type == 0) &&
memcmp(config->hwaddr, hwaddr, hw_len) == 0 &&
is_addr_in_context(context, config)) is_addr_in_context(context, config))
return config; return config;
@@ -669,18 +685,19 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
is_addr_in_context(context, config)) is_addr_in_context(context, config))
return config; return config;
if (hwaddr)
for (config = configs; config; config = config->next) for (config = configs; config; config = config->next)
if ((config->flags & CONFIG_HWADDR) && if ((config->flags & CONFIG_HWADDR) &&
config->wildcard_mask != 0 && config->wildcard_mask != 0 &&
config->hwaddr_len == hw_len &&
(config->hwaddr_type == hw_type || config->hwaddr_type == 0) &&
is_addr_in_context(context, config)) is_addr_in_context(context, config))
{ {
int i; int i;
unsigned int mask = config->wildcard_mask; unsigned int mask = config->wildcard_mask;
for (i = ETHER_ADDR_LEN - 1; i >= 0; i--, mask = mask >> 1) for (i = hw_len - 1; i >= 0; i--, mask = mask >> 1)
if (mask & 1) if (mask & 1)
config->hwaddr[i] = hwaddr[i]; config->hwaddr[i] = hwaddr[i];
if (memcmp(config->hwaddr, hwaddr, ETHER_ADDR_LEN) == 0) if (memcmp(config->hwaddr, hwaddr, hw_len) == 0)
return config; return config;
} }
@@ -719,7 +736,7 @@ void dhcp_read_ethers(struct daemon *daemon)
for (ip = buff; *ip && !isspace(*ip); ip++); for (ip = buff; *ip && !isspace(*ip); ip++);
for(; *ip && isspace(*ip); ip++) for(; *ip && isspace(*ip); ip++)
*ip = 0; *ip = 0;
if (!*ip || parse_hex(buff, hwaddr, 6, NULL) != 6) if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
{ {
syslog(LOG_ERR, _("bad line at %s line %d"), ETHERSFILE, lineno); syslog(LOG_ERR, _("bad line at %s line %d"), ETHERSFILE, lineno);
continue; continue;
@@ -764,6 +781,8 @@ void dhcp_read_ethers(struct daemon *daemon)
for (config = configs; config; config = config->next) for (config = configs; config; config = config->next)
if ((config->flags & CONFIG_HWADDR) && if ((config->flags & CONFIG_HWADDR) &&
config->wildcard_mask == 0 && config->wildcard_mask == 0 &&
config->hwaddr_len == ETHER_ADDR_LEN &&
(config->hwaddr_type == ARPHRD_ETHER || config->hwaddr_type == 0) &&
memcmp(config->hwaddr, hwaddr, ETHER_ADDR_LEN) == 0) memcmp(config->hwaddr, hwaddr, ETHER_ADDR_LEN) == 0)
break; break;
@@ -793,7 +812,8 @@ void dhcp_read_ethers(struct daemon *daemon)
config->flags |= CONFIG_HWADDR | CONFIG_NOCLID; config->flags |= CONFIG_HWADDR | CONFIG_NOCLID;
memcpy(config->hwaddr, hwaddr, ETHER_ADDR_LEN); memcpy(config->hwaddr, hwaddr, ETHER_ADDR_LEN);
config->hwaddr_len = ETHER_ADDR_LEN;
config->hwaddr_type = ARPHRD_ETHER;
count++; count++;
} }
+25 -12
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley /* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -176,7 +176,6 @@ int main (int argc, char **argv)
die(_("DBus error: %s"), err); die(_("DBus error: %s"), err);
} }
#else #else
if (daemon->options & OPT_DBUS)
die(_("DBus not available: set HAVE_DBUS in src/config.h"), NULL); die(_("DBus not available: set HAVE_DBUS in src/config.h"), NULL);
#endif #endif
@@ -256,7 +255,7 @@ int main (int argc, char **argv)
#endif #endif
if (daemon->dhcp && if (daemon->dhcp &&
(i == daemon->lease_fd || (i == fileno(daemon->lease_stream) ||
i == daemon->dhcpfd || i == daemon->dhcpfd ||
i == daemon->dhcp_raw_fd || i == daemon->dhcp_raw_fd ||
i == daemon->dhcp_icmp_fd)) i == daemon->dhcp_icmp_fd))
@@ -314,15 +313,15 @@ int main (int argc, char **argv)
if (if_tmp->name && !if_tmp->used) if (if_tmp->name && !if_tmp->used)
syslog(LOG_WARNING, _("warning: interface %s does not currently exist"), if_tmp->name); syslog(LOG_WARNING, _("warning: interface %s does not currently exist"), if_tmp->name);
#ifdef HAVE_RTNETLINK
/* Must do this after daemonizing so that the pid is right */
netlink_init(daemon);
#endif
if (daemon->dhcp) if (daemon->dhcp)
{ {
struct dhcp_context *dhcp_tmp; struct dhcp_context *dhcp_tmp;
#ifdef HAVE_RTNETLINK
/* Must do this after daemonizing so that the pid is right */
daemon->netlinkfd = netlink_init();
#endif
for (dhcp_tmp = daemon->dhcp; dhcp_tmp; dhcp_tmp = dhcp_tmp->next) for (dhcp_tmp = daemon->dhcp; dhcp_tmp; dhcp_tmp = dhcp_tmp->next)
{ {
prettyprint_time(daemon->dhcp_buff2, dhcp_tmp->lease_time); prettyprint_time(daemon->dhcp_buff2, dhcp_tmp->lease_time);
@@ -375,7 +374,7 @@ int main (int argc, char **argv)
{ {
if (daemon->dhcp) if (daemon->dhcp)
{ {
lease_update_file(1, now); lease_update_file(daemon, 1, now);
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
alarm(daemon->min_leasetime); alarm(daemon->min_leasetime);
#endif #endif
@@ -400,6 +399,15 @@ int main (int argc, char **argv)
maxfd = daemon->dhcpfd; maxfd = daemon->dhcpfd;
} }
#ifdef HAVE_RTNETLINK
if (daemon->netlinkfd != -1)
{
FD_SET(daemon->netlinkfd, &rset);
if (daemon->netlinkfd > maxfd)
maxfd = daemon->netlinkfd;
}
#endif
/* Whilst polling for the dbus, wake every quarter second */ /* Whilst polling for the dbus, wake every quarter second */
#ifdef HAVE_PSELECT #ifdef HAVE_PSELECT
{ {
@@ -498,6 +506,11 @@ int main (int argc, char **argv)
} }
} }
#ifdef HAVE_RTNETLINK
if (daemon->netlinkfd != -1 && FD_ISSET(daemon->netlinkfd, &rset))
netlink_multicast(daemon);
#endif
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
/* if we didn't create a DBus connection, retry now. */ /* if we didn't create a DBus connection, retry now. */
if ((daemon->options & OPT_DBUS) && !daemon->dbus) if ((daemon->options & OPT_DBUS) && !daemon->dbus)
@@ -522,9 +535,9 @@ int main (int argc, char **argv)
if (daemon->dhcp) if (daemon->dhcp)
{ {
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
lease_update_file(1, now); lease_update_file(daemon, 1, now);
#endif #endif
close(daemon->lease_fd); fclose(daemon->lease_stream);
} }
return 0; return 0;
@@ -565,7 +578,7 @@ void clear_cache_and_reload(struct daemon *daemon, time_t now)
dhcp_read_ethers(daemon); dhcp_read_ethers(daemon);
dhcp_update_configs(daemon->dhcp_conf); dhcp_update_configs(daemon->dhcp_conf);
lease_update_from_configs(daemon); lease_update_from_configs(daemon);
lease_update_file(0, now); lease_update_file(daemon, 0, now);
lease_update_dns(daemon); lease_update_dns(daemon);
} }
} }
+53 -38
View File
@@ -92,13 +92,8 @@
memory for the largest packet, and the largest record so the memory for the largest packet, and the largest record so the
min for DNS is PACKETSZ+MAXDNAME+RRFIXEDSZ which is < 1000. min for DNS is PACKETSZ+MAXDNAME+RRFIXEDSZ which is < 1000.
This might be increased is EDNS packet size if greater than the minimum. This might be increased is EDNS packet size if greater than the minimum.
The buffer is also used for NETLINK, which needs to be about 2000 */
on systems with many interfaces/addresses. */ #define DNSMASQ_PACKETSZ PACKETSZ+MAXDNAME+RRFIXEDSZ
#ifdef HAVE_RTNETLINK
# define DNSMASQ_PACKETSZ PACKETSZ+MAXDNAME+RRFIXEDSZ
#else
# define DNSMASQ_PACKETSZ 2000
#endif
#define OPT_BOGUSPRIV 1 #define OPT_BOGUSPRIV 1
#define OPT_FILTER 2 #define OPT_FILTER 2
@@ -197,7 +192,7 @@ struct crec {
#define F_NOERR 32768 #define F_NOERR 32768
/* struct sockaddr is not large enough to hold any address, /* struct sockaddr is not large enough to hold any address,
and specifically not big enough to hold and IPv6 address. and specifically not big enough to hold an IPv6 address.
Blech. Roll our own. */ Blech. Roll our own. */
union mysockaddr { union mysockaddr {
struct sockaddr sa; struct sockaddr sa;
@@ -278,7 +273,7 @@ struct resolvc {
struct hostsfile { struct hostsfile {
struct hostsfile *next; struct hostsfile *next;
char *fname; char *fname;
int index; /* matches to cache entries fro logging */ int index; /* matches to cache entries for logging */
}; };
struct frec { struct frec {
@@ -293,13 +288,16 @@ struct frec {
struct frec *next; struct frec *next;
}; };
#define DHCP_CHADDR_MAX 16
struct dhcp_lease { struct dhcp_lease {
int clid_len; /* length of client identifier */ int clid_len; /* length of client identifier */
unsigned char *clid; /* clientid */ unsigned char *clid; /* clientid */
char *hostname, *fqdn; /* name from client-hostname option or config */ char *hostname, *fqdn; /* name from client-hostname option or config */
int auth_name; /* hostname came from config, not from client */ int auth_name; /* hostname came from config, not from client */
time_t expires; /* lease expiry */ time_t expires; /* lease expiry */
unsigned char hwaddr[ETHER_ADDR_LEN]; int hwaddr_len, hwaddr_type;
unsigned char hwaddr[DHCP_CHADDR_MAX];
struct in_addr addr; struct in_addr addr;
struct dhcp_lease *next; struct dhcp_lease *next;
}; };
@@ -317,7 +315,8 @@ struct dhcp_config {
unsigned int flags; unsigned int flags;
int clid_len; /* length of client identifier */ int clid_len; /* length of client identifier */
unsigned char *clid; /* clientid */ unsigned char *clid; /* clientid */
unsigned char hwaddr[ETHER_ADDR_LEN]; int hwaddr_len, hwaddr_type;
unsigned char hwaddr[DHCP_CHADDR_MAX];
char *hostname; char *hostname;
struct dhcp_netid netid; struct dhcp_netid netid;
struct in_addr addr; struct in_addr addr;
@@ -335,12 +334,15 @@ struct dhcp_config {
#define CONFIG_NOCLID 128 #define CONFIG_NOCLID 128
struct dhcp_opt { struct dhcp_opt {
int opt, len, is_addr; int opt, len, flags;
unsigned char *val, *vendor_class; unsigned char *val, *vendor_class;
struct dhcp_netid *netid; struct dhcp_netid *netid;
struct dhcp_opt *next; struct dhcp_opt *next;
}; };
#define DHOPT_ADDR 1
#define DHOPT_STRING 2
struct dhcp_boot { struct dhcp_boot {
char *file, *sname; char *file, *sname;
struct in_addr next_server; struct in_addr next_server;
@@ -355,20 +357,27 @@ struct dhcp_vendor {
struct dhcp_vendor *next; struct dhcp_vendor *next;
}; };
struct dhcp_mac {
unsigned int mask;
int hwaddr_len, hwaddr_type;
unsigned char hwaddr[DHCP_CHADDR_MAX];
struct dhcp_netid netid;
struct dhcp_mac *next;
};
struct dhcp_context { struct dhcp_context {
unsigned int lease_time, addr_epoch; unsigned int lease_time, addr_epoch;
struct in_addr netmask, broadcast; struct in_addr netmask, broadcast;
struct in_addr local, router; struct in_addr local, router;
struct in_addr start, end; /* range of available addresses */ struct in_addr start, end; /* range of available addresses */
int flags; int flags;
struct dhcp_netid netid; struct dhcp_netid netid, *filter;
struct dhcp_context *next, *current; struct dhcp_context *next, *current;
}; };
#define CONTEXT_STATIC 1 #define CONTEXT_STATIC 1
#define CONTEXT_FILTER 2 #define CONTEXT_NETMASK 2
#define CONTEXT_NETMASK 4 #define CONTEXT_BRDCAST 4
#define CONTEXT_BRDCAST 8
typedef unsigned char u8; typedef unsigned char u8;
@@ -389,7 +398,7 @@ struct udp_dhcp_packet {
u32 xid; u32 xid;
u16 secs, flags; u16 secs, flags;
struct in_addr ciaddr, yiaddr, siaddr, giaddr; struct in_addr ciaddr, yiaddr, siaddr, giaddr;
u8 chaddr[16], sname[64], file[128]; u8 chaddr[DHCP_CHADDR_MAX], sname[64], file[128];
u8 options[312]; u8 options[312];
} data; } data;
}; };
@@ -425,6 +434,7 @@ struct daemon {
struct dhcp_config *dhcp_conf; struct dhcp_config *dhcp_conf;
struct dhcp_opt *dhcp_opts, *vendor_opts; struct dhcp_opt *dhcp_opts, *vendor_opts;
struct dhcp_vendor *dhcp_vendors; struct dhcp_vendor *dhcp_vendors;
struct dhcp_mac *dhcp_macs;
struct dhcp_boot *boot_config; struct dhcp_boot *boot_config;
struct dhcp_netid_list *dhcp_ignore; struct dhcp_netid_list *dhcp_ignore;
int dhcp_max; int dhcp_max;
@@ -440,16 +450,19 @@ struct daemon {
struct irec *interfaces; struct irec *interfaces;
struct listener *listeners; struct listener *listeners;
struct server *last_server; struct server *last_server;
struct server *srv_save; /* Used for resend on DoD */
size_t packet_len; /* " " */
int uptime_fd; int uptime_fd;
/* DHCP state */ /* DHCP state */
int dhcpfd, dhcp_raw_fd, dhcp_icmp_fd, lease_fd; int dhcpfd, dhcp_raw_fd, dhcp_icmp_fd;
#ifdef HAVE_RTNETLINK #ifdef HAVE_RTNETLINK
int netlinkfd; int netlinkfd;
#endif #endif
struct udp_dhcp_packet *dhcp_packet; struct udp_dhcp_packet *dhcp_packet;
char *dhcp_buff, *dhcp_buff2; char *dhcp_buff, *dhcp_buff2;
struct ping_result *ping_results; struct ping_result *ping_results;
FILE *lease_stream;
/* DBus stuff */ /* DBus stuff */
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
@@ -480,23 +493,23 @@ void dump_cache(struct daemon *daemon);
char *cache_get_name(struct crec *crecp); char *cache_get_name(struct crec *crecp);
/* rfc1035.c */ /* rfc1035.c */
unsigned short extract_request(HEADER *header, unsigned int qlen, unsigned short extract_request(HEADER *header, size_t qlen,
char *name, unsigned short *typep); char *name, unsigned short *typep);
int setup_reply(HEADER *header, unsigned int qlen, size_t setup_reply(HEADER *header, size_t qlen,
struct all_addr *addrp, unsigned short flags, struct all_addr *addrp, unsigned short flags,
unsigned long local_ttl); unsigned long local_ttl);
void extract_addresses(HEADER *header, unsigned int qlen, char *namebuff, void extract_addresses(HEADER *header, size_t qlen, char *namebuff,
time_t now, struct daemon *daemon); time_t now, struct daemon *daemon);
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon *daemon, size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *daemon,
struct in_addr local_addr, struct in_addr local_netmask, time_t now); struct in_addr local_addr, struct in_addr local_netmask, time_t now);
int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name, int check_for_bogus_wildcard(HEADER *header, size_t qlen, char *name,
struct bogus_addr *addr, time_t now); struct bogus_addr *addr, time_t now);
unsigned char *find_pseudoheader(HEADER *header, unsigned int plen, unsigned char *find_pseudoheader(HEADER *header, size_t plen,
unsigned int *len, unsigned char **p); size_t *len, unsigned char **p);
int check_for_local_domain(char *name, time_t now, struct daemon *daemon); int check_for_local_domain(char *name, time_t now, struct daemon *daemon);
unsigned int questions_crc(HEADER *header, unsigned int plen, char *buff); unsigned int questions_crc(HEADER *header, size_t plen, char *buff);
int resize_packet(HEADER *header, unsigned int plen, size_t resize_packet(HEADER *header, size_t plen,
unsigned char *pheader, unsigned int hlen); unsigned char *pheader, size_t hlen);
/* util.c */ /* util.c */
unsigned short rand16(void); unsigned short rand16(void);
@@ -515,7 +528,7 @@ int retry_send(void);
void prettyprint_time(char *buf, unsigned int t); void prettyprint_time(char *buf, unsigned int t);
int prettyprint_addr(union mysockaddr *addr, char *buf); int prettyprint_addr(union mysockaddr *addr, char *buf);
int parse_hex(char *in, unsigned char *out, int maxlen, int parse_hex(char *in, unsigned char *out, int maxlen,
unsigned int *wildcard_mask); unsigned int *wildcard_mask, int *mac_type);
/* option.c */ /* option.c */
struct daemon *read_opts (int argc, char **argv, char *compile_opts); struct daemon *read_opts (int argc, char **argv, char *compile_opts);
@@ -542,14 +555,15 @@ void dhcp_packet(struct daemon *daemon, time_t now);
struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr addr); struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr addr);
struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr); struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr);
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool); int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly);
int address_allocate(struct dhcp_context *context, struct daemon *daemon, int address_allocate(struct dhcp_context *context, struct daemon *daemon,
struct in_addr *addrp, unsigned char *hwaddr, struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
struct dhcp_netid *netids, time_t now); struct dhcp_netid *netids, time_t now);
struct dhcp_config *find_config(struct dhcp_config *configs, struct dhcp_config *find_config(struct dhcp_config *configs,
struct dhcp_context *context, struct dhcp_context *context,
unsigned char *clid, int clid_len, unsigned char *clid, int clid_len,
unsigned char *hwaddr, char *hostname); unsigned char *hwaddr, int hw_len,
int hw_type, char *hostname);
void dhcp_update_configs(struct dhcp_config *configs); void dhcp_update_configs(struct dhcp_config *configs);
void dhcp_read_ethers(struct daemon *daemon); void dhcp_read_ethers(struct daemon *daemon);
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr); struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr);
@@ -561,24 +575,24 @@ struct dhcp_context *complete_context(struct daemon *daemon, struct in_addr loca
struct in_addr primary); struct in_addr primary);
/* lease.c */ /* lease.c */
void lease_update_file(int force, time_t now); void lease_update_file(struct daemon *daemon, int force, time_t now);
void lease_update_dns(struct daemon *daemon); void lease_update_dns(struct daemon *daemon);
void lease_init(struct daemon *daemon, time_t now); void lease_init(struct daemon *daemon, time_t now);
struct dhcp_lease *lease_allocate(unsigned char *hwaddr, unsigned char *clid, struct dhcp_lease *lease_allocate(unsigned char *hwaddr, unsigned char *clid,
int clid_len, struct in_addr addr); int hw_len, int hw_type, int clid_len, struct in_addr addr);
int lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr, int lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
unsigned char *clid, int clid_len); unsigned char *clid, int hw_len, int hw_type, int clid_len);
void lease_set_hostname(struct dhcp_lease *lease, char *name, void lease_set_hostname(struct dhcp_lease *lease, char *name,
char *suffix, int auth); char *suffix, int auth);
void lease_set_expires(struct dhcp_lease *lease, time_t exp); void lease_set_expires(struct dhcp_lease *lease, time_t exp);
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
unsigned char *clid, int clid_len); unsigned char *clid, int clid_len);
struct dhcp_lease *lease_find_by_addr(struct in_addr addr); struct dhcp_lease *lease_find_by_addr(struct in_addr addr);
void lease_prune(struct dhcp_lease *target, time_t now); void lease_prune(struct dhcp_lease *target, time_t now);
void lease_update_from_configs(struct daemon *daemon); void lease_update_from_configs(struct daemon *daemon);
/* rfc2131.c */ /* rfc2131.c */
int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name, unsigned int sz, time_t now, int unicast_dest); size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name, size_t sz, time_t now, int unicast_dest);
/* dnsmasq.c */ /* dnsmasq.c */
int icmp_ping(struct daemon *daemon, struct in_addr addr); int icmp_ping(struct daemon *daemon, struct in_addr addr);
@@ -591,10 +605,11 @@ void load_dhcp(struct daemon *daemon, time_t now);
/* netlink.c */ /* netlink.c */
#ifdef HAVE_RTNETLINK #ifdef HAVE_RTNETLINK
int netlink_init(void); void netlink_init(struct daemon *daemon);
int netlink_process(struct daemon *daemon, int index, int netlink_process(struct daemon *daemon, int index,
struct in_addr relay, struct in_addr primary, struct in_addr relay, struct in_addr primary,
struct dhcp_context **retp); struct dhcp_context **retp);
void netlink_multicast(struct daemon *daemon);
#endif #endif
/* dbus.c */ /* dbus.c */
+37 -22
View File
@@ -36,7 +36,7 @@ void forward_init(int first)
/* Send a UDP packet with it's source address set as "source" /* Send a UDP packet with it's source address set as "source"
unless nowild is true, when we just send it with the kernel default */ unless nowild is true, when we just send it with the kernel default */
static void send_from(int fd, int nowild, char *packet, int len, static void send_from(int fd, int nowild, char *packet, size_t len,
union mysockaddr *to, struct all_addr *source, union mysockaddr *to, struct all_addr *source,
unsigned int iface) unsigned int iface)
{ {
@@ -164,7 +164,7 @@ static unsigned short search_servers(struct daemon *daemon, time_t now, struct a
if (namelen >= domainlen && if (namelen >= domainlen &&
hostname_isequal(matchstart, serv->domain) && hostname_isequal(matchstart, serv->domain) &&
domainlen >= matchlen && domainlen >= matchlen &&
(namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' )) (domainlen == 0 || namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' ))
{ {
unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6;
*type = SERV_HAS_DOMAIN; *type = SERV_HAS_DOMAIN;
@@ -212,14 +212,14 @@ static unsigned short search_servers(struct daemon *daemon, time_t now, struct a
/* returns new last_server */ /* returns new last_server */
static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *udpaddr, static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *udpaddr,
struct all_addr *dst_addr, unsigned int dst_iface, struct all_addr *dst_addr, unsigned int dst_iface,
HEADER *header, int plen, time_t now, struct frec *forward) HEADER *header, size_t plen, time_t now, struct frec *forward)
{ {
char *domain = NULL; char *domain = NULL;
int type = 0; int type = 0;
struct all_addr *addrp = NULL; struct all_addr *addrp = NULL;
unsigned int crc = questions_crc(header, (unsigned int)plen, daemon->namebuff); unsigned int crc = questions_crc(header, plen, daemon->namebuff);
unsigned short flags = 0; unsigned short flags = 0;
unsigned short gotname = extract_request(header, (unsigned int)plen, daemon->namebuff, NULL); unsigned short gotname = extract_request(header, plen, daemon->namebuff, NULL);
struct server *start = NULL; struct server *start = NULL;
/* may be no servers available. */ /* may be no servers available. */
@@ -302,6 +302,10 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
} }
else else
{ {
/* Keep info in case we want to re-send this packet */
daemon->srv_save = start;
daemon->packet_len = plen;
if (!gotname) if (!gotname)
strcpy(daemon->namebuff, "query"); strcpy(daemon->namebuff, "query");
if (start->addr.sa.sa_family == AF_INET) if (start->addr.sa.sa_family == AF_INET)
@@ -340,18 +344,19 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
/* could not send on, return empty answer or address if known for whole domain */ /* could not send on, return empty answer or address if known for whole domain */
if (udpfd != -1) if (udpfd != -1)
{ {
plen = setup_reply(header, (unsigned int)plen, addrp, flags, daemon->local_ttl); plen = setup_reply(header, plen, addrp, flags, daemon->local_ttl);
send_from(udpfd, daemon->options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface); send_from(udpfd, daemon->options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface);
} }
return; return;
} }
static int process_reply(struct daemon *daemon, HEADER *header, time_t now, static size_t process_reply(struct daemon *daemon, HEADER *header, time_t now,
unsigned int query_crc, struct server *server, unsigned int n) unsigned int query_crc, struct server *server, size_t n)
{ {
unsigned char *pheader, *sizep; unsigned char *pheader, *sizep;
unsigned int plen, munged = 0; int munged = 0;
size_t plen;
/* If upstream is advertising a larger UDP packet size /* If upstream is advertising a larger UDP packet size
than we allow, trim it so that we don't get overlarge than we allow, trim it so that we don't get overlarge
@@ -433,7 +438,11 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
HEADER *header; HEADER *header;
union mysockaddr serveraddr; union mysockaddr serveraddr;
socklen_t addrlen = sizeof(serveraddr); socklen_t addrlen = sizeof(serveraddr);
int n = recvfrom(sfd->fd, daemon->packet, daemon->edns_pktsz, 0, &serveraddr.sa, &addrlen); ssize_t n = recvfrom(sfd->fd, daemon->packet, daemon->edns_pktsz, 0, &serveraddr.sa, &addrlen);
size_t nn;
/* packet buffer overwritten */
daemon->srv_save = NULL;
/* Determine the address of the server replying so that we can mark that as good */ /* Determine the address of the server replying so that we can mark that as good */
serveraddr.sa.sa_family = sfd->source_addr.sa.sa_family; serveraddr.sa.sa_family = sfd->source_addr.sa.sa_family;
@@ -453,14 +462,14 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
/* for broken servers, attempt to send to another one. */ /* for broken servers, attempt to send to another one. */
{ {
unsigned char *pheader; unsigned char *pheader;
unsigned int plen; size_t plen;
int nn;
/* recreate query from reply */ /* recreate query from reply */
pheader = find_pseudoheader(header, n, &plen, NULL); pheader = find_pseudoheader(header, (size_t)n, &plen, NULL);
header->ancount = htons(0); header->ancount = htons(0);
header->nscount = htons(0); header->nscount = htons(0);
header->arcount = htons(0); header->arcount = htons(0);
if ((nn = resize_packet(header, n, pheader, plen))) if ((nn = resize_packet(header, (size_t)n, pheader, plen)))
{ {
forward->forwardall = 1; forward->forwardall = 1;
header->qr = 0; header->qr = 0;
@@ -496,11 +505,11 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
if (forward->forwardall == 0 || --forward->forwardall == 1 || if (forward->forwardall == 0 || --forward->forwardall == 1 ||
(header->rcode != REFUSED && header->rcode != SERVFAIL)) (header->rcode != REFUSED && header->rcode != SERVFAIL))
{ {
if ((n = process_reply(daemon, header, now, forward->crc, server, (unsigned int)n))) if ((nn = process_reply(daemon, header, now, forward->crc, server, (size_t)n)))
{ {
header->id = htons(forward->orig_id); header->id = htons(forward->orig_id);
header->ra = 1; /* recursion if available */ header->ra = 1; /* recursion if available */
send_from(forward->fd, daemon->options & OPT_NOWILD, daemon->packet, n, send_from(forward->fd, daemon->options & OPT_NOWILD, daemon->packet, nn,
&forward->source, &forward->dest, forward->iface); &forward->source, &forward->dest, forward->iface);
} }
forward->new_id = 0; /* cancel */ forward->new_id = 0; /* cancel */
@@ -516,7 +525,9 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
struct iname *tmp; struct iname *tmp;
struct all_addr dst_addr; struct all_addr dst_addr;
struct in_addr netmask, dst_addr_4; struct in_addr netmask, dst_addr_4;
int m, n, if_index = 0; size_t m;
ssize_t n;
int if_index = 0;
struct iovec iov[1]; struct iovec iov[1];
struct msghdr msg; struct msghdr msg;
struct cmsghdr *cmptr; struct cmsghdr *cmptr;
@@ -533,6 +544,9 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
#endif #endif
} control_u; } control_u;
/* packet buffer overwritten */
daemon->srv_save = NULL;
if (listen->family == AF_INET && (daemon->options & OPT_NOWILD)) if (listen->family == AF_INET && (daemon->options & OPT_NOWILD))
{ {
dst_addr_4 = listen->iface->addr.in.sin_addr; dst_addr_4 = listen->iface->addr.in.sin_addr;
@@ -658,7 +672,7 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
} }
} }
if (extract_request(header, (unsigned int)n, daemon->namebuff, &type)) if (extract_request(header, (size_t)n, daemon->namebuff, &type))
{ {
if (listen->family == AF_INET) if (listen->family == AF_INET)
log_query(F_QUERY | F_IPV4 | F_FORWARD, daemon->namebuff, log_query(F_QUERY | F_IPV4 | F_FORWARD, daemon->namebuff,
@@ -670,18 +684,18 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
#endif #endif
} }
m = answer_request (header, ((char *) header) + PACKETSZ, (unsigned int)n, daemon, m = answer_request (header, ((char *) header) + PACKETSZ, (size_t)n, daemon,
dst_addr_4, netmask, now); dst_addr_4, netmask, now);
if (m >= 1) if (m >= 1)
send_from(listen->fd, daemon->options & OPT_NOWILD, (char *)header, m, &source_addr, &dst_addr, if_index); send_from(listen->fd, daemon->options & OPT_NOWILD, (char *)header, m, &source_addr, &dst_addr, if_index);
else else
forward_query(daemon, listen->fd, &source_addr, &dst_addr, if_index, forward_query(daemon, listen->fd, &source_addr, &dst_addr, if_index,
header, n, now, NULL); header, (size_t)n, now, NULL);
} }
static int read_write(int fd, unsigned char *packet, int size, int rw) static int read_write(int fd, unsigned char *packet, int size, int rw)
{ {
int n, done; ssize_t n, done;
for (done = 0; done < size; done += n) for (done = 0; done < size; done += n)
{ {
@@ -711,7 +725,8 @@ static int read_write(int fd, unsigned char *packet, int size, int rw)
unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now, unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
struct in_addr local_addr, struct in_addr netmask) struct in_addr local_addr, struct in_addr netmask)
{ {
int size = 0, m; int size = 0;
size_t m;
unsigned short qtype, gotname; unsigned short qtype, gotname;
unsigned char c1, c2; unsigned char c1, c2;
/* Max TCP packet + slop */ /* Max TCP packet + slop */
+70 -35
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley /* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -15,9 +15,8 @@
#include "dnsmasq.h" #include "dnsmasq.h"
static struct dhcp_lease *leases; static struct dhcp_lease *leases;
static FILE *lease_file;
static int dns_dirty; static int dns_dirty;
enum { no, yes, force } file_dirty; static enum { no, yes, force } file_dirty;
static int leases_left; static int leases_left;
void lease_init(struct daemon *daemon, time_t now) void lease_init(struct daemon *daemon, time_t now)
@@ -25,25 +24,25 @@ void lease_init(struct daemon *daemon, time_t now)
unsigned int a0, a1, a2, a3; unsigned int a0, a1, a2, a3;
unsigned long ei; unsigned long ei;
time_t expires; time_t expires;
unsigned char hwaddr[ETHER_ADDR_LEN]; unsigned char hwaddr[DHCP_CHADDR_MAX];
struct in_addr addr; struct in_addr addr;
struct dhcp_lease *lease; struct dhcp_lease *lease;
int clid_len = 0; int clid_len = 0, hw_len, hw_type;
int has_old = 0; int has_old = 0;
leases = NULL; leases = NULL;
leases_left = daemon->dhcp_max; leases_left = daemon->dhcp_max;
/* NOTE: need a+ mode to create file if it doesn't exist */ /* NOTE: need a+ mode to create file if it doesn't exist */
if (!(lease_file = fopen(daemon->lease_file, "a+"))) if (!(daemon->lease_stream = fopen(daemon->lease_file, "a+")))
die(_("cannot open or create leases file: %s"), NULL); die(_("cannot open or create leases file: %s"), NULL);
/* a+ mode lease pointer at end. */ /* a+ mode lease pointer at end. */
rewind(lease_file); rewind(daemon->lease_stream);
/* client-id max length is 255 which is 255*2 digits + 254 colons /* client-id max length is 255 which is 255*2 digits + 254 colons
borrow DNS packet buffer which is always larger than 1000 bytes */ borrow DNS packet buffer which is always larger than 1000 bytes */
while (fscanf(lease_file, "%lu %40s %d.%d.%d.%d %255s %764s", while (fscanf(daemon->lease_stream, "%lu %255s %d.%d.%d.%d %255s %764s",
&ei, daemon->dhcp_buff2, &a0, &a1, &a2, &a3, &ei, daemon->dhcp_buff2, &a0, &a1, &a2, &a3,
daemon->dhcp_buff, daemon->packet) == 8) daemon->dhcp_buff, daemon->packet) == 8)
{ {
@@ -64,16 +63,20 @@ void lease_init(struct daemon *daemon, time_t now)
} }
#endif #endif
parse_hex(daemon->dhcp_buff2, hwaddr, ETHER_ADDR_LEN, NULL); hw_len = parse_hex(daemon->dhcp_buff2, hwaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
/* For backwards compatibility, no explict MAC address type means ether. */
if (hw_type == 0)
hw_type = ARPHRD_ETHER;
addr.s_addr = htonl((a0<<24) + (a1<<16) + (a2<<8) + a3); addr.s_addr = htonl((a0<<24) + (a1<<16) + (a2<<8) + a3);
/* decode hex in place */ /* decode hex in place */
if (strcmp(daemon->packet, "*") == 0) if (strcmp(daemon->packet, "*") == 0)
clid_len = 0; clid_len = 0;
else else
clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL); clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
if (!(lease = lease_allocate(hwaddr, (unsigned char *)daemon->packet, clid_len, addr))) if (!(lease = lease_allocate(hwaddr, (unsigned char *)daemon->packet, hw_len, hw_type, clid_len, addr)))
die (_("too many stored leases"), NULL); die (_("too many stored leases"), NULL);
lease->expires = expires; lease->expires = expires;
@@ -84,8 +87,6 @@ void lease_init(struct daemon *daemon, time_t now)
dns_dirty = 1; dns_dirty = 1;
file_dirty = has_old ? yes: no; file_dirty = has_old ? yes: no;
daemon->lease_fd = fileno(lease_file);
} }
void lease_update_from_configs(struct daemon *daemon) void lease_update_from_configs(struct daemon *daemon)
@@ -97,7 +98,8 @@ void lease_update_from_configs(struct daemon *daemon)
char *name; char *name;
for (lease = leases; lease; lease = lease->next) for (lease = leases; lease; lease = lease->next)
if ((config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len, lease->hwaddr, NULL)) && if ((config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len,
lease->hwaddr, lease->hwaddr_len, lease->hwaddr_type, NULL)) &&
(config->flags & CONFIG_NAME) && (config->flags & CONFIG_NAME) &&
(!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr)) (!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr))
lease_set_hostname(lease, config->hostname, daemon->domain_suffix, 1); lease_set_hostname(lease, config->hostname, daemon->domain_suffix, 1);
@@ -105,11 +107,12 @@ void lease_update_from_configs(struct daemon *daemon)
lease_set_hostname(lease, name, daemon->domain_suffix, 1); /* updates auth flag only */ lease_set_hostname(lease, name, daemon->domain_suffix, 1); /* updates auth flag only */
} }
void lease_update_file(int always, time_t now) void lease_update_file(struct daemon *daemon, int always, time_t now)
{ {
struct dhcp_lease *lease; struct dhcp_lease *lease;
int i = always; /* avoid warning */ int i = always; /* avoid warning */
unsigned long expires; unsigned long expires;
char *mess;
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if (always || file_dirty == force) if (always || file_dirty == force)
@@ -119,8 +122,10 @@ void lease_update_file(int always, time_t now)
if (file_dirty != no) if (file_dirty != no)
{ {
#endif #endif
rewind(lease_file); errno = 0;
ftruncate(fileno(lease_file), 0); rewind(daemon->lease_stream);
if (errno != 0 || ftruncate(fileno(daemon->lease_stream), 0) != 0)
goto write_err;
for (lease = leases; lease; lease = lease->next) for (lease = leases; lease; lease = lease->next)
{ {
@@ -133,27 +138,51 @@ void lease_update_file(int always, time_t now)
expires = now; /* eliminate warning */ expires = now; /* eliminate warning */
expires = (unsigned long)lease->expires; expires = (unsigned long)lease->expires;
#endif #endif
fprintf(lease_file, "%lu %.2x:%.2x:%.2x:%.2x:%.2x:%.2x %s %s ", if (fprintf(daemon->lease_stream, "%lu ", expires) < 0)
expires, lease->hwaddr[0], lease->hwaddr[1], goto write_err;
lease->hwaddr[2], lease->hwaddr[3], lease->hwaddr[4], if (lease->hwaddr_type != ARPHRD_ETHER &&
lease->hwaddr[5], inet_ntoa(lease->addr), fprintf(daemon->lease_stream, "%.2x-", lease->hwaddr_type) < 0)
lease->hostname && strlen(lease->hostname) != 0 ? lease->hostname : "*"); goto write_err;
for (i = 0; i < lease->hwaddr_len - 1; i++)
if (fprintf(daemon->lease_stream, "%.2x:", lease->hwaddr[i]) < 0)
goto write_err;
if (fprintf(daemon->lease_stream, "%.2x", lease->hwaddr[i]) < 0)
goto write_err;
if (fprintf(daemon->lease_stream, " %s %s ", inet_ntoa(lease->addr),
lease->hostname && strlen(lease->hostname) != 0 ? lease->hostname : "*") < 0)
goto write_err;
if (lease->clid && lease->clid_len != 0) if (lease->clid && lease->clid_len != 0)
{ {
for (i = 0; i < lease->clid_len - 1; i++) for (i = 0; i < lease->clid_len - 1; i++)
fprintf(lease_file, "%.2x:", lease->clid[i]); if (fprintf(daemon->lease_stream, "%.2x:", lease->clid[i]) < 0)
fprintf(lease_file, "%.2x\n", lease->clid[i]); goto write_err;
if (fprintf(daemon->lease_stream, "%.2x\n", lease->clid[i]) < 0)
goto write_err;
} }
else else
fprintf(lease_file, "*\n"); if (fprintf(daemon->lease_stream, "*\n") < 0)
goto write_err;
} }
fflush(lease_file); if (fflush(daemon->lease_stream) != 0)
fsync(fileno(lease_file)); goto write_err;
if (fsync(fileno(daemon->lease_stream)) < 0)
goto write_err;
file_dirty = no; file_dirty = no;
} }
return;
write_err:
mess = _("failed to write");
#ifdef HAVE_BROKEN_RTC
syslog(LOG_ERR, "%s %s: %m", mess, daemon->lease_file);
#else
syslog(LOG_ERR, "%s %s: %m (retry in %ds)", mess, daemon->lease_file, LEASE_RETRY);
alarm(LEASE_RETRY);
#endif
} }
void lease_update_dns(struct daemon *daemon) void lease_update_dns(struct daemon *daemon)
@@ -204,7 +233,7 @@ void lease_prune(struct dhcp_lease *target, time_t now)
} }
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
unsigned char *clid, int clid_len) unsigned char *clid, int clid_len)
{ {
struct dhcp_lease *lease; struct dhcp_lease *lease;
@@ -217,7 +246,9 @@ struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr,
for (lease = leases; lease; lease = lease->next) for (lease = leases; lease; lease = lease->next)
if ((!lease->clid || !clid) && if ((!lease->clid || !clid) &&
memcmp(hwaddr, lease->hwaddr, ETHER_ADDR_LEN) == 0) lease->hwaddr_len == hw_len &&
lease->hwaddr_type == hw_type &&
memcmp(hwaddr, lease->hwaddr, hw_len) == 0)
return lease; return lease;
return NULL; return NULL;
@@ -236,7 +267,7 @@ struct dhcp_lease *lease_find_by_addr(struct in_addr addr)
struct dhcp_lease *lease_allocate(unsigned char *hwaddr, unsigned char *clid, struct dhcp_lease *lease_allocate(unsigned char *hwaddr, unsigned char *clid,
int clid_len, struct in_addr addr) int hw_len, int hw_type, int clid_len, struct in_addr addr)
{ {
struct dhcp_lease *lease; struct dhcp_lease *lease;
if (!leases_left || !(lease = malloc(sizeof(struct dhcp_lease)))) if (!leases_left || !(lease = malloc(sizeof(struct dhcp_lease))))
@@ -245,10 +276,10 @@ struct dhcp_lease *lease_allocate(unsigned char *hwaddr, unsigned char *clid,
lease->clid = NULL; lease->clid = NULL;
lease->hostname = lease->fqdn = NULL; lease->hostname = lease->fqdn = NULL;
lease->addr = addr; lease->addr = addr;
memset(lease->hwaddr, 0, ETHER_ADDR_LEN); memset(lease->hwaddr, 0, DHCP_CHADDR_MAX);
lease->expires = 1; lease->expires = 1;
if (!lease_set_hwaddr(lease, hwaddr, clid, clid_len)) if (!lease_set_hwaddr(lease, hwaddr, clid, hw_len, hw_type, clid_len))
{ {
free(lease); free(lease);
return NULL; return NULL;
@@ -274,12 +305,16 @@ void lease_set_expires(struct dhcp_lease *lease, time_t exp)
} }
int lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr, int lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
unsigned char *clid, int clid_len) unsigned char *clid, int hw_len, int hw_type, int clid_len)
{ {
if (memcmp(lease->hwaddr, hwaddr, ETHER_ADDR_LEN) != 0) if (hw_len != lease->hwaddr_len ||
hw_type != lease->hwaddr_type ||
memcmp(lease->hwaddr, hwaddr, hw_len) != 0)
{ {
file_dirty = force; file_dirty = force;
memcpy(lease->hwaddr, hwaddr, ETHER_ADDR_LEN); memcpy(lease->hwaddr, hwaddr, hw_len);
lease->hwaddr_len = hw_len;
lease->hwaddr_type = hw_type;
} }
/* only update clid when one is available, stops packets /* only update clid when one is available, stops packets
+84 -26
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley /* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -10,8 +10,6 @@
GNU General Public License for more details. GNU General Public License for more details.
*/ */
/* Author's email: simon@thekelleys.org.uk */
#include "dnsmasq.h" #include "dnsmasq.h"
#ifdef HAVE_RTNETLINK #ifdef HAVE_RTNETLINK
@@ -20,35 +18,74 @@
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
int netlink_init(void) static struct iovec iov[1];
void netlink_init(struct daemon *daemon)
{ {
struct sockaddr_nl addr; struct sockaddr_nl addr;
int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); daemon->netlinkfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (sock < 0) if (daemon->netlinkfd < 0)
return -1; /* no kernel support */ return; /* no kernel support */
addr.nl_family = AF_NETLINK; addr.nl_family = AF_NETLINK;
addr.nl_pad = 0; addr.nl_pad = 0;
addr.nl_pid = getpid(); addr.nl_pid = getpid();
addr.nl_groups = 0; #ifdef HAVE_IPV6
addr.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE | RTMGRP_IPV6_ROUTE;
#else
addr.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE;
#endif
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) if (bind(daemon->netlinkfd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
die(_("cannot bind netlink socket: %s"), NULL); die(_("cannot bind netlink socket: %s"), NULL);
return sock; iov[0].iov_len = 200;
iov[0].iov_base = safe_malloc(iov[0].iov_len);
} }
static ssize_t netlink_recv(struct daemon *daemon)
{
struct msghdr msg;
ssize_t rc;
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
retry:
while ((rc = recvmsg(daemon->netlinkfd, &msg, MSG_PEEK)) == -1 && retry_send());
if (rc == -1)
return -1;
if (msg.msg_flags & MSG_TRUNC)
{
size_t newsz = iov[0].iov_len + 100;
void *new = realloc(iov[0].iov_base, newsz);
if (!new)
return -1;
iov[0].iov_len = newsz;
iov[0].iov_base = new;
goto retry;
}
while ((rc = recvmsg(daemon->netlinkfd, &msg, 0)) == -1 && retry_send());
return rc;
}
/* We borrow the DNS packet buffer here. (The DHCP one already has a packet in it)
Since it's used only within this routine, that's fine, just remember
that calling icmp_echo() will trash it */
int netlink_process(struct daemon *daemon, int index, struct in_addr relay, int netlink_process(struct daemon *daemon, int index, struct in_addr relay,
struct in_addr primary, struct dhcp_context **retp) struct in_addr primary, struct dhcp_context **retp)
{ {
struct sockaddr_nl addr; struct sockaddr_nl addr;
struct nlmsghdr *h; struct nlmsghdr *h;
int len, found_primary = 0; int found_primary = 0;
ssize_t len;
struct dhcp_context *ret = NULL; struct dhcp_context *ret = NULL;
static unsigned int seq = 0; static unsigned int seq = 0;
@@ -88,17 +125,11 @@ int netlink_process(struct daemon *daemon, int index, struct in_addr relay,
} }
get_next: get_next:
while((len = recvfrom(daemon->netlinkfd, daemon->packet, daemon->packet_buff_sz, if ((len = netlink_recv(daemon)) == -1)
MSG_WAITALL, NULL, 0)) == -1 && retry_send());
if (len == -1)
return 0; return 0;
h = (struct nlmsghdr *)daemon->packet; for (h = (struct nlmsghdr *)iov[0].iov_base; NLMSG_OK(h, (unsigned int)len); h = NLMSG_NEXT(h, len))
while (NLMSG_OK(h, (unsigned int)len))
{ {
if (h->nlmsg_seq != seq) if (h->nlmsg_seq != seq)
goto get_next; goto get_next;
@@ -111,7 +142,6 @@ int netlink_process(struct daemon *daemon, int index, struct in_addr relay,
if (h->nlmsg_type == RTM_NEWADDR) if (h->nlmsg_type == RTM_NEWADDR)
{ {
struct ifaddrmsg *ifa = NLMSG_DATA(h); struct ifaddrmsg *ifa = NLMSG_DATA(h);
if (ifa->ifa_index == index && ifa->ifa_family == AF_INET) if (ifa->ifa_index == index && ifa->ifa_family == AF_INET)
{ {
struct rtattr *rta = IFA_RTA(ifa); struct rtattr *rta = IFA_RTA(ifa);
@@ -140,15 +170,43 @@ int netlink_process(struct daemon *daemon, int index, struct in_addr relay,
} }
} }
} }
h = NLMSG_NEXT(h, len);
} }
*retp = ret; *retp = ret;
return found_primary; return found_primary;
} }
/* We arrange to receive netlink multicast messages whenever the network config changes.
If this happens and we still have a DNS packet in the buffer, we re-send it.
This helps on DoD links, where frequently the packet which triggers dialling is
a DNS query, which then gets lost. By re-sending, we can avoid the lookup
failing. */
void netlink_multicast(struct daemon *daemon)
{
ssize_t len;
struct nlmsghdr *h;
if ((len = netlink_recv(daemon)) == -1)
return;
if (!daemon->srv_save)
return;
for (h = (struct nlmsghdr *)iov[0].iov_base; NLMSG_OK(h, (unsigned int)len); h = NLMSG_NEXT(h, len))
{
if (h->nlmsg_type == NLMSG_DONE || h->nlmsg_type == NLMSG_ERROR)
break;
if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_NEWROUTE)
{
while(sendto(daemon->srv_save->sfd->fd, daemon->packet, daemon->packet_len, 0,
&daemon->srv_save->addr.sa, sa_len(&daemon->srv_save->addr)) == -1 && retry_send());
break;
}
}
}
#endif #endif
+1 -1
View File
@@ -503,7 +503,7 @@ void check_servers(struct daemon *daemon)
/* forward table rules reference servers, so have to blow them away */ /* forward table rules reference servers, so have to blow them away */
forward_init(0); forward_init(0);
daemon->last_server = NULL; daemon->last_server = daemon->srv_save = NULL;
for (new = daemon->servers; new; new = tmp) for (new = daemon->servers; new; new = tmp)
{ {
+77 -18
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000 - 2005 Simon Kelley /* dnsmasq is Copyright (c) 2000 - 2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ struct myoption {
int val; int val;
}; };
#define OPTSTRING "31yZDNLERKzowefnbvhdkqr:m:p:c:l:s:i:t:u:g:a:x:S:C:A:T:H:Q:I:B:F:G:O:M:X:V:U:j:P:J:W:Y:2:" #define OPTSTRING "31yZDNLERKzowefnbvhdkqr:m:p:c:l:s:i:t:u:g:a:x:S:C:A:T:H:Q:I:B:F:G:O:M:X:V:U:j:P:J:W:Y:2:4:"
static const struct myoption opts[] = { static const struct myoption opts[] = {
{"version", 0, 0, 'v'}, {"version", 0, 0, 'v'},
@@ -82,6 +82,7 @@ static const struct myoption opts[] = {
{"txt-record", 1, 0, 'Y'}, {"txt-record", 1, 0, 'Y'},
{"enable-dbus", 0, 0, '1'}, {"enable-dbus", 0, 0, '1'},
{"bootp-dynamic", 0, 0, '3'}, {"bootp-dynamic", 0, 0, '3'},
{"dhcp-mac", 1, 0, '4'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -177,6 +178,7 @@ static const struct {
{ "-1, --enable-dbus", gettext_noop("Enable the DBus interface for setting upstream servers, etc."), NULL }, { "-1, --enable-dbus", gettext_noop("Enable the DBus interface for setting upstream servers, etc."), NULL },
{ "-2, --no-dhcp-interface=interface", gettext_noop("Do not provide DHCP on this interface, only provide DNS."), NULL }, { "-2, --no-dhcp-interface=interface", gettext_noop("Do not provide DHCP on this interface, only provide DNS."), NULL },
{ "-3, --bootp-dynamic", gettext_noop("Enable dynamic address allocation for bootp."), NULL }, { "-3, --bootp-dynamic", gettext_noop("Enable dynamic address allocation for bootp."), NULL },
{ "-4, --dhcp-mac=<id>,<mac address>", gettext_noop("Map MAC address (with wildcards) to option set."), NULL },
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };
@@ -949,6 +951,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
new->broadcast.s_addr = 0; new->broadcast.s_addr = 0;
new->router.s_addr = 0; new->router.s_addr = 0;
new->netid.net = NULL; new->netid.net = NULL;
new->filter = NULL;
new->flags = 0; new->flags = 0;
problem = _("bad dhcp-range"); problem = _("bad dhcp-range");
@@ -959,6 +962,8 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
break; break;
} }
while(1)
{
for (cp = arg; *cp; cp++) for (cp = arg; *cp; cp++)
if (!(*cp == ' ' || *cp == '.' || (*cp >='0' && *cp <= '9'))) if (!(*cp == ' ' || *cp == '.' || (*cp >='0' && *cp <= '9')))
break; break;
@@ -968,17 +973,29 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
*comma = 0; *comma = 0;
if (strstr(arg, "net:") == arg) if (strstr(arg, "net:") == arg)
{ {
new->netid.net = safe_string_alloc(arg+4); struct dhcp_netid *tt = safe_malloc(sizeof (struct dhcp_netid));
new->netid.next = NULL; tt->net = safe_string_alloc(arg+4);
new->flags |= CONTEXT_FILTER; tt->next = new->filter;
new->filter = tt;
}
else
{
if (new->netid.net)
{
option = '?';
problem = _("only one netid tag allowed");
} }
else else
new->netid.net = safe_string_alloc(arg); new->netid.net = safe_string_alloc(arg);
a[0] = comma + 1; }
arg = comma + 1;
} }
else else
{
a[0] = arg; a[0] = arg;
break;
}
}
for (k = 1; k < 5; k++) for (k = 1; k < 5; k++)
{ {
@@ -987,7 +1004,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
*(a[k]++) = 0; *(a[k]++) = 0;
} }
if ((k < 2) || ((new->start.s_addr = inet_addr(a[0])) == (in_addr_t)-1)) if (option == '?' || (k < 2) || ((new->start.s_addr = inet_addr(a[0])) == (in_addr_t)-1))
option = '?'; option = '?';
else if (strcmp(a[1], "static") == 0) else if (strcmp(a[1], "static") == 0)
{ {
@@ -1110,7 +1127,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
int len; int len;
arg += 3; /* dump id: */ arg += 3; /* dump id: */
if (strchr(arg, ':')) if (strchr(arg, ':'))
len = parse_hex(arg, (unsigned char *)arg, -1, NULL); len = parse_hex(arg, (unsigned char *)arg, -1, NULL, NULL);
else else
len = (int) strlen(arg); len = (int) strlen(arg);
@@ -1125,10 +1142,11 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
new->flags |= CONFIG_NETID; new->flags |= CONFIG_NETID;
new->netid.net = safe_string_alloc(arg+4); new->netid.net = safe_string_alloc(arg+4);
} }
else if (parse_hex(a[j], new->hwaddr, 6, &new->wildcard_mask) == 6)
new->flags |= CONFIG_HWADDR;
else else
option = '?'; {
new->hwaddr_len = parse_hex(a[j], new->hwaddr, DHCP_CHADDR_MAX, &new->wildcard_mask, &new->hwaddr_type);
new->flags |= CONFIG_HWADDR;
}
} }
else if (strchr(a[j], '.') && (in.s_addr = inet_addr(a[j])) != (in_addr_t)-1) else if (strchr(a[j], '.') && (in.s_addr = inet_addr(a[j])) != (in_addr_t)-1)
{ {
@@ -1223,7 +1241,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
int addrs, digs, is_addr, is_hex, is_dec; int addrs, digs, is_addr, is_hex, is_dec;
new->len = 0; new->len = 0;
new->is_addr = 0; new->flags = 0;
new->netid = NULL; new->netid = NULL;
new->val = NULL; new->val = NULL;
new->vendor_class = NULL; new->vendor_class = NULL;
@@ -1335,7 +1353,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
digs++; digs++;
is_dec = is_addr = 0; is_dec = is_addr = 0;
} }
else if (*cp == '.') else if (*cp == '.' || *cp == '/')
is_dec = is_hex = 0; is_dec = is_hex = 0;
else if (!((*cp >='0' && *cp <= '9') || *cp == '-')) else if (!((*cp >='0' && *cp <= '9') || *cp == '-'))
{ {
@@ -1357,7 +1375,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
{ {
new->len = digs; new->len = digs;
new->val = safe_malloc(new->len); new->val = safe_malloc(new->len);
parse_hex(comma, new->val, digs, NULL); parse_hex(comma, new->val, digs, NULL, NULL);
} }
else if (is_dec) else if (is_dec)
{ {
@@ -1397,18 +1415,41 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
{ {
struct in_addr in; struct in_addr in;
unsigned char *op; unsigned char *op;
new->len = INADDRSZ * addrs; char *slash;
new->val = op = safe_malloc(new->len); /* max length of address/subnet descriptor is five bytes */
new->is_addr = 1; new->val = op = safe_malloc(5 * addrs);
if (!new->vendor_class)
new->flags |= DHOPT_ADDR;
while (addrs--) while (addrs--)
{ {
cp = comma; cp = comma;
if ((comma = strchr(cp, ','))) if ((comma = strchr(cp, ',')))
*comma++ = 0; *comma++ = 0;
if ((slash = strchr(cp, '/')))
*slash++ = 0;
in.s_addr = inet_addr(cp); in.s_addr = inet_addr(cp);
if (!slash)
{
memcpy(op, &in, INADDRSZ); memcpy(op, &in, INADDRSZ);
op += INADDRSZ; op += INADDRSZ;
} }
else
{
unsigned char *p = (unsigned char *)&in;
int netsize = atoi(slash);
*op++ = netsize;
if (netsize > 0)
*op++ = *p++;
if (netsize > 8)
*op++ = *p++;
if (netsize > 16)
*op++ = *p++;
if (netsize > 24)
*op++ = *p++;
new->flags &= ~DHOPT_ADDR; /* cannot re-write descriptor format */
}
}
new->len = op - new->val;
} }
else else
{ {
@@ -1416,6 +1457,7 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
new->len = strlen(comma); new->len = strlen(comma);
/* keep terminating zero on string */ /* keep terminating zero on string */
new->val = (unsigned char *)safe_string_alloc(comma); new->val = (unsigned char *)safe_string_alloc(comma);
new->flags |= DHOPT_STRING;
} }
} }
@@ -1509,6 +1551,23 @@ struct daemon *read_opts (int argc, char **argv, char *compile_opts)
break; break;
} }
case '4':
{
if (!(comma = safe_strchr(arg, ',')))
option = '?';
else
{
struct dhcp_mac *new = safe_malloc(sizeof(struct dhcp_mac));
*comma = 0;
new->netid.net = safe_string_alloc(arg);
unhide_metas(comma+1);
new->hwaddr_len = parse_hex(comma+1, new->hwaddr, DHCP_CHADDR_MAX, &new->mask, &new->hwaddr_type);
new->next = daemon->dhcp_macs;
daemon->dhcp_macs = new;
}
}
break;
case 'U': case 'U':
case 'j': case 'j':
{ {
+19 -19
View File
@@ -17,7 +17,7 @@ static int add_resource_record(HEADER *header, char *limit, int *truncp,
unsigned long ttl, unsigned int *offset, unsigned short type, unsigned long ttl, unsigned int *offset, unsigned short type,
unsigned short class, char *format, ...); unsigned short class, char *format, ...);
static int extract_name(HEADER *header, unsigned int plen, unsigned char **pp, static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
char *name, int isExtract) char *name, int isExtract)
{ {
unsigned char *cp = (unsigned char *)name, *p = *pp, *p1 = NULL; unsigned char *cp = (unsigned char *)name, *p = *pp, *p1 = NULL;
@@ -38,7 +38,7 @@ static int extract_name(HEADER *header, unsigned int plen, unsigned char **pp,
/* get offset */ /* get offset */
l = (l&0x3f) << 8; l = (l&0x3f) << 8;
l |= *p++; l |= *p++;
if (l >= (unsigned int)plen) if (l >= plen)
return 0; return 0;
if (!p1) /* first jump, save location to go back to */ if (!p1) /* first jump, save location to go back to */
@@ -253,7 +253,7 @@ static int in_arpa_name_2_addr(char *namein, struct all_addr *addrp)
return 0; return 0;
} }
static unsigned char *skip_name(unsigned char *ansp, HEADER *header, unsigned int plen) static unsigned char *skip_name(unsigned char *ansp, HEADER *header, size_t plen)
{ {
while(1) while(1)
{ {
@@ -298,7 +298,7 @@ static unsigned char *skip_name(unsigned char *ansp, HEADER *header, unsigned in
return ansp; return ansp;
} }
static unsigned char *skip_questions(HEADER *header, unsigned int plen) static unsigned char *skip_questions(HEADER *header, size_t plen)
{ {
int q, qdcount = ntohs(header->qdcount); int q, qdcount = ntohs(header->qdcount);
unsigned char *ansp = (unsigned char *)(header+1); unsigned char *ansp = (unsigned char *)(header+1);
@@ -315,7 +315,7 @@ static unsigned char *skip_questions(HEADER *header, unsigned int plen)
return ansp; return ansp;
} }
static unsigned char *skip_section(unsigned char *ansp, int count, HEADER *header, unsigned int plen) static unsigned char *skip_section(unsigned char *ansp, int count, HEADER *header, size_t plen)
{ {
int i, rdlen; int i, rdlen;
@@ -338,7 +338,7 @@ static unsigned char *skip_section(unsigned char *ansp, int count, HEADER *heade
might be poisoning attacks. Note that we decode the name rather might be poisoning attacks. Note that we decode the name rather
than CRC the raw bytes, since replies might be compressed differently. than CRC the raw bytes, since replies might be compressed differently.
We ignore case in the names for the same reason. */ We ignore case in the names for the same reason. */
unsigned int questions_crc(HEADER *header, unsigned int plen, char *name) unsigned int questions_crc(HEADER *header, size_t plen, char *name)
{ {
int q; int q;
unsigned int crc = 0xffffffff; unsigned int crc = 0xffffffff;
@@ -380,7 +380,7 @@ unsigned int questions_crc(HEADER *header, unsigned int plen, char *name)
} }
int resize_packet(HEADER *header, unsigned int plen, unsigned char *pheader, unsigned int hlen) size_t resize_packet(HEADER *header, size_t plen, unsigned char *pheader, size_t hlen)
{ {
unsigned char *ansp = skip_questions(header, plen); unsigned char *ansp = skip_questions(header, plen);
@@ -403,7 +403,7 @@ int resize_packet(HEADER *header, unsigned int plen, unsigned char *pheader, uns
return ansp - (unsigned char *)header; return ansp - (unsigned char *)header;
} }
unsigned char *find_pseudoheader(HEADER *header, unsigned int plen, unsigned int *len, unsigned char **p) unsigned char *find_pseudoheader(HEADER *header, size_t plen, size_t *len, unsigned char **p)
{ {
/* See if packet has an RFC2671 pseudoheader, and if so return a pointer to it. /* See if packet has an RFC2671 pseudoheader, and if so return a pointer to it.
also return length of pseudoheader in *len and pointer to the UDP size in *p */ also return length of pseudoheader in *len and pointer to the UDP size in *p */
@@ -428,7 +428,7 @@ unsigned char *find_pseudoheader(HEADER *header, unsigned int plen, unsigned int
save = ansp; save = ansp;
ansp += 6; /* class, TTL */ ansp += 6; /* class, TTL */
GETSHORT(rdlen, ansp); GETSHORT(rdlen, ansp);
if ((unsigned int)(ansp + rdlen - (unsigned char *)header) > plen) if ((size_t)(ansp + rdlen - (unsigned char *)header) > plen)
return NULL; return NULL;
ansp += rdlen; ansp += rdlen;
if (type == T_OPT) if (type == T_OPT)
@@ -470,7 +470,7 @@ static void dns_doctor(HEADER *header, struct doctor *doctor, struct in_addr *ad
} }
} }
static int find_soa(HEADER *header, struct doctor *doctor, unsigned int qlen) static int find_soa(HEADER *header, struct doctor *doctor, size_t qlen)
{ {
unsigned char *p; unsigned char *p;
int qtype, qclass, rdlen; int qtype, qclass, rdlen;
@@ -513,7 +513,7 @@ static int find_soa(HEADER *header, struct doctor *doctor, unsigned int qlen)
else else
p += rdlen; p += rdlen;
if ((unsigned int)(p - (unsigned char *)header) > qlen) if ((size_t)(p - (unsigned char *)header) > qlen)
return 0; /* bad packet */ return 0; /* bad packet */
} }
@@ -533,7 +533,7 @@ static int find_soa(HEADER *header, struct doctor *doctor, unsigned int qlen)
p += rdlen; p += rdlen;
if ((unsigned int)(p - (unsigned char *)header) > qlen) if ((size_t)(p - (unsigned char *)header) > qlen)
return 0; /* bad packet */ return 0; /* bad packet */
} }
@@ -543,7 +543,7 @@ static int find_soa(HEADER *header, struct doctor *doctor, unsigned int qlen)
/* Note that the following code can create CNAME chains that don't point to a real record, /* Note that the following code can create CNAME chains that don't point to a real record,
either because of lack of memory, or lack of SOA records. These are treated by the cache code as either because of lack of memory, or lack of SOA records. These are treated by the cache code as
expired and cleaned out that way. */ expired and cleaned out that way. */
void extract_addresses(HEADER *header, unsigned int qlen, char *name, time_t now, struct daemon *daemon) void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, struct daemon *daemon)
{ {
unsigned char *p, *p1, *endrr; unsigned char *p, *p1, *endrr;
int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0; int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0;
@@ -625,7 +625,7 @@ void extract_addresses(HEADER *header, unsigned int qlen, char *name, time_t now
} }
p1 = endrr; p1 = endrr;
if ((unsigned int)(p1 - (unsigned char *)header) > qlen) if ((size_t)(p1 - (unsigned char *)header) > qlen)
return; /* bad packet */ return; /* bad packet */
} }
} }
@@ -709,7 +709,7 @@ void extract_addresses(HEADER *header, unsigned int qlen, char *name, time_t now
} }
p1 = endrr; p1 = endrr;
if ((unsigned int)(p1 - (unsigned char *)header) > qlen) if ((size_t)(p1 - (unsigned char *)header) > qlen)
return; /* bad packet */ return; /* bad packet */
} }
} }
@@ -742,7 +742,7 @@ void extract_addresses(HEADER *header, unsigned int qlen, char *name, time_t now
/* If the packet holds exactly one query /* If the packet holds exactly one query
return 1 and leave the name from the query in name. */ return 1 and leave the name from the query in name. */
unsigned short extract_request(HEADER *header,unsigned int qlen, char *name, unsigned short *typep) unsigned short extract_request(HEADER *header, size_t qlen, char *name, unsigned short *typep)
{ {
unsigned char *p = (unsigned char *)(header+1); unsigned char *p = (unsigned char *)(header+1);
int qtype, qclass; int qtype, qclass;
@@ -776,7 +776,7 @@ unsigned short extract_request(HEADER *header,unsigned int qlen, char *name, uns
} }
int setup_reply(HEADER *header, unsigned int qlen, size_t setup_reply(HEADER *header, size_t qlen,
struct all_addr *addrp, unsigned short flags, unsigned long ttl) struct all_addr *addrp, unsigned short flags, unsigned long ttl)
{ {
unsigned char *p = skip_questions(header, qlen); unsigned char *p = skip_questions(header, qlen);
@@ -841,7 +841,7 @@ int check_for_local_domain(char *name, time_t now, struct daemon *daemon)
/* Is the packet a reply with the answer address equal to addr? /* Is the packet a reply with the answer address equal to addr?
If so mung is into an NXDOMAIN reply and also put that information If so mung is into an NXDOMAIN reply and also put that information
in the cache. */ in the cache. */
int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name, int check_for_bogus_wildcard(HEADER *header, size_t qlen, char *name,
struct bogus_addr *baddr, time_t now) struct bogus_addr *baddr, time_t now)
{ {
unsigned char *p; unsigned char *p;
@@ -966,7 +966,7 @@ static int add_resource_record(HEADER *header, char *limit, int *truncp, unsigne
} }
/* return zero if we can't answer from cache, or packet size if we can */ /* return zero if we can't answer from cache, or packet size if we can */
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon *daemon, size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *daemon,
struct in_addr local_addr, struct in_addr local_netmask, time_t now) struct in_addr local_addr, struct in_addr local_netmask, time_t now)
{ {
char *name = daemon->namebuff; char *name = daemon->namebuff;
+130 -106
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley /* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -60,15 +60,16 @@
static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val); static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val);
static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dhcp_packet *start); static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dhcp_packet *start);
static unsigned char *option_put_string(unsigned char *p, unsigned char *end, int opt, char *string); static unsigned char *option_put_string(unsigned char *p, unsigned char *end,
int opt, char *string, int null_term);
static void bootp_option_put(struct dhcp_packet *mess, static void bootp_option_put(struct dhcp_packet *mess,
struct dhcp_boot *boot_opts, struct dhcp_netid *netids); struct dhcp_boot *boot_opts, struct dhcp_netid *netids);
static int option_len(unsigned char *opt); static int option_len(unsigned char *opt);
static void *option_ptr(unsigned char *opt); static void *option_ptr(unsigned char *opt);
static struct in_addr option_addr(unsigned char *opt); static struct in_addr option_addr(unsigned char *opt);
static unsigned int option_uint(unsigned char *opt, int size); static unsigned int option_uint(unsigned char *opt, int size);
static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, char *interface, char *string); static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, int hw_len, char *interface, char *string);
static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type, int minsize); static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize);
static unsigned char *do_req_options(struct dhcp_context *context, static unsigned char *do_req_options(struct dhcp_context *context,
unsigned char *p, unsigned char *end, unsigned char *p, unsigned char *end,
unsigned char *req_options, unsigned char *req_options,
@@ -76,21 +77,23 @@ static unsigned char *do_req_options(struct dhcp_context *context,
char *hostname, char *hostname,
struct dhcp_netid *netid, struct dhcp_netid *netid,
struct in_addr subnet_addr, struct in_addr subnet_addr,
unsigned char fqdn_flags); unsigned char fqdn_flags,
int null_term);
int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name, size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name,
unsigned int sz, time_t now, int unicast_dest) size_t sz, time_t now, int unicast_dest)
{ {
unsigned char *opt, *clid = NULL; unsigned char *opt, *clid = NULL;
struct dhcp_lease *ltmp, *lease = NULL; struct dhcp_lease *ltmp, *lease = NULL;
struct dhcp_vendor *vendor; struct dhcp_vendor *vendor;
struct dhcp_mac *mac;
struct dhcp_netid_list *id_list; struct dhcp_netid_list *id_list;
int clid_len = 0, ignore = 0; int clid_len = 0, ignore = 0;
struct dhcp_packet *mess = &daemon->dhcp_packet->data; struct dhcp_packet *mess = &daemon->dhcp_packet->data;
unsigned char *p = mess->options + sizeof(u32); /* skip cookie */ unsigned char *p = mess->options + sizeof(u32); /* skip cookie */
unsigned char *end = (unsigned char *)(daemon->dhcp_packet + 1); unsigned char *end = (unsigned char *)(daemon->dhcp_packet + 1);
char *hostname = NULL, *offer_hostname = NULL, *client_hostname = NULL; char *hostname = NULL, *offer_hostname = NULL, *client_hostname = NULL;
int hostname_auth = 0; int hostname_auth = 0, borken_opt = 0;
unsigned char *req_options = NULL; unsigned char *req_options = NULL;
char *message = NULL; char *message = NULL;
unsigned int time; unsigned int time;
@@ -99,13 +102,15 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
struct in_addr subnet_addr, fallback; struct in_addr subnet_addr, fallback;
unsigned short fuzz = 0; unsigned short fuzz = 0;
unsigned int mess_type = 0; unsigned int mess_type = 0;
u8 *chaddr;
unsigned char fqdn_flags = 0; unsigned char fqdn_flags = 0;
subnet_addr.s_addr = 0; subnet_addr.s_addr = 0;
if (mess->op != BOOTREQUEST) if (mess->op != BOOTREQUEST)
return 0; return 0;
if (mess->hlen > DHCP_CHADDR_MAX)
return 0;
/* check for DHCP rather than BOOTP */ /* check for DHCP rather than BOOTP */
if ((opt = option_find(mess, sz, OPTION_MESSAGE_TYPE, 1))) if ((opt = option_find(mess, sz, OPTION_MESSAGE_TYPE, 1)))
{ {
@@ -132,8 +137,8 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
} }
/* do we have a lease in store? */ /* do we have a lease in store? */
if (mess->htype != 0) if (mess->htype != 0 && mess->hlen != 0)
lease = lease_find_by_client(mess->chaddr, clid, clid_len); lease = lease_find_by_client(mess->chaddr, mess->hlen, mess->htype, clid, clid_len);
/* If this request is missing a clid, but we've seen one before, /* If this request is missing a clid, but we've seen one before,
use it again for option matching etc. */ use it again for option matching etc. */
@@ -144,37 +149,30 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
} }
} }
/* htype == 0 is only allowed in DHCPINFORM, this seems to be a /* htype == 0 is only allowed in DHCPINFORM,
microsoftism. chaddr == NULL in that case */ this seems to be a microsoftism. */
if (mess->htype == 0)
if (mess->htype == 0 && mess_type == DHCPINFORM)
{ {
chaddr = NULL; if (mess_type != DHCPINFORM || mess->hlen != 0)
if (mess->hlen != 0)
return 0; return 0;
} }
else else if (mess->hlen == 0)
{
chaddr = mess->chaddr;
/* Token ring is supported when we have packet sockets
to make the HW headers for us. We don't have the code to build
token ring headers when using BPF. We rely on the fact that
token ring hwaddrs are the same size as ethernet hwaddrs. */
#ifdef HAVE_BPF
if (mess->htype != ARPHRD_ETHER)
#else
if (mess->htype != ARPHRD_ETHER && mess->htype != ARPHRD_IEEE802)
#endif
{
syslog(LOG_WARNING, _("DHCP request for unsupported hardware type (%d) recieved on %s"),
mess->htype, iface_name);
return 0; return 0;
for (mac = daemon->dhcp_macs; mac; mac = mac->next)
if (mac->hwaddr_len == mess->hlen &&
(mac->hwaddr_type == mess->htype || mac->hwaddr_type == 0))
{
int i;
unsigned int mask = mac->mask;
for (i = mac->hwaddr_len - 1; i >= 0; i--, mask = mask >> 1)
if (mask & 1)
mac->hwaddr[i] = mess->chaddr[i];
if (memcmp(mac->hwaddr, mess->chaddr, mac->hwaddr_len) == 0)
{
mac->netid.next = netid;
netid = &mac->netid;
} }
if (mess->hlen != ETHER_ADDR_LEN)
return 0;
} }
/* Determine network for this packet. Our caller will have already linked all the /* Determine network for this packet. Our caller will have already linked all the
@@ -228,7 +226,8 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
mess->op = BOOTREPLY; mess->op = BOOTREPLY;
config = find_config(daemon->dhcp_conf, context, clid, clid_len, chaddr, NULL); config = find_config(daemon->dhcp_conf, context, clid, clid_len,
mess->chaddr, mess->hlen, mess->htype, NULL);
if (mess_type == 0) if (mess_type == 0)
{ {
@@ -261,7 +260,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
} }
for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next) for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next)
if (match_netid(id_list->list, netid)) if (match_netid(id_list->list, netid, 0))
message = _("disabled"); message = _("disabled");
if (!message) if (!message)
@@ -271,14 +270,15 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
logaddr = &config->addr; logaddr = &config->addr;
mess->yiaddr = config->addr; mess->yiaddr = config->addr;
if ((lease = lease_find_by_addr(config->addr)) && if ((lease = lease_find_by_addr(config->addr)) &&
memcmp(lease->hwaddr, chaddr, ETHER_ADDR_LEN) != 0) (lease->hwaddr_len != mess->hlen ||
memcmp(lease->hwaddr, mess->chaddr, lease->hwaddr_len) != 0))
message = _("address in use"); message = _("address in use");
} }
else if (!(daemon->options & OPT_BOOTP_DYNAMIC)) else if (!(daemon->options & OPT_BOOTP_DYNAMIC))
message = _("no address configured"); message = _("no address configured");
else else
{ {
if (!(lease = lease_find_by_client(mess->chaddr, NULL, 0)) || if (!(lease = lease_find_by_client(mess->chaddr, mess->hlen, mess->htype, NULL, 0)) ||
!address_available(context, lease->addr)) !address_available(context, lease->addr))
{ {
if (lease) if (lease)
@@ -287,14 +287,14 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
lease_prune(lease, now); lease_prune(lease, now);
lease = NULL; lease = NULL;
} }
if (!address_allocate(context, daemon, &mess->yiaddr, chaddr, netid, now)) if (!address_allocate(context, daemon, &mess->yiaddr, mess->chaddr, mess->hlen, netid, now))
message = _("no address available"); message = _("no address available");
} }
else else
mess->yiaddr = lease->addr; mess->yiaddr = lease->addr;
} }
if (!message && !lease && (!(lease = lease_allocate(chaddr, NULL, 0, mess->yiaddr)))) if (!message && !lease && (!(lease = lease_allocate(mess->chaddr, NULL, mess->hlen, mess->htype, 0, mess->yiaddr))))
message = _("no leases left"); message = _("no leases left");
if (!message && !(context = narrow_context(context, mess->yiaddr))) if (!message && !(context = narrow_context(context, mess->yiaddr)))
@@ -304,19 +304,19 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
{ {
logaddr = &mess->yiaddr; logaddr = &mess->yiaddr;
if (context->netid.net && !(context->flags & CONTEXT_FILTER)) if (context->netid.net)
{ {
context->netid.next = netid; context->netid.next = netid;
netid = &context->netid; netid = &context->netid;
} }
lease_set_hwaddr(lease, chaddr, NULL, 0); lease_set_hwaddr(lease, mess->chaddr, NULL, mess->hlen, mess->htype, 0);
if (hostname) if (hostname)
lease_set_hostname(lease, hostname, daemon->domain_suffix, 1); lease_set_hostname(lease, hostname, daemon->domain_suffix, 1);
lease_set_expires(lease, 0); /* infinite lease */ lease_set_expires(lease, 0); /* infinite lease */
p = do_req_options(context, p, end, NULL, daemon, p = do_req_options(context, p, end, NULL, daemon,
hostname, netid, subnet_addr, fqdn_flags); hostname, netid, subnet_addr, fqdn_flags, 0);
/* must do this after do_req_options since it overwrites filename field. */ /* must do this after do_req_options since it overwrites filename field. */
mess->siaddr = context->local; mess->siaddr = context->local;
bootp_option_put(mess, daemon->boot_config, netid); bootp_option_put(mess, daemon->boot_config, netid);
@@ -324,7 +324,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
} }
} }
log_packet(NULL, logaddr, chaddr, iface_name, message); log_packet(NULL, logaddr, mess->chaddr, mess->hlen, iface_name, message);
mess->file[128] = save; mess->file[128] = save;
if (message) if (message)
@@ -346,7 +346,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
pp = op; pp = op;
/* Always force update, since the client has no way to do it itself. */ /* Always force update, since the client has no way to do it itself. */
if (fqdn_flags & 0x01) if (!(fqdn_flags & 0x01))
fqdn_flags |= 0x02; fqdn_flags |= 0x02;
fqdn_flags &= ~0x08; fqdn_flags &= ~0x08;
@@ -363,6 +363,8 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else else
{ {
memcpy(pq, op, len); memcpy(pq, op, len);
if (len > 0 && op[len-1] == 0)
borken_opt = 1;
pq += len + 1; pq += len + 1;
} }
@@ -378,7 +380,12 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
{ {
int len = option_len(opt); int len = option_len(opt);
memcpy(daemon->dhcp_buff, option_ptr(opt), len); memcpy(daemon->dhcp_buff, option_ptr(opt), len);
/* May not be zero terminated */ /* Microsoft clients are broken, and need zero-terminated strings
in options. We detect this state here, and do the same in
any options we send */
if (len > 0 && daemon->dhcp_buff[len-1] == 0)
borken_opt = 1;
else
daemon->dhcp_buff[len] = 0; daemon->dhcp_buff[len] = 0;
if (canonicalise(daemon->dhcp_buff)) if (canonicalise(daemon->dhcp_buff))
client_hostname = daemon->dhcp_buff; client_hostname = daemon->dhcp_buff;
@@ -398,7 +405,9 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
/* Search again now we have a hostname. /* Search again now we have a hostname.
Only accept configs without CLID and HWADDR here, (they won't match) Only accept configs without CLID and HWADDR here, (they won't match)
to avoid impersonation by name. */ to avoid impersonation by name. */
struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0, chaddr, hostname); struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0,
mess->chaddr, mess->hlen,
mess->htype, hostname);
if (!have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR)) if (!have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR))
config = new; config = new;
} }
@@ -445,7 +454,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
/* if all the netids in the ignore list are present, ignore this client */ /* if all the netids in the ignore list are present, ignore this client */
for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next) for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next)
if (match_netid(id_list->list, netid)) if (match_netid(id_list->list, netid, 0))
ignore = 1; ignore = 1;
/* Can have setting to ignore the client ID for a particular MAC address or hostname */ /* Can have setting to ignore the client ID for a particular MAC address or hostname */
@@ -485,7 +494,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ))) if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
return 0; return 0;
log_packet("DECLINE", option_ptr(opt), chaddr, iface_name, message); log_packet("DECLINE", option_ptr(opt), mess->chaddr, mess->hlen, iface_name, message);
if (lease && lease->addr.s_addr == option_addr(opt).s_addr) if (lease && lease->addr.s_addr == option_addr(opt).s_addr)
lease_prune(lease, now); lease_prune(lease, now);
@@ -513,7 +522,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else else
message = _("unknown lease"); message = _("unknown lease");
log_packet("RELEASE", &mess->ciaddr, chaddr, iface_name, message); log_packet("RELEASE", &mess->ciaddr, mess->chaddr, mess->hlen, iface_name, message);
return 0; return 0;
@@ -533,15 +542,15 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else if (opt && address_available(context, addr) && !lease_find_by_addr(addr) && else if (opt && address_available(context, addr) && !lease_find_by_addr(addr) &&
!config_find_by_address(daemon->dhcp_conf, addr)) !config_find_by_address(daemon->dhcp_conf, addr))
mess->yiaddr = addr; mess->yiaddr = addr;
else if (!address_allocate(context, daemon, &mess->yiaddr, chaddr, netid, now)) else if (!address_allocate(context, daemon, &mess->yiaddr, mess->chaddr, mess->hlen, netid, now))
message = _("no address available"); message = _("no address available");
log_packet("DISCOVER", opt ? &addr : NULL, chaddr, iface_name, message); log_packet("DISCOVER", opt ? &addr : NULL, mess->chaddr, mess->hlen, iface_name, message);
} }
if (message || !(context = narrow_context(context, mess->yiaddr))) if (message || !(context = narrow_context(context, mess->yiaddr)))
return 0; return 0;
if (context->netid.net && !(context->flags & CONTEXT_FILTER)) if (context->netid.net)
{ {
context->netid.next = netid; context->netid.next = netid;
netid = &context->netid; netid = &context->netid;
@@ -569,10 +578,10 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
p = option_put(p, end, OPTION_T2, 4, (time*7)/8); p = option_put(p, end, OPTION_T2, 4, (time*7)/8);
} }
p = do_req_options(context, p, end, req_options, daemon, p = do_req_options(context, p, end, req_options, daemon,
offer_hostname, netid, subnet_addr, fqdn_flags); offer_hostname, netid, subnet_addr, fqdn_flags, borken_opt);
p = option_end(p, end, mess); p = option_end(p, end, mess);
log_packet("OFFER" , &mess->yiaddr, chaddr, iface_name, NULL); log_packet("OFFER" , &mess->yiaddr, mess->chaddr, mess->hlen, iface_name, NULL);
return p - (unsigned char *)mess; return p - (unsigned char *)mess;
case DHCPREQUEST: case DHCPREQUEST:
@@ -613,8 +622,12 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else else
{ {
/* RENEWING or REBINDING */ /* RENEWING or REBINDING */
/* Must exist a lease for this address */ /* Check existing lease for this address.
if (!lease || mess->ciaddr.s_addr != lease->addr.s_addr) We allow it to be missing if dhcp-authoritative mode
as long as we can allocate the lease now - checked below.
This makes for a smooth recovery from a lost lease DB */
if ((lease && mess->ciaddr.s_addr != lease->addr.s_addr) ||
(!lease && !(daemon->options & OPT_AUTHORITATIVE)))
{ {
message = _("lease not found"); message = _("lease not found");
/* ensure we broadcast NAK */ /* ensure we broadcast NAK */
@@ -625,7 +638,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
mess->yiaddr = mess->ciaddr; mess->yiaddr = mess->ciaddr;
} }
log_packet("REQUEST", &mess->yiaddr, chaddr, iface_name, NULL); log_packet("REQUEST", &mess->yiaddr, mess->chaddr, mess->hlen, iface_name, NULL);
if (!message) if (!message)
{ {
@@ -660,20 +673,20 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
else if ((ltmp = lease_find_by_addr(mess->yiaddr)) && ltmp != lease) else if ((ltmp = lease_find_by_addr(mess->yiaddr)) && ltmp != lease)
message = _("address in use"); message = _("address in use");
else if (!lease && !(lease = lease_allocate(chaddr, clid, clid_len, mess->yiaddr))) else if (!lease && !(lease = lease_allocate(mess->chaddr, clid, mess->hlen, mess->htype, clid_len, mess->yiaddr)))
message = _("no leases left"); message = _("no leases left");
} }
if (message) if (message)
{ {
log_packet("NAK", &mess->yiaddr, chaddr, iface_name, message); log_packet("NAK", &mess->yiaddr, mess->chaddr, mess->hlen, iface_name, message);
mess->siaddr.s_addr = mess->yiaddr.s_addr = 0; mess->siaddr.s_addr = mess->yiaddr.s_addr = 0;
bootp_option_put(mess, NULL, NULL); bootp_option_put(mess, NULL, NULL);
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK); p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ,
ntohl(context ? context->local.s_addr : fallback.s_addr)); ntohl(context ? context->local.s_addr : fallback.s_addr));
p = option_put_string(p, end, OPTION_MESSAGE, message); p = option_put_string(p, end, OPTION_MESSAGE, message, borken_opt);
/* This fixes a problem with the DHCP spec, broadcasting a NAK to a host on /* This fixes a problem with the DHCP spec, broadcasting a NAK to a host on
a distant subnet which unicast a REQ to us won't work. */ a distant subnet which unicast a REQ to us won't work. */
if (!unicast_dest || mess->giaddr.s_addr != 0 || if (!unicast_dest || mess->giaddr.s_addr != 0 ||
@@ -691,9 +704,9 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
hostname_auth = 1; hostname_auth = 1;
} }
log_packet("ACK", &mess->yiaddr, chaddr, iface_name, hostname); log_packet("ACK", &mess->yiaddr, mess->chaddr, mess->hlen, iface_name, hostname);
if (context->netid.net && !(context->flags & CONTEXT_FILTER)) if (context->netid.net)
{ {
context->netid.next = netid; context->netid.next = netid;
netid = &context->netid; netid = &context->netid;
@@ -707,7 +720,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
time = req_time; time = req_time;
} }
lease_set_hwaddr(lease, chaddr, clid, clid_len); lease_set_hwaddr(lease, mess->chaddr, clid, mess->hlen, mess->htype, clid_len);
if (hostname) if (hostname)
lease_set_hostname(lease, hostname, daemon->domain_suffix, hostname_auth); lease_set_hostname(lease, hostname, daemon->domain_suffix, hostname_auth);
lease_set_expires(lease, time == 0xffffffff ? 0 : now + (time_t)time); lease_set_expires(lease, time == 0xffffffff ? 0 : now + (time_t)time);
@@ -725,7 +738,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
p = option_put(p, end, OPTION_T2, 4, ((time * 7)/8) - fuzz); p = option_put(p, end, OPTION_T2, 4, ((time * 7)/8) - fuzz);
} }
p = do_req_options(context, p, end, req_options, daemon, p = do_req_options(context, p, end, req_options, daemon,
hostname, netid, subnet_addr, fqdn_flags); hostname, netid, subnet_addr, fqdn_flags, borken_opt);
} }
p = option_end(p, end, mess); p = option_end(p, end, mess);
@@ -735,7 +748,7 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
if (ignore || have_config(config, CONFIG_DISABLE)) if (ignore || have_config(config, CONFIG_DISABLE))
message = _("ignored"); message = _("ignored");
log_packet("INFORM", &mess->ciaddr, chaddr, iface_name, message); log_packet("INFORM", &mess->ciaddr, mess->chaddr, mess->hlen, iface_name, message);
if (message || mess->ciaddr.s_addr == 0 || if (message || mess->ciaddr.s_addr == 0 ||
!(context = narrow_context(context, mess->ciaddr))) !(context = narrow_context(context, mess->ciaddr)))
@@ -754,31 +767,34 @@ int dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_
if (!hostname) if (!hostname)
hostname = host_from_dns(daemon, mess->yiaddr); hostname = host_from_dns(daemon, mess->yiaddr);
p = do_req_options(context, p, end, req_options, daemon, p = do_req_options(context, p, end, req_options, daemon,
hostname, netid, subnet_addr, fqdn_flags); hostname, netid, subnet_addr, fqdn_flags, borken_opt);
p = option_end(p, end, mess); p = option_end(p, end, mess);
log_packet("ACK", &mess->ciaddr, chaddr, iface_name, hostname); log_packet("ACK", &mess->ciaddr, mess->chaddr, mess->hlen, iface_name, hostname);
return p - (unsigned char *)mess; return p - (unsigned char *)mess;
} }
return 0; return 0;
} }
static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, char *interface, char *string) static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, int hw_len, char *interface, char *string)
{ {
u8 empty[] = { 0, 0, 0, 0, 0, 0}; char buff[(DHCP_CHADDR_MAX * 3) + 1];
char *p = buff;
int i;
if (!hwaddr) *buff = 0;
hwaddr = empty; for (i = 0; i < hw_len - 1; i++)
p += sprintf(p, "%.2x:", hwaddr[i]);
p += sprintf(p, "%.2x ", hwaddr[i]);
syslog(LOG_INFO, "%s%s(%s)%s%s %.2x:%.2x:%.2x:%.2x:%.2x:%.2x%s%s", syslog(LOG_INFO, "%s%s(%s) %s%s%s%s",
type ? "DHCP" : "BOOTP", type ? "DHCP" : "BOOTP",
type ? type : "", type ? type : "",
interface, interface,
addr ? " " : "",
addr ? inet_ntoa(*addr) : "", addr ? inet_ntoa(*addr) : "",
hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5], addr ? " " : "",
string ? " " : "", buff,
string ? string : ""); string ? string : "");
} }
@@ -822,12 +838,12 @@ static void bootp_option_put(struct dhcp_packet *mess,
struct dhcp_boot *tmp; struct dhcp_boot *tmp;
for (tmp = boot_opts; tmp; tmp = tmp->next) for (tmp = boot_opts; tmp; tmp = tmp->next)
if (match_netid(tmp->netid, netids)) if (match_netid(tmp->netid, netids, 0))
break; break;
if (!tmp) if (!tmp)
/* No match, look for one without a netid */ /* No match, look for one without a netid */
for (tmp = boot_opts; tmp; tmp = tmp->next) for (tmp = boot_opts; tmp; tmp = tmp->next)
if (!tmp->netid) if (match_netid(tmp->netid, netids, 1))
break; break;
/* Do this _after_ the matching above, since in /* Do this _after_ the matching above, since in
@@ -884,10 +900,14 @@ static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dh
return p; return p;
} }
static unsigned char *option_put_string(unsigned char *p, unsigned char *end, int opt, char *string) static unsigned char *option_put_string(unsigned char *p, unsigned char *end, int opt,
char *string, int null_term)
{ {
size_t len = strlen(string); size_t len = strlen(string);
if (null_term && len != 255)
len++;
if (check_space(p, end, len, opt)) if (check_space(p, end, len, opt))
{ {
*(p++) = opt; *(p++) = opt;
@@ -935,7 +955,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
return NULL; return NULL;
} }
static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type, int minsize) static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize)
{ {
int overload = 0; int overload = 0;
unsigned char *ret; unsigned char *ret;
@@ -976,31 +996,30 @@ static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt *
struct dhcp_opt *tmp; struct dhcp_opt *tmp;
for (tmp = opts; tmp; tmp = tmp->next) for (tmp = opts; tmp; tmp = tmp->next)
if (tmp->opt == opt) if (tmp->opt == opt)
{ if (match_netid(tmp->netid, netid, 1) || match_netid(tmp->netid, netid, 0))
if (netid)
{
if (match_netid(tmp->netid, netid))
return tmp; return tmp;
}
else if (!tmp->netid)
return tmp;
}
return netid ? option_find2(NULL, opts, opt) : NULL; return netid ? option_find2(NULL, opts, opt) : NULL;
} }
static unsigned char *do_opt(struct dhcp_opt *opt, unsigned char *p, unsigned char *end, struct in_addr local) static unsigned char *do_opt(struct dhcp_opt *opt, unsigned char *p, unsigned char *end,
struct in_addr local, int null_term)
{ {
if (!check_space(p, end, opt->len, opt->opt)) int len = opt->len;
if ((opt->flags & DHOPT_STRING) && null_term && len != 255)
len++;
if (!check_space(p, end, len, opt->opt))
return p; return p;
*(p++) = opt->opt; *(p++) = opt->opt;
*(p++) = opt->len; *(p++) = len;
if (opt->len == 0) if (len == 0)
return p; return p;
if (opt->is_addr && !opt->vendor_class) if (opt->flags & DHOPT_ADDR)
{ {
int j; int j;
struct in_addr *a = (struct in_addr *)opt->val; struct in_addr *a = (struct in_addr *)opt->val;
@@ -1016,8 +1035,8 @@ static unsigned char *do_opt(struct dhcp_opt *opt, unsigned char *p, unsigned ch
} }
else else
{ {
memcpy(p, opt->val, opt->len); memcpy(p, opt->val, len);
p += opt->len; p += len;
} }
return p; return p;
@@ -1030,7 +1049,8 @@ static unsigned char *do_req_options(struct dhcp_context *context,
char *hostname, char *hostname,
struct dhcp_netid *netid, struct dhcp_netid *netid,
struct in_addr subnet_addr, struct in_addr subnet_addr,
unsigned char fqdn_flags) unsigned char fqdn_flags,
int null_term)
{ {
struct dhcp_opt *opt, *config_opts = daemon->dhcp_opts; struct dhcp_opt *opt, *config_opts = daemon->dhcp_opts;
char *vendor_class = NULL; char *vendor_class = NULL;
@@ -1066,7 +1086,7 @@ static unsigned char *do_req_options(struct dhcp_context *context,
if (daemon->domain_suffix && in_list(req_options, OPTION_DOMAINNAME) && if (daemon->domain_suffix && in_list(req_options, OPTION_DOMAINNAME) &&
!option_find2(netid, config_opts, OPTION_DOMAINNAME)) !option_find2(netid, config_opts, OPTION_DOMAINNAME))
p = option_put_string(p, end, OPTION_DOMAINNAME, daemon->domain_suffix); p = option_put_string(p, end, OPTION_DOMAINNAME, daemon->domain_suffix, null_term);
/* Note that we ignore attempts to set the hostname using /* Note that we ignore attempts to set the hostname using
--dhcp-option=12,<name> and the fqdn using --dhcp-option=12,<name> and the fqdn using
@@ -1074,13 +1094,15 @@ static unsigned char *do_req_options(struct dhcp_context *context,
if (hostname) if (hostname)
{ {
if (in_list(req_options, OPTION_HOSTNAME)) if (in_list(req_options, OPTION_HOSTNAME))
p = option_put_string(p, end, OPTION_HOSTNAME, hostname); p = option_put_string(p, end, OPTION_HOSTNAME, hostname, null_term);
if (fqdn_flags != 0) if (fqdn_flags != 0)
{ {
int len = strlen(hostname) + 3; int len = strlen(hostname) + 3;
if (fqdn_flags & 0x04) if (fqdn_flags & 0x04)
len += 2; len += 2;
else if (null_term)
len++;
if (daemon->domain_suffix) if (daemon->domain_suffix)
len += strlen(daemon->domain_suffix) + 1; len += strlen(daemon->domain_suffix) + 1;
@@ -1110,6 +1132,8 @@ static unsigned char *do_req_options(struct dhcp_context *context,
memcpy(p, daemon->domain_suffix, strlen(daemon->domain_suffix)); memcpy(p, daemon->domain_suffix, strlen(daemon->domain_suffix));
p += strlen(daemon->domain_suffix); p += strlen(daemon->domain_suffix);
} }
if (null_term)
*(p++) = 0;
} }
} }
} }
@@ -1138,13 +1162,13 @@ static unsigned char *do_req_options(struct dhcp_context *context,
if (opt->opt == OPTION_VENDOR_ID) if (opt->opt == OPTION_VENDOR_ID)
vendor_class = (char *)opt->val; vendor_class = (char *)opt->val;
else else
p = do_opt(opt, p, end, context->local); p = do_opt(opt, p, end, context->local, null_term);
} }
if (in_list(req_options, OPTION_VENDOR_ID)) if (in_list(req_options, OPTION_VENDOR_ID))
{ {
for (opt = daemon->vendor_opts; opt; opt = opt->next) for (opt = daemon->vendor_opts; opt; opt = opt->next)
if (!opt->netid || match_netid(opt->netid, netid)) if (match_netid(opt->netid, netid, 1) || match_netid(opt->netid, netid, 0))
{ {
if (vendor_class && strcmp(vendor_class, (char *)opt->vendor_class) != 0) if (vendor_class && strcmp(vendor_class, (char *)opt->vendor_class) != 0)
syslog(LOG_WARNING, _("More than one vendor class matches, using %s"), vendor_class); syslog(LOG_WARNING, _("More than one vendor class matches, using %s"), vendor_class);
@@ -1154,7 +1178,7 @@ static unsigned char *do_req_options(struct dhcp_context *context,
if (vendor_class) if (vendor_class)
{ {
p = option_put_string(p, end, OPTION_VENDOR_ID, vendor_class); p = option_put_string(p, end, OPTION_VENDOR_ID, vendor_class, 0);
if (in_list(req_options, OPTION_VENDOR_CLASS_OPT)) if (in_list(req_options, OPTION_VENDOR_CLASS_OPT))
{ {
@@ -1172,9 +1196,9 @@ static unsigned char *do_req_options(struct dhcp_context *context,
plen = p++; /* fill in later */ plen = p++; /* fill in later */
for (opt = daemon->vendor_opts; opt; opt = opt->next) for (opt = daemon->vendor_opts; opt; opt = opt->next)
if ((!opt->netid || match_netid(opt->netid, netid)) && if ((match_netid(opt->netid, netid, 1) || match_netid(opt->netid, netid, 0)) &&
strcmp(vendor_class, (char *)opt->vendor_class) == 0) strcmp(vendor_class, (char *)opt->vendor_class) == 0)
p = do_opt(opt, p, oend, context->local); p = do_opt(opt, p, oend, context->local, null_term);
*plen = p - plen - 1; *plen = p - plen - 1;
} }
+15 -1
View File
@@ -319,17 +319,30 @@ void prettyprint_time(char *buf, unsigned int t)
/* in may equal out, when maxlen may be -1 (No max len). */ /* in may equal out, when maxlen may be -1 (No max len). */
int parse_hex(char *in, unsigned char *out, int maxlen, unsigned int *wildcard_mask) int parse_hex(char *in, unsigned char *out, int maxlen,
unsigned int *wildcard_mask, int *mac_type)
{ {
int mask = 0, i = 0; int mask = 0, i = 0;
char *r; char *r;
if (mac_type)
*mac_type = 0;
while (maxlen == -1 || i < maxlen) while (maxlen == -1 || i < maxlen)
{ {
for (r = in; *r != 0 && *r != ':' && *r != '-'; r++); for (r = in; *r != 0 && *r != ':' && *r != '-'; r++);
if (*r == 0) if (*r == 0)
maxlen = i; maxlen = i;
if (r != in ) if (r != in )
{
if (*r == '-' && i == 0 && mac_type)
{
*r = 0;
*mac_type = strtol(in, NULL, 16);
mac_type = NULL;
}
else
{ {
*r = 0; *r = 0;
mask = mask << 1; mask = mask << 1;
@@ -339,6 +352,7 @@ int parse_hex(char *in, unsigned char *out, int maxlen, unsigned int *wildcard_m
out[i] = strtol(in, NULL, 16); out[i] = strtol(in, NULL, 16);
i++; i++;
} }
}
in = r+1; in = r+1;
} }