snmp: Patch 1118

    OTP-8574  The SMI specifies that an table row OID should be named:
              { "1" }. An option has been introduced, relaxed_row_name_assign_check,
              that allows for a more liberal numbering scheme.

    OTP-8594  Changes to make snmp (forward) compatible with the new version
              of the crypto application (released in R14). As of R14,
              crypto is implemented using NIFs. Also, the API is more
              strict.

    OTP-8648  [manager] Changed default value for the MIB server cache.
              Auto GC is now on by default.

    OTP-8563  Decoding of Counter64 values larger then 9306882749598007295
              fails. Counter64 is encoded as an 64 bit signed integer,
              but is actually an unsigned integer, which the decoder does
              not take into account.

    OTP-8595  [compiler] Fails to compile non-contiguous BITS. Per Hedeland

    OTP-8646  [manager] Raise condition causing the manager server process
              to crash. Unregistering an agent while traffic (set/get-operations)
              is ongoing could cause a crash in the manager server process
              (raise condition).

25 files changed, 738 insertions, 259 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 33e304abfa..45e1549de7 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -33,6 +33,83 @@
   </header>
 
   <section>
+    <title>SNMP Development Toolkit 4.16.2</title>
+    <p>Version 4.16.2 supports code replacement in runtime from/to
+      version 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <!-- 
+      <p>-</p> 
+      -->
+      <list type="bulleted">
+        <item>
+          <p>[compiler] The SMI specifies that a table row OID should be 
+            named: { &lt;tableIdentifier&gt; "1" }. </p>
+	  <p>A new option has been introduced, 
+            <seealso marker="snmpc#compiler_opts">relaxed_row_name_assign_check</seealso>, 
+            that allows for a more liberal numbering scheme</p>
+          <p>Own Id: OTP-8574</p>
+        </item>
+
+        <item>
+          <p>[agent|manager] Changes to make snmp (forward) compatible with 
+            the new version of the crypto application (released in R14).
+            As of R14, crypto is implemented using NIFs. Also,
+            the API is more strict. </p> 
+          <p>Own Id: OTP-8594</p>
+        </item>
+
+        <item>
+          <p>Auto [agent] Changed default value for the MIB server cache. 
+            GC is now on by default. </p>
+          <p>Own Id: OTP-8648</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <!-- 
+      <p>-</p>
+      -->
+
+      <list type="bulleted">
+        <item>
+          <p>Encode/decode of Counter64 values larger than 
+	    16#7fffffffffffffff (9223372036854775807) failed. </p>
+          <p>Own Id: OTP-8563</p>
+        </item>
+
+        <item>
+          <p>[compiler] Fails to compile non-contiguous BITS. </p>
+	  <p>Per Hedeland</p>
+          <p>Own Id: OTP-8595</p>
+        </item>
+
+        <item>
+          <p>[manager] Raise condition causing the manager server process to 
+            crash. Unregistering an agent while traffic (set/get-operations) 
+            is ongoing could cause a crash in the manager server process 
+            (raise condition). </p>
+          <p>Own Id: OTP-8646</p>
+	  <p>Aux Id: Seq 11585</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.16.2 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.16.1</title>
     <p>Version 4.16.1 supports code replacement in runtime from/to
       version 4.16, 4.15, 4.14 and 4.13.5.</p>
diff --git a/lib/snmp/doc/src/notes_history.xml b/lib/snmp/doc/src/notes_history.xml
index 8739400773..934df87866 100644
--- a/lib/snmp/doc/src/notes_history.xml
+++ b/lib/snmp/doc/src/notes_history.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>SNMP Release Notes history</title>
@@ -1732,7 +1732,7 @@
       version 4.1. </p>
     <p>When performing a downgrade, make sure the verbosity of the
       manager server process is silence, or else the process will crash
-      (due to a bug in version 4.0.4) and be restarted by it's 
+      (due to a bug in version 4.0.4) and be restarted by its
       supervisor.</p>
 
     <section>
@@ -1773,7 +1773,7 @@
       version 4.0.4. </p>
     <p>When performing a downgrade, make sure the verbosity of the
       manager server process is silence, or else the process will crash
-      (due to a bug in version 4.0.4) and be restarted by it's 
+      (due to a bug in version 4.0.4) and be restarted by its
       supervisor.</p>
 
     <section>
@@ -1827,8 +1827,8 @@
         </item>
         <item>
           <p>[manager] The server process contained a bug that caused it 
-            to crash, if it received an exit message from it's gct (GC timer) 
-            process and it's verbosity was <em>log</em> or higher. </p>
+            to crash, if it received an exit message from its gct (GC timer)
+            process and its verbosity was <em>log</em> or higher. </p>
 	  <p>This also effects the application downgrade. </p>
           <p>Own Id: OTP-5306</p>
         </item>
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml
index e5a725d720..694e619da1 100644
--- a/lib/snmp/doc/src/snmp_app.xml
+++ b/lib/snmp/doc/src/snmp_app.xml
@@ -80,7 +80,7 @@
 
     <!-- The info below is also found in the snmp_config.xml file -->
 
-    <p>Each snmp component has it's own set of configuration parameters, 
+    <p>Each snmp component has its own set of configuration parameters,
       even though some of the types are common to both components. </p>
 
     <pre>
