author | sandman <sandman> | 2002-10-29 19:33:49 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-29 19:33:49 (UTC) |
commit | 7c340d2a08601f4d27f6d2a407fc0de437b8efad (patch) (side-by-side diff) | |
tree | c6a01ef4e7623ea1da758030e691531f0476885e /core/opie-login/main.cpp | |
parent | 2957aae1073f4c41dd6783c41d1199be71cd9f4a (diff) | |
download | opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.zip opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.tar.gz opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.tar.bz2 |
when quitting opie-login, don't kill the process id returned by getppid(),
but use the previously saved "real" parent pid.
-rw-r--r-- | core/opie-login/main.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 579a93a..674829d 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -60,7 +60,7 @@ using namespace Opie; -int login_main ( int argc, char **argv ); +int login_main ( int argc, char **argv, pid_t ppid ); void sigterm ( int sig ); void exit_closelog ( ); @@ -72,6 +72,9 @@ static struct option long_options [] = { int main ( int argc, char **argv ) { + pid_t ppid = ::getpid ( ); + + if ( ::geteuid ( ) != 0 ) { ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); return 1; @@ -183,7 +186,7 @@ int main ( int argc, char **argv ) ::exit ( 0 ); } else - ::exit ( login_main ( argc, argv )); + ::exit ( login_main ( argc, argv, ppid )); } } return 0; @@ -302,10 +305,10 @@ private: -int login_main ( int argc, char **argv ) +int login_main ( int argc, char **argv, pid_t ppid ) { QWSServer::setDesktopBackground( QImage() ); - LoginApplication *app = new LoginApplication ( argc, argv ); + LoginApplication *app = new LoginApplication ( argc, argv, ppid ); app-> setFont ( QFont ( "Helvetica", 10 )); app-> setStyle ( new QPEStyle ( )); |