1.0.22 - Small bugfixes to the new functions to close files or sessions

Author: CamFlyerCH

FileShareUtils/FileShareUtils.psd1

@@ -254,7 +254,7 @@ public class Netapi
 		ref Int32 resume_handle); 
 
     [DllImport("Netapi32.dll", CharSet = CharSet.Unicode)]
-    public extern static int NetFileClose(string servername, int fileid);
+    public extern static int NetFileClose(string servername, uint fileid);
 
 	[DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
 	public static extern bool GetSecurityDescriptorDacl(
@@ -664,7 +664,7 @@ Function Get-NetShares{
             }
         }
 
-        $Shares | Sort-Object Path
+        $Shares | Sort-Object Path,Name
 
         # Cleanup memory
         [Netapi]::NetApiBufferFree($buffer) | Out-Null
@@ -1068,7 +1068,7 @@ Function Set-NetShare{
 
         If($PSBoundParameters.ContainsKey('Permissions')){
             If($Permissions){
-                # Cenvert and sort given permissions
+                # Convert and sort given permissions
                 $NewACL = Convert-ACLTextToShareACL $Permissions
                 $NewShareACLText = Convert-ShareACLToText $NewACL $True
 
@@ -1517,7 +1517,7 @@ Function Close-NetSession{
             Force-closes an open session on a server
 
         .DESCRIPTION
-            Closes an open session on a local or remote computer by user or client (IP seams to work)
+            Closes an open session on a local or remote computer by specifying user AND client IP
             by using the NetAPI32.dll (without WMI)
 
         .PARAMETER Server
@@ -1536,19 +1536,19 @@ Function Close-NetSession{
                 1.0 //First version 23.03.2020
 
         .EXAMPLE
-            Close-NetSession -Server 'srv1234' -User 'TestUser'
+            Close-NetSession -Server 'srv1234' -User 'TestUser' -ClientIP '11.22.33.44'
 
             Description
             -----------
-            Closes the open session(s) of user "TestUser" on server srv1234
+            Closes the open session(s) of user "TestUser" comming from IP 11.22.33.44 on server srv1234
     #>
 	[CmdletBinding()]
     Param (
         [Parameter(Position=0,Mandatory=$False,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
         [string]$Server = ($env:computername).toLower(),
-        [Parameter(Position=1,Mandatory=$False,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
+        [Parameter(Position=1,Mandatory=$True,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
         [string]$User,
-        [Parameter(Position=2,Mandatory=$False,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
+        [Parameter(Position=2,Mandatory=$True,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
         [string]$ClientIP
     )
     Begin {
@@ -1559,7 +1559,7 @@ Function Close-NetSession{
         $return = [Netapi]::NetSessionDel($Server,$ClientIPUNC,$User)
 
         If($return -ne 0){
-            Throw ("Error during NetSessionDel for user $User or/and client $ClientIP on $Server : " + (Get-NetAPIReturnInfo $return))
+            Throw ("Error during NetSessionDel for user $User and client $ClientIP on $Server : " + (Get-NetAPIReturnInfo $return))
         }
     }
 }
@@ -1712,7 +1712,7 @@ Function Close-NetOpenFiles{
         [Parameter(Position=0,Mandatory=$False,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
         [string]$Server = ($env:computername).toLower(),
         [Parameter(Position=1,Mandatory=$True,ValueFromPipeline=$True,ValueFromPipelineByPropertyName=$True)]
-        [Int]$FileID
+        [UInt32]$FileID
     )
     Begin {
         $return = [Netapi]::NetFileClose($Server,$FileID)

FileShareUtils/FileShareUtils.psm1

@@ -194,15 +194,15 @@ ConnectionType | This can be empty or showing the SMB version used (only with Le
 
 #### Close-NetSession [[-Server] \<string>] [-User] \<string> [-ClientIP] \<string>
 
-Closes an open session on a local or remote computer by user or client (IP seams to work). You have to specify a username or a client IP or both.
+Closes an open session on a local or remote computer by user AND client IP.
 
 The following parameters 
 
 Property | Description
 ---------|----------
 Server | The machine hosting the sessions, default is the local machine
-User | The name of the user
-ClientIP | The IP address of the client (find out with Get-NetSessions)
+**&#42; User** | The name of the user
+**&#42; ClientIP** | The IP address of the client (find out with Get-NetSessions)
 
 
 This function returns nothing.
@@ -213,7 +213,7 @@ This function returns nothing.
 
 With this command you get a sorted (by path and user) list of all over SMB opened files on the machine or on a specified server.  
 By specifying the left part of the local path the list is filtered to this path and subfolders.
-By adding the option -WithID the returned values contain also a FileID that can be used to use Close-NetSession
+By adding the option -WithID the returned values contain also a FileID that can be used to use Close-NetOpenFiles
 
 The returned array of objects will have the following properties:
 
@@ -229,7 +229,7 @@ FileID | ID of the open file (only with option -WithID)
 
 #### Close-NetOpenFiles [[-Server] \<string>] [-FileID] \<int>
 
-Closes an open session on a local or remote computer by user or client (IP seams to work). You have to specify a username or a client IP or both.
+Closes an open file or folder from a local or remote computer.
 
 The following parameters