summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/rpc_client.h1
-rw-r--r--source3/include/rpc_echo.h75
-rw-r--r--source3/include/smb.h2
4 files changed, 3 insertions, 77 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index f56faa7551..3cca090bb9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1006,10 +1006,10 @@ extern int errno;
#include "rpc_spoolss.h"
#include "rpc_eventlog.h"
#include "rpc_ds.h"
-#include "rpc_echo.h"
#include "rpc_shutdown.h"
#include "rpc_perfcount.h"
#include "rpc_perfcount_defs.h"
+#include "librpc/gen_ndr/echo.h"
#include "nt_printing.h"
#include "idmap.h"
#include "client.h"
diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 407d5d97a7..09aa57acc0 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -23,6 +23,7 @@
/* autogenerated client stubs */
+#include "librpc/gen_ndr/cli_echo.h"
#include "librpc/gen_ndr/cli_unixinfo.h"
#include "librpc/gen_ndr/cli_dfs.h"
#include "librpc/gen_ndr/cli_lsa.h"
diff --git a/source3/include/rpc_echo.h b/source3/include/rpc_echo.h
deleted file mode 100644
index 6b4ea6abfb..0000000000
--- a/source3/include/rpc_echo.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Samba rpcecho definitions.
-
- Copyright (C) Tim Potter 2003
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _RPC_ECHO_H
-#define _RPC_ECHO_H
-
-#define ECHO_ADD_ONE 0x00
-#define ECHO_DATA 0x01
-#define ECHO_SINK_DATA 0x02
-#define ECHO_SOURCE_DATA 0x03
-
-typedef struct echo_q_add_one
-{
- uint32 request;
-} ECHO_Q_ADD_ONE;
-
-typedef struct echo_r_add_one
-{
- uint32 response;
-} ECHO_R_ADD_ONE;
-
-typedef struct echo_q_echo_data
-{
- uint32 size;
- char *data;
-} ECHO_Q_ECHO_DATA;
-
-typedef struct echo_r_echo_data
-{
- uint32 size;
- char *data;
-} ECHO_R_ECHO_DATA;
-
-typedef struct echo_q_source_data
-{
- uint32 size;
-} ECHO_Q_SOURCE_DATA;
-
-typedef struct echo_r_source_data
-{
- uint32 size;
- char *data;
-} ECHO_R_SOURCE_DATA;
-
-typedef struct echo_q_sink_data
-{
- uint32 size;
- char *data;
-} ECHO_Q_SINK_DATA;
-
-typedef struct echo_r_sink_data
-{
- int dummy; /* unused */
-} ECHO_R_SINK_DATA;
-
-#endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 5d511760cd..a219cdae6f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -205,7 +205,7 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
#define PI_WINREG 6
#define PI_SPOOLSS 7
#define PI_NETDFS 8
-#define PI_ECHO 9
+#define PI_RPCECHO 9
#define PI_INITSHUTDOWN 10
#define PI_SVCCTL 11
#define PI_EVENTLOG 12