From d6cc59b4db732246f27acd04701090221ce1ca0f Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Wed, 27 Apr 2011 17:12:07 +0000 Subject: [PATCH] Make krb5_os_init_context compile again after r24901 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24902 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/os/init_os_ctx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 5c31d850d..6cb9b1680 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -380,20 +380,18 @@ krb5_os_init_context(krb5_context ctx, krb5_boolean kdc) ctx->preauth_context = NULL; retval = os_init_paths(ctx, kdc); - /* - * If there's an error in the profile, return an error. Just - * ignoring the error is a Bad Thing (tm). - */ + if (retval) + return retval; #ifdef _WIN32 - /* We initialize winsock to version 1.1 but - * we do not care if we succeed or fail. - */ - wVersionRequested = 0x0101; - WSAStartup (wVersionRequested, &wsaData); + /* We initialize winsock to version 1.1 but + * we do not care if we succeed or fail. + */ + wVersionRequested = 0x0101; + WSAStartup (wVersionRequested, &wsaData); #endif /* _WIN32 */ - } - return retval; + + return 0; } krb5_error_code KRB5_CALLCONV -- 2.26.2