repo: ngircd
action: commit
revision: 
path_from: 
revision_from: e0da56fc7b1dae4e21dfda7e0ac8ad7594135986:
path_to: 
revision_to: 

commit e0da56fc7b1dae4e21dfda7e0ac8ad7594135986
Author: Alexander Barton 
Date:   Thu Oct 11 14:54:13 2012 +0000

    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.

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c

--- 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

--- 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 */

-----END OF PAGE-----