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

« back to all changes in this revision

Viewing changes to src/mtcrypt.c

  • Committer: Bazaar Package Importer
  • Author(s): Bastian Kleineidam
  • Date: 2011-04-07 06:48:37 UTC
  • mfrom: (1.4.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110407064837-0mc0w3g3abiu0bx5
Tags: 2.9-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
649
649
        } else {
650
650
                if (!opt->no_update)
651
651
                        pmt_smtab_remove(mountpoint, SMTABF_MOUNTPOINT);
652
 
                pmt_cmtab_remove(mountpoint, CMTABF_MOUNTPOINT);
 
652
                pmt_cmtab_remove(mountpoint);
653
653
                final_ret = 1;
654
654
        }
655
655
 
658
658
 
659
659
int main(int argc, const char **argv)
660
660
{
 
661
        struct stat sb;
661
662
        int ret;
662
663
 
 
664
        if (stat("/etc/mtab", &sb) == 0 && (sb.st_mode & S_IWUGO) == 0) {
 
665
                fprintf(stderr, "This version of mount.crypt does not support "
 
666
                        "mtab-less systems yet.\n");
 
667
                return EXIT_FAILURE;
 
668
        }
 
669
 
663
670
        ret = HX_init();
664
671
        if (ret <= 0) {
665
672
                fprintf(stderr, "HX_init: %s\n", strerror(errno));