From: Gerald Carter Date: Wed, 30 May 2007 21:55:49 +0000 (+0000) Subject: r23251: whoops! Fix compile error X-Git-Tag: samba-4.0.0alpha6~801^2~5736 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3272b1dd602196b2105afda1f9979a8f9596d71e;p=thirdparty%2Fsamba.git r23251: whoops! Fix compile error (This used to be commit 22a3ea40ac69fa3722abf28db845ab284a65ad97) --- diff --git a/source3/include/includes.h b/source3/include/includes.h index bbce3bdb5c8..6c1931844e6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -780,6 +780,9 @@ enum flush_reason_enum { #include "nss_info.h" +/* generated rpc server implementation functions */ +#include "librpc/gen_ndr/srv_echo.h" + /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c index 8e951dde805..9dfb9cba096 100644 --- a/source3/libads/authdata.c +++ b/source3/libads/authdata.c @@ -451,10 +451,11 @@ static BOOL pac_io_pac_signature_data(const char *desc, PAC_SIGNATURE_DATA *data, uint32 length, prs_struct *ps, int depth) { - uint32 siglen = length - sizeof(uint32); + uint32 siglen = 0; + prs_debug(ps, depth, desc, "pac_io_pac_signature_data"); depth++; - + if (data == NULL) return False; @@ -463,6 +464,9 @@ static BOOL pac_io_pac_signature_data(const char *desc, if (!prs_uint32("type", ps, depth, &data->type)) return False; + if ( length > sizeof(uint32) ) + siglen = length - sizeof(uint32); + if (UNMARSHALLING(ps) && length) { if (siglen) { data->signature.buffer = PRS_ALLOC_MEM(ps, uint8, siglen);