← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/kfreebsd_compile_fixes/src/mount-sysv.c

  • Committer: Package Import Robot
  • Author(s): Bastian Kleineidam
  • Date: 2011-09-08 20:10:29 UTC
  • mfrom: (1.4.12 upstream)
  • Revision ID: package-import@ubuntu.com-20110908201029-6hjjcz06by8r70p8
Tags: 2.11-1
http://bugs.debian.org/635083
http://bugs.debian.org/638155
* New upstream release.
* Removed Vcs-Git and Vcs-Browser from debian/control since they are
  supposed to include the debian/ files and not only upstream.
  (Closes: #635083)
* Suggest cifs-utils instead of smbfs. (Closes: #638155)
* Require base-files >= 6.4 since /run is used now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/kfreebsd_compile_fixes/src/mount-sysv.c
18
18
    const struct vol *vpt, struct HXformat_map *vinfo)
19
19
{
20
20
        int (*xcmp)(const char *, const char *);
21
 
        hxmc_t *dev;
22
21
        int cret, sret;
23
22
 
24
 
        if ((dev = pmt_vol_to_dev(vpt)) == NULL) {
25
 
                l0g("pmt::vol_to_dev: %s\n", strerror(errno));
26
 
                return -1;
27
 
        }
28
 
 
29
23
        xcmp = fstype2_icase(vpt->type) ? strcasecmp : strcmp;
30
24
 
31
 
        cret = pmt_cmtab_mounted(dev, vpt->mountpoint);
32
 
        sret = pmt_smtab_mounted(dev, vpt->mountpoint, xcmp);
 
25
        cret = pmt_cmtab_mounted(vpt->combopath, vpt->mountpoint);
 
26
        sret = pmt_smtab_mounted(vpt->combopath, vpt->mountpoint, xcmp);
33
27
        if (cret > 0 || sret > 0)
34
28
                return true;
35
29
        if (cret == 0 && sret == 0)