 6cfbde4d86
			
		
	
	6cfbde4d86
	
	
	
		
			
			The plugin interfaces were originally implemented for use on Unix where KRB5_CALLCONV, HEIM_CALLCONV and similar are defined as nothing. However, on 32-bit Windows the calling convention matters and executing a __stdcall function through a __cdecl function pointer will result in failures. This change updates the krb5plugin_windc, krb5plugin_service_locate, krb5plugin_send_to_kdc plugins to specify the KRB5_CALLCONV for functions. This brings the plugins into compliance with the heim_plugin_common interface requirement that init() and fini() use the platform specified HEIM_CALLCONV. The krb5-plugin(7) man page is updated and the lib/krb5/test_plugin test is also fixed. With this change all tests pass on 32-bit Windows. Change-Id: Ic9d2e1285c9c179e3898dc9d071ed092bcddc406
		
			
				
	
	
		
			132 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			132 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2006 Kungliga Tekniska Högskolan
 | |
|  * (Royal Institute of Technology, Stockholm, Sweden).
 | |
|  * All rights reserved.
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without
 | |
|  * modification, are permitted provided that the following conditions
 | |
|  * are met:
 | |
|  *
 | |
|  * 1. Redistributions of source code must retain the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer.
 | |
|  *
 | |
|  * 2. Redistributions in binary form must reproduce the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer in the
 | |
|  *    documentation and/or other materials provided with the distribution.
 | |
|  *
 | |
|  * 3. Neither the name of the Institute nor the names of its contributors
 | |
|  *    may be used to endorse or promote products derived from this software
 | |
|  *    without specific prior written permission.
 | |
|  *
 | |
|  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 | |
|  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | |
|  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | |
|  * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 | |
|  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | |
|  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | |
|  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | |
|  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | |
|  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | |
|  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | |
|  * SUCH DAMAGE.
 | |
|  */
 | |
| 
 | |
| #include <krb5_locl.h>
 | |
| #include "locate_plugin.h"
 | |
| 
 | |
| static krb5_error_code KRB5_CALLCONV
 | |
| resolve_init(krb5_context context, void **ctx)
 | |
| {
 | |
|     *ctx = NULL;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static void KRB5_CALLCONV
 | |
| resolve_fini(void *ctx)
 | |
| {
 | |
| }
 | |
| 
 | |
| static krb5_error_code KRB5_CALLCONV
 | |
| resolve_lookup(void *ctx,
 | |
| 	       enum locate_service_type service,
 | |
| 	       const char *realm,
 | |
| 	       int domain,
 | |
| 	       int type,
 | |
| 	       int (*add)(void *,int,struct sockaddr *),
 | |
| 	       void *addctx)
 | |
| {
 | |
|     struct sockaddr_in s;
 | |
| 
 | |
|     memset(&s, 0, sizeof(s));
 | |
| 
 | |
| #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 | |
|     s.sin_len = sizeof(s);
 | |
| #endif
 | |
|     s.sin_family = AF_INET;
 | |
|     s.sin_port = htons(88);
 | |
|     s.sin_addr.s_addr = htonl(0x7f000002);
 | |
| 
 | |
|     if (strcmp(realm, "NOTHERE.H5L.SE") == 0) {
 | |
| 	(*add)(addctx, type, (struct sockaddr *)&s);
 | |
| 	return 0;
 | |
|     }
 | |
| 
 | |
|     return KRB5_PLUGIN_NO_HANDLE;
 | |
| }
 | |
| 
 | |
| 
 | |
| krb5plugin_service_locate_ftable resolve = {
 | |
|     0,
 | |
|     resolve_init,
 | |
|     resolve_fini,
 | |
|     resolve_lookup,
 | |
|     NULL
 | |
| };
 | |
| 
 | |
| 
 | |
| int
 | |
| main(int argc, char **argv)
 | |
| {
 | |
|     krb5_error_code ret;
 | |
|     krb5_context context;
 | |
|     krb5_krbhst_handle handle;
 | |
|     char host[MAXHOSTNAMELEN];
 | |
|     int found = 0;
 | |
| 
 | |
|     setprogname(argv[0]);
 | |
| 
 | |
|     ret = krb5_init_context(&context);
 | |
|     if (ret)
 | |
| 	errx(1, "krb5_init_contex");
 | |
| 
 | |
|     ret = krb5_plugin_register(context, PLUGIN_TYPE_DATA,
 | |
| 			       KRB5_PLUGIN_LOCATE, &resolve);
 | |
|     if (ret)
 | |
| 	krb5_err(context, 1, ret, "krb5_plugin_register");
 | |
| 
 | |
| 
 | |
|     ret = krb5_krbhst_init_flags(context,
 | |
| 				 "NOTHERE.H5L.SE",
 | |
| 				 KRB5_KRBHST_KDC,
 | |
| 				 0,
 | |
| 				 &handle);
 | |
|     if (ret)
 | |
| 	krb5_err(context, 1, ret, "krb5_krbhst_init_flags");
 | |
| 
 | |
| 
 | |
|     while(krb5_krbhst_next_as_string(context, handle, host, sizeof(host)) == 0){
 | |
| 	found++;
 | |
|  	if (!found && strcmp(host, "127.0.0.2") != 0 && strcmp(host, "tcp/127.0.0.2") != 0)
 | |
| 	    krb5_errx(context, 1, "wrong address: %s", host);
 | |
|     }
 | |
|     if (!found)
 | |
| 	krb5_errx(context, 1, "failed to find host");
 | |
|     if (found < 2)
 | |
| 	krb5_errx(context, 1, "did not get the two expected results");
 | |
| 
 | |
|     krb5_krbhst_free(context, handle);
 | |
| 
 | |
|     krb5_free_context(context);
 | |
|     return 0;
 | |
| }
 |