summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswatspyder <AndrewDeFilippis@gmail.com>2013-05-28 19:07:04 -0700
committerErmal <eri@pfsense.org>2013-05-29 07:02:32 +0000
commit5217befec5912a2ab56bc1b35795fa52adda24f6 (patch)
tree85bff6a945cf8966f08f62917201c0c7f9ac9050
parent0cbddf492a7e38bc3ad8b75025ca97a3b89885cf (diff)
downloadpfsense-5217befec5912a2ab56bc1b35795fa52adda24f6.zip
pfsense-5217befec5912a2ab56bc1b35795fa52adda24f6.tar.gz
Update dyndns.class
To remove a curl_setopt line that is unused for "dnsomatic", and to allow for all characters to be used in the username and password fields.
-rw-r--r--etc/inc/dyndns.class12
1 files changed, 10 insertions, 2 deletions
diff --git a/etc/inc/dyndns.class b/etc/inc/dyndns.class
index 1b7196d..5ac93d4 100644
--- a/etc/inc/dyndns.class
+++ b/etc/inc/dyndns.class
@@ -438,8 +438,16 @@
log_error("DNS-O-Matic: DNS update() starting.");
if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
- curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass);
- $server = "https://" . $this->_dnsUser . ":" . $this->_dnsPass . "@updates.dnsomatic.com/nic/update?hostname=";
+ /*
+ Reference: https://www.dnsomatic.com/wiki/api
+ DNS-O-Matic usernames are 3-25 characters.
+ DNS-O-Matic passwords are 6-20 characters.
+ All ASCII letters and numbers accepted.
+ Dots, dashes, and underscores allowed, but not at the beginning or end of the string.
+ Required: "rawurlencode" http://www.php.net/manual/en/function.rawurlencode.php
+ Encodes the given string according to RFC 3986.
+ */
+ $server = "https://" . rawurlencode($this->_dnsUser) . ":" . rawurlencode($this->_dnsPass) . "@updates.dnsomatic.com/nic/update?hostname=";
if($this->_dnsServer)
$server = $this->_dnsServer;
if($this->_dnsPort)
OpenPOWER on IntegriCloud