[xiph-commits] r18646 - in icecast/trunk/icecast: . src

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2012-10-10 17:26:38 -0700 (Wed, 10 Oct 2012)
New Revision: 18646

Modified:
   icecast/trunk/icecast/configure.in
   icecast/trunk/icecast/src/main.c
Log:
Fix win32 patches (r18642) so it builds corectly on non-win32 again.

Modified: icecast/trunk/icecast/configure.in
===================================================================
--- icecast/trunk/icecast/configure.in	2012-10-10 23:34:54 UTC (rev 18645)
+++ icecast/trunk/icecast/configure.in	2012-10-11 00:26:38 UTC (rev 18646)
@@ -34,9 +34,10 @@
 AC_HEADER_TIME
 
 AC_CHECK_HEADERS([alloca.h sys/timeb.h])
-AC_CHECK_HEADERS([pwd.h, unistd.h, grp.h, sys/types.h])
-AC_CHECK_FUNC([chuid])
-AC_CHECK_FUNC([chown])
+AC_CHECK_HEADERS([pwd.h unistd.h grp.h sys/types.h],,,AC_INCLUDES_DEFAULT)
+AC_CHECK_FUNCS([setuid])
+AC_CHECK_FUNCS([chroot])
+AC_CHECK_FUNCS([chown])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 XIPH_C__FUNC__

Modified: icecast/trunk/icecast/src/main.c
===================================================================
--- icecast/trunk/icecast/src/main.c	2012-10-10 23:34:54 UTC (rev 18645)
+++ icecast/trunk/icecast/src/main.c	2012-10-11 00:26:38 UTC (rev 18646)
@@ -340,7 +340,7 @@
 static void _ch_root_uid_setup(void)
 {
    ice_config_t *conf = config_get_config_unlocked();
-#ifdef CHUID
+#ifdef HAVE_SETUID
    struct passwd *user;
    struct group *group;
    uid_t uid=-1;
@@ -384,7 +384,7 @@
 
    }   
 #endif
-#if HAVE_CHUID
+#if HAVE_SETUID
 
    if(conf->chuid)
    {
@@ -478,7 +478,7 @@
     stats_initialize(); /* We have to do this later on because of threading */
     fserve_initialize(); /* This too */
 
-#ifdef CHUID 
+#ifdef HAVE_SETUID 
     /* We'll only have getuid() if we also have setuid(), it's reasonable to
      * assume */
     if(!getuid()) /* Running as root! Don't allow this */