Merge remote-tracking branch 'origin/master'

pydio · Dec 17, 2013 · 72b8bfe · 72b8bfe
2 parents cfc2676 + e5f159f
commit 72b8bfe
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php b/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
@@ -189,6 +189,8 @@ public function detectRemoteUserId($repoObject)
 		if ($ssh2->login($user, $pass)) {
 			$output = $ssh2->exec( 'id' );
 
+			$ssh2->disconnect();
+
 			if (trim($output != "")) {
 				$res = sscanf($output, "uid=%i(%s) gid=%i(%s) groups=%i(%s)");
 				preg_match_all("/(\w*)=(\w*)\((\w*)\)/", $output, $matches);
@@ -199,9 +201,9 @@ public function detectRemoteUserId($repoObject)
 					return array($uid, $gid);
 				}
 			}
-
-			$ssh2->disconnect();
 		}
+		unset($ssh2);
+
 		return array(null,null);
 	}