summaryrefslogtreecommitdiff
path: root/source4/lib/dcom/common/main.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 05:09:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:38 -0500
commite82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 (patch)
treeb66f04c223e55e435b6ba56f4f05d2bf03132a12 /source4/lib/dcom/common/main.c
parente3aae721a7d5c8130448d67feb3a9200e14393ac (diff)
downloadsamba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.gz
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.bz2
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.zip
r5298: - got rid of pstring.h from includes.h. This at least makes it a bit
less likely that anyone will use pstring for new code - got rid of winbind_client.h from includes.h. This one triggered a huge change, as winbind_client.h was including system/filesys.h and defining the old uint32 and uint16 types, as well as its own pstring and fstring. (This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)
Diffstat (limited to 'source4/lib/dcom/common/main.c')
-rw-r--r--source4/lib/dcom/common/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c
index 01906501f1..a8324606f1 100644
--- a/source4/lib/dcom/common/main.c
+++ b/source4/lib/dcom/common/main.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "dlinklist.h"
#include "librpc/gen_ndr/ndr_epmapper.h"
#include "librpc/gen_ndr/ndr_remact.h"
@@ -145,7 +146,7 @@ WERROR dcom_ping(struct dcom_context *ctx)
static WERROR dcom_create_object_remote(struct dcom_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct dcom_interface_p ***ip, WERROR *results)
{
- uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+ uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
struct dcerpc_pipe *p;
struct dcom_object_exporter *m;
NTSTATUS status;
@@ -268,7 +269,7 @@ WERROR dcom_get_class_object_remote(struct dcom_context *ctx, struct GUID *clsid
struct DUALSTRINGARRAY dualstring;
NTSTATUS status;
struct pMInterfacePointer pm;
- uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+ uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
status = dcom_connect_host(ctx, &p, server);
if (NT_STATUS_IS_ERR(status)) {
@@ -498,7 +499,7 @@ NTSTATUS dcom_ifacep_from_OBJREF(struct dcom_context *ctx, struct dcom_interface
if (!m) {
struct dcerpc_pipe *po;
struct ResolveOxid r;
- uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+ uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
DEBUG(3, ("No binding data present yet, resolving OXID %llu\n", p->ox->oxid));