From 98aab4894c500fd1c387e3619dc8aa2c096a8b89 Mon Sep 17 00:00:00 2001 From: dsmith Date: Tue, 14 Aug 2007 15:29:40 +0000 Subject: 2007-08-14 David Smith Merge from setuid-branch. Changes also by Martin Hunt . * Makefile.am: Added staprun_funcs.c and cap.c to staprun_SOURCES. Added -lcap to staprun_LDADD. Removed stp_check reference. Added stapio program. Staprun is now setuid. * Makefile.in: Rebuilt. * configure.ac: Version increase to 0.6 and checks for libcap availability. Removed stp_check reference. * configure: Regenerated. * stp_check.in: Removed. * systemtap.spec.in: Version increase to 0.6-1 and added BuildReq for libcap-devl (and removed sudo requirement). Added %pre script to create new groups. Staprun is now setuid. * NEWS: Added info on new security model. * INTERNALS: Removed sudo reference. * README.security: New file. * main.cxx (main): Make sure module name isn't too long. * hash.cxx: Moved MODULE_NAME_LEN define to hash.h. * hash.h: Moved MODULE_NAME_LEN define here from hash.cxx. * buildrun.cxx (run_pass): No longer runs staprun with "sudo". * stap.1.in: Removed sudo references and added information about the stapdev/stapusr groups. * staprun.8.in: Added information about module detaching and attaching. Removed sudo references and added information about the stapdev/stapusr groups. Removed reference to staprun needing to be run as root. Removed reference to removed '-u USERNAME' option. * .cvsignore: Removed stp_check and added stapio and stap_merge. --- main.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 0639f689..e18a1331 100644 --- a/main.cxx +++ b/main.cxx @@ -362,6 +362,14 @@ main (int argc, char * const argv []) " characters [_a-zA-Z0-9])." << endl; usage (s, 1); } + + // Make sure module name isn't too long. + if (s.module_name.size() >= (MODULE_NAME_LEN - 1)) + { + s.module_name.resize(MODULE_NAME_LEN - 1); + cerr << "Truncating module name to '" << s.module_name + << "'" << endl; + } } cerr << "Warning: using '-m' disables cache support." << endl; -- cgit