author | mickeyl <mickeyl> | 2005-02-10 11:20:17 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-10 11:20:17 (UTC) |
commit | 8b48966b1e202a30b5be1069f357d5a4583b58be (patch) (side-by-side diff) | |
tree | b2615eb8c2ad02f53fbec90709df5e35d0e7cea7 | |
parent | 134bba16e6b476406eed60cb9ff1ae596fac7732 (diff) | |
download | opie-8b48966b1e202a30b5be1069f357d5a4583b58be.zip opie-8b48966b1e202a30b5be1069f357d5a4583b58be.tar.gz opie-8b48966b1e202a30b5be1069f357d5a4583b58be.tar.bz2 |
autologin: remove processing of command line arguments in favour of deciding
based on an entry in the opie-login.conf file
-rw-r--r-- | core/opie-login/main.cpp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 711bedc..554efd3 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -54,70 +54,57 @@ #include <stdlib.h> #include <signal.h> #include <getopt.h> #include <string.h> using namespace Opie::Core; int login_main ( int argc, char **argv, pid_t ppid ); void sigterm ( int sig ); void sigint ( int sig ); void exit_closelog ( ); -static struct option long_options [] = { - { "autologin", 1, 0, 'a' }, - { 0, 0, 0, 0 } -}; - - int main ( int argc, char **argv ) { int userExited = 0; pid_t ppid = ::getpid ( ); if ( ::geteuid ( ) != 0 ) { - ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); + ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)\n", argv [0] ); return 1; } if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and ::setuid ( 0 ); // messes up things like config files - char *autolog = 0; - int c; - while (( c = ::getopt_long ( argc, argv, "a:", long_options, 0 )) != -1 ) { - switch ( c ) { - case 'a': - autolog = optarg; - break; - default: - ::fprintf ( stderr, "Usage: %s [-a|--autologin=<user>]\n", argv [0] ); - return 2; - } - } - // struct rlimit rl; // ::getrlimit ( RLIMIT_NOFILE, &rl ); // for ( unsigned int i = 0; i < rl. rlim_cur; i++ ) // ::close ( i ); ::setpgid ( 0, 0 ); ::setsid ( ); ::signal ( SIGTERM, sigterm ); ::signal ( SIGINT, sigterm ); ::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV ); ::atexit ( exit_closelog ); + const char* autolog = 0; + Config c( "opie-login" ); + c.setGroup( "autologin" ); + QString entry = c.readEntry( "user", "" ); + if ( !entry.isEmpty() ) autolog = ::strdup( (const char*) entry ); + while ( true ) { pid_t child = ::fork ( ); if ( child < 0 ) { ::syslog ( LOG_ERR, "Could not fork GUI process\n" ); break; } else if ( child > 0 ) { int status = 0; time_t started = ::time ( 0 ); while ( ::waitpid ( child, &status, 0 ) < 0 ) { } |