Author: zwoop
Date: Tue Oct 12 17:06:35 2010
New Revision: 1021842
URL: http://svn.apache.org/viewvc?rev=1021842&view=rev
Log:
TS-482 Move PKGSYSUSER to ink_config.h.in
Modified:
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Tue Oct 12
17:06:35 2010
@@ -180,6 +180,10 @@
# define PURIFY 1
#endif
+/* Defaults for user / group */
+#define TS_PKGSYSUSER "@pkgsysuser@"
+#define TS_PKGSYSGROUP "@pkgsysgroup@"
+
/* TODO: Fix those always defined features */
#define MODULARIZED
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Tue Oct 12 17:06:35 2010
@@ -43,8 +43,7 @@ AM_CPPFLAGS = \
-I$(srcdir)/mgmt2 \
-I$(srcdir)/mgmt2/preparse \
-I$(srcdir)/mgmt2/utils \
- -I$(srcdir)/api/ts \
- -DPKGSYSUSER=\"$(pkgsysuser)\"
+ -I$(srcdir)/api/ts
includedir=$(prefix)/include/ts
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Tue Oct 12 17:06:35 2010
@@ -36,8 +36,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/preparse \
-I$(top_srcdir)/proxy/mgmt2/stats \
-I$(top_srcdir)/proxy/mgmt2/utils \
- -I$(top_srcdir)/proxy/mgmt2/web2 \
- -DPKGSYSUSER=\"$(pkgsysuser)\"
+ -I$(top_srcdir)/proxy/mgmt2/web2
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Oct 12
17:06:35 2010
@@ -83,7 +83,7 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.temp_dir", "", INK_STRING, "/tmp", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.alarm_email", "", INK_STRING, PKGSYSUSER, RU_REREAD,
RR_NULL, RC_STR, ".*", RA_NULL}
+ {CONFIG, "proxy.config.alarm_email", "", INK_STRING, TS_PKGSYSUSER,
RU_REREAD, RR_NULL, RC_STR, ".*", RA_NULL}
,
{CONFIG, "proxy.config.syslog_facility", "", INK_STRING, "LOG_DAEMON",
RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
@@ -355,7 +355,7 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.admin.number_config_bak", "", INK_INT, "3", RU_NULL,
RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.admin.user_id", "", INK_STRING, PKGSYSUSER, RU_NULL,
RR_REQUIRED, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.admin.user_id", "", INK_STRING, TS_PKGSYSUSER,
RU_NULL, RR_REQUIRED, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.admin.ui_refresh_rate", "", INK_INT, "30", RU_REREAD,
RR_NULL, RC_NULL, NULL, RA_NULL}
,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am Tue Oct 12 17:06:35
2010
@@ -17,9 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = \
- $(iocore_include_dirs) \
- -DPKGSYSUSER=\"$(pkgsysuser)\"
+AM_CPPFLAGS = $(iocore_include_dirs)
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=1021842&r1=1021841&r2=1021842&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Tue Oct 12
17:06:35 2010
@@ -26,12 +26,12 @@
#include "I_Version.h"
#if defined(linux)
-// XXX: Nuke multiple includes
#include "sys/utsname.h"
#include "ink_killall.h"
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
+
union semun
{
int val; /* value for SETVAL */
@@ -78,8 +78,7 @@ static char syslog_fac_str[PATH_MAX];
static int killsig = SIGKILL;
static int coresig = 0;
-static char sys_user[80] = PKGSYSUSER;
-static char admin_user[80] = PKGSYSUSER;
+static char admin_user[80] = TS_PKGSYSUSER;
static char manager_binary[PATH_MAX] = "traffic_manager";
static char server_binary[PATH_MAX] = "traffic_server";
static char manager_options[OPTIONS_LEN_MAX] = "";
@@ -642,16 +641,9 @@ read_config()
}
build_config_table(fp);
-
fclose(fp);
- // Get the admin user
read_config_string("proxy.config.admin.user_id", admin_user,
sizeof(admin_user));
- // just warn if the admin user is not the configured system user
- if (strncmp(sys_user, admin_user, sizeof(admin_user)) != 0) {
- cop_log(COP_WARNING, "proxy.config.admin.user_id should be
\"%s\"",sys_user);
- }
-
read_config_string("proxy.config.manager_binary", manager_binary,
sizeof(manager_binary));
read_config_string("proxy.config.proxy_binary", server_binary,
sizeof(server_binary));
read_config_string("proxy.config.bin_path", bin_path, sizeof(bin_path));
