diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-18 10:10:30 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
| commit | bed374215ff040cc995659d42938be35412a794a (patch) | |
| tree | 3d65c515ff6144564eb76b1ce5059f65e2cd7a79 /source4/librpc | |
| parent | cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf (diff) | |
| download | samba-bed374215ff040cc995659d42938be35412a794a.tar.gz samba-bed374215ff040cc995659d42938be35412a794a.tar.bz2 samba-bed374215ff040cc995659d42938be35412a794a.zip | |
s4-idl: rename s4 server_id.idl to server_id4.idl
this avoids a conflict with the new s3 server_id.idl
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/opendb.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/s4_notify.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/server_id4.idl (renamed from source4/librpc/idl/server_id.idl) | 0 | ||||
| -rw-r--r-- | source4/librpc/idl/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl index b76992960a..4973cd0982 100644 --- a/source4/librpc/idl/opendb.idl +++ b/source4/librpc/idl/opendb.idl @@ -7,7 +7,7 @@ ntvfs/common/opendb.c */ -import "server_id.idl"; +import "server_id4.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/s4_notify.idl b/source4/librpc/idl/s4_notify.idl index 1d4c33470d..89ade2991c 100644 --- a/source4/librpc/idl/s4_notify.idl +++ b/source4/librpc/idl/s4_notify.idl @@ -7,7 +7,7 @@ the change notify buffers */ -import "server_id.idl"; +import "server_id4.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/server_id.idl b/source4/librpc/idl/server_id4.idl index 486143546b..486143546b 100644 --- a/source4/librpc/idl/server_id.idl +++ b/source4/librpc/idl/server_id4.idl diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index aae98a2633..6fe3690b33 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -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_id.idl winbind.idl + opendb.idl sasl_helpers.idl server_id4.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, output_dir='../gen_ndr') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 983f11a08c..afb89fde04 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -5,9 +5,9 @@ bld.RECURSE('../../librpc/tools') bld.RECURSE('idl') bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4', - source='gen_ndr/ndr_server_id.c', + source='gen_ndr/ndr_server_id4.c', deps='ndr', - public_headers='gen_ndr/server_id.h', + public_headers='gen_ndr/server_id4.h', header_path='gen_ndr' ) |