Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 14:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile of the changes in rsloginhandler on Windows.

Browse source 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4009 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-02 22:38:56 +00:00
parent 0dcef10ec2
commit 78aacb927f
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libretroshare/src/rsserver/rsloginhandler.cc
View file

@ -249,14 +249,9 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas
#else #else
/* try to load from file */ /* try to load from file */
std::string entropy = RsInitConfig::load_cert; std::string entropy = getSSLPasswdFileName(ssl_id);
/* get the data out */ /* get the data out */
/* open the data to the file */
std::string passwdfile = RsInitConfig::configDir;
passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator;
passwdfile += "help.dta";
DATA_BLOB DataIn; DATA_BLOB DataIn;
DATA_BLOB DataEnt; DATA_BLOB DataEnt;
DATA_BLOB DataOut; DATA_BLOB DataOut;
@ -269,7 +264,8 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas
char *dataptr = NULL; char *dataptr = NULL;
int datalen = 0; int datalen = 0;
FILE *fp = fopen(passwdfile.c_str(), "rb"); /* open the data to the file */
FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "rb");
if (fp != NULL) if (fp != NULL)
{ {
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
@ -445,7 +441,7 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string
#else /* windows */ #else /* windows */
/* store password encrypted in a file */ /* store password encrypted in a file */
std::string entropy = RsInitConfig::load_cert; std::string entropy = getSSLPasswdFileName(ssl_id);
DATA_BLOB DataIn; DATA_BLOB DataIn;
DATA_BLOB DataEnt; DATA_BLOB DataEnt;
@ -493,15 +489,11 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string
std::cerr << std::endl; std::cerr << std::endl;
**********/ **********/
/* save the data to the file */
std::string passwdfile = RsInitConfig::configDir;
passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator;
passwdfile += "help.dta";
//std::cerr << "Save to: " << passwdfile; //std::cerr << "Save to: " << passwdfile;
//std::cerr << std::endl; //std::cerr << std::endl;
FILE *fp = fopen(passwdfile.c_str(), "wb"); /* save the data to the file */
FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "wb");
if (fp != NULL) if (fp != NULL)
{ {
fwrite(DataOut.pbData, 1, DataOut.cbData, fp); fwrite(DataOut.pbData, 1, DataOut.cbData, fp);

4
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -211,9 +211,9 @@ void StartDialog::notSecureWarning() {
/* some error msg */ /* some error msg */
if(ui.autologin_checkbox->isChecked()) if(ui.autologin_checkbox->isChecked())
#ifdef UBUNTU #ifdef UBUNTU
QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#else #else
QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#endif #endif
return; return;

BIN
retroshare-gui/src/lang/retroshare_de.qm
View file

Binary file not shown.

18
retroshare-gui/src/lang/retroshare_de.ts
View file

@ -10473,25 +10473,33 @@ Bist Du sicher?</translation>
<location line="+30"/> <location line="+30"/>
<location line="+2"/> <location line="+2"/>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished"></translation> <translation>Warnung</translation>
</message> </message>
<message> <message>
<location line="-2"/> <location line="-2"/>
<source> The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. <source>The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring.
Your PGP passwd will not be stored. Your PGP passwd will not be stored.
This choice can be reverted in settings.</source> This choice can be reverted in settings.</source>
<translation type="unfinished"></translation> <translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in deinem Gnome Keyring gespeichert.
Dein PGP wird nicht gespeichert.
Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source> The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. <source>The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure.
Your PGP passwd will not be stored. Your PGP passwd will not be stored.
This choice can be reverted in settings.</source> This choice can be reverted in settings.</source>
<translation type="unfinished"></translation> <translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in der Datei keys/help.dta gespeichert- Das ist nicht sicher.
Dein PGP wird nicht gespeichert.
Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
</message> </message>
</context> </context>
<context> <context>