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 | |
| 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
| -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 | ||||
| -rw-r--r-- | source4/ntvfs/common/notify.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/ntvfs.h | 2 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.h | 2 |
6 files changed, 6 insertions, 6 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' ) diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index fdf3aeb305..e369404e85 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -30,7 +30,7 @@ #include "messaging/messaging.h" #include "tdb_wrap.h" #include "lib/messaging/irpc.h" -#include "librpc/gen_ndr/ndr_notify.h" +#include "librpc/gen_ndr/ndr_s4_notify.h" #include "../lib/util/dlinklist.h" #include "ntvfs/common/ntvfs_common.h" #include "ntvfs/sysdep/sys_notify.h" diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 02281e749c..31750dca1d 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -332,7 +332,7 @@ struct ntvfs_critical_sizes { struct messaging_context; #include "librpc/gen_ndr/security.h" -#include "librpc/gen_ndr/notify.h" +#include "librpc/gen_ndr/s4_notify.h" #include "ntvfs/ntvfs_proto.h" #endif /* _NTVFS_H_ */ diff --git a/source4/ntvfs/sysdep/sys_notify.h b/source4/ntvfs/sysdep/sys_notify.h index d912a9bdaf..c474d4e6a0 100644 --- a/source4/ntvfs/sysdep/sys_notify.h +++ b/source4/ntvfs/sysdep/sys_notify.h @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "librpc/gen_ndr/notify.h" +#include "librpc/gen_ndr/s4_notify.h" #include "param/share.h" struct sys_notify_context; |