Indefero Commit Details

Date:

2010-02-27 15:09:51 (14 years 9 months ago)

Author:

Loic d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

b9d8eeea9e202813302e7fcba1d31f11461b5073

Parents:

75777daf4ba1654bccd954f22082435fc998daa4

Message:

Fixed to catch the error output of the key check.

Changes:

File differences

-213
214 214
215 215
216 
216
217 217
218 218
219 219
+            $tmpfile = Pluf::f('tmp_folder', '/tmp').$user.'-key';␊
            file_put_contents($tmpfile, $key, LOCK_EX);␊
            $cmd = Pluf::f('idf_exec_cmd_prefix', '').␊
                'ssh-keygen -l -f '.escapeshellarg($tmpfile);␊
                'ssh-keygen -l -f '.escapeshellarg($tmpfile).' > /dev/null 2>&1';␊
            exec($cmd, $out, $return);␊
            unlink($tmpfile);␊
            if ($return != 0) {␊
             $tmpfile = Pluf::f('tmp_folder', '/tmp').$user.'-key';␊
             file_put_contents($tmpfile, $key, LOCK_EX);␊
             $cmd = Pluf::f('idf_exec_cmd_prefix', '').␊
-                'ssh-keygen -l -f '.escapeshellarg($tmpfile);␊
+                'ssh-keygen -l -f '.escapeshellarg($tmpfile).' > /dev/null 2>&1';␊
             exec($cmd, $out, $return);␊
             unlink($tmpfile);␊
             if ($return != 0) {␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags