svn rev #22111: tools/gssmonger/trunk/ gssmaggot/ include/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22111
Commit By: raeburn
Log Message:
fix up conditionalization of gss_wrap_iov - actually do configure test; get macro name right; actually include config.h


Changed Files:
U   tools/gssmonger/trunk/configure.ac
U   tools/gssmonger/trunk/gssmaggot/gssapi.c
U   tools/gssmonger/trunk/include/unix.h
Modified: tools/gssmonger/trunk/configure.ac
===================================================================
--- tools/gssmonger/trunk/configure.ac	2009-03-17 22:37:00 UTC (rev 22110)
+++ tools/gssmonger/trunk/configure.ac	2009-03-17 22:48:38 UTC (rev 22111)
@@ -90,6 +90,8 @@
    # Not much to check; we hope that krb5-config checked everything for us
 fi
 
+AC_CHECK_FUNCS(gss_wrap_iov)
+
 # Log4cpp replaces ezlog under Windows.
 AC_ARG_WITH(log4cpp, [  --with-log4cpp=PREFIX	Specify location of log4cpp], [log4cpp="$withval"], [log4cpp=yes])
 if test "$log4cpp" != no; then

Modified: tools/gssmonger/trunk/gssmaggot/gssapi.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-17 22:37:00 UTC (rev 22110)
+++ tools/gssmonger/trunk/gssmaggot/gssapi.c	2009-03-17 22:48:38 UTC (rev 22111)
@@ -1007,7 +1007,7 @@
 	  OUT PULONG    pcbPad,
 	  OUT PVOID     *ppvTrailer,
 	  OUT PULONG    pcbTrailer ) {
-#ifdef HAVE_GSS_WRAP_EX
+#ifdef HAVE_GSS_WRAP_IOV
     GSSERRTYPE         minor = 0;
     ULONG              ulRet = GSMERR_TEST_ISSUE;
     gss_iov_buffer_desc Buffers[5] = { { 0 } };
@@ -1082,7 +1082,7 @@
 
 	    OUT PVOID                  *ppvClear,
 	    OUT PULONG                 pcbClear ) {
-#ifdef HAVE_GSS_WRAP_EX
+#ifdef HAVE_GSS_WRAP_IOV
     gss_iov_buffer_desc Buffers[5] = { { 0 } };
     GSSERRTYPE          minor = 0;
     ULONG               ulRet = GSMERR_TEST_ISSUE;

Modified: tools/gssmonger/trunk/include/unix.h
===================================================================
--- tools/gssmonger/trunk/include/unix.h	2009-03-17 22:37:00 UTC (rev 22110)
+++ tools/gssmonger/trunk/include/unix.h	2009-03-17 22:48:38 UTC (rev 22111)
@@ -74,6 +74,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include "../config.h"
+
 #ifdef USE_TIME_H
 #include <time.h>
 #else