Prüfung des eingegebenen SSH-Key war fehlerhaft, jetzt korrigiert (37795a6)

@@ -286,8 +286,10 @@ function newkey($pubkey, $handle)
   $keyfile = $key_dir.'/'.$handle.'.pub';
   file_put_contents($keyfile, $pubkey);
   
-  $proc = popen("/usr/bin/ssh-keygen -l -f '{$keyfile}'", 'r');
+  DEBUG("checking public key $keyfile");
+  $proc = popen("/usr/bin/ssh-keygen -l -f '{$keyfile}' 2>&1", 'r');
   $output = fread($proc, 512);
+  DEBUG($output);
   pclose($proc);
   if (preg_match('/.* is not a public key file.*/', $output)) {
     unlink($keyfile);


...	...	@@ -286,8 +286,10 @@ function newkey($pubkey, $handle)
286	286	$keyfile = $key_dir.'/'.$handle.'.pub';
287	287	file_put_contents($keyfile, $pubkey);
288	288
289		- $proc = popen("/usr/bin/ssh-keygen -l -f '{$keyfile}'", 'r');
	289	+ DEBUG("checking public key $keyfile");
	290	+ $proc = popen("/usr/bin/ssh-keygen -l -f '{$keyfile}' 2>&1", 'r');
290	291	$output = fread($proc, 512);
	292	+ DEBUG($output);
291	293	pclose($proc);
292	294	if (preg_match('/.* is not a public key file.*/', $output)) {
293	295	unlink($keyfile);
294	296

webinterface.git