← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libpam-mount/trusty-proposed

« back to all changes in this revision

Viewing changes to src/rdconf1.c

  • Committer: Bazaar Package Importer
  • Author(s): Bastian Kleineidam
  • Date: 2010-05-09 10:46:01 UTC
  • mfrom: (1.4.4 upstream) (27.2.7 maverick)
  • Revision ID: james.westby@ubuntu.com-20100509104601-cip885tmppv2tc52
Tags: 2.1+git20100509-1
http://bugs.debian.org/580636
http://bugs.debian.org/484122
http://bugs.debian.org/580430
* New upstream release, plus git changes until 9.5.2010
  + Works now with other password slots than zero on crypted mounts
    (Closes: #580636)
  + Certainly includes old patch fixing the cron segfaults
    (Closes: #484122)
* Only warn about missing fskey hash when an fskey path has been given.
  (Closes: #580430)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rdconf1.c
126
126
 
127
127
        if (*dest_pptr == NULL)
128
128
                return true;
129
 
        HXformat_aprintf(vinfo, &tmp, *dest_pptr);
 
129
        HXformat2_aprintf(vinfo, &tmp, *dest_pptr);
130
130
        *dest_pptr = xstrdup(tmp);
131
131
        HXmc_free(tmp);
132
132
        return true;
1317
1317
                free(vpt->fs_key_cipher);
1318
1318
                vpt->fs_key_cipher = tmp;
1319
1319
        }
 
1320
        if ((tmp = xml_getprop(node, "fskeypath")) != NULL) {
 
1321
                free(vpt->fs_key_path);
 
1322
                vpt->fs_key_path = tmp;
 
1323
        }
1320
1324
        if ((tmp = xml_getprop(node, "fskeyhash")) != NULL) {
1321
1325
                free(vpt->fs_key_hash);
1322
1326
                vpt->fs_key_hash = tmp;
1323
 
        } else {
1324
 
                l0g("Volume %s: consider specifying the fskeyhash\n",
1325
 
                    (vpt->volume != NULL) ? vpt->volume : "(null)");
 
1327
        } else {
 
1328
                if (vpt->fs_key_path != NULL)
 
1329
                        l0g("Volume %s: consider specifying the fskeyhash\n",
 
1330
                            (vpt->volume != NULL) ? vpt->volume : "(null)");
1326
1331
                vpt->fs_key_hash = HX_strdup("md5");
1327
1332
        }
1328
 
        if ((tmp = xml_getprop(node, "fskeypath")) != NULL) {
1329
 
                free(vpt->fs_key_path);
1330
 
                vpt->fs_key_path = tmp;
1331
 
        }
1332
1333
 
1333
1334
        if (fstype_nodev(vpt->fstype) == 1 && vpt->volume == NULL)
1334
1335
                vpt->volume = xstrdup("none");
1343
1344
 
1344
1345
//-----------------------------------------------------------------------------
1345
1346
static const struct pmt_command default_command[] = {
1346
 
        {CMD_SMBMOUNT,   "smbfs", {"smbmount", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" OPTIONS)", NULL}},
 
1347
        {CMD_SMBMOUNT,   "smbfs", {"smbmount", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(if %(OPTIONS),\",%(OPTIONS)\")", NULL}},
1347
1348
        {CMD_SMBUMOUNT,  "smbfs", {"smbumount", "%(MNTPT)", NULL}},
1348
 
        {CMD_CIFSMOUNT,   "cifs", {"mount", "-t", "cifs", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "user=%(USER),uid=%(USERUID),gid=%(USERGID)%(before=\",\" OPTIONS)", NULL}},
1349
 
        {CMD_NCPMOUNT,   "ncpfs", {"ncpmount", "%(SERVER)/%(USER)", "%(MNTPT)", "-o", "pass-fd=0,volume=%(VOLUME)%(before=\",\" OPTIONS)", NULL}},
 
1349
        {CMD_CIFSMOUNT,   "cifs", {"mount", "-t", "cifs", "//%(SERVER)/%(VOLUME)", "%(MNTPT)", "-o", "user=%(USER),uid=%(USERUID),gid=%(USERGID)%(if %(OPTIONS),\",%(OPTIONS)\")", NULL}},
 
1350
        {CMD_NCPMOUNT,   "ncpfs", {"ncpmount", "%(SERVER)/%(USER)", "%(MNTPT)", "-o", "pass-fd=0,volume=%(VOLUME)%(if %(OPTIONS),\",%(OPTIONS)\")", NULL}},
1350
1351
        {CMD_NCPUMOUNT,  "ncpfs", {"ncpumount", "%(MNTPT)", NULL}},
1351
 
        {CMD_FUSEMOUNT,   "fuse", {"mount.fuse", "%(VOLUME)", "%(MNTPT)", "%(ifnempty=\"-o\" OPTIONS)", "%(OPTIONS)", NULL}},
 
1352
        {CMD_FUSEMOUNT,   "fuse", {"mount.fuse", "%(VOLUME)", "%(MNTPT)", "%(if %(OPTIONS),-o%(OPTIONS))", NULL}},
1352
1353
        {CMD_FUSEUMOUNT, "fuse",  {"fusermount", "-u", "%(MNTPT)", NULL}},
1353
1354
        /* Do not use LCLMOUNT to avoid calling fsck */
1354
 
        {CMD_NFSMOUNT,    "nfs",   {"mount", "%(ifnempty=\"-o\" OPTIONS)", "%(OPTIONS)", "-t", "%(FSTYPE)", "%(SERVER):%(VOLUME)", "%(MNTPT)", NULL}},
 
1355
        {CMD_NFSMOUNT,    "nfs",   {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(SERVER):%(VOLUME)", "%(MNTPT)", NULL}},
1355
1356
        {CMD_NFSMOUNT,    "nfs4"},
1356
 
        {CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(ifnempty=\"-o\" OPTIONS)", "%(OPTIONS)", "-t", "%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
1357
 
        {CMD_CRYPTMOUNT,  "crypt", {"mount.crypt", "%(ifnempty=\"-ocipher=\" CIPHER)%(CIPHER)", "%(ifnempty=\"-ofsk_cipher=\" FSKEYCIPHER)%(FSKEYCIPHER)", "%(ifnempty=\"-ofsk_hash=\" FSKEYHASH)%(FSKEYHASH)", "%(ifnempty=\"-okeyfile=\" FSKEYPATH)%(FSKEYPATH)", "%(ifnempty=\"-o\" OPTIONS)%(OPTIONS)", "%(VOLUME)", "%(MNTPT)", NULL}},
 
1357
        {CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
 
1358
        {CMD_CRYPTMOUNT,  "crypt", {"mount.crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}},
1358
1359
        {CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}},
1359
1360
        {CMD_UMOUNT,     NULL,     {"umount", "%(MNTPT)", NULL}},
1360
1361
        {CMD_FSCK,       NULL,     {"fsck", "-p", "%(FSCKTARGET)", NULL}},