s4:ntvfs rename notify.idl to s4_notify.idl until we can merge this IDL
authorAndrew Bartlett <abartlet@samba.org>
Tue, 18 May 2010 10:34:20 +0000 (20:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 24 May 2010 13:08:11 +0000 (23:08 +1000)
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

source4/librpc/idl/s4_notify.idl [moved from source4/librpc/idl/notify.idl with 96% similarity]
source4/librpc/idl/wscript_build
source4/librpc/wscript_build
source4/ntvfs/common/notify.c
source4/ntvfs/ntvfs.h
source4/ntvfs/sysdep/sys_notify.h

similarity index 96%
rename from source4/librpc/idl/notify.idl
rename to source4/librpc/idl/s4_notify.idl
index a19f7376785e6d7d7f39d6429dab31f4a2363675..1d4c33470d4c90792fc87b5f00f010d7659f51b8 100644 (file)
@@ -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;
index 0fcb420cbe2a8f51eb926e44aada2c77fd22440a..4ad30385f5543db792c5d42fe1a652a2b3b353f9 100644 (file)
@@ -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",
index 234fe425c98a1935489943b1642c45e2920adb7a..ab80c09e66809ae6b217226910ff2465851690b9 100644 (file)
@@ -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'
        )
 
index fdf3aeb3056441df6514eac5ae45f4d5277febcc..e369404e85f1edf5bc991d74aca0a6978ffdd820 100644 (file)
@@ -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"
index 02281e749cafed9e9e51d31dec3041f997808785..31750dca1dc1f82e4a77aff1a6e632d54b7d1b77 100644 (file)
@@ -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_ */
index d912a9bdaf63c6aab370044e469020a693576769..c474d4e6a023c66adf1fe92c6bbca2ce4bf6d9c3 100644 (file)
@@ -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;