diff options
author | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
---|---|---|
committer | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
commit | 5c29bc8931d025de4ec91247be04da4388642727 (patch) | |
tree | 0345ca3ba451dfdbe2f2bb48745299fe306e6d3f /source3/include | |
parent | 20104eef70ea1e2a64acb762ade2b4d64af0ee57 (diff) | |
parent | d4d706e0fa6ed2c6b8cd1d788257c7bd096a170b (diff) | |
download | samba-5c29bc8931d025de4ec91247be04da4388642727.tar.gz samba-5c29bc8931d025de4ec91247be04da4388642727.tar.bz2 samba-5c29bc8931d025de4ec91247be04da4388642727.zip |
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/includes.h | 1 | ||||
-rw-r--r-- | source3/include/nameserv.h | 2 | ||||
-rw-r--r-- | source3/include/rpc_dce.h | 4 | ||||
-rw-r--r-- | source3/include/smb.h | 1 | ||||
-rw-r--r-- | source3/include/smb_macros.h | 3 |
5 files changed, 9 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 0b3565f632..06d41957c9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -703,6 +703,7 @@ typedef char fstring[FSTRING_LEN]; #include "rpc_perfcount_defs.h" #include "librpc/gen_ndr/notify.h" #include "librpc/gen_ndr/xattr.h" +#include "librpc/rpc/dcerpc.h" #include "nt_printing.h" #include "idmap.h" #include "client.h" diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index 46236970a6..4377e3330a 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -491,7 +491,9 @@ struct nmb_packet { #define DGRAM_UNIQUE 0x10 #define DGRAM_GROUP 0x11 #define DGRAM_BROADCAST 0x12 +/* defined in IDL #define DGRAM_ERROR 0x13 +*/ #define DGRAM_QUERY_REQUEST 0x14 #define DGRAM_POSITIVE_QUERY_RESPONSE 0x15 #define DGRAM_NEGATIVE_QUERT_RESPONSE 0x16 diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 2793421734..9b2044fa20 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -165,10 +165,10 @@ struct pipe_id_info { /* the names appear not to matter: the syntaxes _do_ matter */ const char *client_pipe; - RPC_IFACE abstr_syntax; /* this one is the abstract syntax id */ + const RPC_IFACE *abstr_syntax; /* this one is the abstract syntax id */ const char *server_pipe; /* this one is the secondary syntax name */ - RPC_IFACE trans_syntax; /* this one is the primary syntax id */ + const RPC_IFACE *trans_syntax; /* this one is the primary syntax id */ }; /* RPC_HDR - dce rpc header */ diff --git a/source3/include/smb.h b/source3/include/smb.h index d52d8493d0..598708bfe3 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -310,6 +310,7 @@ extern const DATA_BLOB data_blob_null; #include "librpc/gen_ndr/libnet_join.h" #include "librpc/gen_ndr/krb5pac.h" #include "librpc/gen_ndr/ntsvcs.h" +#include "librpc/gen_ndr/nbt.h" struct lsa_dom_info { bool valid; diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index c98c4244de..0e21431226 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -169,8 +169,11 @@ #define reply_botherror(req,status,eclass,ecode) reply_both_error(req,eclass,ecode,status,__LINE__,__FILE__) #define reply_unixerror(req,defclass,deferror) reply_unix_error(req,defclass,deferror,NT_STATUS_OK,__LINE__,__FILE__) +#if 0 +/* defined in IDL */ /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 +#endif #define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x)) |