diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 14:57:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 14:57:56 +0100 |
| commit | e91ecef78904be02bb785fdff0dcaf6d38176ba7 (patch) | |
| tree | 74622d0cfdd0e3c935b4600cf57c3c7a8d9ebc1d /lib/kernel/src/net_kernel.erl | |
| parent | 2ff2b4ee1b50eb621e436f7c448808d67d6690df (diff) | |
| parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
| download | otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.gz otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.bz2 otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/kernel/src/net_kernel.erl')
| -rw-r--r-- | lib/kernel/src/net_kernel.erl | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index f5e2820bbe..23db85e1f4 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -322,24 +322,19 @@ init({Name, LongOrShortNames, TickT}) -> process_flag(priority, max), Ticktime = to_integer(TickT), Ticker = spawn_link(net_kernel, ticker, [self(), Ticktime]), - case auth:get_cookie(Node) of - Cookie when is_atom(Cookie) -> - {ok, #state{name = Name, - node = Node, - type = LongOrShortNames, - tick = #tick{ticker = Ticker, time = Ticktime}, - connecttime = connecttime(), - connections = - ets:new(sys_dist,[named_table, - protected, - {keypos, 2}]), - listen = Listeners, - allowed = [], - verbose = 0 - }}; - _ELSE -> - {stop, {error,{bad_cookie, Node}}} - end; + {ok, #state{name = Name, + node = Node, + type = LongOrShortNames, + tick = #tick{ticker = Ticker, time = Ticktime}, + connecttime = connecttime(), + connections = + ets:new(sys_dist,[named_table, + protected, + {keypos, 2}]), + listen = Listeners, + allowed = [], + verbose = 0 + }}; Error -> {stop, Error} end. |