>From 3518cdf8501898fd3f7b57a90bd75b2b58395164 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Fri, 8 Jan 2010 14:52:17 +0100 Subject: [PATCH] Rename PAM_USER_INFO to PAM_SYSTEM_INFO --- server/providers/data_provider_be.c | 2 +- server/providers/krb5/krb5_child.c | 4 ++-- sss_client/pam_sss.c | 6 +++--- sss_client/sss_cli.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c index e59f64a..40d5c8c 100644 --- a/server/providers/data_provider_be.c +++ b/server/providers/data_provider_be.c @@ -584,7 +584,7 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) if (!becli->bectx->bet_info[target].bet_ops) { DEBUG(7, ("Undefined backend target.\n")); pd->pam_status = PAM_MODULE_UNKNOWN; - ret = pam_add_response(pd, PAM_USER_INFO, + ret = pam_add_response(pd, PAM_SYSTEM_INFO, sizeof(MSG_TARGET_NO_CONFIGURED), (const uint8_t *) MSG_TARGET_NO_CONFIGURED); if (ret != EOK) { diff --git a/server/providers/krb5/krb5_child.c b/server/providers/krb5/krb5_child.c index 04cf1f0..a8eed71 100644 --- a/server/providers/krb5/krb5_child.c +++ b/server/providers/krb5/krb5_child.c @@ -300,7 +300,7 @@ static struct response *prepare_response_message(struct krb5_req *kr, if (kerr == 0) { if(kr->pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) { - ret = pack_response_packet(resp, PAM_SUCCESS, PAM_USER_INFO, + ret = pack_response_packet(resp, PAM_SUCCESS, PAM_SYSTEM_INFO, "success"); } else { if (kr->ccname == NULL) { @@ -324,7 +324,7 @@ static struct response *prepare_response_message(struct krb5_req *kr, return NULL; } - ret = pack_response_packet(resp, pam_status, PAM_USER_INFO, krb5_msg); + ret = pack_response_packet(resp, pam_status, PAM_SYSTEM_INFO, krb5_msg); sss_krb5_free_error_message(krb5_error_ctx, krb5_msg); } diff --git a/sss_client/pam_sss.c b/sss_client/pam_sss.c index 951a1dc..abd9706 100644 --- a/sss_client/pam_sss.c +++ b/sss_client/pam_sss.c @@ -397,12 +397,12 @@ static int eval_response(pam_handle_t *pamh, size_t buflen, uint8_t *buf) } switch(*type) { - case PAM_USER_INFO: + case PAM_SYSTEM_INFO: if (buf[p + (*len -1)] != '\0') { - D(("user info does not end with \\0.")); + D(("system info does not end with \\0.")); break; } - logger(pamh, LOG_INFO, "user info: [%s]", &buf[p]); + logger(pamh, LOG_INFO, "system info: [%s]", &buf[p]); break; case PAM_DOMAIN_NAME: D(("domain name: [%s]", &buf[p])); diff --git a/sss_client/sss_cli.h b/sss_client/sss_cli.h index 7c18e1c..3996fff 100644 --- a/sss_client/sss_cli.h +++ b/sss_client/sss_cli.h @@ -169,7 +169,7 @@ enum sss_status { }; enum response_type { - PAM_USER_INFO = 0x01, + PAM_SYSTEM_INFO = 0x01, PAM_DOMAIN_NAME, PAM_ENV_ITEM, /* only pam environment */ ENV_ITEM, /* only user environment */ -- 1.6.5.2