summaryrefslogtreecommitdiff
path: root/pam_cifscreds.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@samba.org>2014-04-20 20:41:05 -0400
committerJeff Layton <jlayton@samba.org>2014-04-20 20:41:08 -0400
commit382ec63757c1d8d4d399d17ccc927c4897d4cfc9 (patch)
treeef20698955496b8b0a64b61c2249e9d1d2c38ef3 /pam_cifscreds.c
parent3da4c43b575498be86c87a2ac3f3142e3cab1c59 (diff)
downloadcifs-utils-382ec63757c1d8d4d399d17ccc927c4897d4cfc9.tar.gz
cifs-utils-382ec63757c1d8d4d399d17ccc927c4897d4cfc9.tar.bz2
cifs-utils-382ec63757c1d8d4d399d17ccc927c4897d4cfc9.zip
cifscreds: better error handling for key_add
If the string buffers would have been overrun, set errno to EINVAL before returning. Then, have the callers report the errors to stderr or syslog as appropriate. Cc: Sebastian Krahmer <krahmer@suse.de> Signed-off-by: Jeff Layton <jlayton@samba.org>
Diffstat (limited to 'pam_cifscreds.c')
-rw-r--r--pam_cifscreds.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/pam_cifscreds.c b/pam_cifscreds.c
index fb23117..5d99c2d 100644
--- a/pam_cifscreds.c
+++ b/pam_cifscreds.c
@@ -208,6 +208,7 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
switch(errno) {
case ENOKEY:
+ /* success */
break;
default:
pam_syslog(ph, LOG_ERR, "Unable to search keyring for %s (%s)",
@@ -233,8 +234,8 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
while (currentaddress) {
key_serial_t key = key_add(currentaddress, user, password, keytype);
if (key <= 0) {
- pam_syslog(ph, LOG_ERR, "error: Add credential key for %s",
- currentaddress);
+ pam_syslog(ph, LOG_ERR, "error: Add credential key for %s: %s",
+ currentaddress, strerror(errno));
} else {
if ((args & ARG_DEBUG) == ARG_DEBUG) {
pam_syslog(ph, LOG_DEBUG, "credential key for \\\\%s\\%s added",
@@ -336,8 +337,8 @@ static int cifscreds_pam_update(pam_handle_t *ph, const char *user, const char *
for (id = 0; id < count; id++) {
key_serial_t key = key_add(currentaddress, user, password, keytype);
if (key <= 0) {
- pam_syslog(ph, LOG_ERR, "error: Update credential key for %s",
- currentaddress);
+ pam_syslog(ph, LOG_ERR, "error: Update credential key for %s: %s",
+ currentaddress, strerror(errno));
}
}