From dcd2eadd05fc22492c27f45238b1451a5d564b79 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Wed, 30 Jan 2013 18:04:17 +0100
Subject: [PATCH] domain-options on domain.add do not work

---
 hsarjcli/scripting/package_dump.js | 34 ++++++++++++------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/hsarjcli/scripting/package_dump.js b/hsarjcli/scripting/package_dump.js
index cccd11e..134a87a 100644
--- a/hsarjcli/scripting/package_dump.js
+++ b/hsarjcli/scripting/package_dump.js
@@ -83,31 +83,23 @@ if (pacs.length == 1 && hive != 'undef') {
 	// Domain
 	var domains = domain.search();
 	for (idx=0; idx<domains.length; idx++) {
-		if (domains[idx]['name'] == pacname + '.hostsharing.net') {
-		    file.write('domain.update({where:{\n');
-		    file.write('name: "' + domains[idx]['name'] + '"\n');
-		    file.write('},set:{\n');
-		    file.write('domainoptions: [\n');
-		    if (domains[idx]['domainoptions']) {
-				for (jdx=0; jdx<domains[idx]['domainoptions'].length; jdx++) {
-			    	file.write('     "' + domains[idx]['domainoptions'][jdx] + '",\n');
-				}
-			}
-		    file.write('  ]\n');
-		    file.write('}});\n');
-		} else {
+		if ( ! (domains[idx]['name'] == pacname + '.hostsharing.net')) {
 		    file.write('domain.add({set:{\n');
 		    file.write('name: "' + domains[idx]['name'] + '",\n');
-		    file.write('user: "' + domains[idx]['user'] + '",\n');
-		    file.write('domainoptions: [\n');
-		    if (domains[idx]['domainoptions']) {
-				for (jdx=0; jdx<domains[idx]['domainoptions'].length; jdx++) {
-			    	file.write('     "' + domains[idx]['domainoptions'][jdx] + '",\n');
-				}
-			}
-		    file.write('  ]\n');
+		    file.write('user: "' + domains[idx]['user'] + '"\n');
 		    file.write('}});\n');
 		}
+	    file.write('domain.update({where:{\n');
+	    file.write('name: "' + domains[idx]['name'] + '"\n');
+	    file.write('},set:{\n');
+	    file.write('domainoptions: [\n');
+	    if (domains[idx]['domainoptions']) {
+			for (jdx=0; jdx<domains[idx]['domainoptions'].length; jdx++) {
+		    	file.write('     "' + domains[idx]['domainoptions'][jdx] + '",\n');
+			}
+		}
+	    file.write('  ]\n');
+	    file.write('}});\n');
 	}	
 	// Alias
 	var aliases = emailalias.search();