X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=f016b6aa88e9a4a4de167d78e02dea523c51e32b;hb=92fba63ad88e0a3260c75468fb3407fae7074dc6;hp=a4c2fe8aabc07c72ff5fa00b21330ea087612856;hpb=bb20aeb9bcbb27eda540a6df2faf2d07e71d23f3;p=ngircd-alex.git diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index a4c2fe8a..f016b6aa 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -351,6 +351,13 @@ Fill_Version(void) { NGIRCd_VersionAddition[0] = '\0'; +#ifdef ICONV + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", + sizeof NGIRCd_VersionAddition); + strlcat(NGIRCd_VersionAddition, "CHARCONV", + sizeof NGIRCd_VersionAddition); +#endif #ifdef DEBUG if (NGIRCd_VersionAddition[0]) strlcat(NGIRCd_VersionAddition, "+", @@ -560,6 +567,8 @@ Setup_FDStreams(int fd) } /* Setup_FDStreams */ +#if !defined(SINGLE_USER_OS) + /** * Get user and group ID of unprivileged "nobody" user. * @@ -599,6 +608,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) return true; } /* NGIRCd_getNobodyID */ +#endif + static bool Random_Init_Kern(const char *file) @@ -685,6 +696,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) } } +#if !defined(SINGLE_USER_OS) /* Check user ID */ if (Conf_UID == 0) { pwd = getpwuid(0); @@ -711,6 +723,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } } +#endif /* Change user ID */ if (getuid() != Conf_UID) {