Diffstat (limited to 'core/opie-login/loginwindowimpl.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index 3265b46..f24ebb3 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp | |||
@@ -22,2 +22,3 @@ | |||
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | #include <signal.h> | ||
23 | 24 | ||
@@ -39,2 +40,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
39 | pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); | 40 | pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); |
41 | pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( ))); | ||
40 | m_menu-> setPopup ( pop ); | 42 | m_menu-> setPopup ( pop ); |
@@ -59,3 +61,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C | |||
59 | 61 | ||
60 | m_caption-> setText ( m_caption-> text ( ) + tr( "<center><h1><u>%1 %2</u></h1></center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); | 62 | m_caption-> setText ( m_caption-> text ( ) + tr( "<center>%1 %2</center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); |
61 | } | 63 | } |
@@ -69,5 +71,5 @@ void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) | |||
69 | switch ( e-> key ( )) { | 71 | switch ( e-> key ( )) { |
70 | case Key_F34: suspend ( ); | 72 | case HardKey_Suspend: suspend ( ); |
71 | break; | 73 | break; |
72 | case Key_F35: backlight ( ); | 74 | case HardKey_Backlight: backlight ( ); |
73 | break; | 75 | break; |
@@ -90,3 +92,3 @@ QStringList LoginWindowImpl::getAllUsers ( ) | |||
90 | 92 | ||
91 | while (( pwd = getpwent ( ))) { | 93 | while (( pwd = ::getpwent ( ))) { |
92 | if (( pwd-> pw_uid == 0 ) || ( pwd-> pw_uid >= 500 && pwd-> pw_uid < 65534 )) | 94 | if (( pwd-> pw_uid == 0 ) || ( pwd-> pw_uid >= 500 && pwd-> pw_uid < 65534 )) |
@@ -95,3 +97,3 @@ QStringList LoginWindowImpl::getAllUsers ( ) | |||
95 | 97 | ||
96 | endpwent ( ); | 98 | ::endpwent ( ); |
97 | 99 | ||
@@ -110,7 +112,12 @@ void LoginWindowImpl::restart ( ) | |||
110 | 112 | ||
111 | void LoginWindowImpl::suspend ( ) | 113 | void LoginWindowImpl::quit ( ) |
112 | { | 114 | { |
113 | system ( "apm -s" ); | 115 | qApp-> quit ( ); |
114 | usleep ( 1 * 1000 * 1000 ); | 116 | ::kill ( ::getppid ( ), SIGUSR1 ); |
117 | } | ||
118 | |||
119 | void LoginWindowImpl::suspend ( ) | ||
115 | { | 120 | { |
121 | ODevice::inst ( )-> suspend ( ); | ||
122 | |||
116 | QCopEnvelope e("QPE/System", "setBacklight(int)"); | 123 | QCopEnvelope e("QPE/System", "setBacklight(int)"); |
@@ -118,3 +125,2 @@ void LoginWindowImpl::suspend ( ) | |||
118 | } | 125 | } |
119 | } | ||
120 | 126 | ||
@@ -122,3 +128,2 @@ void LoginWindowImpl::backlight ( ) | |||
122 | { | 128 | { |
123 | { | ||
124 | QCopEnvelope e("QPE/System", "setBacklight(int)"); | 129 | QCopEnvelope e("QPE/System", "setBacklight(int)"); |
@@ -126,3 +131,2 @@ void LoginWindowImpl::backlight ( ) | |||
126 | } | 131 | } |
127 | } | ||
128 | 132 | ||
@@ -260,24 +264,14 @@ bool LoginWindowImpl::changeIdentity ( const char *user ) | |||
260 | fail |= ( pw == 0 ); | 264 | fail |= ( pw == 0 ); |
261 | printf ( "1 %d\n", fail ); | ||
262 | fail |= ( initgroups ( pw-> pw_name, pw-> pw_gid )); | 265 | fail |= ( initgroups ( pw-> pw_name, pw-> pw_gid )); |
263 | endgrent ( ); | 266 | endgrent ( ); |
264 | printf ( "2 %d\n", fail ); | ||
265 | fail |= ( setgid ( pw-> pw_gid )); | 267 | fail |= ( setgid ( pw-> pw_gid )); |
266 | printf ( "3 %d\n", fail ); | ||
267 | fail |= ( setuid ( pw-> pw_uid )); | 268 | fail |= ( setuid ( pw-> pw_uid )); |
268 | 269 | ||
269 | printf ( "4 %d\n", fail ); | ||
270 | fail |= ( chdir ( pw-> pw_dir ) && chdir ( "/" )); | 270 | fail |= ( chdir ( pw-> pw_dir ) && chdir ( "/" )); |
271 | 271 | ||
272 | printf ( "5 %d\n", fail ); | ||
273 | fail |= ( setenv ( "HOME", pw-> pw_dir, 1 )); | 272 | fail |= ( setenv ( "HOME", pw-> pw_dir, 1 )); |
274 | printf ( "6 %d\n", fail ); | ||
275 | fail |= ( setenv ( "SHELL", pw-> pw_shell, 1 )); | 273 | fail |= ( setenv ( "SHELL", pw-> pw_shell, 1 )); |
276 | printf ( "7 %d\n", fail ); | ||
277 | fail |= ( setenv ( "USER", pw-> pw_name, 1 )); | 274 | fail |= ( setenv ( "USER", pw-> pw_name, 1 )); |
278 | printf ( "8 %d\n", fail ); | ||
279 | fail |= ( setenv ( "LOGNAME", pw-> pw_name, 1 )); | 275 | fail |= ( setenv ( "LOGNAME", pw-> pw_name, 1 )); |
280 | printf ( "9 %d\n", fail ); | ||
281 | fail |= ( setenv ( "PATH", ( pw-> pw_uid ? DEFAULT_LOGIN_PATH : DEFAULT_ROOT_LOGIN_PATH ), 1 )); | 276 | fail |= ( setenv ( "PATH", ( pw-> pw_uid ? DEFAULT_LOGIN_PATH : DEFAULT_ROOT_LOGIN_PATH ), 1 )); |
282 | printf ( "10 %d\n", fail ); | ||
283 | 277 | ||
@@ -288,4 +282,4 @@ void LoginWindowImpl::login ( ) | |||
288 | { | 282 | { |
289 | const char *user = strdup ( m_user-> currentText ( ). local8Bit ( )); | 283 | const char *user = ::strdup ( m_user-> currentText ( ). local8Bit ( )); |
290 | const char *pass = strdup ( m_password-> text ( ). local8Bit ( )); | 284 | const char *pass = ::strdup ( m_password-> text ( ). local8Bit ( )); |
291 | bool ok; | 285 | bool ok; |
@@ -305,8 +299,14 @@ void LoginWindowImpl::login ( ) | |||
305 | if ( changeIdentity ( user )) { | 299 | if ( changeIdentity ( user )) { |
306 | QString opie = getenv ( "OPIEDIR" ); | 300 | char *opie = ::getenv ( "OPIEDIR" ); |
307 | opie += "/bin/qpe"; | 301 | char *arg = new char [::strlen ( opie ) + 8 + 1]; |
302 | |||
303 | ::strcpy ( arg, opie ); | ||
304 | ::strcat ( arg, "/bin/qpe" ); | ||
305 | |||
306 | // start qpe via a login shell | ||
307 | ::execl ( "/bin/sh", "-sh", "-c", arg, 0 ); | ||
308 | 308 | ||
309 | execl ( opie. latin1 ( ), "qpe", 0 ); | 309 | QMessageBox::critical ( this, tr( "Failure" ), tr( "Could not start OPIE\n(%1)." ). arg ( arg )); |
310 | delete [] arg; | ||
310 | 311 | ||
311 | QMessageBox::critical ( this, tr( "Failure" ), tr( "Could not start OPIE." )); | ||
312 | restart ( ); | 312 | restart ( ); |