Switch to unified view

a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx
...
...
245
    LockableShmSeg seg(ohcreds_segpath, ohcreds_segid, ohcreds_segsize);
245
    LockableShmSeg seg(ohcreds_segpath, ohcreds_segid, ohcreds_segsize);
246
    if (seg.ok()) {
246
    if (seg.ok()) {
247
        LockableShmSeg::Accessor access(seg);
247
        LockableShmSeg::Accessor access(seg);
248
        char *cp = (char *)(access.getseg());
248
        char *cp = (char *)(access.getseg());
249
        string data(cp);
249
        string data(cp);
250
        LOGDEB1("PlgWithSlave::maybeStartCmd: segment content [" << data << "]\n");
250
        LOGDEB1("PlgWithSlave::maybeStartCmd: segment content [" << data <<
251
                "]\n");
251
        ConfSimple credsconf(data, true);
252
        ConfSimple credsconf(data, true);
252
        string user, password;
253
        string user, password;
253
        if (credsconf.get(plg->m_name + "user", user) &&
254
        if (credsconf.get(plg->m_name + "user", user) &&
254
            credsconf.get(plg->m_name + "pass", password)) {
255
            credsconf.get(plg->m_name + "pass", password)) {
255
            unordered_map<string,string> res;
256
            unordered_map<string,string> res;
256
            if (!cmd.callproc("login", {{"user", user}, {"password", password}}, res)) {
257
            if (!cmd.callproc("login", {{"user", user}, {"password", password}},
258
                              res)) {
257
                LOGINF("PlgWithSlave::maybeStartCmd: tried login but failed for " <<
259
                LOGINF("PlgWithSlave::maybeStartCmd: tried login but failed for "
258
                       plg->m_name);
260
                       << plg->m_name);
259
            }
261
            }
260
        }
262
        }
261
    } else {
263
    } else {
262
        LOGDEB0("PlgWithSlave::maybeStartCmd: shm attach failed (probably ok)\n");
264
        LOGDEB0("PlgWithSlave::maybeStartCmd: shm attach error (probably ok)\n");
263
    }
265
    }
264
    return true;
266
    return true;
265
}
267
}
266
268
267
bool PlgWithSlave::startInit()
269
bool PlgWithSlave::startInit()