svn commit: samba r17802 - in branches/SAMBA_3_0/source/libaddns: .
jerry at samba.org
jerry at samba.org
Thu Aug 24 18:09:05 GMT 2006
Author: jerry
Date: 2006-08-24 18:09:05 +0000 (Thu, 24 Aug 2006)
New Revision: 17802
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17802
Log:
trying to fix more build farm hosts
Modified:
branches/SAMBA_3_0/source/libaddns/dns.h
branches/SAMBA_3_0/source/libaddns/dnsgss.c
branches/SAMBA_3_0/source/libaddns/dnssign.c
branches/SAMBA_3_0/source/libaddns/dnsupdate.c
Changeset:
Modified: branches/SAMBA_3_0/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dns.h 2006-08-24 16:56:36 UTC (rev 17801)
+++ branches/SAMBA_3_0/source/libaddns/dns.h 2006-08-24 18:09:05 UTC (rev 17802)
@@ -40,8 +40,15 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <stdarg.h>
+
+#ifdef HAVE_UUID_UUID_H
#include <uuid/uuid.h>
+#endif
+
+#ifdef HAVE_KRB5_H
#include <krb5.h>
+#endif
#if HAVE_GSSAPI_H
#include <gssapi.h>
@@ -51,6 +58,10 @@
#include <gssapi/gssapi_generic.h>
#endif
+#if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
+#define HAVE_GSSAPI_SUPPORT 1
+#endif
+
#include <talloc.h>
#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
@@ -238,7 +249,6 @@
#define DNS_REFUSED 5
typedef long HANDLE;
-typedef gss_ctx_id_t CtxtHandle, *PCtxtHandle;
#ifndef _BOOL
typedef int BOOL;
@@ -485,37 +495,48 @@
int32 DNSGetSendBufferContextSize( HANDLE hSendBuffer );
uint8 *DNSGetSendBufferContextBuffer( HANDLE hSendBuffer );
-/* from linux/dnsgss.c */
-int32 DNSVerifyResponseMessage_GSSSuccess( PCtxtHandle pGSSContext, DNS_RR_RECORD * pClientTKeyRecord, DNS_RESPONSE * pDNSResponse );
-int32 DNSVerifyResponseMessage_GSSContinue( PCtxtHandle pGSSContext, DNS_RR_RECORD * pClientTKeyRecord, DNS_RESPONSE * pDNSResponse, uint8 ** ppServerKeyData, int16 * pwServerKeyDataSize );
+/* from dnsgss.c */
+
+#ifdef HAVE_GSSAPI_SUPPORT
+
+int32 DNSVerifyResponseMessage_GSSSuccess( gss_ctx_id_t * pGSSContext, DNS_RR_RECORD * pClientTKeyRecord, DNS_RESPONSE * pDNSResponse );
+int32 DNSVerifyResponseMessage_GSSContinue( gss_ctx_id_t * pGSSContext, DNS_RR_RECORD * pClientTKeyRecord, DNS_RESPONSE * pDNSResponse, uint8 ** ppServerKeyData, int16 * pwServerKeyDataSize );
int32 DNSResponseGetRCode( DNS_RESPONSE * pDNSResponse, int16 * pwRCode );
int32 DNSResponseGetTSIGRecord( DNS_RESPONSE * pDNSResponse, DNS_RR_RECORD ** ppTSIGRecord );
int32 DNSCompareTKeyRecord( DNS_RR_RECORD * pClientTKeyRecord, DNS_RR_RECORD * pTKeyRecord );
int32 DNSBuildTKeyQueryRequest( char *szKeyName, uint8 * pKeyData, int32 dwKeyLen, DNS_REQUEST ** ppDNSRequest );
int32 DNSResponseGetTKeyRecord( DNS_RESPONSE * pDNSResponse, DNS_RR_RECORD ** ppTKeyRecord );
int32 DNSGetTKeyData( DNS_RR_RECORD * pTKeyRecord, uint8 ** ppKeyData, int16 * pwKeyDataSize );
-int32 DNSNegotiateSecureContext( HANDLE hDNSServer, char *szDomain, char *szServerName, char *szKeyName, PCtxtHandle pGSSContext );
+int32 DNSNegotiateSecureContext( HANDLE hDNSServer, char *szDomain, char *szServerName, char *szKeyName, gss_ctx_id_t * pGSSContext );
void display_status( const char *msg, OM_uint32 maj_stat, OM_uint32 min_stat );
int32 DNSNegotiateContextAndSecureUpdate( HANDLE hDNSServer, char *szServiceName, char *szDomainName, char *szHost, int32 dwIPAddress );
-/* from linux/dnsupdate.c */
+#endif /* HAVE_GSSAPI_SUPPORT */
+/* from dnsupdate.c */
+
int32 DNSSendUpdate( HANDLE hDNSServer, char *szDomainName, char *szHost, struct in_addr *iplist, int num_addrs, DNS_UPDATE_RESPONSE ** ppDNSUpdateResponse );
-int32 DNSSendSecureUpdate( HANDLE hDNSServer, PCtxtHandle pGSSContext, char *pszKeyName, char *szDomainName, char *szHost, int32 dwIP, DNS_UPDATE_RESPONSE ** ppDNSUpdateResponse );
-int32 DNSUpdateGenerateSignature( PCtxtHandle pGSSContext, DNS_UPDATE_REQUEST * pDNSUpdateRequest, char *pszKeyName );
int32 DNSBuildSignatureBuffer( int32 dwMaxSignatureSize, uint8 ** ppSignature );
int32 DNSBuildMessageBuffer( DNS_UPDATE_REQUEST * pDNSUpdateRequest, char *szKeyName, int32 * pdwTimeSigned, int16 * pwFudge, uint8 ** ppMessageBuffer, int32 * pdwMessageSize );
int32 DNSClose( HANDLE hDNSUpdate );
+#ifdef HAVE_GSSAPI_SUPPORT
+int32 DNSSendSecureUpdate( HANDLE hDNSServer, gss_ctx_id_t * pGSSContext, char *pszKeyName, char *szDomainName, char *szHost, int32 dwIP, DNS_UPDATE_RESPONSE ** ppDNSUpdateResponse );
+int32 DNSUpdateGenerateSignature( gss_ctx_id_t * pGSSContext, DNS_UPDATE_REQUEST * pDNSUpdateRequest, char *pszKeyName );
+#endif /* HAVE_GSSAPI_SUPPORT */
+
/* from dnsupresp.c */
int32 DNSUpdateReceiveUpdateResponse( HANDLE hDNSHandle, DNS_UPDATE_RESPONSE ** ppDNSResponse );
/* from dnssign.c */
-int32 DNSGenerateHash( CtxtHandle * gss_context, uint8 * pRequestBuffer, uint8 ** ppMAC, int32 * pdwMacLen );
+#ifdef HAVE_GSSAPI_SUPPORT
+int32 DNSGenerateHash( gss_ctx_id_t * gss_context, uint8 * pRequestBuffer, uint8 ** ppMAC, int32 * pdwMacLen );
int32 BuildHashInputBuffer( DNS_REQUEST * pDNSRequest, int32 dwLength, uint8 ** ppHashInputBuffer, int32 * pdwHashInputBufferLen );
-int32 DNSStdValidateAndGetTSIGRecord( CtxtHandle * gss_context, DNS_RESPONSE * pDNSResponse, DNS_RR_RECORD ** ppDNSTSIGRecord );
+int32 DNSStdValidateAndGetTSIGRecord( gss_ctx_id_t * gss_context, DNS_RESPONSE * pDNSResponse, DNS_RR_RECORD ** ppDNSTSIGRecord );
+#endif /* HAVE_GSSAPI_SUPPORT */
+
#endif /* _DNS_H */
Modified: branches/SAMBA_3_0/source/libaddns/dnsgss.c
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dnsgss.c 2006-08-24 16:56:36 UTC (rev 17801)
+++ branches/SAMBA_3_0/source/libaddns/dnsgss.c 2006-08-24 18:09:05 UTC (rev 17802)
@@ -28,6 +28,8 @@
#include <ctype.h>
+#ifdef HAVE_GSSAPI_SUPPORT
+
/*********************************************************************
*********************************************************************/
@@ -89,7 +91,7 @@
/*********************************************************************
*********************************************************************/
-int32 DNSVerifyResponseMessage_GSSSuccess( PCtxtHandle pGSSContext,
+int32 DNSVerifyResponseMessage_GSSSuccess( gss_ctx_id_t * pGSSContext,
DNS_RR_RECORD * pClientTKeyRecord,
DNS_RESPONSE * pDNSResponse )
{
@@ -133,7 +135,7 @@
/*********************************************************************
*********************************************************************/
-int32 DNSVerifyResponseMessage_GSSContinue( PCtxtHandle pGSSContext,
+int32 DNSVerifyResponseMessage_GSSContinue( gss_ctx_id_t * pGSSContext,
DNS_RR_RECORD * pClientTKeyRecord,
DNS_RESPONSE * pDNSResponse,
uint8 ** ppServerKeyData,
@@ -283,8 +285,8 @@
{
int32 dwError = 0;
char *pszKeyName = NULL;
- CtxtHandle ContextHandle = 0;
- CtxtHandle *pContextHandle = &ContextHandle;
+ gss_ctx_id_t ContextHandle = 0;
+ gss_ctx_id_t *pContextHandle = &ContextHandle;
dwError = DNSGenerateKeyName( &pszKeyName );
BAIL_ON_ERROR( dwError );
@@ -344,7 +346,7 @@
int32 DNSNegotiateSecureContext( HANDLE hDNSServer,
char *szDomain,
char *szServerName,
- char *szKeyName, PCtxtHandle pGSSContext )
+ char *szKeyName, gss_ctx_id_t * pGSSContext )
{
int32 dwError = 0;
int32 dwMajorStatus = 0;
@@ -413,7 +415,7 @@
BAIL_ON_SEC_ERROR( dwMajorStatus );
printf( "After gss_import_name %d\n", dwMajorStatus );
- memset( pGSSContext, 0, sizeof( CtxtHandle ) );
+ memset( pGSSContext, 0, sizeof( gss_ctx_id_t ) );
*pGSSContext = GSS_C_NO_CONTEXT;
do {
@@ -548,3 +550,5 @@
display_status_1( msg, maj_stat, GSS_C_GSS_CODE );
display_status_1( msg, min_stat, GSS_C_MECH_CODE );
}
+
+#endif /* HAVE_GSSAPI_SUPPORT */
Modified: branches/SAMBA_3_0/source/libaddns/dnssign.c
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dnssign.c 2006-08-24 16:56:36 UTC (rev 17801)
+++ branches/SAMBA_3_0/source/libaddns/dnssign.c 2006-08-24 18:09:05 UTC (rev 17802)
@@ -27,10 +27,12 @@
#include "dns.h"
+#ifdef HAVE_GSSAPI_SUPPORT
+
/*********************************************************************
*********************************************************************/
-int32 DNSStdValidateAndGetTSIGRecord( CtxtHandle * gss_context,
+int32 DNSStdValidateAndGetTSIGRecord( gss_ctx_id_t * gss_context,
DNS_RESPONSE * pDNSResponse,
DNS_RR_RECORD ** ppDNSTSIGRecord )
{
@@ -42,7 +44,7 @@
/*********************************************************************
*********************************************************************/
-int32 DNSUpdateValidateAndGetTSIGRecord( CtxtHandle * gss_context,
+int32 DNSUpdateValidateAndGetTSIGRecord( gss_ctx_id_t * gss_context,
DNS_UPDATE_RESPONSE * pDNSUpdateResponse,
DNS_RR_RECORD ** ppDNSTSIGRecord )
{
@@ -50,3 +52,5 @@
return dwError;
}
+
+#endif
Modified: branches/SAMBA_3_0/source/libaddns/dnsupdate.c
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dnsupdate.c 2006-08-24 16:56:36 UTC (rev 17801)
+++ branches/SAMBA_3_0/source/libaddns/dnsupdate.c 2006-08-24 18:09:05 UTC (rev 17802)
@@ -337,9 +337,9 @@
/********************************************************************
********************************************************************/
-
+#ifdef HAVE_GSSAPI_SUPPORT
int32 DNSSendSecureUpdate( HANDLE hDNSServer,
- PCtxtHandle pGSSContext,
+ gss_ctx_id_t * pGSSContext,
char *pszKeyName,
char *szDomainName,
char *szHost,
@@ -425,7 +425,7 @@
/*********************************************************************
*********************************************************************/
-int32 DNSUpdateGenerateSignature( PCtxtHandle pGSSContext,
+int32 DNSUpdateGenerateSignature( gss_ctx_id_t * pGSSContext,
DNS_UPDATE_REQUEST * pDNSUpdateRequest,
char *pszKeyName )
{
@@ -492,6 +492,7 @@
return dwError;
}
+#endif /* HAVE_GSSAPI_SUPPORT */
/*********************************************************************
*********************************************************************/
More information about the samba-cvs
mailing list