i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launch_daemon: Fixed registering session daemon.

Browse Source 
* Still used the old protocol.
* Minor cleanup.
This commit is contained in:
Axel Dörfler
2015-07-22 20:43:35 +02:00
parent 638ee09556
commit a3211522d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/launch/LaunchDaemon.cpp
+4 -4
View File
@@ -311,7 +311,7 @@ LaunchDaemon::MessageReceived(BMessage* message)
const char* baseName = message->GetString("base target"); const char* baseName = message->GetString("base target");
Target* target = FindTarget(name); Target* target = FindTarget(name);
if (target == NULL) { if (target == NULL && baseName != NULL) {
Target* baseTarget = FindTarget(baseName); Target* baseTarget = FindTarget(baseName);
if (baseTarget != NULL) { if (baseTarget != NULL) {
target = new Target(name); target = new Target(name);
@@ -384,13 +384,13 @@ LaunchDaemon::MessageReceived(BMessage* message)
status_t status = B_OK; status_t status = B_OK;
BMessenger target; BMessenger target;
if (message->FindMessenger("target", &target) != B_OK) if (message->FindMessenger("daemon", &target) != B_OK)
status = B_BAD_VALUE; status = B_BAD_VALUE;
if (status == B_OK) { if (status == B_OK) {
Session* session = new (std::nothrow) Session(user, target); Session* session = new (std::nothrow) Session(user, target);
if (session != NULL) if (session != NULL)
fSessions.insert(std::pair<uid_t, Session*>(user, session)); fSessions.insert(std::make_pair(user, session));
else else
status = B_NO_MEMORY; status = B_NO_MEMORY;
} }
@@ -614,7 +614,7 @@ LaunchDaemon::_AddJob(Target* target, bool service, BMessage& message)
if (fInitTarget != NULL) if (fInitTarget != NULL)
job->AddRequirement(fInitTarget->Name()); job->AddRequirement(fInitTarget->Name());
fJobs.insert(std::pair<BString, Job*>(job->Name(), job)); fJobs.insert(std::make_pair(job->Title(), job));
} }