From cab29219d7fb43bc77bbffd8224a8a2cddb59b22 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sun, 11 Feb 2024 18:43:17 +0100 Subject: [PATCH] dns/ddclient - change netcup separator as discussed closes https://github.com/opnsense/plugins/pull/3549 --- .../opnsense/scripts/ddclient/lib/account/netcup.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py index 91e5ae1f9f..9bb775c1e1 100755 --- a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py +++ b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/netcup.py @@ -66,17 +66,11 @@ def execute(self): self.hostname, self.domain = self.settings['hostnames'].split('.', 1) - if self.settings['password'].count(':') > 1: - if self.settings['password'].count('\\:') == 1: - self.settings['APIPassword'], self.settings['APIKey'] = self.settings['password'].split('\\:') - elif self.settings['password'].count(':') == 1: - self.settings['APIPassword'], self.settings['APIKey'] = self.settings['password'].split(':') + if self.settings['password'].count('|') == 1: + self.settings['APIPassword'], self.settings['APIKey'] = self.settings['password'].split('|') if self.settings['APIPassword'] is None or self.settings['APIKey'] is None: - syslog.syslog( - syslog.LOG_ERR, - "Unable to parse APIPassword:APIKey, when colons are used, make sure to escape the separator (\:)." - ) + syslog.syslog(syslog.LOG_ERR, "Unable to parse APIPassword|APIKey.") return False self.netcupAPISessionID = self._login()