mirror of
https://github.com/apache/httpd.git
synced 2025-08-13 14:40:20 +00:00
Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -107,6 +107,8 @@ static int set_group_privs(void)
|
||||
else
|
||||
name = ap_unixd_config.user_name;
|
||||
|
||||
#if !defined(OS2)
|
||||
/* OS/2 doesn't support groups. */
|
||||
/*
|
||||
* Set the GID before initgroups(), since on some platforms
|
||||
* setgid() is known to zap the group list.
|
||||
@ -126,6 +128,7 @@ static int set_group_privs(void)
|
||||
"and Group %u", name, (unsigned)ap_unixd_config.group_id);
|
||||
return -1;
|
||||
}
|
||||
#endif /* !defined(OS2) */
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -210,7 +213,7 @@ unixd_set_user(cmd_parms *cmd, void *dummy,
|
||||
|
||||
ap_unixd_config.user_name = arg;
|
||||
ap_unixd_config.user_id = ap_uname2id(arg);
|
||||
#if !defined (BIG_SECURITY_HOLE)
|
||||
#if !defined (BIG_SECURITY_HOLE) && !defined (OS2)
|
||||
if (ap_unixd_config.user_id == 0) {
|
||||
return "Error:\tApache has not been designed to serve pages while\n"
|
||||
"\trunning as root. There are known race conditions that\n"
|
||||
|
Reference in New Issue
Block a user