diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-18 20:34:20 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-05-24 23:08:11 +1000 |
| commit | 6c726745a4253f35a5d2e016185ba5624fd40644 (patch) | |
| tree | 1ce30d95be81344c8df721687a64c9fa520d6ac8 /source4/librpc | |
| parent | 8e1e6b0112c06b8587c0823a62d2103c047f8310 (diff) | |
| download | samba-6c726745a4253f35a5d2e016185ba5624fd40644.tar.gz samba-6c726745a4253f35a5d2e016185ba5624fd40644.tar.bz2 samba-6c726745a4253f35a5d2e016185ba5624fd40644.zip | |
s4:ntvfs rename notify.idl to s4_notify.idl until we can merge this IDL
This IDL is almost common, but the source3 version has a
hand-marshalled server_id. The s3compat build has problems with two
different idl files of the same name.
Andrew Bartlett
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/s4_notify.idl (renamed from source4/librpc/idl/notify.idl) | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/wscript_build | 2 | ||||
| -rw-r--r-- | source4/librpc/wscript_build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/idl/notify.idl b/source4/librpc/idl/s4_notify.idl index a19f737678..1d4c33470d 100644 --- a/source4/librpc/idl/notify.idl +++ b/source4/librpc/idl/s4_notify.idl @@ -34,7 +34,7 @@ interface notify The max_mask and max_mask_subdir at each depth is the bitwise or of the filters and subdir filters for all entries at that depth. This allows a depth to be quickly skipped if - no entries will match the target filter + no entries will match the target filter */ typedef struct { uint32 max_mask; diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index 0fcb420cbe..4ad30385f5 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python bld.SAMBA_PIDL_LIST('PIDL', - source='''irpc.idl nfs4acl.idl notify.idl ntp_signd.idl + source='''irpc.idl nfs4acl.idl s4_notify.idl ntp_signd.idl opendb.idl sasl_helpers.idl server_id.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=../librpc/idl --header --ndr-parser --client --python --server", diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 234fe425c9..ab80c09e66 100644 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -288,7 +288,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', - source='gen_ndr/ndr_notify.c', + source='gen_ndr/ndr_s4_notify.c', public_deps='LIBNDR' ) |