sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

server_id.idl: Bring server_id.idl in common

Browse Source 
Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2011-05-02 10:55:20 +10:00
parent 174893c312
commit d057116cc2
19 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
source3/librpc/idl/server_id.idl → librpc/idl/server_id.idl
View File

2
librpc/idl/wscript_build
View File

@ -8,7 +8,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
printcap.idl''',

7
librpc/wscript_build
View File

@ -175,6 +175,13 @@ bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
public_deps='ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
source='gen_ndr/ndr_server_id.c',
deps='ndr',
public_headers='gen_ndr/server_id.h',
header_path='gen_ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
source='gen_ndr/ndr_trkwks.c',
public_deps='ndr'

3
source3/Makefile.in
View File

@ -1608,8 +1608,7 @@ IDL_FILES = librpc/idl/messaging.idl \
librpc/idl/wbint.idl \
librpc/idl/perfcount.idl \
librpc/idl/secrets.idl \
librpc/idl/libnet_join.idl \
librpc/idl/server_id.idl
librpc/idl/libnet_join.idl
samba3-idl::
@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \

2
source3/librpc/idl/wscript_build
View File

@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
bld.SAMBA_PIDL_LIST('PIDL',
'''messaging.idl libnetapi.idl notify.idl
perfcount.idl secrets.idl libnet_join.idl server_id.idl''',
perfcount.idl secrets.idl libnet_join.idl''',
options='--includedir=%s --header --ndr-parser' % topinclude,
output_dir='../gen_ndr')

5
source3/librpc/wscript_build
View File

@ -10,11 +10,6 @@ bld.SAMBA3_SUBSYSTEM('NDR_LIBNET_JOIN',
public_deps='ndr'
)
bld.SAMBA3_SUBSYSTEM('NDR_SERVER_ID',
source='gen_ndr/ndr_server_id.c',
public_deps='ndr'
)
bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING',
source='gen_ndr/ndr_messaging.c',
public_deps='ndr NDR_SERVER_ID'

2
source4/cluster/cluster.c
View File

@ -23,7 +23,7 @@
#include "cluster/cluster.h"
#include "cluster/cluster_private.h"
#include "librpc/gen_ndr/misc.h"
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
static struct cluster_ops *ops;

2
source4/cluster/cluster.h
View File

@ -22,7 +22,7 @@
#ifndef __CLUSTER_H__
#define __CLUSTER_H__
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
/*
test for same cluster id

2
source4/cluster/local.c
View File

@ -26,7 +26,7 @@
#include "lib/util/tdb_wrap.h"
#include "system/filesys.h"
#include "param/param.h"
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
/*
server a server_id for the local node

2
source4/lib/messaging/messaging.h
View File

@ -21,7 +21,7 @@
#ifndef _MESSAGES_H_
#define _MESSAGES_H_
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
struct imessaging_context;

2
source4/lib/messaging/pymessaging.c
View File

@ -31,7 +31,7 @@
#include "param/param.h"
#include "param/pyparam.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
void initmessaging(void);

2
source4/librpc/idl/opendb.idl
View File

@ -7,7 +7,7 @@
ntvfs/common/opendb.c
*/
import "server_id4.idl";
import "server_id.idl";
[
pointer_default(unique)

2
source4/librpc/idl/s4_notify.idl
View File

@ -7,7 +7,7 @@
the change notify buffers
*/
import "server_id4.idl";
import "server_id.idl";
[
pointer_default(unique)

2
source4/librpc/idl/wscript_build
View File

@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
bld.SAMBA_PIDL_LIST('PIDL',
source='''irpc.idl nfs4acl.idl s4_notify.idl ntp_signd.idl
opendb.idl sasl_helpers.idl server_id4.idl winbind.idl
opendb.idl sasl_helpers.idl winbind.idl
winsif.idl winsrepl.idl winstation.idl''',
options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude,
output_dir='../gen_ndr')

9
source4/librpc/wscript_build
View File

@ -4,13 +4,6 @@ bld.RECURSE('../../librpc/idl')
bld.RECURSE('../../librpc/tools')
bld.RECURSE('idl')
bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4',
source='gen_ndr/ndr_server_id4.c',
deps='ndr',
public_headers='gen_ndr/server_id4.h',
header_path='gen_ndr'
)
bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
source='gen_ndr/ndr_winstation.c',
@ -52,7 +45,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
source='gen_ndr/ndr_s4_notify.c',
public_deps='ndr NDR_SERVER_ID4'
public_deps='ndr NDR_SERVER_ID'
)

2
source4/ntvfs/ntvfs.h
View File

@ -24,7 +24,7 @@
#include "libcli/raw/interfaces.h"
#include "param/share.h"
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
/* modules can use the following to determine if the interface has changed */
/* version 1 -> 0 - make module stacking easier -- metze */

2
source4/rpc_server/dcerpc_server.h
View File

@ -23,7 +23,7 @@
#ifndef SAMBA_DCERPC_SERVER_H
#define SAMBA_DCERPC_SERVER_H
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/ndr/libndr.h"

2
source4/smbd/service_stream.h
View File

@ -23,7 +23,7 @@
#ifndef __SERVICE_STREAM_H__
#define __SERVICE_STREAM_H__
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
/* modules can use the following to determine if the interface has changed
* please increment the version number after each interface change

2
source4/smbd/service_task.h
View File

@ -22,7 +22,7 @@
#ifndef __SERVICE_TASK_H__
#define __SERVICE_TASK_H__
#include "librpc/gen_ndr/server_id4.h"
#include "librpc/gen_ndr/server_id.h"
struct task_server {
struct tevent_context *event_ctx;