~ubuntu-branches/ubuntu/vivid/ecryptfs-utils/vivid

« back to all changes in this revision

Viewing changes to src/libecryptfs/cipher_list.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2008-04-09 09:54:00 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080409095400-cexrc09wzgqsk9bs
Tags: 43-1
* New upstream release.
* Removing watch file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
/**
45
45
 * Pulling ourselves up by the bootstraps...
46
46
 */
47
 
static int get_proc_mount_point(char **proc_mount_point)
 
47
int ecryptfs_get_proc_mount_point(char **proc_mount_point)
48
48
{
49
49
        FILE *fp;
50
50
        struct mntent *mntent;
160
160
                rc = -EINVAL;
161
161
                goto out;
162
162
        }
163
 
        rc = get_proc_mount_point(&proc_mount_point);
 
163
        rc = ecryptfs_get_proc_mount_point(&proc_mount_point);
164
164
        if (rc) {
165
165
                syslog(LOG_WARNING, "Error attempting to find proc mount "
166
166
                       "point in [/etc/mtab]. Defaulting to [/proc].\n");
351
351
        char *tmp = NULL;
352
352
        int rc;
353
353
 
354
 
        rc = get_proc_mount_point(&proc_mount_point);
 
354
        rc = ecryptfs_get_proc_mount_point(&proc_mount_point);
355
355
        if (rc) {
356
356
                syslog(LOG_WARNING, "Error attempting to find proc mount "
357
357
                       "point in [/etc/mtab]. Defaulting to [/proc].\n");