Changeset 187 in openpam
- Timestamp:
- Dec 12, 2002, 5:06:29 PM (18 years ago)
- Location:
- trunk/lib
- Files:
-
- 44 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/openpam_borrow_cred.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c# 2$34 * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#3 $ 35 35 */ 36 36 … … 58 58 int r; 59 59 60 ENTER(); 60 61 if (geteuid() != 0) 61 return(PAM_PERM_DENIED);62 RETURNC(PAM_PERM_DENIED); 62 63 scred = calloc(1, sizeof *scred); 63 64 if (scred == NULL) 64 return(PAM_BUF_ERR);65 RETURNC(PAM_BUF_ERR); 65 66 scred->euid = geteuid(); 66 67 scred->egid = getegid(); … … 68 69 if (r == -1) { 69 70 free(scred); 70 return(PAM_SYSTEM_ERR);71 RETURNC(PAM_SYSTEM_ERR); 71 72 } 72 73 scred->ngroups = r; … … 74 75 if (r != PAM_SUCCESS) { 75 76 free(scred); 76 return(r);77 RETURNC(r); 77 78 } 78 79 if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 || 79 80 setegid(pwd->pw_gid) == -1 || seteuid(pwd->pw_uid) == -1) { 80 81 openpam_restore_cred(pamh); 81 return(PAM_SYSTEM_ERR);82 RETURNC(PAM_SYSTEM_ERR); 82 83 } 83 return(PAM_SUCCESS);84 RETURNC(PAM_SUCCESS); 84 85 } 85 86 -
trunk/lib/openpam_findenv.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_findenv.c# 8$34 * $P4: //depot/projects/openpam/lib/openpam_findenv.c#9 $ 35 35 */ 36 36 … … 54 54 int i; 55 55 56 ENTER(); 56 57 if (pamh == NULL) 57 return (-1); 58 58 RETURNI(-1); 59 59 for (i = 0; i < pamh->env_count; ++i) 60 60 if (strncmp(pamh->env[i], name, len) == 0 && 61 61 pamh->env[i][len] == '=') 62 return(i);63 return(-1);62 RETURNI(i); 63 RETURNI(-1); 64 64 } 65 65 -
trunk/lib/openpam_free_data.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_free_data.c# 2$34 * $P4: //depot/projects/openpam/lib/openpam_free_data.c#3 $ 35 35 */ 36 36 … … 51 51 openpam_free_data(pam_handle_t *pamh, void *data, int status) 52 52 { 53 /* silence compiler warnings */ 54 pamh = pamh; 55 status = status; 53 54 ENTER(); 55 (void)pamh; 56 (void)status; 56 57 free(data); 58 RETURNV(); 57 59 } 58 60 -
trunk/lib/openpam_get_option.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_get_option.c# 4$34 * $P4: //depot/projects/openpam/lib/openpam_get_option.c#5 $ 35 35 */ 36 36 … … 58 58 int i; 59 59 60 ENTER(); 60 61 if (pamh == NULL || pamh->current == NULL || option == NULL) 61 return(NULL);62 RETURNS(NULL); 62 63 cur = pamh->current; 63 64 len = strlen(option); … … 65 66 if (strncmp(cur->optv[i], option, len) == 0) { 66 67 if (cur->optv[i][len] == '\0') 67 return(&cur->optv[i][len]);68 RETURNS(&cur->optv[i][len]); 68 69 else if (cur->optv[i][len] == '=') 69 return(&cur->optv[i][len + 1]);70 RETURNS(&cur->optv[i][len + 1]); 70 71 } 71 72 } 72 return(NULL);73 RETURNS(NULL); 73 74 } 74 75 -
trunk/lib/openpam_log.c
r175 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_log.c#1 6$34 * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ 35 35 */ 36 36 … … 65 65 #ifndef DEBUG 66 66 return; 67 #e ndif67 #else 68 68 priority = LOG_DEBUG; 69 69 break; 70 #endif 70 71 case PAM_LOG_VERBOSE: 71 72 priority = LOG_INFO; … … 110 111 #ifndef DEBUG 111 112 return; 112 #e ndif113 #else 113 114 priority = LOG_DEBUG; 114 115 break; 116 #endif 115 117 case PAM_LOG_VERBOSE: 116 118 priority = LOG_INFO; -
trunk/lib/openpam_nullconv.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_nullconv.c# 3$34 * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#4 $ 35 35 */ 36 36 … … 38 38 39 39 #include <security/pam_appl.h> 40 #include <security/openpam.h> 40 41 #include "openpam_impl.h" 41 42 42 43 /* … … 53 54 { 54 55 56 ENTER(); 55 57 (void)n; 56 58 (void)msg; 57 59 (void)resp; 58 60 (void)data; 59 return(PAM_CONV_ERR);61 RETURNC(PAM_CONV_ERR); 60 62 } 61 63 -
trunk/lib/openpam_restore_cred.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c# 2$34 * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#3 $ 35 35 */ 36 36 … … 57 57 int r; 58 58 59 ENTER(); 59 60 r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); 60 61 if (r != PAM_SUCCESS) 61 return(r);62 RETURNC(r); 62 63 if (scred == NULL) 63 return(PAM_SYSTEM_ERR);64 RETURNC(PAM_SYSTEM_ERR); 64 65 if (seteuid(scred->euid) == -1 || 65 66 setgroups(scred->ngroups, scred->groups) == -1 || 66 67 setegid(scred->egid) == -1) 67 return(PAM_SYSTEM_ERR);68 RETURNC(PAM_SYSTEM_ERR); 68 69 pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL); 69 return(PAM_SUCCESS);70 RETURNC(PAM_SUCCESS); 70 71 } 71 72 -
trunk/lib/openpam_set_option.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_set_option.c# 5$34 * $P4: //depot/projects/openpam/lib/openpam_set_option.c#6 $ 35 35 */ 36 36 … … 62 62 int i; 63 63 64 ENTER(); 64 65 if (pamh == NULL || pamh->current == NULL || option == NULL) 65 return(PAM_SYSTEM_ERR);66 RETURNC(PAM_SYSTEM_ERR); 66 67 cur = pamh->current; 67 68 for (len = 0; option[len] != '\0'; ++len) … … 76 77 /* remove */ 77 78 if (i == cur->optc) 78 return(PAM_SUCCESS);79 RETURNC(PAM_SUCCESS); 79 80 for (free(cur->optv[i]); i < cur->optc; ++i) 80 81 cur->optv[i] = cur->optv[i + 1]; 81 82 cur->optv[i] = NULL; 82 return(PAM_SUCCESS);83 RETURNC(PAM_SUCCESS); 83 84 } 84 85 if ((opt = malloc(len + strlen(value) + 2)) == NULL) 85 return(PAM_BUF_ERR);86 RETURNC(PAM_BUF_ERR); 86 87 sprintf(opt, "%.*s=%s", (int)len, option, value); 87 88 if (i == cur->optc) { … … 90 91 if (optv == NULL) { 91 92 free(opt); 92 return(PAM_BUF_ERR);93 RETURNC(PAM_BUF_ERR); 93 94 } 94 95 optv[i] = opt; … … 101 102 cur->optv[i] = opt; 102 103 } 103 return(PAM_SUCCESS);104 RETURNC(PAM_SUCCESS); 104 105 } 105 106 -
trunk/lib/openpam_ttyconv.c
r170 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#1 3$34 * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#14 $ 35 35 */ 36 36 … … 47 47 48 48 #include <security/pam_appl.h> 49 #include <security/openpam.h> 49 50 #include "openpam_impl.h" 50 51 51 52 int openpam_ttyconv_timeout = 0; … … 140 141 int i; 141 142 142 data = data; 143 ENTER(); 144 (void)data; 143 145 if (n <= 0 || n > PAM_MAX_NUM_MSG) 144 return(PAM_CONV_ERR);146 RETURNC(PAM_CONV_ERR); 145 147 if ((*resp = calloc(n, sizeof **resp)) == NULL) 146 return(PAM_BUF_ERR);148 RETURNC(PAM_BUF_ERR); 147 149 for (i = 0; i < n; ++i) { 148 150 resp[i]->resp_retcode = 0; … … 175 177 } 176 178 } 177 return(PAM_SUCCESS);179 RETURNC(PAM_SUCCESS); 178 180 fail: 179 181 while (i) … … 181 183 free(*resp); 182 184 *resp = NULL; 183 return(PAM_CONV_ERR);185 RETURNC(PAM_CONV_ERR); 184 186 } 185 187 -
trunk/lib/pam_acct_mgmt.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c# 9$34 * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#10 $ 35 35 */ 36 36 … … 52 52 int flags) 53 53 { 54 int pam_err; 54 55 55 return (openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags)); 56 ENTER(); 57 pam_err = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); 58 RETURNC(pam_err); 56 59 } 57 60 -
trunk/lib/pam_authenticate.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_authenticate.c#1 1$34 * $P4: //depot/projects/openpam/lib/pam_authenticate.c#12 $ 35 35 */ 36 36 … … 54 54 int pam_err; 55 55 56 ENTER(); 56 57 if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) 57 return(PAM_SYMBOL_ERR);58 RETURNC(PAM_SYMBOL_ERR); 58 59 pam_err = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); 59 60 pam_set_item(pamh, PAM_AUTHTOK, NULL); 60 return(pam_err);61 RETURNC(pam_err); 61 62 } 62 63 -
trunk/lib/pam_authenticate_secondary.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c# 6$34 * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_chauthtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#1 2$34 * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#13 $ 35 35 */ 36 36 … … 54 54 int pam_err; 55 55 56 ENTER(); 56 57 if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) 57 return(PAM_SYMBOL_ERR);58 RETURNC(PAM_SYMBOL_ERR); 58 59 pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, 59 60 flags | PAM_PRELIM_CHECK); … … 63 64 pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); 64 65 pam_set_item(pamh, PAM_AUTHTOK, NULL); 65 return(pam_err);66 RETURNC(pam_err); 66 67 } 67 68 -
trunk/lib/pam_close_session.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_close_session.c# 9$34 * $P4: //depot/projects/openpam/lib/pam_close_session.c#10 $ 35 35 */ 36 36 … … 53 53 { 54 54 55 ENTER(); 55 56 if (flags & ~(PAM_SILENT)) 56 return(PAM_SYMBOL_ERR);57 return(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags));57 RETURNC(PAM_SYMBOL_ERR); 58 RETURNC(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); 58 59 } 59 60 -
trunk/lib/pam_end.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_end.c#1 0$34 * $P4: //depot/projects/openpam/lib/pam_end.c#11 $ 35 35 */ 36 36 … … 55 55 int i; 56 56 57 ENTER(); 57 58 if (pamh == NULL) 58 return(PAM_SYSTEM_ERR);59 RETURNC(PAM_SYSTEM_ERR); 59 60 60 61 /* clear module data */ … … 81 82 free(pamh); 82 83 83 return(PAM_SUCCESS);84 RETURNC(PAM_SUCCESS); 84 85 } 85 86 -
trunk/lib/pam_get_authtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_authtok.c# 19$34 * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#20 $ 35 35 */ 36 36 … … 66 66 int pitem, r, style, twice; 67 67 68 ENTER(); 68 69 if (pamh == NULL || authtok == NULL) 69 return (PAM_SYSTEM_ERR); 70 70 RETURNC(PAM_SYSTEM_ERR); 71 71 *authtok = NULL; 72 72 twice = 0; … … 87 87 break; 88 88 default: 89 return(PAM_SYMBOL_ERR);89 RETURNC(PAM_SYMBOL_ERR); 90 90 } 91 92 91 if (openpam_get_option(pamh, "try_first_pass") || 93 92 openpam_get_option(pamh, "use_first_pass")) { 94 93 r = pam_get_item(pamh, item, (const void **)authtok); 95 94 if (r == PAM_SUCCESS && *authtok != NULL) 96 return(PAM_SUCCESS);95 RETURNC(PAM_SUCCESS); 97 96 else if (openpam_get_option(pamh, "use_first_pass")) 98 return(r == PAM_SUCCESS ? PAM_AUTH_ERR : r);97 RETURNC(r == PAM_SUCCESS ? PAM_AUTH_ERR : r); 99 98 } 100 99 if (prompt == NULL) { … … 107 106 r = pam_prompt(pamh, style, &resp, "%s", prompt); 108 107 if (r != PAM_SUCCESS) 109 return(r);108 RETURNC(r); 110 109 if (twice) { 111 110 r = pam_prompt(pamh, style, &resp2, "Retype %s", prompt); 112 111 if (r != PAM_SUCCESS) { 113 112 free(resp); 114 return(r);113 RETURNC(r); 115 114 } 116 115 if (strcmp(resp, resp2) != 0) { … … 121 120 } 122 121 if (resp == NULL) 123 return(PAM_TRY_AGAIN);122 RETURNC(PAM_TRY_AGAIN); 124 123 r = pam_set_item(pamh, item, resp); 125 124 free(resp); 126 125 if (r != PAM_SUCCESS) 127 return(r);128 return(pam_get_item(pamh, item, (const void **)authtok));126 RETURNC(r); 127 RETURNC(pam_get_item(pamh, item, (const void **)authtok)); 129 128 } 130 129 -
trunk/lib/pam_get_data.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_data.c# 8$34 * $P4: //depot/projects/openpam/lib/pam_get_data.c#9 $ 35 35 */ 36 36 … … 55 55 pam_data_t *dp; 56 56 57 ENTER(); 57 58 if (pamh == NULL) 58 return (PAM_SYSTEM_ERR); 59 59 RETURNC(PAM_SYSTEM_ERR); 60 60 for (dp = pamh->module_data; dp != NULL; dp = dp->next) 61 61 if (strcmp(dp->name, module_data_name) == 0) { 62 62 *data = dp->data; 63 return(PAM_SUCCESS);63 RETURNC(PAM_SUCCESS); 64 64 } 65 66 return (PAM_NO_MODULE_DATA); 65 RETURNC(PAM_NO_MODULE_DATA); 67 66 } 68 67 -
trunk/lib/pam_get_item.c
r164 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_item.c#1 3$34 * $P4: //depot/projects/openpam/lib/pam_get_item.c#14 $ 35 35 */ 36 36 … … 53 53 const void **item) 54 54 { 55 56 ENTER(); 55 57 if (pamh == NULL) 56 return (PAM_SYSTEM_ERR); 57 58 RETURNC(PAM_SYSTEM_ERR); 58 59 switch (item_type) { 59 60 case PAM_SERVICE: … … 70 71 case PAM_REPOSITORY: 71 72 *item = pamh->item[item_type]; 72 return(PAM_SUCCESS);73 RETURNC(PAM_SUCCESS); 73 74 default: 74 return(PAM_SYMBOL_ERR);75 RETURNC(PAM_SYMBOL_ERR); 75 76 } 76 77 } -
trunk/lib/pam_get_mapped_authtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c# 6$34 * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c#7 $ 35 35 */ 36 36 … … 53 53 { 54 54 55 return (PAM_SYSTEM_ERR); 55 ENTER(); 56 RETURNC(PAM_SYSTEM_ERR); 56 57 } 57 58 -
trunk/lib/pam_get_mapped_username.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c# 6$34 * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c#7 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_get_user.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_get_user.c#1 2$34 * $P4: //depot/projects/openpam/lib/pam_get_user.c#13 $ 35 35 */ 36 36 … … 61 61 int r; 62 62 63 ENTER(); 63 64 if (pamh == NULL || user == NULL) 64 return (PAM_SYSTEM_ERR); 65 65 RETURNC(PAM_SYSTEM_ERR); 66 66 r = pam_get_item(pamh, PAM_USER, (const void **)user); 67 67 if (r == PAM_SUCCESS) 68 return(PAM_SUCCESS);68 RETURNC(PAM_SUCCESS); 69 69 if (prompt == NULL) { 70 70 r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt); … … 74 74 r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt); 75 75 if (r != PAM_SUCCESS) 76 return(r);76 RETURNC(r); 77 77 r = pam_set_item(pamh, PAM_USER, resp); 78 78 free(resp); 79 79 if (r != PAM_SUCCESS) 80 return(r);81 return(pam_get_item(pamh, PAM_USER, (const void **)user));80 RETURNC(r); 81 RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user)); 82 82 } 83 83 -
trunk/lib/pam_getenv.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_getenv.c# 7$34 * $P4: //depot/projects/openpam/lib/pam_getenv.c#8 $ 35 35 */ 36 36 … … 55 55 int i; 56 56 57 ENTER(); 57 58 if (pamh == NULL) 58 return (NULL); 59 60 /* sanity checks */ 59 RETURNC(NULL); 61 60 if (name == NULL || strchr(name, '=') != NULL) 62 return (NULL); 63 61 RETURNC(NULL); 64 62 if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) 65 return(NULL);66 return(strdup(pamh->env[i]));63 RETURNC(NULL); 64 RETURNC(strdup(pamh->env[i])); 67 65 } 68 66 -
trunk/lib/pam_getenvlist.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_getenvlist.c# 9$34 * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#10 $ 35 35 */ 36 36 … … 55 55 int i; 56 56 57 ENTER(); 57 58 if (pamh == NULL) 58 return (NULL); 59 59 RETURNP(NULL); 60 60 envlist = malloc(sizeof(char *) * (pamh->env_count + 1)); 61 61 if (envlist == NULL) { 62 62 openpam_log(PAM_LOG_ERROR, "%s", 63 63 pam_strerror(pamh, PAM_BUF_ERR)); 64 return(NULL);64 RETURNP(NULL); 65 65 } 66 66 for (i = 0; i < pamh->env_count; ++i) { … … 71 71 openpam_log(PAM_LOG_ERROR, "%s", 72 72 pam_strerror(pamh, PAM_BUF_ERR)); 73 return(NULL);73 RETURNP(NULL); 74 74 } 75 75 } 76 76 envlist[i] = NULL; 77 openpam_log(PAM_LOG_DEBUG, "returning %d variables\n", pamh->env_count); 78 return (envlist); 77 RETURNP(envlist); 79 78 } 80 79 -
trunk/lib/pam_open_session.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_open_session.c# 9$34 * $P4: //depot/projects/openpam/lib/pam_open_session.c#10 $ 35 35 */ 36 36 … … 53 53 { 54 54 55 ENTER(); 55 56 if (flags & ~(PAM_SILENT)) 56 return(PAM_SYMBOL_ERR);57 return(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags));57 RETURNC(PAM_SYMBOL_ERR); 58 RETURNC(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); 58 59 } 59 60 -
trunk/lib/pam_putenv.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_putenv.c# 8$34 * $P4: //depot/projects/openpam/lib/pam_putenv.c#9 $ 35 35 */ 36 36 … … 56 56 int i; 57 57 58 ENTER(); 58 59 if (pamh == NULL) 59 return(PAM_SYSTEM_ERR);60 RETURNC(PAM_SYSTEM_ERR); 60 61 61 62 /* sanity checks */ 62 63 if (namevalue == NULL || (p = strchr(namevalue, '=')) == NULL) 63 return(PAM_SYSTEM_ERR);64 RETURNC(PAM_SYSTEM_ERR); 64 65 65 66 /* see if the variable is already in the environment */ 66 67 if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) != -1) { 67 68 if ((p = strdup(namevalue)) == NULL) 68 return(PAM_BUF_ERR);69 RETURNC(PAM_BUF_ERR); 69 70 free(pamh->env[i]); 70 71 pamh->env[i] = p; 71 return(PAM_SUCCESS);72 RETURNC(PAM_SUCCESS); 72 73 } 73 74 … … 77 78 sizeof(char *) * (pamh->env_size * 2 + 1)); 78 79 if (env == NULL) 79 return(PAM_BUF_ERR);80 RETURNC(PAM_BUF_ERR); 80 81 pamh->env = env; 81 82 pamh->env_size = pamh->env_size * 2 + 1; … … 84 85 /* add the variable at the end */ 85 86 if ((pamh->env[pamh->env_count] = strdup(namevalue)) == NULL) 86 return(PAM_BUF_ERR);87 RETURNC(PAM_BUF_ERR); 87 88 ++pamh->env_count; 88 return(PAM_SUCCESS);89 RETURNC(PAM_SUCCESS); 89 90 } 90 91 -
trunk/lib/pam_set_data.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_set_data.c#1 0$34 * $P4: //depot/projects/openpam/lib/pam_set_data.c#11 $ 35 35 */ 36 36 … … 59 59 pam_data_t *dp; 60 60 61 ENTER(); 61 62 if (pamh == NULL) 62 return (PAM_SYSTEM_ERR); 63 63 RETURNC(PAM_SYSTEM_ERR); 64 64 for (dp = pamh->module_data; dp != NULL; dp = dp->next) { 65 65 if (strcmp(dp->name, module_data_name) == 0) { … … 68 68 dp->data = data; 69 69 dp->cleanup = cleanup; 70 return(PAM_SUCCESS);70 RETURNC(PAM_SUCCESS); 71 71 } 72 72 } 73 74 73 if ((dp = malloc(sizeof *dp)) == NULL) 75 return(PAM_BUF_ERR);74 RETURNC(PAM_BUF_ERR); 76 75 if ((dp->name = strdup(module_data_name)) == NULL) { 77 76 free(dp); 78 return(PAM_BUF_ERR);77 RETURNC(PAM_BUF_ERR); 79 78 } 80 79 dp->data = data; … … 82 81 dp->next = pamh->module_data; 83 82 pamh->module_data = dp; 84 return(PAM_SUCCESS);83 RETURNC(PAM_SUCCESS); 85 84 } 86 85 -
trunk/lib/pam_set_item.c
r164 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_set_item.c#1 5$34 * $P4: //depot/projects/openpam/lib/pam_set_item.c#16 $ 35 35 */ 36 36 … … 59 59 size_t nsize, osize; 60 60 61 ENTER(); 61 62 if (pamh == NULL) 62 return (PAM_SYSTEM_ERR); 63 63 RETURNC(PAM_SYSTEM_ERR); 64 64 slot = &pamh->item[item_type]; 65 65 switch (item_type) { … … 86 86 break; 87 87 default: 88 return(PAM_SYMBOL_ERR);88 RETURNC(PAM_SYMBOL_ERR); 89 89 } 90 90 if (*slot != NULL) { … … 94 94 if (item != NULL) { 95 95 if ((tmp = malloc(nsize)) == NULL) 96 return(PAM_BUF_ERR);96 RETURNC(PAM_BUF_ERR); 97 97 memcpy(tmp, item, nsize); 98 98 } else { … … 100 100 } 101 101 *slot = tmp; 102 return(PAM_SUCCESS);102 RETURNC(PAM_SUCCESS); 103 103 } 104 104 -
trunk/lib/pam_set_mapped_authtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_set_mapped_authtok.c# 6$34 * $P4: //depot/projects/openpam/lib/pam_set_mapped_authtok.c#7 $ 35 35 */ 36 36 … … 53 53 { 54 54 55 return (PAM_SYSTEM_ERR); 55 ENTER(); 56 RETURNC(PAM_SYSTEM_ERR); 56 57 } 57 58 -
trunk/lib/pam_set_mapped_username.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_set_mapped_username.c# 6$34 * $P4: //depot/projects/openpam/lib/pam_set_mapped_username.c#7 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_setcred.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_setcred.c#1 0$34 * $P4: //depot/projects/openpam/lib/pam_setcred.c#11 $ 35 35 */ 36 36 … … 53 53 { 54 54 55 ENTER(); 55 56 if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| 56 57 PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) 57 return(PAM_SYMBOL_ERR);58 RETURNC(PAM_SYMBOL_ERR); 58 59 /* XXX enforce exclusivity */ 59 return(openpam_dispatch(pamh, PAM_SM_SETCRED, flags));60 RETURNC(openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); 60 61 } 61 62 -
trunk/lib/pam_setenv.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_setenv.c# 7$34 * $P4: //depot/projects/openpam/lib/pam_setenv.c#8 $ 35 35 */ 36 36 … … 59 59 int r; 60 60 61 ENTER(); 61 62 if (pamh == NULL) 62 return(PAM_SYSTEM_ERR);63 RETURNC(PAM_SYSTEM_ERR); 63 64 64 65 /* sanity checks */ 65 66 if (name == NULL || value == NULL || strchr(name, '=') != NULL) 66 return(PAM_SYSTEM_ERR);67 RETURNC(PAM_SYSTEM_ERR); 67 68 68 69 /* is it already there? */ 69 70 if (!overwrite && openpam_findenv(pamh, name, strlen(name)) != -1) 70 return(PAM_SUCCESS);71 RETURNC(PAM_SUCCESS); 71 72 72 73 /* set it... */ 73 74 if ((env = malloc(strlen(name) + strlen(value) + 2)) == NULL) 74 return(PAM_BUF_ERR);75 RETURNC(PAM_BUF_ERR); 75 76 sprintf(env, "%s=%s", name, value); 76 77 r = pam_putenv(pamh, env); 77 78 free(env); 78 return(r);79 RETURNC(r); 79 80 } 80 81 -
trunk/lib/pam_sm_acct_mgmt.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#5 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_sm_authenticate.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c#5 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_sm_authenticate_secondary.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#5 $ 35 35 */ 36 36 … … 59 59 { 60 60 61 return (PAM_SYSTEM_ERR); 61 ENTER(); 62 RETURNC(PAM_SYSTEM_ERR); 62 63 } 63 64 -
trunk/lib/pam_sm_chauthtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c# 5$34 * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c#6 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_sm_close_session.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c#5 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_sm_get_mapped_authtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#5 $ 35 35 */ 36 36 … … 58 58 { 59 59 60 return (PAM_SYSTEM_ERR); 60 ENTER(); 61 RETURNC(PAM_SYSTEM_ERR); 61 62 } 62 63 -
trunk/lib/pam_sm_get_mapped_username.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_username.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#5 $ 35 35 */ 36 36 … … 59 59 { 60 60 61 return (PAM_SYSTEM_ERR); 61 ENTER(); 62 RETURNC(PAM_SYSTEM_ERR); 62 63 } 63 64 -
trunk/lib/pam_sm_open_session.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c#5 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_sm_set_mapped_authtok.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#5 $ 35 35 */ 36 36 … … 58 58 { 59 59 60 return (PAM_SYSTEM_ERR); 60 ENTER(); 61 RETURNC(PAM_SYSTEM_ERR); 61 62 } 62 63 -
trunk/lib/pam_sm_set_mapped_username.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_username.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#5 $ 35 35 */ 36 36 … … 56 56 { 57 57 58 return (PAM_SYSTEM_ERR); 58 ENTER(); 59 RETURNC(PAM_SYSTEM_ERR); 59 60 } 60 61 -
trunk/lib/pam_sm_setcred.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c# 4$34 * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c#5 $ 35 35 */ 36 36 … … 54 54 { 55 55 56 return (PAM_SYSTEM_ERR); 56 ENTER(); 57 RETURNC(PAM_SYSTEM_ERR); 57 58 } 58 59 -
trunk/lib/pam_start.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_start.c#1 6$34 * $P4: //depot/projects/openpam/lib/pam_start.c#17 $ 35 35 */ 36 36 … … 57 57 int r; 58 58 59 ENTER(); 59 60 if ((ph = calloc(1, sizeof *ph)) == NULL) 60 return(PAM_BUF_ERR);61 RETURNC(PAM_BUF_ERR); 61 62 if ((r = pam_set_item(ph, PAM_SERVICE, service)) != PAM_SUCCESS) 62 63 goto fail; … … 72 73 *pamh = ph; 73 74 openpam_log(PAM_LOG_DEBUG, "pam_start(\"%s\") succeeded", service); 74 return(PAM_SUCCESS);75 RETURNC(PAM_SUCCESS); 75 76 76 77 fail: 77 78 pam_end(ph, r); 78 return(r);79 RETURNC(r); 79 80 } 80 81 -
trunk/lib/pam_vprompt.c
r157 r187 32 32 * SUCH DAMAGE. 33 33 * 34 * $P4: //depot/projects/openpam/lib/pam_vprompt.c# 7$34 * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $ 35 35 */ 36 36 … … 40 40 41 41 #include <security/pam_appl.h> 42 #include <security/openpam.h> 42 43 #include "openpam_impl.h" 43 44 44 45 /* … … 62 63 int r; 63 64 65 ENTER(); 64 66 r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); 65 67 if (r != PAM_SUCCESS) 66 return(r);68 RETURNC(r); 67 69 if (conv == NULL) { 68 70 openpam_log(PAM_LOG_ERROR, "no conversation function"); 69 return(PAM_SYSTEM_ERR);71 RETURNC(PAM_SYSTEM_ERR); 70 72 } 71 73 vsnprintf(msgbuf, PAM_MAX_MSG_SIZE, fmt, ap); … … 77 79 *resp = rsp == NULL ? NULL : rsp->resp; 78 80 free(rsp); 79 return(r);81 RETURNC(r); 80 82 } 81 83
Note: See TracChangeset
for help on using the changeset viewer.