Merge pull request #31 from sawest/master

version 6.0.6

ActiveDirectory.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="06.00.04">
+    <package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="06.00.06">
       <friendlyName>DNN_ActiveDirectoryAuthentication</friendlyName>
       <description>The DotNetNuke Active Directory Authentication Project is an Authentication provider for DotNetNuke that uses the Windows 
         Active Directory authentication protocol to authenticate users.
@@ -33,7 +33,7 @@
             <assembly>
               <path>bin\Providers</path>
               <name>DotNetNuke.Authentication.ActiveDirectory.dll</name>
-              <version>06.00.04</version>
+              <version>06.00.06</version>
             </assembly>
             <assembly>
               <path>bin</path>

AssemblyInfo.vb

@@ -29,7 +29,7 @@ Imports System.Runtime.InteropServices
 '
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("06.00.04.7")> 
+' <Assembly: AssemblyVersion("06.00.06.1")> 
 
-<Assembly: AssemblyVersion("06.00.04.7")>
-<Assembly: AssemblyFileVersion("06.00.04.7")>
+<Assembly: AssemblyVersion("06.00.06.1")>
+<Assembly: AssemblyFileVersion("06.00.06.1")>

Providers/ADSIProvider/CrossReferenceCollection.vb

@@ -34,12 +34,12 @@ Namespace DotNetNuke.Authentication.ActiveDirectory.ADSI
         '''     [tamttt]	08/01/2004	Created
         ''' </history>
         ''' -------------------------------------------------------------------
-            Public Structure CrossReference
+        Public Class CrossReference
             Friend mDomainPath As String
             Friend mCanonicalName As String
             Friend mNetBIOSName As String
 
-            Friend Sub New (ByVal Path As String, ByVal NetBIOS As String, ByVal Canonical As String)
+            Friend Sub New(ByVal Path As String, ByVal NetBIOS As String, ByVal Canonical As String)
                 mDomainPath = Path
                 mCanonicalName = Canonical
                 mNetBIOSName = NetBIOS
@@ -62,7 +62,7 @@ Namespace DotNetNuke.Authentication.ActiveDirectory.ADSI
                     Return mNetBIOSName
                 End Get
             End Property
-        End Structure
+        End Class
 
         ' Allows access to items by both NetBiosName or CanonicalName
         Private mNetBIOSLookup As Hashtable = New Hashtable

Providers/ADSIProvider/Utilities.vb

@@ -315,7 +315,11 @@ Namespace DotNetNuke.Authentication.ActiveDirectory.ADSI
             ' Only access CrossRefCollection if LDAP is accessible
             If Not config.RefCollection Is Nothing AndAlso config.RefCollection.Count > 0 Then
                 Dim refObject As CrossReferenceCollection.CrossReference = config.RefCollection.Item(CanonicalName)
-                Return refObject.mNetBIOSName
+                If Not refObject Is Nothing Then
+                    Return refObject.mNetBIOSName
+                Else
+                    Return ""
+                End If
             Else
                 Return ""
             End If

version.txt

@@ -1 +1 @@
-6.0.4.7
+6.0.6.1