@@ -346,7 +346,7 @@
         <p>Defines if the mib server shall perform cache gc automatically or 
           leave it to the user (see 
           <seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
-        <p>Default is <c>false</c>.</p>
+        <p>Default is <c>true</c>.</p>
       </item>
 
       <tag><c><![CDATA[mibs_cache_age() = integer() > 0 <optional>]]></c></tag>
@@ -693,7 +693,7 @@
         <p>Specifies if and how the audit trail log shall be repaired
           when opened. Unless this parameter has the value <c>snmp_repair</c>
           it is sent to <c>disk_log</c>. If, on the other hand, the value is
-          <c>snmp_repair</c>, snmp attempts to handle certain faults on it's 
+          <c>snmp_repair</c>, snmp attempts to handle certain faults on its
           own. And even if it cannot repair the file, it does not truncate it 
           directly, but instead <em>moves it aside</em> for later off-line 
           analysis.</p>
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 6fc9cc49f2..769b908adc 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -343,7 +343,7 @@
         <p>Defines if the mib server shall perform cache gc automatically or 
           leave it to the user (see 
           <seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
-        <p>Default is <c>false</c>.</p>
+        <p>Default is <c>true</c>.</p>
       </item>
 
       <tag><c><![CDATA[mibs_cache_age() = integer() > 0 <optional>]]></c></tag>
@@ -704,7 +704,7 @@
         <p>Specifies if and how the audit trail log shall be repaired
           when opened. Unless this parameter has the value <c>snmp_repair</c>
           it is sent to <c>disk_log</c>. If, on the other hand, the value is
-          <c>snmp_repair</c>, snmp attempts to handle certain faults on it's 
+          <c>snmp_repair</c>, snmp attempts to handle certain faults on its
           own. And even if it cannot repair the file, it does not truncate it 
           directly, but instead <em>moves it aside</em> for later off-line 
           analysis.</p>
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index b3661ae9b0..69fe6d62f4 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>snmpa</title>
@@ -648,6 +648,20 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       <desc>
         <p>Disable the mib server cache. </p>
 
+        <marker id="which_mibs_cache_size"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>which_mibs_cache_size() -> void()</name>
+      <name>which_mibs_cache_size(Agent) -> void()</name>
+      <fsummary>The size of the mib server cache</fsummary>
+      <type>
+        <v>Agent = pid() | atom()</v>
+      </type>
+      <desc>
+        <p>Retreive the size of the mib server cache. </p>
+
         <marker id="gc_mibs_cache"></marker>
       </desc>
     </func>
diff --git a/lib/snmp/doc/src/snmpa_network_interface_filter.xml b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
index d625fd3e4a..10419517dd 100644
--- a/lib/snmp/doc/src/snmpa_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>snmpa_network_interface_filter</title>
@@ -153,7 +153,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 'set-request'
         <p>For the message to be discarded all together, the function 
           <em>must</em> return <em>false</em>. </p>
         <p>Note that it is possible for this function to filter out targets
-          (but <em>not</em> add it's own) by returning an updated 
+          (but <em>not</em> add its own) by returning an updated
           <c>Targets</c> list (<c>NewTargets</c>). </p>
       </desc>
     </func>
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index 48d63d6c91..fbd0950c69 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>snmpc</title>
@@ -47,9 +47,10 @@
       <type>
         <v>File = string()</v>
         <v>Options = [opt()]</v>
-        <v>opt() = db() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | outdir() |  no_defs() | verbosity() | warnings()</v>
+        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | outdir() |  no_defs() | verbosity() | warnings()</v>
         <v>db() = {db, volatile|persistent|mnesia}</v>
         <v>deprecated() = {deprecated, bool()}</v>
+        <v>relaxed_row_name_assign_check() = relaxed_row_name_assign_check</v>
         <v>description() = description</v>
         <v>reference() = reference</v>
         <v>group_check() = {group_check, bool()}</v>
@@ -71,75 +72,104 @@
           compiled file <c>BinFileName</c> is called 
           <c><![CDATA[<File>.bin]]></c>. </p>
         <list type="bulleted">
-          <item>The option <c>db</c> specifies which database should
-           be used for the default instrumentation. Default is
-          <c>volatile</c>.
+          <item>
+	    <p>The option <c>db</c> specifies which database should
+	      be used for the default instrumentation. </p>
+	    <p>Default is <c>volatile</c>. </p>
+          </item>
+          <item>
+	    <p>The option <c>deprecated</c> specifies if a deprecated 
+              definition should be kept or not. If the option is 
+              false the MIB compiler will ignore all deprecated
+              definitions. </p>
+	    <p>Default is <c>true</c>. </p>
           </item>
-          <item>The option <c>deprecated</c> specifies if a deprecated 
-           definition should be kept or not. If the option is 
-           false the MIB compiler will ignore all deprecated
-           definitions. Default is <c>true</c>.
+          <item>
+	    <p>The option <c>relaxed_row_name_assign_check</c>, if present,
+	      specifies that the row name assign check shall not be done 
+	      strictly according to the SMI (which allows only the value 1). 
+              With this option, all values greater than zero is allowed 
+	      (>= 1). This means that the error will be converted to a 
+              warning. </p>
+	    <p>By default it is not included, but if this option is present 
+	      it will be. </p>
           </item>
-          <item>The option <c>description</c> specifies if the text
-           of the DESCRIPTION field will be included or not. By default 
-           it is not included, but if this option is present it will
-           be.
+          <item>
+	    <p>The option <c>description</c> specifies if the text
+              of the DESCRIPTION field will be included or not. </p>
+	    <p>By default it is not included, but if this option is 
+	      present it will be. </p>
           </item>
-          <item>The option <c>reference</c> specifies if the text
-           of the REFERENCE field, when found in a table definition, 
-           will be included or not. By default 
-           it is not included, but if this option is present it will
-           be. The reference text will be placed in the allocList field 
-           of the mib-entry record (#me{}) for the table.
+          <item>
+	    <p>The option <c>reference</c> specifies if the text
+              of the REFERENCE field, when found in a table definition, 
+              will be included or not. </p>
+	    <p>By default it is not included, but if this option is present 
+	      it will be. The reference text will be placed in the allocList 
+	      field of the mib-entry record (#me{}) for the table. </p>
           </item>
-          <item>The option <c>group_check</c> specifies whether the
-           mib compiler should check the OBJECT-GROUP macro and
-           the NOTIFICATION-GROUP macro for correctness or not.  
-           Default is <c>true</c>.
+          <item>
+	    <p>The option <c>group_check</c> specifies whether the
+	      mib compiler should check the OBJECT-GROUP macro and
+              the NOTIFICATION-GROUP macro for correctness or not.  </p>
+	    <p>Default is <c>true</c>. </p>
           </item>
-          <item>The option <c>i</c> specifies the path to search for
-           imported (compiled) MIB files. The directories should be
-           strings with a trailing directory delimiter. Default is
-          <c>["./"]</c>.
+          <item>
+	    <p>The option <c>i</c> specifies the path to search for
+	      imported (compiled) MIB files. The directories should be
+              strings with a trailing directory delimiter. </p>
+	    <p>Default is <c>["./"]</c>. </p>
           </item>
-          <item>The option <c>il</c> (include_lib) also specifies a
-           list of directories to search for imported MIBs. It
-           assumes that the first element in the directory name
-           corresponds to an OTP application. The compiler will find
-           the current installed version. For example, the value
-           ["snmp/mibs/"] will be replaced by ["snmp-3.1.1/mibs/"]
-           (or what the current version may be in the system). The
-           current directory and the <c><![CDATA[<snmp-home>/priv/mibs/]]></c>
-           are always listed last in the include path.
+          <item>
+	    <p>The option <c>il</c> (include_lib) also specifies a
+              list of directories to search for imported MIBs. It
+              assumes that the first element in the directory name
+              corresponds to an OTP application. The compiler will find
+              the current installed version. For example, the value
+              ["snmp/mibs/"] will be replaced by ["snmp-3.1.1/mibs/"]
+              (or what the current version may be in the system). The
+              current directory and the 
+	      <c><![CDATA[<snmp-home>/priv/mibs/]]></c>
+              are always listed last in the include path. </p>
           </item>
-          <item>The option <c>imports</c>, if present, specifies that the
-           IMPORT statement of the MIB shall be included in the compiled mib.
+          <item>
+	    <p>The option <c>imports</c>, if present, specifies that 
+              the IMPORT statement of the MIB shall be included in the 
+	      compiled mib. </p>
           </item>
-          <item>The option <c>module</c>, if present, specifies the
-           name of a module which implements all instrumentation
-           functions for the MIB.  The name of all instrumentation
-           functions must be the same as the corresponding managed
-           object it implements.
+          <item>
+	    <p>The option <c>module</c>, if present, specifies the
+              name of a module which implements all instrumentation
+              functions for the MIB.  </p>
+	    <p>The name of all instrumentation
+              functions must be the same as the corresponding managed
+              object it implements. </p>
           </item>
-          <item>The option <c>module_identity</c>, if present, specifies 
-           that the info part of the MODULE-IDENTITY statement of the MIB 
-           shall be included in the compiled mib.
+          <item>
+	    <p>The option <c>module_identity</c>, if present, specifies 
+              that the info part of the MODULE-IDENTITY statement of the MIB 
+              shall be included in the compiled mib. </p>
           </item>
-          <item>The option <c>no_defs</c>, if present, specifies 
-           that if a managed object does not have an instrumentation
-           function, the default instrumentation function should NOT
-           be used, instead this is reported as an error, and the
-           compilation aborts.
+          <item>
+	    <p>The option <c>no_defs</c>, if present, specifies 
+              that if a managed object does not have an instrumentation
+              function, the default instrumentation function should NOT
+              be used, instead this is reported as an error, and the
+              compilation aborts. </p>
           </item>
-          <item>The option <c>verbosity</c> specifies the verbosity of
-           the SNMP mib compiler. I.e. if warning, info, log, debug 
-           and trace messages shall be shown. Default is <c>silence</c>.
-           Note that if the option <c>warnings</c> is <c>true</c> and the 
-           option <c>verbosity</c> is <c>silence</c>, warning messages will
-           still be shown.
+          <item>
+	    <p>The option <c>verbosity</c> specifies the verbosity of
+	      the SNMP mib compiler. I.e. if warning, info, log, debug 
+              and trace messages shall be shown. </p>
+	    <p>Default is <c>silence</c>. </p>
+            <p>Note that if the option <c>warnings</c> is <c>true</c> and the 
+              option <c>verbosity</c> is <c>silence</c>, warning messages will
+              still be shown. </p>
           </item>
-          <item>The option <c>warnings</c> specifies whether warning
-           messages should be shown. Default is <c>true</c>.
+          <item>
+	    <p>The option <c>warnings</c> specifies whether warning
+              messages should be shown. </p>
+	    <p>Default is <c>true</c>. </p>
           </item>
         </list>
         <p>The MIB compiler understands both SMIv1 and SMIv2 MIBs.  It
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 9e7ac75daf..1ee391d9ba 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>snmpm</title>
@@ -920,7 +920,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
         <v>Oids = [oid()]</v>
       </type>
       <desc>
-        <p>Transform a alias-name to it's oid.</p>
+        <p>Transform a alias-name to its oid.</p>
         <p>Note that an alias-name is only unique within the mib, so
           when loading several mib's into a manager, there might be
           several instances of the same aliasname.</p>
@@ -938,7 +938,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Transform a oid to it's aliasname.</p>
+        <p>Transform a oid to its aliasname.</p>
 
         <marker id="oid_to_type"></marker>
       </desc>
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index a113bba3a7..1c37d76074 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -47,6 +47,7 @@
 	 mib_of/1, mib_of/2, 
 	 me_of/1,  me_of/2, 
 	 invalidate_mibs_cache/0, invalidate_mibs_cache/1, 
+	 which_mibs_cache_size/0, which_mibs_cache_size/1, 
 	 enable_mibs_cache/0, enable_mibs_cache/1, 
 	 disable_mibs_cache/0, disable_mibs_cache/1,
 	 gc_mibs_cache/0, gc_mibs_cache/1, gc_mibs_cache/2, gc_mibs_cache/3,
@@ -302,6 +303,13 @@ invalidate_mibs_cache(Agent) ->
     snmpa_agent:invalidate_mibs_cache(Agent).
 
 
+which_mibs_cache_size() ->
+    which_mibs_cache_size(snmp_master_agent).
+
+which_mibs_cache_size(Agent) ->
+    snmpa_agent:which_mibs_cache_size(Agent).
+
+
 enable_mibs_cache() ->
     enable_mibs_cache(snmp_master_agent).
 
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index fb04fca632..648f5b53fa 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -48,6 +48,7 @@
 	 get/2, get/3, get_next/2, get_next/3]).
 -export([mib_of/1, mib_of/2, me_of/1, me_of/2,
 	 invalidate_mibs_cache/1,
+	 which_mibs_cache_size/1, 
 	 enable_mibs_cache/1, disable_mibs_cache/1,
 	 gc_mibs_cache/1, gc_mibs_cache/2, gc_mibs_cache/3,
 	 enable_mibs_cache_autogc/1, disable_mibs_cache_autogc/1,
@@ -245,6 +246,10 @@ disable_mibs_cache(Agent) ->
     call(Agent, {mibs_cache_request, disable_cache}).
 
 
+which_mibs_cache_size(Agent) ->
+    call(Agent, {mibs_cache_request, cache_size}).
+
+
 enable_mibs_cache_autogc(Agent) ->
     call(Agent, {mibs_cache_request, enable_autogc}).
 
@@ -1219,6 +1224,8 @@ handle_mibs_cache_request(MibServer, Req) ->
 			      snmpa_mib:gc_cache(MibServer, Age);
 			  {gc_cache, Age, GcLimit} ->
 			      snmpa_mib:gc_cache(MibServer, Age, GcLimit);
+			  cache_size ->
+			      snmpa_mib:which_cache_size(MibServer);
 			  enable_cache ->
 			      snmpa_mib:enable_cache(MibServer);
 			  disable_cache ->
diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl
index 370989d0be..ce90db18b3 100644
--- a/lib/snmp/src/agent/snmpa_mib.erl
+++ b/lib/snmp/src/agent/snmpa_mib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(snmpa_mib).
@@ -55,7 +55,7 @@
 -define(NO_CACHE,              no_mibs_cache).
 -define(DEFAULT_CACHE_USAGE,   true).
 -define(CACHE_GC_TICKTIME,     timer:minutes(1)).
--define(DEFAULT_CACHE_AUTOGC,  false).
+-define(DEFAULT_CACHE_AUTOGC,  true).
 -define(DEFAULT_CACHE_GCLIMIT, 100).
 -define(DEFAULT_CACHE_AGE,     timer:minutes(10)).
 -define(CACHE_GC_TRIGGER,      cache_gc_trigger).
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index 12a6b996ff..b94294844b 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -560,11 +560,15 @@ encrypt(Data, PrivProtocol, PrivKey, SecLevel) ->
 	    ?vtrace("encrypt -> 3.1.4a",[]),
 	    case (catch try_encrypt(PrivProtocol, PrivKey, Data)) of
 		{ok, ScopedPduData, MsgPrivParams} ->
-		    ?vtrace("encrypt -> encode tag",[]),
+		    ?vtrace("encrypt -> encrypted - now encode tag",[]),
 		    {snmp_pdus:enc_oct_str_tag(ScopedPduData), MsgPrivParams};
                 {error, Reason} ->
+		    ?vtrace("encrypt -> error: "
+			    "~n   Reason: ~p", [Reason]),
                     error(Reason);
- 		_Error ->
+ 		Error ->
+		    ?vtrace("encrypt -> other: "
+			    "~n   Error: ~p", [Error]),
 		    error(encryptionError)
 	    end
     end.
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 204de71c2e..a138a2dfd1 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,36 +22,63 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.16.1", 
+   [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+   ]
+  }, 
   {"4.16", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
    ]
   }, 
   {"4.15",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
+     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
+    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.14",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update, snmpa_mib, soft, soft_purge, soft_purge, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -64,14 +91,18 @@
   }, 
   {"4.13.5",   
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update, snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -88,37 +119,64 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.16.1", 
+   [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+   ]
+  }, 
   {"4.16", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
    ]
   }, 
   {"4.15",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.14",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -131,14 +189,18 @@
   }, 
   {"4.13.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
     {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 8a1f15d4a4..a7f2cdc2bc 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 -module(snmpc).
@@ -34,6 +34,7 @@
 -include("snmpc.hrl").
 -include("snmpc_lib.hrl").
 
+-record(dldata, {deprecated, relaxed_row_name_assign_check}).
 
 look_at(Mib) ->
     io:format("~p ~n", [snmpc_lib:look_at(Mib)]).
@@ -114,6 +115,7 @@ compile(FileName) ->
 %%          module_identity
 %%          {module, string()}
 %%          no_defs
+%%          relaxed_row_name_assign_check
 %% (hidden) {verbosity,   trace|debug|log|info|silence}   silence
 %% (hidden) version 
 %% (hidden) options 
@@ -201,6 +203,8 @@ get_options([imports|Opts], Formats, Args) ->
     get_options(Opts, ["~n   imports"|Formats], Args);
 get_options([module_identity|Opts], Formats, Args) ->
     get_options(Opts, ["~n   module_identity"|Formats], Args);
+get_options([relaxed_row_name_assign_check|Opts], Formats, Args) ->
+    get_options(Opts, ["~n   relaxed_row_name_assign_check"|Formats], Args);
 get_options([_|Opts], Formats, Args) ->
     get_options(Opts, Formats, Args).
     
@@ -284,6 +288,8 @@ check_options([imports| T]) ->
     check_options(T);
 check_options([module_identity| T]) ->
     check_options(T);
+check_options([relaxed_row_name_assign_check| T]) ->
+    check_options(T);
 check_options([{module, M} | T]) when is_atom(M) ->
     check_options(T);
 check_options([no_defs| T]) ->
@@ -309,6 +315,9 @@ get_description(Options) ->
 get_reference(Options) ->
     get_bool_option(reference, Options).
 
+get_relaxed_row_name_assign_check(Options) ->
+    lists:member(relaxed_row_name_assign_check, Options).
+
 get_bool_option(Option, Options) ->
     case lists:member(Option, Options) of
 	false ->
@@ -406,8 +415,12 @@ compile_parsed_data(#pdata{mib_name = MibName,
 			   defs     = Definitions}) ->
     snmpc_lib:import(Imports),
     update_imports(Imports),
-    Deprecated = get_deprecated(get(options)),
-    definitions_loop(Definitions, Deprecated),
+    Opts = get(options),
+    Deprecated = get_deprecated(Opts),
+    RelChk = get_relaxed_row_name_assign_check(Opts),
+    Data = #dldata{deprecated                    = Deprecated,
+		   relaxed_row_name_assign_check = RelChk}, 
+    definitions_loop(Definitions, Data),
     MibName.
 
 update_imports(Imports) ->
@@ -436,21 +449,21 @@ update_status(Name, Status) ->
 %% A deprecated object
 definitions_loop([{#mc_object_type{name = ObjName, status = deprecated}, 
 		   Line}|T],
-		 false) ->
+		 #dldata{deprecated = false} = Data) ->
     %% May be implemented but the compiler chooses not to.
     ?vinfo2("object_type ~w is deprecated => ignored", [ObjName], Line),    
     update_status(ObjName, deprecated), 
-    definitions_loop(T, false);
+    definitions_loop(T, Data);
 
 %% A obsolete object
 definitions_loop([{#mc_object_type{name = ObjName, status = obsolete}, 
 		   Line}|T], 
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("object_type ~w is obsolete => ignored", [ObjName], Line),
     %% No need to implement a obsolete object
     update_status(ObjName, obsolete),
     ensure_macro_imported('OBJECT-TYPE', Line),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 %% Defining a table
 definitions_loop([{#mc_object_type{name        = NameOfTable,
@@ -475,7 +488,7 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 		  {#mc_sequence{name   = SeqName,
 				fields = FieldList},
 		   Sline}|ColsEtc],
-		 Deprecated) ->
+		 Data) ->
     ?vlog("defloop -> "
 	  "[object_type(sequence_of),object_type(type,[1]),sequence]:"
 	  "~n   NameOfTable:  ~p"
@@ -529,7 +542,89 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 			 TableME#me{assocList=[{table_info, 
 						TableInfo} | make_reference(Ref)]} |
 				ColMEs]),
