1998-02-05
1998-02-05 00:59:28 by Johan Schön <js@opera.com>
-
c79b26cc976d5492815f4b76df7ea6ed0c03f91a
(17 lines)
(+15/-2)
[
Show
| Annotate
]
Branch: 5.2
Fixes for NT
Rev: server/base_server/config/describers.pike:1.53
Rev: server/base_server/config/low_describers.pike:1.20
Rev: server/base_server/configuration.pike:1.93
Rev: server/base_server/dummy_hosts.pike:1.4
Rev: server/base_server/mainconfig.pike:1.92
Rev: server/base_server/read_config.pike:1.19
Rev: server/base_server/roxen.pike:1.164
Rev: server/base_server/roxenloader.pike:1.56
Rev: server/config_actions/openports.pike:1.9
Rev: server/config_actions/problems.pike:1.11
Rev: server/config_actions/proc.pike:1.7
Rev: server/modules/graphics/graphic_text.pike:1.100
Rev: server/modules/tags/htmlparse.pike:1.75
Rev: server/protocols/http.pike:1.53
Rev: server/roxen-images/urtavla.ppm:1.6
1:
- string cvs_version = "$Id: configuration.pike,v 1.92 1998/02/04 16:10:37 per Exp $";
+ string cvs_version = "$Id: configuration.pike,v 1.93 1998/02/05 00:59:14 js Exp $";
#include <module.h>
#include <roxen.h>
509:
#endif
object lf=open( logfile, "wac");
#if efun(chmod)
+ #if efun(geteuid)
if(geteuid() != getuid()) chmod(logfile,0666);
#endif
-
+ #endif
if(!lf) {
mkdirhier(logfile);
if(!(lf=open( logfile, "wac"))) {
2098:
}
}
}
- #if efun(gethostbyname) && efun(gethostname)
+ #if efun(gethostbyname)
+ #if efun(gethostname)
if(!s) {
f = gethostbyname(gethostname()); // First try..
if(f)
2119: Inside #if efun(gethostbyname) && efun(gethostname)
}
}
#endif
+ #endif
if(!s) {
t = Stdio.read_bytes("/etc/resolv.conf");
if(t) {
2523:
if(port[2] && port[2]!="ANY")
prt += port[2];
else
+ #if efun(gethostname)
prt += (gethostname()/".")[0] + "." + QUERY(Domain);
-
+ #else
+ ;
+ #endif
prt += ":"+port[0]+"/";
if(port_open( port ))
res += "<font color=darkblue><b>Open:</b></font> <a target=server_view href=\""+prt+"\">"+prt+"</a> \n<br>";
2556:
private string get_my_url()
{
string s;
+ #if efun(gethostname)
s = (gethostname()/".")[0] + "." + query("Domain");
s -= "\n";
-
+ #else
+ s = "localhost";
+ #endif
return "http://" + s + "/";
}