summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/main.cpp4
-rw-r--r--noncore/settings/networksettings2/network/network_NN.cpp5
-rw-r--r--noncore/settings/networksettings2/networksettings2/resources.cpp83
-rw-r--r--noncore/settings/networksettings2/networksettings2/resources.h5
-rw-r--r--noncore/settings/networksettings2/nsdata.cpp12
5 files changed, 64 insertions, 45 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp
index 200e31b..9004d19 100644
--- a/noncore/settings/networksettings2/main.cpp
+++ b/noncore/settings/networksettings2/main.cpp
@@ -92,12 +92,13 @@ int main( int argc, char * argv[] ) {
char * MyArgv[4];
MyArgv[0] = "networksettings2";
MyArgv[1] = "--prompt";
MyArgv[2] = argv[1];
MyArgv[3] = NULL;
NSResources->system().execAsUser( S, MyArgv );
+ Log(("FAILED %s-cNN-allowed\n", argv[1] ));
// if we come here , failed
printf( "%s-cNN-disallowed", argv[1] );
}
}
break;
case ACT_REGEN :
@@ -106,14 +107,17 @@ int main( int argc, char * argv[] ) {
rv = (NS.regenerate()) ? 1 : 0;
}
break;
case ACT_PROMPT :
{ ActivateProfile AP(argv[1]);
if( AP.exec() == QDialog::Accepted ) {
+ Log(("%s-c%ld-allowed\n",
+ argv[1], AP.selectedProfile() ));
printf( "%s-c%ld-allowed", argv[1], AP.selectedProfile() );
} else {
+ Log(("%s-c%NN-disallowed\n", argv[1] ));
printf( "%s-cNN-disallowed", argv[1] );
}
}
break;
case ACT_VPN :
{ ActivateVPN AVPN;
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index 1feffdb..b5c41bf 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -1,6 +1,7 @@
+#include <qpe/qpeapplication.h>
#include <asdevice.h>
#include "network_NN.h"
#include "network_NNI.h"
static const char * NetworkNeeds[] =
{ "device",
@@ -50,13 +51,15 @@ short NetworkNetNode::generateFile( const QString & ID,
<< NIC
<< " can be brought UP"
<< endl;
TS << "mapping "
<< NIC
<< endl;
- TS << " script networksettings2-request"
+ TS << " script "
+ << QPEApplication::qpeDir()
+ << "/bin/networksettings2-request"
<< endl
<< endl;
return 0;
}
return 1;
}
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index 7ece817..2f17693 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -291,27 +291,30 @@ typedef struct EnvVars {
int Len;
} EnvVar_t;
#define AnEV(x) x, sizeof(x)-1
static EnvVar_t EV[] = {
- // AnEV( "HOME=" ), -> SPECIAL
- // AnEV( "LOGNAME=" ), -> SPECIAL
- AnEV( "USER=" ),
- AnEV( "LD_LIBRARY_PATH=" ),
- AnEV( "PATH=" ),
- AnEV( "QTDIR=" ),
- AnEV( "OPIEDIR=" ),
- AnEV( "SHELL=" ),
+ AnEV( "HOME" ),
+ AnEV( "LOGNAME" ),
+ AnEV( "USER" ),
+ AnEV( "LD_LIBRARY_PATH" ),
+ AnEV( "PATH" ),
+ AnEV( "QTDIR" ),
+ AnEV( "OPIEDIR" ),
+ AnEV( "SHELL" ),
{ NULL, 0 }
};
void TheNSResources::detectCurrentUser( void ) {
// find current running qpe
QString QPEEnvFile = "";
+ CurrentUser.UserName = "";
+ CurrentUser.HomeDir = "";
+
if( getenv( "OPIEDIR" ) == 0 ) {
// nothing known
{ // open proc dir and find all dirs in it
QRegExp R("[0-9]+");
QDir ProcDir( "/proc" );
QFileInfo FI;
@@ -364,39 +367,34 @@ void TheNSResources::detectCurrentUser( void ) {
char * Data = Buf;
char * DataEnd = Data+BufSize-1;
// get env items out of list
while( Data < DataEnd ) {
- if( strncmp( Data, "LOGNAME=", 8 ) == 0 ) {
- CurrentUser.UserName = Data+8;
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
- strdup( Data );
- } else if( strncmp( Data, "HOME=", 5 ) == 0 ) {
- CurrentUser.HomeDir = Data+5;
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
- strdup( Data );
- } else {
+
EnvVar_t * Run = EV;
while( Run->Name ) {
- if( strncmp( Data, Run->Name, Run->Len ) == 0 ) {
+ if( strncmp( Data, Run->Name, Run->Len ) == 0 &&
+ Data[Run->Len] == '='
+ ) {
CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
strdup( Data );
+
+ if( strcmp( Run->Name, "OPIEDIR" ) == 0 ) {
// put OPIEDIR in env
- if( strcmp( Run->Name, "OPIEDIR=" ) == 0 ) {
putenv( CurrentUser.EnvList[CurrentUser.EnvList.size()-1] );
-
+ } else if( strcmp( Run->Name, "HOME" ) == 0 ) {
+ CurrentUser.HomeDir = Data+5;
+ } else if( strcmp( Run->Name, "LOGNAME" ) == 0 ) {
+ CurrentUser.UserName = Data+8;
}
break;
}
Run ++;
}
- }
Data += strlen( Data )+1;
}
free( Buf );
@@ -418,36 +416,35 @@ void TheNSResources::detectCurrentUser( void ) {
CurrentUser.Uid =
CurrentUser.Gid = -1;
}
}
} else {
- CurrentUser.UserName = getenv( "LOGNAME" );
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
- strdup( CurrentUser.UserName );
-
- CurrentUser.HomeDir = getenv( "HOME" );
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
- strdup( CurrentUser.HomeDir );
+ char * X;
+ QString S;
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("USER");
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("LD_LIBRARY_PATH");
+ EnvVar_t * Run = EV;
+ while( Run->Name ) {
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("PATH");
+ if( ( X = getenv( Run->Name ) ) ) {
+ Log(( "Env : %s = %s\n", Run->Name, X ));
+ S.sprintf( "%s=%s", Run->Name, X );
CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("QTDIR");
+ CurrentUser.EnvList[CurrentUser.EnvList.size()-1] =
+ strdup( S.latin1() );
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("OPIEDIR");
- CurrentUser.EnvList.resize( CurrentUser.EnvList.size()+1 );
- CurrentUser.EnvList[CurrentUser.EnvList.size()-1] = getenv("SHELL");
+ if( strcmp( Run->Name, "LOGNAME" ) == 0 ) {
+ CurrentUser.UserName = X;
+ } else if( strcmp( Run->Name, "HOME" ) == 0 ) {
+ CurrentUser.HomeDir = X;
+ } // regulare env var
+ } else {
+ Log(("Could not determine %s\n", Run->Name ));
+ }
+ Run ++;
+ }
CurrentUser.Uid = getuid();
CurrentUser.Gid = getgid();
}
}
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index 16355ba..23b120e 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -24,12 +24,15 @@ typedef struct NetNode_S {
class CurrentQPEUser {
public :
CurrentQPEUser() : UserName(), HomeDir(), EnvList() {}
+ inline bool known( void )
+ { return ! HomeDir.isEmpty() && ! UserName.isEmpty(); }
+
QString UserName;
QString HomeDir;
int Uid;
int Gid;
QArray<char *> EnvList;
};
@@ -96,12 +99,14 @@ public :
void addConnection( NodeCollection * NC );
void removeConnection( const QString & N );
NodeCollection * findConnection( const QString & N );
Name2Connection_t & connections( void )
{ return ConnectionsMap; }
+ inline bool userKnown( void )
+ { return CurrentUser.known(); }
CurrentQPEUser & currentUser( void )
{ return CurrentUser; }
private :
void detectCurrentUser( void );
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index d709c0a..e2dd5b5 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -12,12 +12,19 @@
static QString CfgFile;
NetworkSettingsData::NetworkSettingsData( void ) {
// init global resources structure
new TheNSResources();
+ if( ! NSResources->userKnown() ) {
+ Log(( "Cannot detect qpe user HOME=\"%s\" USER=\"%s\"\n",
+ NSResources->currentUser().HomeDir.latin1(),
+ NSResources->currentUser().UserName.latin1() ));
+ return;
+ }
+
CfgFile.sprintf( "%s/Settings/NS2.conf",
NSResources->currentUser().HomeDir.latin1() );
Log(( "Cfg from %s\n", CfgFile.latin1() ));
// load settings
IsModified = 0;
@@ -536,13 +543,14 @@ bool NetworkSettingsData::canStart( const char * Interface ) {
// load situation
NodeCollection * NC = 0;
QList<NodeCollection> PossibleConnections;
PossibleConnections = collectPossible( Interface );
- Log( ( "Possiblilies %d\n", PossibleConnections.count() ));
+ Log( ( "for %s : Possiblilies %d\n",
+ Interface, PossibleConnections.count() ));
switch( PossibleConnections.count() ) {
case 0 : // no connections
break;
case 1 : // one connection
NC = PossibleConnections.first();
break;
@@ -566,18 +574,20 @@ bool NetworkSettingsData::canStart( const char * Interface ) {
break;
}
// FT
case Available :
case IsUp : // also called for 'ifdown'
// device is ready -> done
+ Log(( "%s-c%d-allowed\n", Interface, NC->number() ));
printf( "%s-c%d-allowed\n", Interface, NC->number() );
return 0;
}
}
// if we come here no alternatives are possible
+ Log(( "%s-cnn-disallowed\n", Interface ));
printf( "%s-cnn-disallowed\n", Interface );
return 0;
}
/*
Called by the system to regenerate config files