svn rev #24902: trunk/src/lib/krb5/os/

ghudson@MIT.EDU ghudson at MIT.EDU
Wed Apr 27 13:12:07 EDT 2011


http://src.mit.edu/fisheye/changelog/krb5/?cs=24902
Commit By: ghudson
Log Message:
Make krb5_os_init_context compile again after r24901.



Changed Files:
U   trunk/src/lib/krb5/os/init_os_ctx.c
Modified: trunk/src/lib/krb5/os/init_os_ctx.c
===================================================================
--- trunk/src/lib/krb5/os/init_os_ctx.c	2011-04-27 15:58:49 UTC (rev 24901)
+++ trunk/src/lib/krb5/os/init_os_ctx.c	2011-04-27 17:12:07 UTC (rev 24902)
@@ -380,20 +380,18 @@
     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




More information about the cvs-krb5 mailing list