From 18f15227e89926fd8707e2e475c7d2a2cc7d5eda Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 20 Sep 2012 07:58:15 +0000
Subject: Work with ruby 1.9

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@549 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
---
 bin/ldap2bind | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/ldap2bind b/bin/ldap2bind
index 3af9dfc..cc80a92 100755
--- a/bin/ldap2bind
+++ b/bin/ldap2bind
@@ -52,8 +52,16 @@ def makeNewSerial(oldSerial)
 	return serial
 end
 
+def ensureArray(x)
+	if x.kind_of?(Array)
+		return x
+	else
+		return [x]
+	end
+end
+
 def setRecord(domains, type, rrdata, dn)
-	domains.each{ |d|
+	ensureArray(domains).each{ |d|
 		handled = false
 		domainparts = d.split('.')
 		localpart = []
@@ -275,7 +283,7 @@ reload_required = false
 		next if on_disk == zone.reject{ |e| e =~ /IGNORE_LINE/ }
 	end
 	f = File.new( @baseDir + '/' + name, "w" )
-	f.write(zone)
+	f.write(zone.join(''))
 	f.close
 	reload_required = true
 }
@@ -309,7 +317,7 @@ else
 	reload_required = true
 end
 f = File.new( @namedconf, "w" )
-f.write(zonelist)
+f.write(zonelist.join(''))
 f.close
 
 
@@ -325,7 +333,7 @@ else
 end
 if push_required
 	f = File.new( @pushedList, "w" );
-	f.write(pushingList)
+	f.write(pushingList.join(''))
 	f.close
 	if @pushToServers
 		@pushToServers.each{ |server|
-- 
cgit v1.2.3