Rev 11630: Update ndrdump to work in samba3 in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Fri Mar 2 12:45:06 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11630
revision-id: jelmer at samba.org-20070302124451-iifyah7w73bjwimu
parent: svn-v2:21649 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Fri 2007-03-02 13:44:51 +0100
message:
Update ndrdump to work in samba3
modified:
source/librpc/tools/ndrdump.c svn-v2:21564 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2ftools%2fndrdump.c
=== modified file 'source/librpc/tools/ndrdump.c'
--- a/source/librpc/tools/ndrdump.c 2007-02-27 18:00:15 +0000
+++ b/source/librpc/tools/ndrdump.c 2007-03-02 12:44:51 +0000
@@ -20,11 +20,13 @@
*/
#include "includes.h"
+#if (_SAMBA_BUILD_ >= 4)
#include "lib/cmdline/popt_common.h"
#include "system/filesys.h"
#include "system/locale.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/rpc/dcerpc_table.h"
+#endif
static const struct dcerpc_interface_call *find_function(
const struct dcerpc_interface_table *p,
@@ -47,6 +49,7 @@
return &p->calls[i];
}
+#if (_SAMBA_BUILD_ >= 4)
static void show_pipes(void)
{
@@ -63,6 +66,8 @@
exit(1);
}
+#endif
+
static void show_functions(const struct dcerpc_interface_table *p)
{
int i;
@@ -159,7 +164,9 @@
{ NULL }
};
+#if (_SAMBA_BUILD_ >= 4)
dcerpc_table_init();
+#endif
pc = poptGetContext("ndrdump", argc, argv, long_options, 0);
@@ -187,14 +194,21 @@
if (!pipe_name) {
poptPrintUsage(pc, stderr, 0);
+#if (_SAMBA_BUILD_ >= 4)
show_pipes();
+#endif
exit(1);
}
if (plugin != NULL) {
p = load_iface_from_plugin(plugin, pipe_name);
+ }
+#if (_SAMBA_BUILD_ <= 3)
+ else {
+ fprintf(stderr, "Only loading from DSO's supported in Samba 3\n");
+ exit(1);
}
-
+#else
if (!p) {
p = idl_iface_by_name(pipe_name);
}
@@ -208,6 +222,7 @@
p = idl_iface_by_uuid(&uuid);
}
}
+#endif
if (!p) {
printf("Unknown pipe or UUID '%s'\n", pipe_name);
@@ -257,7 +272,11 @@
exit(1);
}
+#if (_SAMBA_BUILD_ >= 4)
data = (uint8_t *)file_load(ctx_filename, &size, mem_ctx);
+#else
+ data = (uint8_t *)file_load(ctx_filename, &size, 0);
+#endif
if (!data) {
perror(ctx_filename);
exit(1);
@@ -283,7 +302,11 @@
}
if (filename)
+#if (_SAMBA_BUILD_ >= 4)
data = (uint8_t *)file_load(filename, &size, mem_ctx);
+#else
+ data = (uint8_t *)file_load(filename, &size, 0);
+#endif
else
data = (uint8_t *)stdin_load(mem_ctx, &size);
More information about the samba-cvs
mailing list