From 6c9fe712447b4b868c9fe3e1d91df174485d0ada Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Fri, 8 Jan 2010 17:39:09 +0100 Subject: Avoid 'PAM' at the beginning of define and enum names --- server/providers/data_provider_be.c | 2 +- server/providers/krb5/krb5_auth.c | 8 ++++---- server/providers/krb5/krb5_child.c | 7 ++++--- server/responder/pam/pamsrv.c | 8 ++++---- server/responder/pam/pamsrv_cmd.c | 26 +++++++++++++------------- 5 files changed, 26 insertions(+), 25 deletions(-) (limited to 'server') diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c index 72b671ba8..fa26c1456 100644 --- a/server/providers/data_provider_be.c +++ b/server/providers/data_provider_be.c @@ -587,7 +587,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_SYSTEM_INFO, + ret = pam_add_response(pd, SSS_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_auth.c b/server/providers/krb5/krb5_auth.c index 1ac8c4c5a..c013ea89e 100644 --- a/server/providers/krb5/krb5_auth.c +++ b/server/providers/krb5/krb5_auth.c @@ -66,7 +66,7 @@ static errno_t add_krb5_env(struct dp_option *opts, const char *ccname, ret = ENOMEM; goto done; } - ret = pam_add_response(pd, PAM_ENV_ITEM, strlen(env)+1, + ret = pam_add_response(pd, SSS_PAM_ENV_ITEM, strlen(env)+1, (uint8_t *) env); if (ret != EOK) { DEBUG(1, ("pam_add_response failed.\n")); @@ -82,7 +82,7 @@ static errno_t add_krb5_env(struct dp_option *opts, const char *ccname, ret = ENOMEM; goto done; } - ret = pam_add_response(pd, PAM_ENV_ITEM, strlen(env)+1, + ret = pam_add_response(pd, SSS_PAM_ENV_ITEM, strlen(env)+1, (uint8_t *) env); if (ret != EOK) { DEBUG(1, ("pam_add_response failed.\n")); @@ -98,7 +98,7 @@ static errno_t add_krb5_env(struct dp_option *opts, const char *ccname, ret = ENOMEM; goto done; } - ret = pam_add_response(pd, PAM_ENV_ITEM, strlen(env)+1, + ret = pam_add_response(pd, SSS_PAM_ENV_ITEM, strlen(env)+1, (uint8_t *) env); if (ret != EOK) { DEBUG(1, ("pam_add_response failed.\n")); @@ -945,7 +945,7 @@ static void krb5_resolve_done(struct tevent_req *req) goto done; } - ret = pam_add_response(pd, PAM_ENV_ITEM, strlen(msg) + 1, + ret = pam_add_response(pd, SSS_PAM_ENV_ITEM, strlen(msg) + 1, (uint8_t *) msg); if (ret != EOK) { DEBUG(1, ("pam_add_response failed.\n")); diff --git a/server/providers/krb5/krb5_child.c b/server/providers/krb5/krb5_child.c index a8eed714f..8ff9259bf 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_SYSTEM_INFO, + ret = pack_response_packet(resp, PAM_SUCCESS, SSS_PAM_SYSTEM_INFO, "success"); } else { if (kr->ccname == NULL) { @@ -314,7 +314,7 @@ static struct response *prepare_response_message(struct krb5_req *kr, return NULL; } - ret = pack_response_packet(resp, PAM_SUCCESS, PAM_ENV_ITEM, msg); + ret = pack_response_packet(resp, PAM_SUCCESS, SSS_PAM_ENV_ITEM, msg); talloc_zfree(msg); } } else { @@ -324,7 +324,8 @@ static struct response *prepare_response_message(struct krb5_req *kr, return NULL; } - ret = pack_response_packet(resp, pam_status, PAM_SYSTEM_INFO, krb5_msg); + ret = pack_response_packet(resp, pam_status, SSS_PAM_SYSTEM_INFO, + krb5_msg); sss_krb5_free_error_message(krb5_error_ctx, krb5_msg); } diff --git a/server/responder/pam/pamsrv.c b/server/responder/pam/pamsrv.c index 626d2c55f..84b13dc45 100644 --- a/server/responder/pam/pamsrv.c +++ b/server/responder/pam/pamsrv.c @@ -43,8 +43,8 @@ #include "sbus/sbus_client.h" #include "responder/pam/pamsrv.h" -#define PAM_SBUS_SERVICE_VERSION 0x0001 -#define PAM_SBUS_SERVICE_NAME "pam" +#define SSS_PAM_SBUS_SERVICE_VERSION 0x0001 +#define SSS_PAM_SBUS_SERVICE_NAME "pam" static int service_reload(DBusMessage *message, struct sbus_connection *conn); @@ -142,8 +142,8 @@ static int pam_process_init(TALLOC_CTX *mem_ctx, SSS_PAM_SOCKET_NAME, SSS_PAM_PRIV_SOCKET_NAME, CONFDB_PAM_CONF_ENTRY, - PAM_SBUS_SERVICE_NAME, - PAM_SBUS_SERVICE_VERSION, + SSS_PAM_SBUS_SERVICE_NAME, + SSS_PAM_SBUS_SERVICE_VERSION, &monitor_pam_interface, "PAM", &pam_dp_interface, &pctx->rctx); diff --git a/server/responder/pam/pamsrv_cmd.c b/server/responder/pam/pamsrv_cmd.c index bc7685368..f89e73c8c 100644 --- a/server/responder/pam/pamsrv_cmd.c +++ b/server/responder/pam/pamsrv_cmd.c @@ -96,10 +96,10 @@ static int pam_parse_in_data_v2(struct sss_names_ctx *snctx, uint32_t size; char *pam_user; int ret; - uint32_t terminator = END_OF_PAM_REQUEST; + uint32_t terminator = SSS_END_OF_PAM_REQUEST; if (blen < 4*sizeof(uint32_t)+2 || - ((uint32_t *)body)[0] != START_OF_PAM_REQUEST || + ((uint32_t *)body)[0] != SSS_START_OF_PAM_REQUEST || memcmp(&body[blen - sizeof(uint32_t)], &terminator, sizeof(uint32_t)) != 0) { DEBUG(1, ("Received data is invalid.\n")); return EINVAL; @@ -112,7 +112,7 @@ static int pam_parse_in_data_v2(struct sss_names_ctx *snctx, if (c > blen) return EINVAL; switch(type) { - case PAM_ITEM_USER: + case SSS_PAM_ITEM_USER: ret = extract_string(&pam_user, body, blen, &c); if (ret != EOK) return ret; @@ -120,39 +120,39 @@ static int pam_parse_in_data_v2(struct sss_names_ctx *snctx, &pd->domain, &pd->user); if (ret != EOK) return ret; break; - case PAM_ITEM_SERVICE: + case SSS_PAM_ITEM_SERVICE: ret = extract_string(&pd->service, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_TTY: + case SSS_PAM_ITEM_TTY: ret = extract_string(&pd->tty, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_RUSER: + case SSS_PAM_ITEM_RUSER: ret = extract_string(&pd->ruser, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_RHOST: + case SSS_PAM_ITEM_RHOST: ret = extract_string(&pd->rhost, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_CLI_PID: + case SSS_PAM_ITEM_CLI_PID: ret = extract_uint32_t(&pd->cli_pid, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_AUTHTOK: + case SSS_PAM_ITEM_AUTHTOK: ret = extract_authtok(&pd->authtok_type, &pd->authtok_size, &pd->authtok, body, blen, &c); if (ret != EOK) return ret; break; - case PAM_ITEM_NEWAUTHTOK: + case SSS_PAM_ITEM_NEWAUTHTOK: ret = extract_authtok(&pd->newauthtok_type, &pd->newauthtok_size, &pd->newauthtok, body, blen, &c); if (ret != EOK) return ret; break; - case END_OF_PAM_REQUEST: + case SSS_END_OF_PAM_REQUEST: if (c != blen) return EINVAL; break; default: @@ -574,7 +574,7 @@ static void pam_reply(struct pam_auth_req *preq) } if (pd->domain != NULL) { - pam_add_response(pd, PAM_DOMAIN_NAME, strlen(pd->domain)+1, + pam_add_response(pd, SSS_PAM_DOMAIN_NAME, strlen(pd->domain)+1, (uint8_t *) pd->domain); } @@ -671,7 +671,7 @@ static int pam_forwarder(struct cli_ctx *cctx, int pam_cmd) size_t blen; int timeout; int ret; - uint32_t terminator = END_OF_PAM_REQUEST; + uint32_t terminator = SSS_END_OF_PAM_REQUEST; preq = talloc_zero(cctx, struct pam_auth_req); if (!preq) { return ENOMEM; -- cgit