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 --- sss_client/pam_sss.c | 55 ++++++++++++++++++++++++++-------------------------- sss_client/sss_cli.h | 34 ++++++++++++++++---------------- 2 files changed, 45 insertions(+), 44 deletions(-) (limited to 'sss_client') diff --git a/sss_client/pam_sss.c b/sss_client/pam_sss.c index 03d902f15..8e31cc6fd 100644 --- a/sss_client/pam_sss.c +++ b/sss_client/pam_sss.c @@ -189,7 +189,7 @@ static int pack_message_v3(struct pam_items *pi, size_t *size, int len; uint8_t *buf; int rp; - uint32_t terminator = END_OF_PAM_REQUEST; + uint32_t terminator = SSS_END_OF_PAM_REQUEST; len = sizeof(uint32_t) + 2*sizeof(uint32_t) + pi->pam_user_size + @@ -215,30 +215,31 @@ static int pack_message_v3(struct pam_items *pi, size_t *size, } rp = 0; - ((uint32_t *)(&buf[rp]))[0] = START_OF_PAM_REQUEST; + ((uint32_t *)(&buf[rp]))[0] = SSS_START_OF_PAM_REQUEST; rp += sizeof(uint32_t); - rp += add_string_item(PAM_ITEM_USER, pi->pam_user, pi->pam_user_size, + rp += add_string_item(SSS_PAM_ITEM_USER, pi->pam_user, pi->pam_user_size, &buf[rp]); - rp += add_string_item(PAM_ITEM_SERVICE, pi->pam_service, + rp += add_string_item(SSS_PAM_ITEM_SERVICE, pi->pam_service, pi->pam_service_size, &buf[rp]); - rp += add_string_item(PAM_ITEM_TTY, pi->pam_tty, pi->pam_tty_size, + rp += add_string_item(SSS_PAM_ITEM_TTY, pi->pam_tty, pi->pam_tty_size, &buf[rp]); - rp += add_string_item(PAM_ITEM_RUSER, pi->pam_ruser, pi->pam_ruser_size, + rp += add_string_item(SSS_PAM_ITEM_RUSER, pi->pam_ruser, pi->pam_ruser_size, &buf[rp]); - rp += add_string_item(PAM_ITEM_RHOST, pi->pam_rhost, pi->pam_rhost_size, + rp += add_string_item(SSS_PAM_ITEM_RHOST, pi->pam_rhost, pi->pam_rhost_size, &buf[rp]); - rp += add_uint32_t_item(PAM_ITEM_CLI_PID, (uint32_t) pi->cli_pid, &buf[rp]); + rp += add_uint32_t_item(SSS_PAM_ITEM_CLI_PID, (uint32_t) pi->cli_pid, + &buf[rp]); - rp += add_authtok_item(PAM_ITEM_AUTHTOK, pi->pam_authtok_type, + rp += add_authtok_item(SSS_PAM_ITEM_AUTHTOK, pi->pam_authtok_type, pi->pam_authtok, pi->pam_authtok_size, &buf[rp]); - rp += add_authtok_item(PAM_ITEM_NEWAUTHTOK, pi->pam_newauthtok_type, + rp += add_authtok_item(SSS_PAM_ITEM_NEWAUTHTOK, pi->pam_newauthtok_type, pi->pam_newauthtok, pi->pam_newauthtok_size, &buf[rp]); @@ -264,9 +265,9 @@ static int null_strcmp(const char *s1, const char *s2) { } enum { - PAM_CONV_DONE = 0, - PAM_CONV_STD, - PAM_CONV_REENTER, + SSS_PAM_CONV_DONE = 0, + SSS_PAM_CONV_STD, + SSS_PAM_CONV_REENTER, }; static int do_pam_conversation(pam_handle_t *pamh, const int msg_style, @@ -275,7 +276,7 @@ static int do_pam_conversation(pam_handle_t *pamh, const int msg_style, char **answer) { int ret; - int state = PAM_CONV_STD; + int state = SSS_PAM_CONV_STD; struct pam_conv *conv; struct pam_message *mesg[1]; struct pam_response *resp=NULL; @@ -298,7 +299,7 @@ static int do_pam_conversation(pam_handle_t *pamh, const int msg_style, } mesg[0]->msg_style = msg_style; - if (state == PAM_CONV_REENTER) { + if (state == SSS_PAM_CONV_REENTER) { mesg[0]->msg = reenter_msg; } else { mesg[0]->msg = msg; @@ -319,7 +320,7 @@ static int do_pam_conversation(pam_handle_t *pamh, const int msg_style, return PAM_SYSTEM_ERR; } - if (state == PAM_CONV_REENTER) { + if (state == SSS_PAM_CONV_REENTER) { if (null_strcmp(*answer, resp[0].resp) != 0) { logger(pamh, LOG_NOTICE, "Passwords do not match."); _pam_overwrite((void *)resp[0].resp); @@ -358,12 +359,12 @@ static int do_pam_conversation(pam_handle_t *pamh, const int msg_style, resp = NULL; } - if (reenter_msg != NULL && state == PAM_CONV_STD) { - state = PAM_CONV_REENTER; + if (reenter_msg != NULL && state == SSS_PAM_CONV_STD) { + state = SSS_PAM_CONV_REENTER; } else { - state = PAM_CONV_DONE; + state = SSS_PAM_CONV_DONE; } - } while (state != PAM_CONV_DONE); + } while (state != SSS_PAM_CONV_DONE); return PAM_SUCCESS; } @@ -408,26 +409,26 @@ static int eval_response(pam_handle_t *pamh, size_t buflen, uint8_t *buf) } switch(type) { - case PAM_SYSTEM_INFO: + case SSS_PAM_SYSTEM_INFO: if (buf[p + (len -1)] != '\0') { D(("user info does not end with \\0.")); break; } logger(pamh, LOG_INFO, "system info: [%s]", &buf[p]); break; - case PAM_DOMAIN_NAME: + case SSS_PAM_DOMAIN_NAME: D(("domain name: [%s]", &buf[p])); break; - case ENV_ITEM: - case PAM_ENV_ITEM: - case ALL_ENV_ITEM: + case SSS_ENV_ITEM: + case SSS_PAM_ENV_ITEM: + case SSS_ALL_ENV_ITEM: if (buf[p + (len -1)] != '\0') { D(("env item does not end with \\0.")); break; } D(("env item: [%s]", &buf[p])); - if (type == PAM_ENV_ITEM || type == ALL_ENV_ITEM) { + if (type == SSS_PAM_ENV_ITEM || type == SSS_ALL_ENV_ITEM) { ret = pam_putenv(pamh, (char *)&buf[p]); if (ret != PAM_SUCCESS) { D(("pam_putenv failed.")); @@ -435,7 +436,7 @@ static int eval_response(pam_handle_t *pamh, size_t buflen, uint8_t *buf) } } - if (type == ENV_ITEM || type == ALL_ENV_ITEM) { + if (type == SSS_ENV_ITEM || type == SSS_ALL_ENV_ITEM) { env_item = strdup((char *)&buf[p]); if (env_item == NULL) { D(("strdup failed")); diff --git a/sss_client/sss_cli.h b/sss_client/sss_cli.h index 3996fff29..7d25711b0 100644 --- a/sss_client/sss_cli.h +++ b/sss_client/sss_cli.h @@ -137,20 +137,20 @@ enum sss_authtok_type { SSS_AUTHTOK_TYPE_PASSWORD = 0x0001, }; -#define START_OF_PAM_REQUEST 0x4d415049 -#define END_OF_PAM_REQUEST 0x4950414d +#define SSS_START_OF_PAM_REQUEST 0x4d415049 +#define SSS_END_OF_PAM_REQUEST 0x4950414d enum pam_item_type { - PAM_ITEM_EMPTY = 0x0000, - PAM_ITEM_USER, - PAM_ITEM_SERVICE, - PAM_ITEM_TTY, - PAM_ITEM_RUSER, - PAM_ITEM_RHOST, - PAM_ITEM_AUTHTOK, - PAM_ITEM_NEWAUTHTOK, - PAM_ITEM_CLI_LOCALE, - PAM_ITEM_CLI_PID, + SSS_PAM_ITEM_EMPTY = 0x0000, + SSS_PAM_ITEM_USER, + SSS_PAM_ITEM_SERVICE, + SSS_PAM_ITEM_TTY, + SSS_PAM_ITEM_RUSER, + SSS_PAM_ITEM_RHOST, + SSS_PAM_ITEM_AUTHTOK, + SSS_PAM_ITEM_NEWAUTHTOK, + SSS_PAM_ITEM_CLI_LOCALE, + SSS_PAM_ITEM_CLI_PID, }; #define SSS_NSS_MAX_ENTRIES 256 @@ -169,11 +169,11 @@ enum sss_status { }; enum response_type { - PAM_SYSTEM_INFO = 0x01, - PAM_DOMAIN_NAME, - PAM_ENV_ITEM, /* only pam environment */ - ENV_ITEM, /* only user environment */ - ALL_ENV_ITEM, /* pam and user environment */ + SSS_PAM_SYSTEM_INFO = 0x01, + SSS_PAM_DOMAIN_NAME, + SSS_PAM_ENV_ITEM, /* only pam environment */ + SSS_ENV_ITEM, /* only user environment */ + SSS_ALL_ENV_ITEM, /* pam and user environment */ }; enum nss_status sss_nss_make_request(enum sss_cli_command cmd, -- cgit