Commit 6f6c6914 authored by Christian Mollekopf's avatar Christian Mollekopf
Browse files

Use the target of the symlink instead as socket directory.

Socket paths must be shorter than 108 characters, and the symlink is quickly beyond that.
By using the actual directory this can be avoided.

This results in the socket used to start the mysql database, as well as
the socket in akonadiconnectionrc being set to the /tmp/ path.

BUG: 277839
REVIEW: 112152
parent a2ada719
...@@ -99,10 +99,10 @@ QString akonadiSocketDirectory() ...@@ -99,10 +99,10 @@ QString akonadiSocketDirectory()
const QString tmpl = QLatin1String( "akonadi-" ) + QLatin1String( pw_ent->pw_name ) + QLatin1String( ".XXXXXX" ); const QString tmpl = QLatin1String( "akonadi-" ) + QLatin1String( pw_ent->pw_name ) + QLatin1String( ".XXXXXX" );
if ( checkSocketDirectory( link ) ) if ( checkSocketDirectory( link ) )
return link; return QFileInfo( link ).symLinkTarget();
if ( createSocketDirectory( link, tmpl ) ) if ( createSocketDirectory( link, tmpl ) )
return link; return QFileInfo( link ).symLinkTarget();
qCritical() << "Could not create socket directory for Akonadi."; qCritical() << "Could not create socket directory for Akonadi.";
return QString(); return QString();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment