Permalink
Browse files

partial fix - refs #853

  • Loading branch information...
1 parent 3e042b2 commit 025b5ad044944f5ed6a7e91b21afcf488e293613 @ohadlevy ohadlevy committed May 6, 2011
Showing with 2 additions and 4 deletions.
  1. +2 −4 lib/proxy/dhcp/server/isc.rb
View
6 lib/proxy/dhcp/server/isc.rb
@@ -148,10 +148,8 @@ def parse_record_options text
def omcmd cmd, msg=nil
if cmd == "connect"
- if SETTINGS.dhcp_key_name and SETTINGS.dhcp_key_secret
- args = "key #{SETTINGS.dhcp_key} #{SETTINGS.dhcp_key_secret}"
- end
- @om = IO.popen("/bin/sh -c '/usr/bin/omshell #{args} 2>&1'", "r+")
+ @om = IO.popen("/bin/sh -c '/usr/bin/omshell 2>&1'", "r+")
+ @om.puts "key #{SETTINGS.dhcp_key_name} \"#{SETTINGS.dhcp_key_secret}\"" if SETTINGS.dhcp_key_name and SETTINGS.dhcp_key_secret
@om.puts "server #{name}"
@om.puts "connect"
@om.puts "new host"

0 comments on commit 025b5ad

Please sign in to comment.