Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Icecast-Server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
94
Issues
94
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
Icecast-Server
Commits
a424a4e1
Commit
a424a4e1
authored
Oct 11, 2012
by
Philipp Schafft
🦁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix win32 patches (r18642) so it builds corectly on non-win32 again.
svn path=/icecast/trunk/icecast/; revision=18646
parent
91b49c58
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
configure.in
configure.in
+4
-3
src/main.c
src/main.c
+3
-3
No files found.
configure.in
View file @
a424a4e1
...
...
@@ -34,9 +34,10 @@ AC_HEADER_STDC
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__
...
...
src/main.c
View file @
a424a4e1
...
...
@@ -340,7 +340,7 @@ static void _server_proc(void)
static
void
_ch_root_uid_setup
(
void
)
{
ice_config_t
*
conf
=
config_get_config_unlocked
();
#ifdef
CH
UID
#ifdef
HAVE_SET
UID
struct
passwd
*
user
;
struct
group
*
group
;
uid_t
uid
=-
1
;
...
...
@@ -384,7 +384,7 @@ static void _ch_root_uid_setup(void)
}
#endif
#if HAVE_
CH
UID
#if HAVE_
SET
UID
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 */
fserve_initialize
();
/* This too */
#ifdef
CH
UID
#ifdef
HAVE_SET
UID
/* We'll only have getuid() if we also have setuid(), it's reasonable to
* assume */
if
(
!
getuid
())
/* Running as root! Don't allow this */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment