aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

Fix win32 patches (r18642) so it builds corectly on non-win32 again.

Browse Source 
svn path=/icecast/trunk/icecast/; revision=18646
This commit is contained in:
Philipp Schafft 2012-10-11 00:26:38 +00:00
parent 91b49c583b
commit a424a4e1fe
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.in
View File

@ -34,9 +34,10 @@ AC_HEADER_STDC
AC_HEADER_TIME AC_HEADER_TIME
AC_CHECK_HEADERS([alloca.h sys/timeb.h]) AC_CHECK_HEADERS([alloca.h sys/timeb.h])
AC_CHECK_HEADERS([pwd.h, unistd.h, grp.h, sys/types.h]) AC_CHECK_HEADERS([pwd.h unistd.h grp.h sys/types.h],,,AC_INCLUDES_DEFAULT)
AC_CHECK_FUNC([chuid]) AC_CHECK_FUNCS([setuid])
AC_CHECK_FUNC([chown]) AC_CHECK_FUNCS([chroot])
AC_CHECK_FUNCS([chown])
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
XIPH_C__FUNC__ XIPH_C__FUNC__

6
src/main.c
View File

@ -340,7 +340,7 @@ static void _server_proc(void)
static void _ch_root_uid_setup(void) static void _ch_root_uid_setup(void)
{ {
ice_config_t *conf = config_get_config_unlocked(); ice_config_t *conf = config_get_config_unlocked();
#ifdef CHUID #ifdef HAVE_SETUID
struct passwd *user; struct passwd *user;
struct group *group; struct group *group;
uid_t uid=-1; uid_t uid=-1;
@ -384,7 +384,7 @@ static void _ch_root_uid_setup(void)
} }
#endif #endif
#if HAVE_CHUID #if HAVE_SETUID
if(conf->chuid) if(conf->chuid)
{ {
@ -478,7 +478,7 @@ int main(int argc, char **argv)
stats_initialize(); /* We have to do this later on because of threading */ stats_initialize(); /* We have to do this later on because of threading */
fserve_initialize(); /* This too */ fserve_initialize(); /* This too */
#ifdef CHUID #ifdef HAVE_SETUID
/* We'll only have getuid() if we also have setuid(), it's reasonable to /* We'll only have getuid() if we also have setuid(), it's reasonable to
* assume */ * assume */
if(!getuid()) /* Running as root! Don't allow this */ if(!getuid()) /* Running as root! Don't allow this */