From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 27 Apr 2011 17:12:07 +0000 (+0000)
Subject: Make krb5_os_init_context compile again after r24901
X-Git-Tag: krb5-1.10-alpha1~450
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6cc59b4db732246f27acd04701090221ce1ca0f;p=krb5.git

Make krb5_os_init_context compile again after r24901

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24902 dc483132-0cff-0310-8789-dd5450dbe970
---

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