Switch to unified view

a/src/ohcredentials.cxx b/src/ohcredentials.cxx
...
...
300
        return true;
300
        return true;
301
    }
301
    }
302
302
303
    bool save() {
303
    bool save() {
304
        bool saveohcredentials = doingsavetofile();
304
        bool saveohcredentials = doingsavetofile();
305
        // We share the creds with the media server process because it
305
        // The media server process needs the credentials for
306
        // needs them for url translation If saveohcredentials is
306
        // translating the permanent URL into the actual media stream
307
        // true, we use a file, which can also be used by the regular
307
        // ones. We can use either a shared memory segment or a file
308
        // media server plugin, for possible later access without
308
        // for this purpose.
309
        // ohcredentials (e.g. with another non-kazoo CP). If it's
309
        //
310
        // false, we use a shared mem segment, and the user/pass would
310
        // Using a file offers less security (the creds are available
311
        // have to be set in /etc/upmpdcli.conf for the media server
311
        // to anyone with physical access to the device), but they can
312
        // plugin to work.
312
        // then also be used by the regular Media Server plugin,
313
        // allowing access by a non-ohcredentials CP (e.g. upplay)
314
        // without having to set them in upmpdcli.conf. In other
315
        // words, the Credentials service utility is extended to
316
        // regular CPs.
317
        // 
318
        // The choice between shmem/file is decided by the
319
        // saveohcredentials configuration variable
313
        if (saveohcredentials) {
320
        if (saveohcredentials) {
314
            string credsfile = path_cat(cachedir, "screds");
321
            string credsfile = path_cat(cachedir, "screds");
315
            ConfSimple credsconf(credsfile.c_str());
322
            ConfSimple credsconf(credsfile.c_str());
316
            if (!credsconf.ok()) {
323
            if (!credsconf.ok()) {
317
                LOGERR("OHCredentials: error opening " << credsfile <<
324
                LOGERR("OHCredentials: error opening " << credsfile <<