1998-02-05
1998-02-05 00:59:28 by Johan Schön <js@opera.com>
-
c79b26cc976d5492815f4b76df7ea6ed0c03f91a
(34 lines)
(+27/-7)
[
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:
- constant cvs_version = "$Id: roxen.pike,v 1.163 1998/02/04 16:10:40 per Exp $";
+ constant cvs_version = "$Id: roxen.pike,v 1.164 1998/02/05 00:59:18 js Exp $";
#define IN_ROXEN
#include <roxen.h>
#include <config.h>
9:
#include <variables.h>
inherit "read_config";
-
+ #ifdef __NT__
+ #define NO_DNS
+ #endif
#ifdef NO_DNS
inherit "dummy_hosts";
#else
298:
if(!port_no)
{
port = Stdio.Port( "stdin", accept_callback );
-
+ port->set_id(port);
if(port->errno())
{
report_error("Cannot listen to stdin.\n"
306:
}
} else {
port = Stdio.Port();
+ port->set_id(port);
if(!stringp(ether) || (lower_case(ether) == "any"))
ether=0;
if(ether)
363:
};
loading_config_interface = 0;
if(!configuration_interface_obj) {
- report_error(sprintf("Failed to load the configuration interface!\n"
- "%s\n", describe_backtrace(err)));
+ report_error(sprintf("Failed to load the configuration interface!\n"));
}
}
return configuration_interface_obj;
560:
Stdio.write_file("etc/supports", new);
old = Stdio.read_bytes( "etc/supports" );
#if efun(chmod)
+ #if efun(geteuid)
if(geteuid() != getuid()) chmod("etc/supports",0660);
#endif
-
+ #endif
if(old != new)
{
perror("FAILED to update the supports file.\n");
937:
void kill_me()
{
// Change to root user if possible ( to kill the start script... )
+ #if efun(seteuid)
seteuid(getuid());
setegid(getgid());
-
+ #endif
+ #if efun(setuid)
setuid(0);
-
+ #endif
stop_all_modules();
if(main_configuration_port && objectp(main_configuration_port))
1101:
// ConfigurationURL is set by the 'install' script.
if(!(!l && sscanf(QUERY(ConfigurationURL), "http://%s:%*s", s)))
{
- #if efun(gethostbyname) && efun(gethostname)
+ #if efun(gethostbyname)
+ #if efun(gethostname)
f = gethostbyname(gethostname()); // First try..
if(f)
foreach(f, f) if (arrayp(f)) {
1110: Inside #if efun(gethostbyname) && efun(gethostname)
s=t;
}
#endif
+ #endif
if(!s)
{
t = read_bytes("/etc/resolv.conf");
1143:
private string get_my_url()
{
string s;
+ #if efun(gethostname)
s = (gethostname()/".")[0] + "." + query("Domain");
-
+ #else
+ s = "localhost";
+ #endif
s -= "\n";
return "http://" + s + "/";
}
1156:
int set_u_and_gid()
{
+ #ifndef __NT__
string u, g;
array pw;
1195:
return 1;
}
}
+ #endif
}
static mapping __vars = ([ ]);
2111:
private void fix_root(string to)
{
+ #ifndef __NT__
if(getuid())
{
perror("It is impossible to chroot() if the server is not run as root.\n");
2126:
return;
}
perror("Root is now "+to+".\n");
+ #endif
}
void create_pid_file(string where)
{
-
+ #ifndef __NT__
if(!where) return;
where = replace(where, ({ "$pid", "$uid" }),
({ (string)getpid(), (string)getuid() }));
2137:
rm(where);
if(catch(Stdio.write_file(where, sprintf("%d\n%d", getpid(), getppid()))))
perror("I cannot create the pid file ("+where+").\n");
+ #endif
}
void init_shuffler();