aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-12-22 20:29:13 -0500
committerAnthony G. Basile <blueness@gentoo.org>2012-12-24 05:57:57 -0500
commit25ae31d55263d2254dca978f6be215c57b40c92d (patch)
tree88a4afe8ee4e84f003bdc30a9552cf55e91ade67
parentscripts/paxmodule.c: fix logic of finding either PT_PAX or XATTR_PAX (diff)
downloadelfix-25ae31d55263d2254dca978f6be215c57b40c92d.tar.gz
elfix-25ae31d55263d2254dca978f6be215c57b40c92d.tar.bz2
elfix-25ae31d55263d2254dca978f6be215c57b40c92d.zip
scripts/migrate-pax, misc/alt-revdep-pax: immediately bail if we are not root
-rwxr-xr-xmisc/alt-revdep-pax6
-rwxr-xr-xscripts/migrate-pax12
2 files changed, 12 insertions, 6 deletions
diff --git a/misc/alt-revdep-pax b/misc/alt-revdep-pax
index 58fba3c..b46fe23 100755
--- a/misc/alt-revdep-pax
+++ b/misc/alt-revdep-pax
@@ -523,6 +523,12 @@ def run_usage():
def main():
+ # Are we root?
+ uid = os.getuid()
+ if uid != 0:
+ print('This program must be run as root')
+ sys.exit(1)
+
try:
opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:l:vemy')
except getopt.GetoptError as err:
diff --git a/scripts/migrate-pax b/scripts/migrate-pax
index 1d5c2f7..09a41e2 100755
--- a/scripts/migrate-pax
+++ b/scripts/migrate-pax
@@ -55,6 +55,12 @@ def run_usage():
def main():
+ # Are we root?
+ uid = os.getuid()
+ if uid != 0:
+ print('This program must be run as root')
+ sys.exit(1)
+
try:
opts, args = getopt.getopt(sys.argv[1:], 'vmdh')
except getopt.GetoptError as err:
@@ -95,12 +101,6 @@ def main():
run_usage()
sys.exit(1)
- # Are we root?
- uid = os.getuid()
- if uid != 0 and do_migration:
- print('RUN AS ROOT: cannot migrate flags')
- sys.exit(1)
-
# Do we have XATTR_PAX support?
if do_migration or do_deleteall:
try: