You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2010/10/14 20:58:17 UTC
svn commit: r1022654 - in /trafficserver/traffic/trunk: configure.ac
iocore/dns/Makefile.am proxy/Main.cc proxy/congest/Makefile.am
Author: igalic
Date: Thu Oct 14 18:58:17 2010
New Revision: 1022654
URL: http://svn.apache.org/viewvc?rev=1022654&view=rev
Log:
Fix build for OpenSolaris. Regards to zwoop and lewellyn.
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/dns/Makefile.am
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/congest/Makefile.am
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1022654&r1=1022653&r2=1022654&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Thu Oct 14 18:58:17 2010
@@ -534,7 +534,9 @@ case $host_os in
CCASFLAGS="-Wa,-32" # TODO: add 64bit support to atomic ops
debug_opt="-g $common_opt"
release_opt="-g $common_opt -xO3"
- cxx_opt="-library=stlport4 -erroff"
+ cxx_opt="-library=stlport4"
+ cxx_dbg="+w2"
+ cxx_rel="-erroff"
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS],1,
[posix thread semantics]
)
@@ -557,8 +559,8 @@ esac
cc_oflag_opt=$release_opt
cc_oflag_dbg=$debug_opt
-cxx_oflag_opt="$release_opt $cxx_opt"
-cxx_oflag_dbg="$debug_opt $cxx_opt"
+cxx_oflag_opt="$release_opt $cxx_opt $cxx_rel"
+cxx_oflag_dbg="$debug_opt $cxx_opt $cxx_dbg"
SHARED_CFLAGS=-fPIC
SHARED_LDFLAGS=-shared
Modified: trafficserver/traffic/trunk/iocore/dns/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/Makefile.am?rev=1022654&r1=1022653&r2=1022654&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/dns/Makefile.am Thu Oct 14 18:58:17 2010
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/mgmt2 \
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1022654&r1=1022653&r2=1022654&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Thu Oct 14 18:58:17 2010
@@ -1580,11 +1580,7 @@ change_uid_gid(const char *user)
ink_fatal_die("sysconf() failed for _SC_GETPW_R_SIZE_MAX");
}
-#if defined(__GNUC__)
- char buf[buflen];
-#else
char *buf = (char *)xmalloc(buflen);
-#endif
if (geteuid()) {
// Not running as root
@@ -1634,9 +1630,7 @@ change_uid_gid(const char *user)
}
}
}
-#if !defined(__GNUC__)
xfree(buf);
-#endif
}
#if TS_HAS_V2STATS
@@ -2101,14 +2095,15 @@ main(int argc, char **argv)
}
// change the user of the process
- const long MAX_LOGIN = sysconf(_SC_LOGIN_NAME_MAX);
- char user[MAX_LOGIN <= 0 ? _POSIX_LOGIN_NAME_MAX : MAX_LOGIN];
+ const long max_login = sysconf(_SC_LOGIN_NAME_MAX) <= 0 ? _POSIX_LOGIN_NAME_MAX : sysconf(_SC_LOGIN_NAME_MAX);
+ char *user = (char *)xmalloc(max_login);
*user = '\0';
if ((TS_ReadConfigString(user, "proxy.config.admin.user_id",
- sizeof(user)) == REC_ERR_OKAY) &&
+ max_login) == REC_ERR_OKAY) &&
user[0] != '\0' &&
strcmp(user, "#-1")) {
change_uid_gid(user);
+ xfree(user);
}
Debug("server",
"running as uid=%u, gid=%u, effective uid=%u, gid=%u",
Modified: trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=1022654&r1=1022653&r2=1022654&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/congest/Makefile.am Thu Oct 14 18:58:17 2010
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/librecords \
-I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/proxy/http2 \
-I$(top_srcdir)/proxy/mgmt2 \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/utils \