webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ddns: Import upstream patch for provider DDNSS.

Browse Source 
Fixes #12328.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Stefan Schantl
2020-12-02 10:13:52 +01:00
committed by Michael Tremer
parent 848911b247
commit 882db5cd03
3 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/ddns
View File

@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Apply upstream patches.
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure \

30
src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch Normal file
View File

@@ -0,0 +1,30 @@
commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon May 25 18:00:51 2020 +0200
ProviderDDNSS: Fix unhandled exception on update
In python > 3.3 the getheader() attribute is not longer part of the
urllib.response response.info() object. It is part of response object
and so directly can be accessed.
Fixes #12328
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index f1fed22..46d8a67 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
response = self.send_request(self.url, data=data)
# This provider sends the response code as part of the header.
- header = response.info()
-
# Get status information from the header.
- output = header.getheader('ddnss-response')
+ output = response.getheader('ddnss-response')
# Handle success messages.
if output == "good" or output == "nochg":

30
src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch Normal file
View File

@@ -0,0 +1,30 @@
commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon May 25 18:00:51 2020 +0200
ProviderDDNSS: Fix unhandled exception on update
In python > 3.3 the getheader() attribute is not longer part of the
urllib.response response.info() object. It is part of response object
and so directly can be accessed.
Fixes #12328
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index f1fed22..46d8a67 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
response = self.send_request(self.url, data=data)
# This provider sends the response code as part of the header.
- header = response.info()
-
# Get status information from the header.
- output = header.getheader('ddnss-response')
+ output = response.getheader('ddnss-response')
# Handle success messages.
if output == "good" or output == "nochg":