diff options
| author | Erland Schönbeck <[email protected]> | 2015-04-28 13:32:55 +0200 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-04-28 13:32:55 +0200 |
| commit | 22173c2e4d65e47039975b91015560ae4256b3c1 (patch) | |
| tree | 807470de259e85483b79b40e6e8f85c89608b982 /lib/snmp/src/agent/snmpa_vacm.erl | |
| parent | 861145a503c77d8144033f38d288bdda31699edd (diff) | |
| parent | 722357d7a23ee4a47277f05aa5fd593bc4de0db0 (diff) | |
| download | otp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.gz otp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.bz2 otp-22173c2e4d65e47039975b91015560ae4256b3c1.zip | |
Merge branch 'erland/OTP18/snmp/OTP-12452'
* erland/OTP18/snmp/OTP-12452:
snmp: Remove deprecated warning for erlang:now in snmp_verbority
snmp: Change to random use crypto. Remove use of erlang:now
Diffstat (limited to 'lib/snmp/src/agent/snmpa_vacm.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_vacm.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/snmp/src/agent/snmpa_vacm.erl b/lib/snmp/src/agent/snmpa_vacm.erl index dadcf32543..281b2bd34a 100644 --- a/lib/snmp/src/agent/snmpa_vacm.erl +++ b/lib/snmp/src/agent/snmpa_vacm.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2012. All Rights Reserved. +%% Copyright Ericsson AB 1999-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -305,8 +305,8 @@ dump_table() -> %% time dumping the table. unique_table_name(Pre) -> %% We want something that is guaranteed to be unique, - %% therefor we use erlang:now() instead of os:timestamp() - unique_table_name(Pre, erlang:now()). + %% therefor we use erlang:timestamp() instead of os:timestamp() + unique_table_name(Pre, erlang:timestamp()). unique_table_name(Pre, {_A, _B, C} = Now) -> {Date, Time} = calendar:now_to_datetime(Now), @@ -445,6 +445,3 @@ gc_tab(Oid) -> user_err(F, A) -> snmpa_error:user_err(F, A). - -% config_err(F, A) -> -% snmpa_error:config_err(F, A). |