diff options
| author | Alexander Barton <alex@barton.de> | 2012-10-11 14:54:13 +0000 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-10-11 14:54:13 +0000 |
| commit | e0da56fc7b1dae4e21dfda7e0ac8ad7594135986 (patch) | |
| tree | 9126766a38c2d5778727dd0176bacd9fac1fd62a /src | |
| parent | cdaaae0cb2c2b30db8bb61506a826ff87c58f7c8 (diff) | |
| download | ngircd-e0da56fc7b1dae4e21dfda7e0ac8ad7594135986.tar.gz ngircd-e0da56fc7b1dae4e21dfda7e0ac8ad7594135986.zip | |
Disable UID/GID checks on "single user OS"
Don't abort on "single user operating systems" that don't know more than one user account and therefore can't change user and group IDs. Currently, the only such system supported by ngIRCd is Haiku, a BeOS clone.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/ngircd.c | 6 | ||||
| -rw-r--r-- | src/portab/portab.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 50d91ce8..f016b6aa 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -567,6 +567,8 @@ Setup_FDStreams(int fd) } /* Setup_FDStreams */ +#if !defined(SINGLE_USER_OS) + /** * Get user and group ID of unprivileged "nobody" user. * @@ -606,6 +608,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) return true; } /* NGIRCd_getNobodyID */ +#endif + static bool Random_Init_Kern(const char *file) @@ -692,6 +696,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) } } +#if !defined(SINGLE_USER_OS) /* Check user ID */ if (Conf_UID == 0) { pwd = getpwuid(0); @@ -718,6 +723,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } } +#endif /* Change user ID */ if (getuid() != Conf_UID) { diff --git a/src/portab/portab.h b/src/portab/portab.h index 1c6e3f85..208d3500 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -112,7 +112,6 @@ typedef unsigned char bool; /* SPLint */ - #ifdef S_SPLINT_S #include "splint.h" #endif @@ -132,6 +131,9 @@ typedef unsigned char bool; #define HOST_VENDOR "unknown" #endif +#ifdef __HAIKU__ +#define SINGLE_USER_OS +#endif /* configure options */ |