← Back to branch summary

~mrooney/ecryptfs/nautilus-integration

« back to all changes in this revision

Viewing changes to src/libecryptfs/key_management.c

  • Committer: Dustin Kirkland
  • Date: 2009-04-30 21:59:50 UTC
  • Revision ID: kirkland@canonical.com-20090430215950-3jn680ktxmsmiogm
  * debian/changelog, src/libecryptfs/cmd_ln_parser.c,
    src/libecryptfs/key_management.c, src/pam_ecryptfs/pam_ecryptfs.c,
    src/utils/ecryptfs_add_passphrase.c,
    src/utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c,
    src/utils/ecryptfs_rewrap_passphrase.c,
    src/utils/ecryptfs_unwrap_passphrase.c,
    src/utils/ecryptfs_wrap_passphrase.c: silence some useless logging,
    LP: #313330

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libecryptfs/key_management.c
166
166
        rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);
167
167
        if (rc != -1) { /* we already have this key in keyring; we're done */
168
168
                rc = 1;
169
 
                syslog(LOG_WARNING, "Passphrase key already in keyring;"
170
 
                       " rc = [%d]\n", rc);
171
169
                goto out;
172
170
        } else if ((rc == -1) && (errno != ENOKEY)) {
173
171
                int errnum = errno;
765
763
        memset(&nvp_list_head, 0, sizeof(struct ecryptfs_name_val_pair));
766
764
        rc = ecryptfs_parse_rc_file(&nvp_list_head);
767
765
        if (rc) {
768
 
                if (rc != -EIO) {
 
766
                if (rc != -ENOENT) {
769
767
                        syslog(LOG_WARNING,
770
768
                                "Error attempting to parse .ecryptfsrc file; "
771
769
                                "rc = [%d]", rc);