diff options
| author | Colin Smith <colin@pfsense.org> | 2005-08-03 07:15:38 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-08-03 07:15:38 +0000 |
| commit | 7822d9660ccf2116b3377fefb4c23f680bb648b4 (patch) | |
| tree | 824a83c4c2d47201e1679693487e01fbc68cf2aa /etc | |
| parent | 909d8f12bfb6bcf7497eacc684ebdd16ee4d4109 (diff) | |
| download | pfsense-7822d9660ccf2116b3377fefb4c23f680bb648b4.zip pfsense-7822d9660ccf2116b3377fefb4c23f680bb648b4.tar.gz | |
return_filename_as_string -> file_get_contents
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.bootup | 2 | ||||
| -rwxr-xr-x | etc/sshd | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index 1235ec9..214c2cf 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -40,7 +40,7 @@ touch("{$g['varrun_path']}/booting"); if($g['platform'] == "cdrom") { - $motd = trim(return_filename_as_string("/etc/motd")); + $motd = trim(file_get_contents("/etc/motd")); if(strlen($motd) > 2) echo "\n{$motd}\n\n"; } @@ -113,17 +113,17 @@ system("/usr/bin/ssh-keygen -t dsa -N '' -f $sshConfigDir/ssh_host_dsa_key"); /* save keys */ - $dsa = return_filename_as_string("{$sshConfigDir}/ssh_host_dsa_key"); - $rsa = return_filename_as_string("{$sshConfigDir}/ssh_host_rsa_key"); - $rsa1 = return_filename_as_string("{$sshConfigDir}/ssh_host_key"); + $dsa = file_get_contents("{$sshConfigDir}/ssh_host_dsa_key"); + $rsa = file_get_contents("{$sshConfigDir}/ssh_host_rsa_key"); + $rsa1 = file_get_contents("{$sshConfigDir}/ssh_host_key"); $config['ssh']['dsa'] = base64_encode($dsa); $config['ssh']['rsa'] = base64_encode($rsa); $config['ssh']['rsa1']= base64_encode($rsa1); /* save public keys */ - $dsapub = return_filename_as_string("{$sshConfigDir}/ssh_host_dsa_key.pub"); - $rsapub = return_filename_as_string("{$sshConfigDir}/ssh_host_rsa_key.pub"); - $rsa1pub = return_filename_as_string("{$sshConfigDir}/ssh_host_key.pub"); + $dsapub = file_get_contents("{$sshConfigDir}/ssh_host_dsa_key.pub"); + $rsapub = file_get_contents("{$sshConfigDir}/ssh_host_rsa_key.pub"); + $rsa1pub = file_get_contents("{$sshConfigDir}/ssh_host_key.pub"); $config['ssh']['dsa_key'] = base64_encode($dsapub); $config['ssh']['rsa_key'] = base64_encode($rsapub); $config['ssh']['rsa1_key']= base64_encode($rsa1pub); @@ -176,4 +176,4 @@ system("/usr/sbin/sshd"); fwrite($stderr, "Done.\n"); -?>
\ No newline at end of file +?> |
