Add nominal support for Untangle v12 (which is the same as v11).

diff --git a/doc/man8/untangle-https-backup.8 b/doc/man8/untangle-https-backup.8
index 488cb1eb7c6fe5fbc1de778ae793dac0993ee474..419112edee26cdae5f3aecde122dc0cbf8b8c430 100644 (file)
--- a/doc/man8/untangle-https-backup.8
+++ b/doc/man8/untangle-https-backup.8
@@ -41,9 +41,9 @@ The hostname or IP address where the Untangle web UI is available.
 The Untangle admin username.
 .IP \fBpassword\fR\ (required)
 The Untangle admin password.
 The Untangle admin username.
 .IP \fBpassword\fR\ (required)
 The Untangle admin password.

-.IP \fBversion\fR\ (default:\ \fI11\fR)
-The version of Untangle running on this host. Currently only \fI9\fR
-and \fI11\fR are supported.
+.IP \fBversion\fR\ (default:\ \fI12\fR)
+The version of Untangle running on this host. Currently only \fI9\fR,
+\fI11\fR, and \fI12\fR are supported.

 .IP \fBverify_cert\fR\ (default:\ False)
 Whether or not to verify the site's SSL certificate, either
 \fITrue\fR or \fIFalse\fR.
 .IP \fBverify_cert\fR\ (default:\ False)
 Whether or not to verify the site's SSL certificate, either
 \fITrue\fR or \fIFalse\fR.

diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py
index 6a972804f0fe0a1afe0523a108b2c4ecce009b7e..f8fd795aa49dbb3533d8f7a45d005a4d80f0b584 100644 (file)
--- a/src/untangle/untangle.py
+++ b/src/untangle/untangle.py
@@ -18,7 +18,7 @@ class Untangle:
         self.host = s['host']
         self.username = s.get('username', 'admin')
         self.password = s['password']
         self.host = s['host']
         self.username = s.get('username', 'admin')
         self.password = s['password']

-        self.version = int(s.get('version', '11'))
+        self.version = int(s.get('version', '12'))

         self.base_url = 'https://' + self.host + '/' # This never changes
 
         # Sanity check the numerical version.
         self.base_url = 'https://' + self.host + '/' # This never changes
 
         # Sanity check the numerical version.


@@ -81,6 +81,9 @@ class Untangle:
             return self.get_backup_v9()
         elif self.version == 11:
             return self.get_backup_v11()
             return self.get_backup_v9()
         elif self.version == 11:
             return self.get_backup_v11()

+        elif self.version == 12:
+            # The procedure for v12 is the same as for v11.
+            return self.get_backup_v11()

 
 
     def get_backup_v9(self):
 
 
     def get_backup_v9(self):