--- k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp.suid 2005-03-02 14:04:00.000000000 +0100
+++ k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp 2005-03-02 14:05:11.000000000 +0100
@@ -188,7 +188,7 @@
if( out.output().contains( "-xamix" ) ||
bin->version >= K3bVersion( 2, 1, -1, "a12" ) )
bin->addFeature( "xamix" );
-
+#if 0
// check if we run cdrecord as root
if( !getuid() )
bin->addFeature( "suidroot" );
@@ -199,6 +199,9 @@
bin->addFeature( "suidroot" );
}
}
+#endif
+ bin->addFeature( "suidroot" );
+
}
else {
kdDebug() << "(K3bCdrecordProgram) could not start " << bin->path << endl;
@@ -280,16 +283,7 @@
if( out.output().contains( "-overburn" ) )
bin->addFeature( "overburn" );
- // check if we run cdrecord as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
}
else {
kdDebug() << "(K3bDvdrecordProgram) could not start " << bin->path << endl;
@@ -371,15 +365,7 @@
bin->addFeature( "sectype" );
// check if we run mkisofs as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
}
else {
kdDebug() << "(K3bMkisofsProgram) could not start " << bin->path << endl;
@@ -451,16 +437,7 @@
if( out.output().contains( "-clone" ) )
bin->addFeature( "clone" );
- // check if we run mkisofs as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
}
else {
kdDebug() << "(K3bReadcdProgram) could not start " << bin->path << endl;
@@ -549,15 +526,7 @@
bin->addFeature( "disable-burnproof" );
// check if we run cdrdao as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
}
else {
kdDebug() << "(K3bCdrdaoProgram) could not start " << bin->path << endl;
@@ -804,17 +773,7 @@
// fixed Copyright:
bin->copyright = "Andy Polyakov <appro@fy.chalmers.se>";
- // check if we run growisofs as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
-
+ bin->addFeature( "suidroot" );
addBin( bin );
return true;
}
@@ -879,15 +838,7 @@
bin->copyright = "Andy Polyakov <appro@fy.chalmers.se>";
// check if we run dvd+rw-format as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
addBin( bin );
return true;
@@ -961,16 +912,7 @@
return false;
}
- // check if we run as root
- if( !getuid() )
- bin->addFeature( "suidroot" );
- else {
- struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
- if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
- }
- }
+ bin->addFeature( "suidroot" );
addBin( bin );
return true;