← Back to branch summary

~ecryptfs/ecryptfs/trunk

« back to all changes in this revision

Viewing changes to src/utils/io.c

  • Committer: Tyler Hicks
  • Date: 2012-11-05 06:05:54 UTC
  • Revision ID: tyhicks@canonical.com-20121105060554-5ji4q2865a9qk1ct
* autogen.sh:
  - Use the --copy option when invoking intltoolize

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/utils/io.c
28
28
#include <stdlib.h>
29
29
#include <errno.h>
30
30
#include <sys/mman.h>
 
31
#include "config.h"
31
32
#include "ecryptfs.h"
32
33
#include "io.h"
33
34
 
200
201
        if (!confirmed_pass) {
201
202
                rc = -ENOMEM;
202
203
                ecryptfs_syslog(LOG_ERR, "Failed to allocate memory\n");
203
 
                goto ret;
 
204
                goto out;
204
205
        }
205
206
        mlock(confirmed_pass, ECRYPTFS_MAX_PASSWORD_LENGTH);
206
207
        printf("\n\tMount-wide passphrase: ");
228
229
out:
229
230
        memset(confirmed_pass, 0, ECRYPTFS_MAX_PASSWORD_LENGTH);
230
231
        free(confirmed_pass);
231
 
ret:
232
232
        return rc;
233
233
}
234
234