From 8e58945adc547918c6fc7c3441870e952c1236e4 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Fri, 24 Nov 1995 02:44:55 +0000 Subject: [PATCH] minor formatting changes. renamed check() to somthing less generic --- dce_pwent.c | 76 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/dce_pwent.c b/dce_pwent.c index 6fd5908c9..72acd194e 100644 --- a/dce_pwent.c +++ b/dce_pwent.c @@ -1,5 +1,5 @@ /* - * supplied by Jeff Earickson, Colby College, Waterville, ME + * Contributed by Jeff Earickson, Colby College, Waterville, ME * (jaearick@colby.edu) * The code below basically comes from the examples supplied on * the OSF DCE 1.0.3 manpages for the sec_login routines, with @@ -23,9 +23,17 @@ #include #include /* required to call dce_error_inq_text routine */ -static int error_stat; -static unsigned char error_string[dce_c_error_string_len]; -int check(error_status_t input_status, char *comment); +/* + * Prototypes + */ +static int check_dce_status __P((error_status_t, char *)); + +/* + * Globals + */ +static int error_stat; +static unsigned char error_string[dce_c_error_string_len]; + /* returns 1 (true) if user is a valid DCE principal, 0 (false) otherwise */ int dce_pwent(username, plain_pw) @@ -43,7 +51,7 @@ int dce_pwent(username, plain_pw) if(sec_login_setup_identity((unsigned_char_p_t) username, sec_login_no_flags, &login_context, &status)) { - if (check(status, "sec_login_setup_identity(1):")) + if (check_dce_status(status, "sec_login_setup_identity(1):")) return(0); password_rec.key.key_type = sec_passwd_plain; @@ -52,71 +60,73 @@ int dce_pwent(username, plain_pw) if(sec_login_validate_identity(login_context, &password_rec, &reset_passwd, &auth_src, &status)) { - if (check(status, "sec_login_validate_identity(1):")) + if (check_dce_status(status, "sec_login_validate_identity(1):")) return(0); if (!sec_login_certify_identity(login_context, &status)) { - (void) fprintf(stderr, "Whoa! Bogus authentication server!\n"); - (void) check(status, "sec_login_certify_identity(1):"); - return(0); + (void) fprintf(stderr, "Whoa! Bogus authentication server!\n"); + (void) check_dce_status(status, "sec_login_certify_identity(1):"); + return(0); } - if(check(status, "sec_login_certify_identity(2):")) + if(check_dce_status(status, "sec_login_certify_identity(2):")) return(0); (void) sec_login_set_context(login_context, &status); - if (check(status, "sec_login_set_context:")) + if (check_dce_status(status, "sec_login_set_context:")) return(0); if (auth_src != sec_login_auth_src_network) { - (void) fprintf(stderr, "You have no network credentials\n"); - return(0); + (void) fprintf(stderr, "You have no network credentials\n"); + return(0); } if (reset_passwd) { - (void) fprintf(stderr, "Your DCE password needs resetting\n"); - return(0); + (void) fprintf(stderr, "Your DCE password needs resetting\n"); + return(0); } - /* malloc space for passwd structure */ + /* malloc() space for passwd structure */ nbytes = sizeof(struct passwd); - if((pwd = (struct passwd *) malloc(nbytes)) == NULL) { - (void) fprintf(stderr, "malloc for passwd struct failed\n"); - return(0);; + if ((pwd = (struct passwd *) malloc(nbytes)) == NULL) { + (void) fprintf(stderr, "malloc for passwd struct failed\n"); + return(0);; } (void) sec_login_get_pwent(login_context, &pwd, &status); (void) free(pwd); - if (check(status, "sec_login_get_pwent:")) + if (check_dce_status(status, "sec_login_get_pwent:")) return(0); - /* if we get to here, then the pwent above */ - /* properly fetched the password structure */ - /* from the DCE registry, so the user must */ - /* be valid. We don't really care what */ - /* the user's registry password is, just */ - /* that the user could be validated.... */ + /* + * if we get to here, then the pwent above properly + * fetched the password structure from the DCE registry, + * so the user must be valid. We don't really care what + * the user's registry password is, just that the user + * could be validated.... + */ return(1); } else { - if (check(status, "sec_login_validate_identity(2):")) - return(0); - sec_login_purge_context(&login_context, &status); - if (check(status, "sec_login_purge_context:")) - return(0); + if (check_dce_status(status, "sec_login_validate_identity(2):")) + return(0); + (void) sec_login_purge_context(&login_context, &status); + if (check_dce_status(status, "sec_login_purge_context:")) + return(0); } } - if (check(status, "sec_login_setup_identity(2):")) + if (check_dce_status(status, "sec_login_setup_identity(2):")) return(0); return(0); } /* returns 1 (true) for DCE "ok" status, 0 (false) otherwise */ -int check(input_status, comment) +static int check_dce_status(input_status, comment) error_status_t input_status; char *comment; { if (input_status == rpc_s_ok) return(0); + (void) dce_error_inq_text(input_status, error_string, &error_stat); (void) fprintf(stderr, "%s %s\n", comment, error_string); -- 2.40.0