← Back to branch summary

~mrooney/ecryptfs/nautilus-integration

« back to all changes in this revision

Viewing changes to src/pam_ecryptfs/pam_ecryptfs.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/pam_ecryptfs/pam_ecryptfs.c
147
147
        }
148
148
        rc = ecryptfs_read_salt_hex_from_rc(salt_hex);
149
149
        if (rc) {
150
 
                syslog(LOG_WARNING, "%s\n", ECRYPTFS_WARN_DEFAULT_SALT);
151
150
                from_hex(salt, ECRYPTFS_DEFAULT_SALT_HEX, ECRYPTFS_SALT_SIZE);
152
151
        } else
153
152
                from_hex(salt, salt_hex, ECRYPTFS_SALT_SIZE);
185
184
                                auth_tok_sig, passphrase, salt);
186
185
                }
187
186
                if (rc == 1) {
188
 
                        syslog(LOG_WARNING, "There is already a key in the "
189
 
                               "user session keyring for the given "
190
 
                               "passphrase.\n");
191
187
                        goto out_child;
192
188
                }
193
189
                if (rc) {
441
437
                goto out;
442
438
        }
443
439
        if ((rc = ecryptfs_read_salt_hex_from_rc(salt_hex))) {
444
 
                syslog(LOG_WARNING, "%s\n", ECRYPTFS_WARN_DEFAULT_SALT);
445
440
                from_hex(salt, ECRYPTFS_DEFAULT_SALT_HEX, ECRYPTFS_SALT_SIZE);
446
441
        } else {
447
442
                from_hex(salt, salt_hex, ECRYPTFS_SALT_SIZE);