From c0e1bd504535139cbdf73a4bc312e7aa7b09bd4b Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Sun, 11 Nov 2018 16:54:11 +0000
Subject: [PATCH] Conditionally backup/restore dmz_config

---
 domain/backup/backup.go  |  5 ++++-
 domain/backup/restore.go | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/domain/backup/backup.go b/domain/backup/backup.go
index 51d3bad3..1a31b310 100644
--- a/domain/backup/backup.go
+++ b/domain/backup/backup.go
@@ -268,7 +268,10 @@ func (b backerHandler) dmzConfig(files *[]backupItem) (err error) {
 	if err != nil {
 		return
 	}
-	*files = append(*files, backupItem{Filename: "dmz_config.json", Content: content})
+
+	if b.Spec.SystemBackup() {
+		*files = append(*files, backupItem{Filename: "dmz_config.json", Content: content})
+	}
 
 	w := ""
 	if !b.Spec.SystemBackup() {
diff --git a/domain/backup/restore.go b/domain/backup/restore.go
index 720447e3..12eda6e8 100644
--- a/domain/backup/restore.go
+++ b/domain/backup/restore.go
@@ -136,9 +136,11 @@ func (r *restoreHandler) PerformRestore(b []byte, l int64) (err error) {
 	}
 
 	// Config.
-	err = r.dmzConfig()
-	if err != nil {
-		return
+	if r.Context.GlobalAdmin {
+		err = r.dmzConfig()
+		if err != nil {
+			return
+		}
 	}
 
 	// Audit Log.
@@ -1649,8 +1651,7 @@ func (r *restoreHandler) dmzUser() (err error) {
 				err = errors.Wrap(err, fmt.Sprintf("unable to check email %s", u[i].Email))
 				return
 			}
-			// Existing userID from database overrides all incoming userID values
-			// by using remapUser().
+			// Existing userID from database overrides all incoming userID values by using remapUser().
 			if len(userID) > 0 {
 				r.MapUserID[u[i].RefID] = userID
 				insert = false