-    definitions_loop(RestObjs, Deprecated);
+    definitions_loop(RestObjs, Data);
+
+definitions_loop([{#mc_object_type{name        = NameOfTable,
+				   syntax      = {{sequence_of, SeqName}, _},
+				   max_access  = Taccess,
+				   kind        = Kind, 
+				   status      = Tstatus,
+				   description = Desc1,
+				   units       = Tunits,
+				   reference   = Ref, 
+				   name_assign = Tindex},
+		   Tline},
+		  {#mc_object_type{name        = NameOfEntry,
+				   syntax      = {{type, SeqName}, TEline},
+				   max_access  = 'not-accessible',
+				   kind        = {table_entry, IndexingInfo},
+				   status      = Estatus,
+				   description = Desc2,
+				   units       = Eunits, 
+				   name_assign = {NameOfTable,[Idx]} = BadOID},
+		   Eline},
+		  {#mc_sequence{name   = SeqName,
+				fields = FieldList},
+		   Sline}|ColsEtc],
+		 #dldata{relaxed_row_name_assign_check = true} = Data) 
+  when is_integer(Idx) andalso (Idx > 1) ->
+    ?vlog("defloop -> "
+	  "[object_type(sequence_of),object_type(type,[~w]),sequence]:"
+	  "~n   NameOfTable:  ~p"
+	  "~n   SeqName:      ~p"
+	  "~n   Taccess:      ~p"
+	  "~n   Kind:         ~p"
+	  "~n   Tstatus:      ~p"
+	  "~n   Tindex:       ~p"
+	  "~n   Tunits:       ~p"
+	  "~n   Tline:        ~p"
+	  "~n   NameOfEntry:  ~p"
+	  "~n   TEline:       ~p"
+	  "~n   IndexingInfo: ~p"
+	  "~n   Estatus:      ~p"
+	  "~n   Eunits:       ~p"
+	  "~n   Ref:          ~p"
+	  "~n   Eline:        ~p"
+	  "~n   FieldList:    ~p"
+	  "~n   Sline:        ~p",
+	  [Idx, 
+	   NameOfTable,SeqName,Taccess,Kind,Tstatus,
+	   Tindex,Tunits,Tline,
+	   NameOfEntry,TEline,IndexingInfo,Estatus,Eunits,Ref,Eline,
+	   FieldList,Sline]),
+    update_status(NameOfTable, Tstatus),
+    update_status(NameOfEntry, Estatus),
+    update_status(SeqName,     undefined),
+    ensure_macro_imported('OBJECT-TYPE', Tline),
+    ?vwarning2("Bad TableEntry OID definition (~w)",
+	       [BadOID], Eline),
+    test_table(NameOfTable,Taccess,Kind,Tindex,Tline),
+    {Tfather,Tsubindex} = Tindex,
+    snmpc_lib:register_oid(Tline,NameOfTable,Tfather,Tsubindex),
+    Description1 = make_description(Desc1),
+    TableME = #me{aliasname   = NameOfTable,
+		  entrytype   = table, 
+		  access      = 'not-accessible',
+		  description = Description1,
+		  units       = Tunits},
+    snmpc_lib:register_oid(TEline,NameOfEntry,NameOfTable,[Idx]),
+    Description2 = make_description(Desc2),
+    TableEntryME = #me{aliasname   = NameOfEntry, 
+		       entrytype   = table_entry,
+		       assocList   = [{table_entry_with_sequence, SeqName}], 
+		       access      = 'not-accessible',
+		       description = Description2,
+		       units       = Eunits},
+    {ColMEs, RestObjs} = 
+	define_cols(ColsEtc, 1, FieldList, NameOfEntry, NameOfTable, []),
+    TableInfo = snmpc_lib:make_table_info(Eline, NameOfTable,
+					  IndexingInfo, ColMEs),
+    snmpc_lib:add_cdata(#cdata.mes, 
+			[TableEntryME,
+			 TableME#me{assocList=[{table_info, 
+						TableInfo} | make_reference(Ref)]} |
+				ColMEs]),
+    definitions_loop(RestObjs, Data);
 
 definitions_loop([{#mc_object_type{name        = NameOfTable,
 				   syntax      = {{sequence_of, SeqName},_},
@@ -550,7 +645,7 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 				   name_assign = BadOID}, Eline},
 		  {#mc_sequence{name   = SeqName,
 				fields = FieldList}, Sline}|ColsEtc],
