[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Mar 23 11:45:25 MDT 2010
The branch, master has been updated
via ec30022... s4:librpc/rpc/pyrpc.h: librpc/rpc/dcerpc.h isn't needed anymore
via f57b1da... s4:lib/messaging: pymessaging needs libndr.h
via 4985720... pidl:Samba4/Python: librpc/rpc/dcerpc.h isn't needed anymore
via 48cd096... s4:libnet: don't include librpc/rpc/dcerpc.h directly
via 845f9c0... s3:librpc/rpc: move prototypes to dcerpc.h
from bf9f24f... s4-smbtorture: use torture_context in samsync test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ec30022233dd41db7bd13de73fbd7e7602c42e18
Author: Stefan Metzmacher <metze at sernet.private>
Date: Thu Mar 18 18:55:49 2010 +0100
s4:librpc/rpc/pyrpc.h: librpc/rpc/dcerpc.h isn't needed anymore
metze
commit f57b1da428a2922e872657e43c6fa2e3774b22c4
Author: Stefan Metzmacher <metze at sernet.private>
Date: Thu Mar 18 19:36:50 2010 +0100
s4:lib/messaging: pymessaging needs libndr.h
metze
commit 4985720e81b46e1663b5d5c8caba122b5bea2fc5
Author: Stefan Metzmacher <metze at sernet.private>
Date: Thu Mar 18 18:55:00 2010 +0100
pidl:Samba4/Python: librpc/rpc/dcerpc.h isn't needed anymore
metze
commit 48cd096126578c6a09aeba8d4cc68840c50d8d8c
Author: Stefan Metzmacher <metze at sernet.private>
Date: Fri Mar 19 13:02:26 2010 +0100
s4:libnet: don't include librpc/rpc/dcerpc.h directly
metze
commit 845f9c01ed279495919e2781db2e8927ebd3e968
Author: Stefan Metzmacher <metze at sernet.private>
Date: Fri Mar 19 19:16:35 2010 +0100
s3:librpc/rpc: move prototypes to dcerpc.h
metze
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/Python.pm | 1 -
source3/include/proto.h | 18 ------------------
source3/librpc/rpc/dcerpc.h | 18 ++++++++++++++++++
source4/lib/messaging/pymessaging.c | 1 +
source4/libnet/libnet_rpc.c | 1 -
source4/libnet/libnet_samsync_ldb.c | 1 -
source4/libnet/libnet_site.c | 1 -
source4/librpc/rpc/pyrpc.h | 1 -
8 files changed, 19 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 5cf619b..789a7dd 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1127,7 +1127,6 @@ sub Parse($$$$$)
/* Python wrapper functions auto-generated by pidl */
#include <Python.h>
#include \"includes.h\"
-#include \"librpc/rpc/dcerpc.h\"
#include \"lib/talloc/pytalloc.h\"
#include \"librpc/rpc/pyrpc.h\"
#include \"$hdr\"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 403b96a..b42f473 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2117,24 +2117,6 @@ extern const struct ndr_syntax_id null_ndr_syntax_id;
char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
-/* The following definitions come from librpc/rpc/binding.c */
-
-const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
-_PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
-_PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
-_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor,
- struct ndr_syntax_id *syntax);
-const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
-enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
-_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
-_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
-_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx,
- struct epm_tower *tower,
- struct dcerpc_binding **b_out);
-_PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
- const struct dcerpc_binding *binding,
- struct epm_tower *tower);
-
/* The following definitions come from libsmb/cliconnect.c */
ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 07e03e9..0c120df 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -93,4 +93,22 @@ struct dcerpc_binding {
/* use NDR64 transport */
#define DCERPC_NDR64 (1<<21)
+/* The following definitions come from librpc/rpc/binding.c */
+
+const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
+_PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
+_PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
+_PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor,
+ struct ndr_syntax_id *syntax);
+const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
+enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
+_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
+_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
+_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx,
+ struct epm_tower *tower,
+ struct dcerpc_binding **b_out);
+_PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
+ const struct dcerpc_binding *binding,
+ struct epm_tower *tower);
+
#endif /* __DCERPC_H__ */
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 1f3b687..35e0093 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -24,6 +24,7 @@
#include "scripting/python/modules.h"
#include "libcli/util/pyerrors.h"
#include "librpc/rpc/pyrpc.h"
+#include "librpc/ndr/libndr.h"
#include "lib/messaging/irpc.h"
#include "lib/messaging/messaging.h"
#include "lib/events/events.h"
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 2ab7f41..83df262 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -22,7 +22,6 @@
#include "libnet/libnet.h"
#include "libcli/libcli.h"
#include "libcli/composite/composite.h"
-#include "librpc/rpc/dcerpc.h"
#include "librpc/rpc/dcerpc_proto.h"
#include "librpc/gen_ndr/ndr_lsa_c.h"
#include "librpc/gen_ndr/ndr_samr.h"
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index fa39375..05b0c13 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -31,7 +31,6 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "ldb_wrap.h"
#include "libcli/security/security.h"
-#include "librpc/rpc/dcerpc.h"
#include "param/param.h"
struct samsync_ldb_secret {
diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c
index 67935b2..3147cbb 100644
--- a/source4/libnet/libnet_site.c
+++ b/source4/libnet/libnet_site.c
@@ -22,7 +22,6 @@
#include "libcli/cldap/cldap.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
-#include "librpc/rpc/dcerpc.h"
#include "libcli/resolve/resolve.h"
#include "param/param.h"
#include "lib/tsocket/tsocket.h"
diff --git a/source4/librpc/rpc/pyrpc.h b/source4/librpc/rpc/pyrpc.h
index 3233754..0cc70e8 100644
--- a/source4/librpc/rpc/pyrpc.h
+++ b/source4/librpc/rpc/pyrpc.h
@@ -21,7 +21,6 @@
#define _PYRPC_H_
#include "libcli/util/pyerrors.h"
-#include "librpc/rpc/dcerpc.h"
#define PY_CHECK_TYPE(type, var, fail) \
if (!PyObject_TypeCheck(var, type)) {\
--
Samba Shared Repository
More information about the samba-cvs
mailing list