-		 Deprecated) ->
+		 Data) ->
     ?vlog("defloop -> "
 	  "[object_type(sequence_of),object_type(type),sequence(fieldList)]:"
 	  "~n   NameOfTable:  ~p"
@@ -605,13 +700,13 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 				TableME#me{assocList=[{table_info, 
 						       TableInfo} | make_reference(Ref)]} |
 				ColMEs]),
-    definitions_loop(RestObjs, Deprecated);
+    definitions_loop(RestObjs, Data);
 
 definitions_loop([{#mc_new_type{name         = NewTypeName,
 				macro        = Macro,
 				syntax       = OldType,
 				display_hint = DisplayHint},Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> new_type:"
 	   "~n   Macro:       ~p"
 	   "~n   NewTypeName: ~p"
@@ -632,7 +727,7 @@ definitions_loop([{#mc_new_type{name         = NewTypeName,
 						imported     = false,
 						display_hint = DisplayHint}])
     end,
-    definitions_loop(T,	Deprecated);
+    definitions_loop(T,	Data);
 
 %% Plain variable
 definitions_loop([{#mc_object_type{name        = NewVarName,
@@ -643,7 +738,7 @@ definitions_loop([{#mc_object_type{name        = NewVarName,
 				   description = Desc1, 
 				   units       = Units,
 				   name_assign = {Parent,SubIndex}},Line} |T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> object_type (variable):"
 	   "~n   NewVarName: ~p"
 	   "~n   Type:       ~p"
@@ -672,7 +767,7 @@ definitions_loop([{#mc_object_type{name        = NewVarName,
     VI = snmpc_lib:make_variable_info(NewME2), 
     snmpc_lib:add_cdata(#cdata.mes,
 			[NewME2#me{assocList = [{variable_info, VI}]}]),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_module_identity{name         = NewVarName,
 				       last_updated = LU,
@@ -682,7 +777,7 @@ definitions_loop([{#mc_module_identity{name         = NewVarName,
 				       revisions    = Revs0, 
 				       name_assign  = {Parent, SubIndex}},
 		   Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> module-identity: "
 	   "~n   NewVarName: ~p"
 	   "~n   LU:         ~p"
@@ -706,13 +801,13 @@ definitions_loop([{#mc_module_identity{name         = NewVarName,
     snmpc_lib:add_cdata(
       #cdata.mes,
       [snmpc_lib:makeInternalNode2(false, NewVarName)]),
-    definitions_loop(T, Deprecated);    
+    definitions_loop(T, Data);    
 
 definitions_loop([{#mc_internal{name      = NewVarName,
 				macro     = Macro,
 				parent    = Parent,
 				sub_index = SubIndex},Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> internal:"
 	   "~n   NewVarName: ~p"
 	   "~n   Macro:      ~p"
@@ -724,7 +819,7 @@ definitions_loop([{#mc_internal{name      = NewVarName,
     snmpc_lib:add_cdata(
       #cdata.mes,
       [snmpc_lib:makeInternalNode2(false, NewVarName)]),
-    definitions_loop(T, Deprecated);    
+    definitions_loop(T, Data);    
 
 %% A trap message
 definitions_loop([{#mc_trap{name        = TrapName,
@@ -732,7 +827,7 @@ definitions_loop([{#mc_trap{name        = TrapName,
 			    vars        = Variables, 
 			    description = Desc1,
 			    num         = SpecificCode}, Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> trap:"
 	   "~n   TrapName:     ~p"
 	   "~n   EnterPrise:   ~p"
@@ -755,7 +850,7 @@ definitions_loop([{#mc_trap{name        = TrapName,
     lists:foreach(fun(Trap2) -> snmpc_lib:check_trap(Trap2, Trap, Line) end, 
 		  CDATA#cdata.traps), 
     snmpc_lib:add_cdata(#cdata.traps, [Trap]),
-    definitions_loop(T, Deprecated);    
+    definitions_loop(T, Data);    
 
 definitions_loop([{#mc_object_type{name        = NameOfEntry, 
 				   syntax      = Type, 
@@ -763,7 +858,7 @@ definitions_loop([{#mc_object_type{name        = NameOfEntry,
 				   kind        = {table_entry, Index},
 				   status      = Estatus,
 				   name_assign = SubIndex},Eline}|T], 
-		 Deprecated) ->
+		 Data) ->
     ?vlog("defloop -> object_type (table_entry):"
 	  "~n   NameOfEntry: ~p"
 	  "~n   Type:        ~p"
@@ -777,7 +872,7 @@ definitions_loop([{#mc_object_type{name        = NameOfEntry,
     update_status(NameOfEntry, Estatus),
     snmpc_lib:print_error("Misplaced TableEntry definition (~w)",
 			  [NameOfEntry], Eline),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_notification{name   = TrapName,
 				    status = deprecated}, Line}|T],
@@ -790,19 +885,19 @@ definitions_loop([{#mc_notification{name   = TrapName,
 
 definitions_loop([{#mc_notification{name   = TrapName,
 				    status = obsolete}, Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> notification ~w is obsolete => ignored", 
 	   [TrapName], Line),
     update_status(TrapName, obsolete),
     ensure_macro_imported('NOTIFICATION-TYPE', Line),
-    definitions_loop(T, Deprecated);    
+    definitions_loop(T, Data);    
 
 definitions_loop([{#mc_notification{name        = TrapName,
 				    vars        = Variables,
 				    status      = Status,
 				    description = Desc,
 				    name_assign = {Parent, SubIndex}},Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> notification:"
 	   "~n   TrapName:  ~p"
 	   "~n   Variables: ~p"
@@ -824,13 +919,13 @@ definitions_loop([{#mc_notification{name        = TrapName,
 			  oidobjects  = Variables}, 
     snmpc_lib:check_notification(Notif, Line, CDATA#cdata.traps),
     snmpc_lib:add_cdata(#cdata.traps, [Notif]),
-    definitions_loop(T, Deprecated);    
+    definitions_loop(T, Data);    
 
-definitions_loop([{#mc_module_compliance{name = Name},Line}|T], Deprecated) ->
+definitions_loop([{#mc_module_compliance{name = Name},Line}|T], Data) ->
     ?vlog2("defloop -> module_compliance:"
 	   "~n   Name: ~p", [Name], Line),
     ensure_macro_imported('MODULE-COMPLIANCE', Line),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_object_group{name        = Name,
 				    objects     = GroupObjects,
@@ -838,7 +933,7 @@ definitions_loop([{#mc_object_group{name        = Name,
 				    description = Desc,
 				    reference   = Ref,
 				    name_assign = {Parent,SubIndex}}, Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog2("defloop -> object_group ~p:"
 	   "~n   GroupObjects: ~p"
 	   "~n   Status:       ~p"
@@ -873,7 +968,7 @@ definitions_loop([{#mc_object_group{name        = Name,
 			       {objects, GroupObjects}]},  
     snmpc_lib:add_cdata(#cdata.mes, [NewME]),
 
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_notification_group{name        = Name,
 					  objects     = GroupObjects,
@@ -882,7 +977,7 @@ definitions_loop([{#mc_notification_group{name        = Name,
 					  reference   = Ref,
 					  name_assign = {Parent,SubIndex}}, 
 		   Line}
-		  |T], Deprecated) ->
+		  |T], Data) ->
     ?vlog2("defloop -> notification_group ~p:"
 	   "~n   GroupObjects: ~p"
 	   "~n   Status:       ~p"
@@ -918,13 +1013,13 @@ definitions_loop([{#mc_notification_group{name        = Name,
 			       {objects, GroupObjects}]},  
     snmpc_lib:add_cdata(#cdata.mes, [NewME]),
 
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_object_type{name   = NameOfTable,
 				   syntax = {{sequence_of, SeqName},_},
 				   status = Tstatus},Tline}, 
 		  Entry, Seq|T],
-		Deprecated) ->
+		Data) ->
     ?vlog("defloop -> object_type (sequence_of): "
 	  "~n   NameOfTable: ~p"
 	  "~n   SeqName:     ~p"
@@ -956,12 +1051,12 @@ definitions_loop([{#mc_object_type{name   = NameOfTable,
 	      "Invalid TableEntry '~p' (check STATUS, Sequence name, Oid)",
 	      [safe_elem(1,safe_elem(2,Entry))],Tline)
     end,
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_object_type{name   = NameOfTable,
 				   syntax = {{sequence_of, SeqName},_},
 				   status = Tstatus},Tline}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vlog("defloop -> object_type (sequence_of):"
 	  "~n   object_type: ~p"
 	  "~n   sequence_of: ~p"
@@ -969,24 +1064,24 @@ definitions_loop([{#mc_object_type{name   = NameOfTable,
     update_status(NameOfTable, Tstatus),
     snmpc_lib:print_error("Invalid statements following table ~p.",
 			  [NameOfTable],Tline),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
 definitions_loop([{#mc_sequence{name   = SeqName,
 				fields = _FieldList},Line}|T],
-		 Deprecated) ->
+		 Data) ->
     ?vwarning2("Unexpected SEQUENCE ~w => ignoring", [SeqName], Line),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
-definitions_loop([{Obj,Line}|T], Deprecated) ->
+definitions_loop([{Obj,Line}|T], Data) ->
     ?vinfo2("defloop -> unknown error"
 	    "~n   Obj:  ~p", [Obj], Line),
     snmpc_lib:print_error("Unknown Error in MIB. "
 	 "Can't describe the error better than this: ~999p ignored."
 	 " Please send a trouble report to [email protected].",
 				 [Obj], Line),
-    definitions_loop(T, Deprecated);
+    definitions_loop(T, Data);
 
-definitions_loop([], _Deprecated) ->
+definitions_loop([], _Data) ->
     ?vlog("defloop -> done", []),
     ok.
 
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index b7e84e7d6b..4e5bc69f81 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -125,7 +125,8 @@ test_kibbles(Kibbles,Line) ->
 
 test_kibbles2([],_,_) ->
     ok;
-test_kibbles2([{_KibbleName,BitNo}|Ks],BitNo,Line) ->
+test_kibbles2([{_KibbleName,BitNo}|Ks],ExpectBitNo,Line)
+  when BitNo >= ExpectBitNo ->
     test_kibbles2(Ks,BitNo+1,Line);
 test_kibbles2([{_KibbleName,BitNo}|_Ks],ExpectBitNo,Line) ->
     print_error("Expected kibble no ~p but got ~p.",[ExpectBitNo,BitNo],Line).
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 30aacc0ec3..d64b5b1d53 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -2804,16 +2804,16 @@ agent_data(TargetName, CtxName) ->
 agent_data(TargetName, CtxName, Config) ->
     case snmpm_config:agent_info(TargetName, all) of
 	{ok, Info} ->
-	    {value, {_, Version}} = lists:keysearch(version, 1, Info),
+	    Version = agent_data_item(version, Info), 
 	    MsgData = 
 		case Version of
 		    v3 ->
 			DefSecModel = agent_data_item(sec_model, Info),
 			DefSecName  = agent_data_item(sec_name,  Info),
 			DefSecLevel = agent_data_item(sec_level, Info),
-				   
+			
 			EngineId    = agent_data_item(engine_id, Info),
-
+			
 			SecModel    = agent_data_item(sec_model,   
 						      Config, 
 						      DefSecModel),
@@ -2829,7 +2829,7 @@ agent_data(TargetName, CtxName, Config) ->
 		    _ ->
 			DefComm     = agent_data_item(community, Info),
 			DefSecModel = agent_data_item(sec_model, Info),
-
+			
 			Comm        = agent_data_item(community, 
 						      Config, 
 						      DefComm),
@@ -2848,8 +2848,12 @@ agent_data(TargetName, CtxName, Config) ->
     end.
 
 agent_data_item(Item, Info) ->
-    {value, {_, Val}} = lists:keysearch(Item, 1, Info),
-    Val.
+    case lists:keysearch(Item, 1, Info) of
+	{value, {_, Val}} ->
+	    Val;
+	false ->
+	    throw({error, {not_found, Item, Info}})
+    end.
 
 agent_data_item(Item, Info, Default) ->
     case lists:keysearch(Item, 1, Info) of
diff --git a/lib/snmp/src/misc/snmp_pdus.erl b/lib/snmp/src/misc/snmp_pdus.erl
index 6c80fc3876..dc8900c8cd 100644
--- a/lib/snmp/src/misc/snmp_pdus.erl
+++ b/lib/snmp/src/misc/snmp_pdus.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -38,7 +38,10 @@
 	 dec_usm_security_parameters/1,
 	 strip_encrypted_scoped_pdu_data/1,
 	 octet_str_to_bits/1, bits_to_str/1,
-	 get_encoded_length/1]).
+	 get_encoded_length/1,
+	 enc_value/2, dec_value/1]).
+
+%% -compile(export_all).
 
 %% Returns the number of octets required to encode Length.
 get_encoded_length(Length) ->
@@ -290,12 +293,18 @@ dec_value([68 | Bytes]) ->
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'Opaque', Value}, Rest};
 dec_value([70 | Bytes]) ->
+    %% Counter64 is an unsigned 64 but is actually encoded as 
+    %% a signed integer 64.
     {Value, Rest} = dec_integer_notag(Bytes),
-    if Value >= 0, Value =< 18446744073709551615 ->
-	    {{'Counter64', Value}, Rest};
-       true ->
-	    exit({error, {bad_counter64, Value}})
-    end;
+    Value2 = 
+	if
+	    (Value >= 0) andalso (Value < 16#8000000000000000) ->
+		Value;
+	    (Value < 0) ->
+		18446744073709551615 + Value + 1;
+	    true ->
+		exit({error, {bad_counter64, Value}})	end,
+    {{'Counter64', Value2}, Rest};
 dec_value([128,0|T]) ->
     {{'NULL', noSuchObject}, T};
 dec_value([129,0|T]) ->
@@ -633,6 +642,21 @@ enc_value(_Type, endOfMibView) ->
     [130,0];
 enc_value('NULL', _Val) ->
     [5,0];
+enc_value('Counter64', Val) ->
+    Val2 = 
+	if
+	    Val > 16#ffffffffffffffff ->
+		exit({error, {bad_counter64, Val}});
+	    Val >= 16#8000000000000000 ->
+		(Val band 16#7fffffffffffffff) - 16#8000000000000000;
+	    Val >= 0 ->
+		Val;
+	    true ->
+		exit({error, {bad_counter64, Val}}) 
+	end,
+    Bytes2 = enc_integer_notag(Val2),
+    Len2 = elength(length(Bytes2)),
+    lists:append([70 | Len2],Bytes2);
 enc_value(Type, Val) ->
     Bytes2 = enc_integer_notag(Val),
     Len2 = elength(length(Bytes2)),
@@ -643,10 +667,7 @@ enc_val_tag('Counter32',Val) when (Val >= 0) andalso (Val =< 4294967295) ->
 enc_val_tag('Unsigned32', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
     66;
 enc_val_tag('TimeTicks', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    67;
-enc_val_tag('Counter64', Val) when ((Val >= 0) andalso 
-				    (Val =< 18446744073709551615)) ->
-    70.
+    67.
 
 
 %%----------------------------------------------------------------------
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 19be564a8e..3508f9e1c2 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -198,7 +198,7 @@ des_encrypt(PrivKey, Data, SaltFun) ->
     [A,B,C,D,E,F,G,H | PreIV] = PrivKey,
     DesKey = [A,B,C,D,E,F,G,H],
     Salt = SaltFun(),
-    IV = snmp_misc:str_xor(PreIV, Salt),
+    IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     TailLen = (8 - (length(Data) rem 8)) rem 8,
     Tail = mk_tail(TailLen),
     EncData = crypto:des_cbc_encrypt(DesKey, IV, [Data,Tail]),
@@ -213,13 +213,13 @@ des_decrypt(PrivKey, MsgPrivParams, EncData)
     [A,B,C,D,E,F,G,H | PreIV] = PrivKey,
     DesKey = [A,B,C,D,E,F,G,H],
     Salt = MsgPrivParams,
-    IV = snmp_misc:str_xor(PreIV, Salt),
+    IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
     Data = binary_to_list(crypto:des_cbc_decrypt(DesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2};
 des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
-    ?vtrace("des_decrypt -> entry with when bad MsgPrivParams"
+    ?vtrace("des_decrypt -> entry when bad MsgPrivParams"
 	    "~n   PrivKey:          ~p"
 	    "~n   BadMsgPrivParams: ~p"
 	    "~n   EncData:          ~p", 
@@ -232,7 +232,7 @@ aes_encrypt(PrivKey, Data, SaltFun) ->
     Salt = SaltFun(),
     EngineBoots = snmp_framework_mib:get_engine_boots(),
     EngineTime = snmp_framework_mib:get_engine_time(),
-    IV = [?i32(EngineBoots), ?i32(EngineTime) | Salt],
+    IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
     EncData = crypto:aes_cfb_128_encrypt(AesKey, IV, Data),
     {ok, binary_to_list(EncData), Salt}.
 
@@ -240,7 +240,7 @@ aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
   when length(MsgPrivParams) =:= 8 ->
     AesKey = PrivKey,
     Salt = MsgPrivParams,
-    IV = [?i32(EngineBoots), ?i32(EngineTime) | Salt],
+    IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
     Data = binary_to_list(crypto:aes_cfb_128_decrypt(AesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
diff --git a/lib/snmp/test/modules.mk b/lib/snmp/test/modules.mk
index ff848cad1b..6a0c3e9481 100644
--- a/lib/snmp/test/modules.mk
+++ b/lib/snmp/test/modules.mk
@@ -1,20 +1,20 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2004-2010. 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
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 
 SUITE_MODULES = \
@@ -57,6 +57,10 @@ MODULES = \
 
 HRL_FILES = snmp_test_lib.hrl
 
+# These are MIBs that aure used by the compiler test-suite.
+COMPILER_MIB_FILES = \
+	OTP8574-MIB
+
 MIB_FILES = \
 	OLD-SNMPEA-MIB.mib \
 	OLD-SNMPEA-MIB-v2.mib \
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 9a9127a130..ad77b01362 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -46,7 +46,9 @@
 	 module_identity/1,
 
 	 tickets/1,
-	 otp_6150/1
+	 otp_6150/1,
+	 otp_8574/1, 
+	 otp_8595/1
 
 	]).
 
@@ -56,6 +58,7 @@
 -export([
         ]).
 
+
 %%----------------------------------------------------------------------
 %% Macros
 %%----------------------------------------------------------------------
@@ -98,7 +101,9 @@ all(suite) ->
 
 tickets(suite) ->
     [
-     otp_6150
+     otp_6150,
+     otp_8574,
+     otp_8595
     ].
 
 
@@ -178,6 +183,54 @@ otp_6150(Config) when is_list(Config) ->
     ok.
 
 
+otp_8574(suite) ->
+    [];
+otp_8574(Config) when is_list(Config) ->
+    put(tname,otp_8574),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(comp_dir, Config),
+    MibDir  = ?config(mib_dir,  Config),
+    MibFile = join(MibDir, "OTP8574-MIB.mib"),
+    
+    p("ensure compile fail without relaxed assign check"),
+    case snmpc:compile(MibFile, [{group_check, false}, {outdir, Dir}]) of
+	{error, compilation_failed} ->
+	    p("with relaxed assign check MIB compiles with warning"),
+	    case snmpc:compile(MibFile, [{group_check, false}, 
+					 {outdir, Dir}, 
+					 relaxed_row_name_assign_check]) of
+		{ok, _Mib} ->
+		    ok;
+		{error, Reason} ->
+		    p("unexpected compile failure: "
+		      "~n   Reason: ~p", [Reason]),
+		    exit({unexpected_compile_failure, Reason})
+	    end;
+
+	{ok, _} ->
+	    p("unexpected compile success"),
+	    exit(unexpected_compile_success)
+    end.
+
+
+otp_8595(suite) ->
+    [];
+otp_8595(Config) when is_list(Config) ->
+    put(tname,otp_8595),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(comp_dir, Config),
+    MibDir  = ?config(mib_dir,  Config),
+    MibFile = join(MibDir, "OTP8595-MIB.mib"),
+    ?line {ok, Mib} = 
+	snmpc:compile(MibFile, [{outdir,      Dir}, 
+				{verbosity,   trace}, 
+				{group_check, false}]),
+    io:format("otp_8595 -> Mib: ~n~p~n", [Mib]),
+    ok.
+
+
 %%======================================================================
 %% Internal functions
 %%======================================================================
@@ -373,6 +426,9 @@ join(A,B) ->
 %% p(F) ->
 %%     p(F, []).
 
+p(F) ->
+    p(F, []).
+
 p(F, A) ->
     p(get(tname), F, A).
 
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index fcb3d7e30c..d5dc1387f7 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1444,10 +1444,9 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
     p("[test 54] write usm config file with invalid auth-key (4)"),
     Usm54 = setelement(4, Usm51, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,kalle]"),
     write_usm_conf(ConfDir, [Usm54]),
-    %% ?line ok = crypto:start(),  %% Varf�r k�r den redan?
-    ?line crypto:start(),  %% Make sure it's started...
+    ?line maybe_start_crypto(),  %% Make sure it's started...
     ?line {error, Reason54} = config_start(Opts),
-    ?line ok = crypto:stop(),
+    ?line ok = maybe_stop_crypto(),
     p("start failed (as expected): ~p", [Reason54]),
     ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason54,
     await_config_not_running(),
@@ -1492,21 +1491,35 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
     p("[test 59] write usm config file with invalid auth-key (9)"),
     Usm59 = setelement(4, Usm57, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,ka]"),
     write_usm_conf(ConfDir, [Usm59]),
-    ?line ok = crypto:start(),
+    ?line ok = maybe_start_crypto(),
     ?line {error, Reason59} = config_start(Opts),
-    ?line ok = crypto:stop(),
+    ?line ok = maybe_stop_crypto(),
     p("start failed (as expected): ~p", [Reason59]),
     ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason59,
     await_config_not_running(),
 
     %% --
-    p("[test 5A] write usm config file with valid auth-key when crypto not started (10)"),
-    Usm5A = setelement(4, Usm57, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]"),
-    write_usm_conf(ConfDir, [Usm5A]),
-    ?line {error, Reason5A} = config_start(Opts),
-    p("start failed (as expected): ~p", [Reason5A]),
-    ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason5A,
-    await_config_not_running(),
+    %% <CRYPTO-MODIFICATIONS>
+    %% The crypto application do no longer need to be started
+    %% explicitly (all of it is as of R14 implemented with NIFs).
+    case (catch crypto:version()) of
+	{'EXIT', {undef, _}} ->
+	    p("[test 5A] write usm config file with valid auth-key "
+	      "when crypto not started (10)"),
+	    Usm5A = setelement(4, 
+			       Usm57, 
+			       "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]"),
+	    write_usm_conf(ConfDir, [Usm5A]),
+	    ?line {error, Reason5A} = config_start(Opts),
+	    p("start failed (as expected): ~p", [Reason5A]),
+	    ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason5A,
+	    await_config_not_running();
+	_ ->
+	    %% This function is only present in version 2.0 or greater.
+	    %% The crypto app no longer needs to be explicitly started
+	    ok
+    end,
+    %% </CRYPTO-MODIFICATIONS>
 
     %% --
     p("[test 61] write usm config file with invalid priv-protocol (1)"),
@@ -1566,9 +1579,9 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
     p("[test 74] write usm config file with invalid priv-key (4)"),
     Usm74 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,kalle]"),
     write_usm_conf(ConfDir, [Usm74]),
-    ?line ok = crypto:start(),
+    ?line ok = maybe_start_crypto(),
     ?line {error, Reason74} = config_start(Opts),
-    ?line ok = crypto:stop(),
+    ?line ok = maybe_stop_crypto(),
     p("start failed (as expected): ~p", [Reason74]),
     ?line {failed_check, _, _, _, {invalid_priv_key, _}} = Reason74,
     await_config_not_running(),
@@ -1592,15 +1605,27 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
     await_config_not_running(),
 
     %% --
-    p("[test 77] write usm config file with valid priv-key when crypto not started (7)"),
-    Usm77 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6]"),
-    write_usm_conf(ConfDir, [Usm77]),
-    ?line {error, Reason77} = config_start(Opts),
-    p("start failed (as expected): ~p", [Reason77]),
-    ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason77,
-    await_config_not_running(),
+    %% <CRYPTO-MODIFICATIONS>
+    %% The crypto application do no longer need to be started
+    %% explicitly (all of it is as of R14 implemented with NIFs).
+    case (catch crypto:version()) of
+	{'EXIT', {undef, _}} ->
+	    p("[test 77] write usm config file with valid priv-key "
+	      "when crypto not started (7)"),
+	    Usm77 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6]"),
+	    write_usm_conf(ConfDir, [Usm77]),
+	    ?line {error, Reason77} = config_start(Opts),
+	    p("start failed (as expected): ~p", [Reason77]),
+	    ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason77,
+	    await_config_not_running();
+	_ ->
+	    %% This function is only present in version 2.0 or greater.
+	    %% The crypto app no longer needs to be explicitly started
+	    ok
+    end,
+    %% </CRYPTO-MODIFICATIONS>
 
-     %% --
+    %% --
     p("[test 78] write usm config file with invalid usm (1)"),
     write_usm_conf2(ConfDir, "{\"bmkEngine\", \"swiusmcf\"}."),
     ?line {error, Reason81} = config_start(Opts),
@@ -2676,6 +2701,27 @@ write_conf_file(Dir, File, Str) ->
     file:close(Fd).
 
 
+maybe_start_crypto() ->
+    case (catch crypto:version()) of
+	{'EXIT', {undef, _}} ->
+	    %% This is the version of crypto before the NIFs...
+	    ?CRYPTO_START();
+	_ ->
+	    %% No need to start this version of crypto..
+	    ok
+    end.
+
+maybe_stop_crypto() ->
+    case (catch crypto:version()) of
+	{'EXIT', {undef, _}} ->
+	    %% This is the version of crypto before the NIFs...
+	    crypto:stop();
+	_ ->
+	    %% There is nothing to stop in this version of crypto..
+	    ok
+    end.
+
+
 %% ------
 
 str(X) ->
diff --git a/lib/snmp/test/snmp_pdus_test.erl b/lib/snmp/test/snmp_pdus_test.erl
index d5add50f52..6dc5b779aa 100644
--- a/lib/snmp/test/snmp_pdus_test.erl
+++ b/lib/snmp/test/snmp_pdus_test.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -37,6 +37,7 @@
 	 all/1, 
 	 tickets/1,
 	 otp7575/1,
+	 otp8563/1, 
          init_per_testcase/2, fin_per_testcase/2
 	]).
 
@@ -66,6 +67,7 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
 fin_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
+
 %%======================================================================
 %% Test case definitions
 %%======================================================================
@@ -76,7 +78,8 @@ all(suite) ->
 
 tickets(suite) ->
     [
-     otp7575
+     otp7575,
+     otp8563
     ].
 
 
@@ -118,6 +121,55 @@ otp7575(Config) when is_list(Config) ->
     ok.
 
 
+otp8563(suite) -> [];
+otp8563(doc) -> ["OTP-8563"];
+otp8563(Config) when is_list(Config) ->
+    Val1 = 16#7fffffffffffffff,
+    io:format("try encode and decode ~w~n", [Val1]),
+    Enc1 = snmp_pdus:enc_value('Counter64', Val1), 
+    {{'Counter64', Val1}, []} = snmp_pdus:dec_value(Enc1), 
+
+    Val2 = Val1 + 1,
+    io:format("try encode and decode ~w~n", [Val2]),
+    Enc2 = snmp_pdus:enc_value('Counter64', Val2), 
+    {{'Counter64', Val2}, []} = snmp_pdus:dec_value(Enc2), 
+
+    Val3 = Val2 + 1,
+    io:format("try encode and decode ~w~n", [Val3]),
+    Enc3 = snmp_pdus:enc_value('Counter64', Val3), 
+    {{'Counter64', Val3}, []} = snmp_pdus:dec_value(Enc3), 
+
+    Val4 = 16#fffffffffffffffe,
+    io:format("try encode and decode ~w~n", [Val4]),
+    Enc4 = snmp_pdus:enc_value('Counter64', Val4), 
+    {{'Counter64', Val4}, []} = snmp_pdus:dec_value(Enc4), 
+
+    Val5 = Val4 + 1,
+    io:format("try encode and decode ~w~n", [Val5]),
+    Enc5 = snmp_pdus:enc_value('Counter64', Val5), 
+    {{'Counter64', Val5}, []} = snmp_pdus:dec_value(Enc5), 
+
+    Val6 = 16#ffffffffffffffff + 1, 
+    io:format("try and fail to encode ~w~n", [Val6]),
+    case (catch snmp_pdus:enc_value('Counter64', Val6)) of
+	{'EXIT', {error, {bad_counter64, Val6}}} ->
+	    ok;
+	Unexpected6 ->
+	    exit({unexpected_encode_result, Unexpected6, Val6})
+    end,
+
+    Val7 = -1, 
+    io:format("try and fail to encode ~w~n", [Val7]),
+    case (catch snmp_pdus:enc_value('Counter64', Val7)) of
+	{'EXIT', {error, {bad_counter64, Val7}}} ->
+	    ok;
+	Unexpected7 ->
+	    exit({unexpected_encode_result, Unexpected7, Val7})
+    end,
+    
+    ok.
+
+
 %%======================================================================
 %% Internal functions
 %%======================================================================
diff --git a/lib/snmp/test/snmp_test_data/OLD-SNMPEA-MIB.mib b/lib/snmp/test/snmp_test_data/OLD-SNMPEA-MIB.mib
index dd90d0ab50..2ba1a6fd67 100644
--- a/lib/snmp/test/snmp_test_data/OLD-SNMPEA-MIB.mib
+++ b/lib/snmp/test/snmp_test_data/OLD-SNMPEA-MIB.mib
@@ -12,18 +12,12 @@ OLD-SNMPEA-MIB DEFINITIONS ::= BEGIN
 		;
  
 --   MODULE-IDENTITY
---   LAST-UPDATED "9709220900Z"
---   ORGANIZATION "ETX/DN/S"
---   CONTACT-INFO
---      "            Martin Bj�rklund
---
---           Postal: ERICSSON SOFTWARE TECHNOLOGY AB
---                   ERLANG SYSTEMS
---                   Box 1214
---                   S-164 28  KISTA, SWEDEN
---
---              Tel: +46  8 719 20 89
---           E-mail: [email protected]"
+--   LAST-UPDATED "1004200000Z"
+--   ORGANIZATION "Erlang/OTP"
+--   CONTACT-INFO ""
+--   DESCRIPTION
+--       "Header cleanup."
+--   REVISION     "1004200000Z"
 --   DESCRIPTION
 --       "This MIB module defines MIB objects for the SNMPEA
 --       component in OTP."
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index e6220f9241..ef1ba0b948 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -101,8 +101,8 @@ init_packet(Parent, SnmpMgr,
 
 init_debug(Dbg) when is_atom(Dbg) ->
     put(debug,Dbg),
-    put(verbosity,silence);
-    %% put(verbosity,trace);
+    %% put(verbosity, silence);
+    put(verbosity, trace);
 init_debug(DbgOptions) when is_list(DbgOptions) ->
     case lists:keysearch(debug, 1, DbgOptions) of
 	{value, {_, Dbg}} when is_atom(Dbg) ->
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 50c72b33b5..c3704bf6c9 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -17,11 +17,15 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.16.1
+SNMP_VSN = 4.16.2
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
 
-TICKETS = OTP-8480 OTP-8481
+TICKETS = OTP-8563 OTP-8574 OTP-8594 OTP-8595 OTP-8646 OTP-8648
+
+TICKETS_4_16_1 = \
+	OTP-8480 \
+	OTP-8481
 
 TICKETS_4_16 = \
 	OTP-8395 \