r14464: Don't include ndr_BASENAME.h files unless strictly required, instead

try to include just the BASENAME.h files (containing only structs)
(This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd)

diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 0eff955c7162499e42a0f31ac5d0b236a7d7a324..32a4f019f4776d76776acd44648152fcc81cc6ae 100644 (file)
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
 #include "libcli/ldap/ldap.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static const char *user_attrs[] = {
        /* requried for the krb5 kdc*/

diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c
index 86854dfcec73914899636d8211192c39a41d2d30..4a031e6b94bd5183bf76e9e8bb8cc68cbdfe70b2 100644 (file)
--- a/source4/auth/auth_winbind.c
+++ b/source4/auth/auth_winbind.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "nsswitch/winbind_client.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response *response, struct netr_SamInfo3 *info3)
 {

diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 01a00c3dfcd0121f1501a90a2ba19f31c49d3797..ee90c8228ab62f078aee8a6abed4365d51f84879 100644 (file)
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 

diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index dd510f97f1baff8e1ab522e0a3c58b836901baac..6afd5ea828fb80e50809a68eafef6ef1f83587ce 100644 (file)
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"

diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index 67c73d2230a879e2f554f3fd26e0d802c8c99411..aa9a113e8d9ea099df63e19974790b310b6296ca 100644 (file)
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 

diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index f3b5f8c1195297b8682f56a543bf33c5dd04ccbf..8d1cef1cbdfeb0e37abe7c22b99d8aa2db6826aa 100644 (file)
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"

diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index e2c9596ac45c8d60d42af6ccad789250857f253c..48f748cb19e466b85d32f296905d5758078ff9ad 100644 (file)
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"

diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 61edcade346813515095209c2772d8a9825d91cc..20c5854098e58ea66599993bf316a1fea44366d7 100644 (file)
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "lib/crypto/crypto.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 
 /****************************************************************************

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index 13d89c2db6567027dcd4bbabbfd8fadebfd6fcda..1efb1afd544d554bbaff431ed6ce3db0726ef4d5 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 
 /* NTLMSSP mode */
 enum ntlmssp_role

diff --git a/source4/client/client.c b/source4/client/client.c
index b9864f967132d8cd3a928016bd6cc2dfec5ff4d6..2f03ca09727a8407a16bd86eef9bb505175bfa6f 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -39,6 +39,8 @@
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/proto.h"
 #include "lib/replace/readline.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static int io_bufsize = 64512;
 

diff --git a/source4/dsdb/common/flag_mapping.c b/source4/dsdb/common/flag_mapping.c
index 150179b841a2520f3ae4b8f1ba965e8fbfa88c56..4105ba74b147b50fa52accb1da3f5f910980d03d 100644 (file)
--- a/source4/dsdb/common/flag_mapping.c
+++ b/source4/dsdb/common/flag_mapping.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 #include "ads.h"
 
 /* 

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index af3fdd89261065241eefe57168beb81356307057..8ccab1df3da199311c1383dc67ec05086d1c9335 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/drsuapi.h"
 #include "rpc_server/common/common.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "system/kerberos.h"

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 653ba27454e6000e0351b37330e2a2a9ee0f2f4e..87446328f64dabe905532fdf89049ec1f45c169a 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -37,6 +37,7 @@
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #include <time.h>
 

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 32d226b2b7e1fc4d2884252d1d3c8fb23be0ffc6..047cb97b35d1a3c7e6cdda5ba81f293815db9bf7 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -34,8 +34,9 @@
 #include "libcli/ldap/ldap.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/misc.h"
+#include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 8a4a871627dc2c38f4d5cae891078308b3ea67cd..6ab33031df49e5e801d4a4996e3af9080a45ca81 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -39,6 +39,7 @@
 #include "lib/ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
 
 

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 358f565283a36318f5671bfd31cde661cdef743f..0f6e57c9cf7992f633271934caa4011dd7b5a1b4 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "libcli/security/proto.h"

diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 0a776d46ce082bc6e13e5ee31b348cab6c6a1a2a..9315f62a0be9f2fdda7b4468124920b66e984e6c 100644 (file)
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -31,6 +31,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "heimdal/lib/krb5/krb5_locl.h"
 #include "heimdal/lib/krb5/krb5-private.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/dcerpc_server.h"

diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index c05e1fdceb6b2a08cacb847900c01eb6cdc8e3b6..0bd83c800a27b5476fffa635fb0b4995a88c4853 100644 (file)
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/com_dcom.h"

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 8829d862d330630506a00a4906222215b580762c..c0bffa78e56243de8420d74f52de019c5aeb493c 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -25,6 +25,7 @@
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/replace/readline.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /* 
  * ck/cd - change key

diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 02864b601655076737c9edb54dffb3fe5e7915e7..479fedbc28bc887d0e2f3b6c1a50bad135267058 100644 (file)
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -28,7 +28,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "auth/credentials/credentials.h"
 

diff --git a/source4/libcli/auth/credentials.h b/source4/libcli/auth/credentials.h
index 27c5a4e689e5bf843e9ffae8dca0f733a255957f..2e781f701f2c7f0dad2cda62ee4cbcc2107c9769 100644 (file)
--- a/source4/libcli/auth/credentials.h
+++ b/source4/libcli/auth/credentials.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 struct creds_CredentialState {
        uint32_t negotiate_flags;

diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 9e407ba2006e6353125fc35fdede4a9a21a9c730..2773dba1d758963d60b397197f83dd721b824ad7 100644 (file)
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -39,6 +39,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   destroy a pending request

diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 944510077bcd8b1c6a9d3c1168d28d3d28d73c26..98cb54ddedb1a2f903fff427e4141eb73069f32c 100644 (file)
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -21,7 +21,7 @@
 */
 
 #include "libcli/util/asn_1.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 struct ldap_message;
 

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index f67e561afcf593ee548568bbfd480bbe00f792bc..18ab398c796c860131dafe4b722bfa61108c726f 100644 (file)
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -25,6 +25,7 @@
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
                                    struct nbt_name *dest_name,

diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 326ec7e9083d9e3051485de3a7beb6a16ce3a246..16bb9d2fb7201d31759fc5079e462dca5a70b558 100644 (file)
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 /*

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index 830d81257d687b5ae412822d0b328a4449f824c9..26675cb420eadde463817938ce6ba31f05272326 100644 (file)
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   a datagram name request

diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index df8c63fa8783f869ed2079b71d7b86c0c4788aa1..08b9b0e641af35d19f8dae5f7cfde68a38372ec5 100644 (file)
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -24,6 +24,7 @@
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /* 
    send a netlogon mailslot request 

diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index 84ad814fa03baec2718679ac7af4393ff696d84b..f480212b79a1c71e10000ec3aecfbfeb2659548a 100644 (file)
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -24,6 +24,7 @@
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /* 
    send a ntlogon mailslot request 

diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 085aa352ac011716bde683ff5e31518aec1892b0..9ed20b77ba00fdce703e79865fd9b72277cd2c12 100644 (file)
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -24,7 +24,7 @@
 #include "include/includes.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 #include "libcli/composite/composite.h"
 #include "libcli/libcli.h"
 #include "libcli/resolve/resolve.h"

diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index b4411d6fe69ddba5ef08ba860ebc4b570f076324..e828beb29f96198cf0c0815baa4e367fea740f86 100644 (file)
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -23,7 +23,7 @@
 #ifndef __LIBNBT_H__
 #define __LIBNBT_H__
 
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   possible states for pending requests

diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 5c7e86367f73cb8efa6e7d15b1814ef46da7f916..957f87abfdd33d3b52dc8b6f55b6e4aa32e16f3a 100644 (file)
--- a/source4/libcli/nbt/nameregister.c
+++ b/source4/libcli/nbt/nameregister.c
@@ -24,6 +24,7 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/composite/composite.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   send a nbt name registration request

diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 42b92b14cce4c66efa849b22316452ad8d8e9aad..eca52531138e43cfd538471704556b527af8c7c9 100644 (file)
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "libcli/nbt/libnbt.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define NBT_MAX_REPLIES 1000
 

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index df5c608d081496bf03c95ad052fa480abd21ebf1..2ad155e9b9543f8165a6f02afab00764f720ad38 100644 (file)
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -26,6 +26,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 /*

diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 96a06b9bec570cc48aa4f8ac27b310b38eb9d38d..f115a18d231cd9109dc8f7d850a8280a19e656d5 100644 (file)
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -22,7 +22,7 @@
 
 #include "libcli/raw/request.h"
 #include "smb.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 
 struct smbcli_tree;  /* forward declare */
 struct smbcli_request;  /* forward declare */

diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index 59ac65a3401364d1f2a5577890200ee55bf4067f..6f35b7f829fe110b110df95fb617dd000b2322c3 100644 (file)
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /****************************************************************************
 fetch file ACL (async send)

diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 6f8befebfe2db649e61530071d1226a7748cd8fd..d889b500fb05ab908e291012657672fa8b620afd 100644 (file)
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smb.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define SETUP_REQUEST(cmd, wct, buflen) do { \
        req = smbcli_request_setup(tree, cmd, wct, buflen); \

diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index cf8f2f71b491214677a47506f344c07fe26a5d8c..b33d0df8285ae59f1bf37454620e17b9f2221691 100644 (file)
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /* local macros to make the code more readable */
 #define FINFO_CHECK_MIN_SIZE(size) if (blob->length < (size)) { \

diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index c283f0fda172424d1d90771ab72a9c4f1394587a..781ea957dfd934a97f3e823349cb98ef9cbe777a 100644 (file)
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -34,6 +34,7 @@
 #include "system/network.h"
 #include "system/filesys.h"
 #include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct host_state {
        struct nbt_name name;

diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index e8473966b48eed5f4471d7fbe80b6e1a630c3537..7188faba7b07620e648f2296a78d1c819857bdae 100644 (file)
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct nbtlist_state {
        struct nbt_name name;

diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index c3fdf4bc25f1fe6c7a8e18a2588d08474b9670e0..8bacab8cd7610f96fe4bb8c0c5a9551f16271c6e 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 struct resolve_state {
        struct nbt_name name;

diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index a1e9985edd2df28afebcf458c26946e6e8bf5f84..862a25e20d1f2db33c1f4716f26ce029718c181a 100644 (file)
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/iconv.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 struct flag_map {
        const char *name;

diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 7760ee7c22c089ddbcd60cc5b24b86d8c266ed51..1391a4654da3b9f1d1a10afe057a8c76108003cb 100644 (file)
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   return a blank security token

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index b36e37a1a4ff97cbe9669b7c55ab0f1b88bd2efa..a28d33cf7f7d17f6422e62f19f410ec527a5bc76 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -28,6 +28,7 @@
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 7cafef829a9629ad4d578ffdedc2e51722e9ca15..f1f0f01c1d4e1677914b25987539b6dfd710ba16 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -31,6 +31,7 @@
 #include "libcli/libcli.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 struct smblsa_state {

diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 3fb142ea0b3795bbf831d0d8285e9bfe8c328143..c37d5f98731fdcfabd1623983d823a8aa156733b 100644 (file)
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "libcli/wrepl/winsrepl.h"
+#include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
 #include "system/network.h"

diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index 2fea11bd63a69718d6ddfc085e301a98d4bd02de..3ea672327bf850e5d0bc65bcd15233493d77db25 100644 (file)
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/source4/libcli/wrepl/winsrepl.h
@@ -20,8 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_nbt.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/nbt.h"
+#include "librpc/gen_ndr/winsrepl.h"
 
 /*
   main context structure for the wins replication client library

diff --git a/source4/libnet/composite.h b/source4/libnet/composite.h
index 515db2a792728d46a0298f2fd5923e5090fed21b..916e3061249e8c15c8ac8a4519249513524341a8 100644 (file)
--- a/source4/libnet/composite.h
+++ b/source4/libnet/composite.h
@@ -22,7 +22,7 @@
   composite function io definitions
 */
 
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 
 /*
  * Monitor structure and message types definitions. Composite function monitoring

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 3b0d861e010ed4072d274e366ad4b006ebeab1e8..a517aa373378a3ada9eaa4a1bbc5aa7b1e36c696 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -31,7 +31,9 @@
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h
index 3b233950b0247797d395925e2ba8a436efe68cc5..aa0b244f6d6f0182f686e194a8a727d54ea190bd 100644 (file)
--- a/source4/libnet/libnet_join.h
+++ b/source4/libnet/libnet_join.h
@@ -23,7 +23,7 @@
 #ifndef __LIBNET_JOIN_H__
 #define __LIBNET_JOIN_H__
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 enum libnet_Join_level {
        LIBNET_JOIN_AUTOMATIC,

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index e5059c5f08caeaf7187048285c1b8347d1345d02..c8c80db1839088ec5ae6de218f817b4469801a19 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 3e9f069fb575af318869defc0c6b2221bea3501d..b9d493fdf8d4aed47dc0ac0d39554f6d8e19f86c 100644 (file)
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/libcli.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /**

diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c
index 8936d6829a7f9f9e2ba1f498439813773c910358..0f97263b477a6c880bf5eef1fb73aa150f5c0e51 100644 (file)
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -25,6 +25,7 @@
 #include "libnet/libnet.h"
 #include "dlinklist.h"
 #include "samba3/samba3.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 struct samdump_secret {

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 8cc0cada83986244af2144efb490cdb1a85ebd10..4f75d784f69ac2a57842899b67f42fda7ced1d21 100644 (file)
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -31,6 +31,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 struct samsync_ldb_secret {
        struct samsync_ldb_secret *prev, *next;

diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c
index 35980fdcbba26f7b19aebc8492ef14fa92f7c497..08a5b599e22cbc8b3894cb768d75215d9624fccb 100644 (file)
--- a/source4/libnet/libnet_share.c
+++ b/source4/libnet/libnet_share.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 

diff --git a/source4/libnet/libnet_share.h b/source4/libnet/libnet_share.h
index efe54742711373513e46f5714572e2ec0b9f9736..fdf162a066ab6a4fe5e361afee860fee0d4841f6 100644 (file)
--- a/source4/libnet/libnet_share.h
+++ b/source4/libnet/libnet_share.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
 
 enum libnet_ListShares_level {
        LIBNET_LIST_SHARES_GENERIC,

diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c
index d1d8298e3c484d4a2dee7790749dfecf1e195b71..211cbc9e7f7a56282cb2b0d0c27b34de16e4a27c 100644 (file)
--- a/source4/libnet/libnet_time.c
+++ b/source4/libnet/libnet_time.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 /*

diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index ba9fd0cc83d42b2a7680bd1a2364cc99d962d737..1fca102d177acc9648b1a02f7a32ce192dccb1c7 100644 (file)
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 
 NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_CreateUser *r)

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 352dde27e6a02dc1006553e9e1fb8c7a226fe8af..8f229c04e10dd9ad8b74b01c40e5f045df61a491 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -25,6 +25,7 @@
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/schannel_proto.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 

diff --git a/source4/libnet/libnet_vampire.h b/source4/libnet/libnet_vampire.h
index fcd93c3654f3b472db03455b41c1bc607f17faae..a3735d18487e9b3db9a27a21a11f72c822fd3249 100644 (file)
--- a/source4/libnet/libnet_vampire.h
+++ b/source4/libnet/libnet_vampire.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 
 struct libnet_SamSync_state {
        struct libnet_context *machine_net_ctx;

diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl
index 5ccfe56a611482c351831d6996b9f138b80ea0ef..99dfba64a8dd147e9bbcdbb5552894161f909b1c 100644 (file)
--- a/source4/librpc/idl/krb5pac.idl
+++ b/source4/librpc/idl/krb5pac.idl
@@ -7,7 +7,7 @@
 [
   version(0.0),
   pointer_default(unique),
-  depends(security,netlogon),
+  depends(security,netlogon,samr),
   helper("librpc/ndr/ndr_krb5pac.h")
 ]
 interface krb5pac

diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index ad38fce9a549e84886a85e9be114f55aa24d27ff..6794b9cb1e04c203ee011bec5dc97c3d6527e1f1 100644 (file)
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -18,7 +18,7 @@
        endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
        pointer_default(unique),
        pointer_default_top(unique),
-       depends(dcom)
+       depends(dcom, orpc)
 ]
 interface IOXIDResolver
 {

diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index f57b1b43350d1822f7d52334c28ab3c13d7dcc81..0d830c3f5fd951beb3a18eb750337054c18dcfd8 100644 (file)
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -10,7 +10,7 @@
        pointer_default(unique),
        pointer_default_top(unique),
        endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]"),
-       depends(dcom)
+       depends(dcom,orpc)
 ]
 interface IRemoteActivation
 {

diff --git a/source4/librpc/idl/schannel.idl b/source4/librpc/idl/schannel.idl
index 8c72742f88107e9f2d607905b6452c476b69122e..f3c84c591a490c9306576d99013214ce62a125fd 100644 (file)
--- a/source4/librpc/idl/schannel.idl
+++ b/source4/librpc/idl/schannel.idl
@@ -5,7 +5,7 @@
 */
 
 [
-       depends(netlogon)
+       depends(netlogon,nbt)
 ]
 interface schannel
 {

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 3c65cd7b6a41933390a58d259650c071fdb4590b..12a7877ec0c177d206bd8bb8f1940e72d1181f27 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -11,7 +11,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   helpstring("Remote Registry Service"),
-  depends(lsa,initshutdown)
+  depends(lsa,initshutdown,security)
 ] interface winreg
 {
        declare bitmap security_secinfo;

diff --git a/source4/librpc/ndr/ndr_sec.c b/source4/librpc/ndr/ndr_sec.c
index ee01536ede5ba78e01bdd10c8a58fcdf3410bdde..fb18d48909d8b65da37a90898687f6ac67b0b713 100644 (file)
--- a/source4/librpc/ndr/ndr_sec.c
+++ b/source4/librpc/ndr/ndr_sec.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field

diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/source4/librpc/ndr/ndr_sec_helper.c
index a6cd0fc62ed250c465be36b5df2196f122638f32..8325aef93d1a074a80e6fd081bf919edee58cd9c 100644 (file)
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ b/source4/librpc/ndr/ndr_sec_helper.c
@@ -22,6 +22,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   return the wire size of a dom_sid

diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 0d589bad6bec8975578ca851e9b69fadb0d0fb6d..ca77202aa72ddeaddd8289278e173cfd7793ea00 100644 (file)
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "libcli/composite/composite.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 

diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c
index 72ebf0c301b10acb8b493141d9e4acb29ec4e4f1..fbd650b10444376f22747ae6bb6777d69f549415 100644 (file)
--- a/source4/nbt_server/defense.c
+++ b/source4/nbt_server/defense.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 

diff --git a/source4/nbt_server/dgram/browse.c b/source4/nbt_server/dgram/browse.c
index 4cef705f0212cd24a5d26cc4fbb5cc6448b4dfee..37a00519ce06427b7add2f124da41c3acb2dbf29 100644 (file)
--- a/source4/nbt_server/dgram/browse.c
+++ b/source4/nbt_server/dgram/browse.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 static const char *nbt_browse_opcode_string(enum nbt_browse_opcode r)
 {

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index eea36060dd4097b46ce2b7c9670811141217ffae..632f987c37fddcf80a76da7db8dc5ce68c920d8c 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "db_wrap.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   reply to a GETDC request

diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 580422f1de59464dea9bc68ea74bf2c2f132ccfe..165a9f461a378191a0d04648b0374610013b87b3 100644 (file)
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   reply to a SAM LOGON request

diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index f28170c1065323a4cd3da9e8299c6d4fcceb9815..d307acfb9cfe28ad576e1c2f531a00ec604e2779 100644 (file)
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "nbt_server/dgram/proto.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   a list of mailslots that we have static handlers for

diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index adcdbfd7049b8e1b0eca6fa22a42c0035328e95d..3f82bbd757c7a7882612f33b1179a7e28785159f 100644 (file)
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -26,8 +26,10 @@
 #include "smbd/service.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   serve out the nbt statistics

diff --git a/source4/nbt_server/nbt_server.h b/source4/nbt_server/nbt_server.h
index 9203f20fd91512041ee4785990d5448fab660ed3..3b70c0a330570fa3765e0920dcbc37fa585d977d 100644 (file)
--- a/source4/nbt_server/nbt_server.h
+++ b/source4/nbt_server/nbt_server.h
@@ -23,7 +23,7 @@
 #include "libcli/nbt/libnbt.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/irpc.h"
 #include "lib/messaging/irpc.h"
 
 /* 

diff --git a/source4/nbt_server/nodestatus.c b/source4/nbt_server/nodestatus.c
index 140451d74afc053f2df201feb151efd7d73d1bb8..d87e5c470e13997d427a380810e83a6f6d26e81c 100644 (file)
--- a/source4/nbt_server/nodestatus.c
+++ b/source4/nbt_server/nodestatus.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   send a name status reply

diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index d73a3b027afdd22d0052be101d01c536359e6e18..da275dee887319b765266fd8cd8c5bb2e0ba18e6 100644 (file)
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
 #include "lib/socket/socket.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
   we received a badly formed packet - log it

diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 078a876c8e71581e4cc2c87fc07950692d464115..9223e2ee3cff00f426b75a282ce13c820685f56e 100644 (file)
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 /*

diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index 958ab42a3dda4f9e48083749a424153ecb68c283..7d178991efb6b3b0869210790a56177bb06d127a 100644 (file)
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);

diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 70cc0e9ae8dbf5e3ffc58e2d0aaf87b6c08062fb..bfaf1edbdeaf241e681a22b23fcc053033d5a44e 100644 (file)
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -25,6 +25,7 @@
 #include "nbt_server/wins/winsserver.h"
 #include "libcli/composite/composite.h"
 #include "lib/events/events.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "smbd/service_task.h"
 
 static void nbtd_wins_refresh_handler(struct composite_context *c);

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 7e726aedf2767534b6a7b3544acfbf81600ecce8..a0b65bec2583a114bc70a6db9fd9bf78255ad239 100644 (file)
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -26,6 +26,7 @@
 #include "nbt_server/wins/winsdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "db_wrap.h"
 #include "system/network.h"

diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 85ffd7bce5a11726cd52d4f286589332f37b7e6d..9f9e72cbdc74573f964fe91da118b70fcf7dbd4e 100644 (file)
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -25,6 +25,7 @@
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsdb.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
 #include "smbd/service_task.h"

diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index 70f7dea95582397216a227d1b87ecdf0cb9d4498..c22d29a72324055501676aca560c822ec98f2337 100644 (file)
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -28,6 +28,7 @@
 #include "libcli/ldap/ldap.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index a5939996932321255e1428d6d7710ab9b216ecfc..8ec62dff8b0e9e7e1d5b9d5aeec9ed9e8c7698b8 100644 (file)
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "libcli/rap/rap.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
 #include "rpc_server/common/common.h"
 
 /* At this moment these are just dummy functions, but you might get the

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 246290ae913e35c190241c926b8bfb9ef3fbea17..84ad62fcc83355b49cf4fb474591e600e2412a65 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 #include "libcli/security/proto.h"
 
 

diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c
index 553681a3d4cfe352ec8692bbf5ea80bbc07965d4..72293fb746fdde9d471b1b415d67501e6672a160 100644 (file)
--- a/source4/ntvfs/posix/pvfs_fsinfo.c
+++ b/source4/ntvfs/posix/pvfs_fsinfo.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 /* We use libblkid out of e2fsprogs to identify UUID of a volume */
 #ifdef HAVE_LIBBLKID

diff --git a/source4/ntvfs/posix/pvfs_mkdir.c b/source4/ntvfs/posix/pvfs_mkdir.c
index fe2c5d0467fa649905d7895088539cf616cee1eb..047b6f45a7a60061e3b10b7be2b544dda7151462 100644 (file)
--- a/source4/ntvfs/posix/pvfs_mkdir.c
+++ b/source4/ntvfs/posix/pvfs_mkdir.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/dir.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   create a directory with EAs

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 174cab51eca3e5e81a3d135b39d9c0430d402e35..4f0615087abc7b0735a801437826e1bedb0f0f02 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -26,7 +26,7 @@
 #include "system/time.h"
 #include "dlinklist.h"
 #include "messaging/messaging.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 /*
   create file handles with convenient numbers for sniffers

diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index c23a3c834810f290452f42d6a3914ed77b5ad693..fb1b0aa3f93374081e81e36f16f71268c548f83e 100644 (file)
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index c88f49d116075e8078be457794d3b893d384da38..411fbd9c27c63bbe12e762283d2f477e52bc9828 100644 (file)
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   read from a file

diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c
index 81f6ef1bf72933eed085b21b83595d4233d7bf5d..8629ecabf251e9732b1b73f7efa8b854bf4fee2b 100644 (file)
--- a/source4/ntvfs/posix/pvfs_rename.c
+++ b/source4/ntvfs/posix/pvfs_rename.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
   resolve a wildcard rename pattern. This works on one component of the name

diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index c74bac5a3d6132e2664763936d934b20f34ab655..7ee64887fb4d74efb8a7bf7109b033b0431c11de 100644 (file)
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "smbd/service_stream.h"
 #include "lib/events/events.h"
 

diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 45edaa5b946caddfc573b659e599b1823e39cc81..4997207a8b39ea62dbb33f74d6b13bf6dc810eca 100644 (file)
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_streams.c b/source4/ntvfs/posix/pvfs_streams.c
index 3910baadd09ba1ba02e76a8419610a1336f051b8..159cf7470d8b6bedd088f6f9142a49a93dec2f65 100644 (file)
--- a/source4/ntvfs/posix/pvfs_streams.c
+++ b/source4/ntvfs/posix/pvfs_streams.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index 6930a0ba41f335db594eb51144c67abc8e0751c5..9c23b3e4fdadb59ce842a97d52b277d72f2db41e 100644 (file)
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c
index d0894a735e8d64daa1558abbccdaa5b6ca017ccd..cf38d3c1cb8c927e3da8f1bf8175622505a805da 100644 (file)
--- a/source4/ntvfs/posix/pvfs_xattr.c
+++ b/source4/ntvfs/posix/pvfs_xattr.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "util/unix_privs.h"
+#include "librpc/gen_ndr/ndr_xattr.h"
 
 /*
   pull a xattr as a blob

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 31588fdf782ceb02576849c7b6d20d4f2a81f7e5..3f1c676df3585080676812bc29b460585f777197 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "smbd/service_stream.h"
 #include "lib/tdb/include/tdb.h"
 #include "db_wrap.h"

diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 84828fb3ceeb47a0c616fa16d4babdd620c4383d..71120965c2fcf5f2588d7c89f440dea21f0c621f 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -23,7 +23,7 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 #include "system/filesys.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 0d871c58cb62f51bd9663f8d4a66300a9bc17a88..931eed626fd65c979f0d6757cd7df65874e0c681 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -59,8 +59,8 @@
 #include "pstring.h"
 #include "system/time.h"
 #include "system/iconv.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/svcctl.h"
+#include "librpc/gen_ndr/samr.h"
 #include "smb_server/smb_server.h"
 #include "libcli/raw/signing.h"
 #include "dlinklist.h"

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 42375674f5f30c522030f954a3ac5b21ce3df8e3..972368195b45cd0a2c79160465100ee5d32fb5a6 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2239,10 +2239,14 @@ sub HeaderInterface($)
 
        pidl_hdr "#include \"librpc/ndr/libndr.h\"";
 
+       if (has_property($interface, "object")) {
+               pidl "#include \"librpc/gen_ndr/ndr_orpc.h\"";
+       }
+
        if (defined $interface->{PROPERTIES}->{depends}) {
                my @d = split / /, $interface->{PROPERTIES}->{depends};
                foreach my $i (@d) {
-                       pidl_hdr "#include \"librpc/gen_ndr/ndr_$i\.h\"";
+                       pidl "#include \"librpc/gen_ndr/ndr_$i\.h\"";
                }
        }
 

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 8710f08cc7468750b1e2a17d635a38a4f9c25317..fd6d303330b3ba7f656ee580f894c59a2582fe80 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -309,11 +309,11 @@ sub ParseInterface($)
 
 sub Parse($$)
 {
-       my($ndr) = shift;
-       my($filename) = shift;
+       my($ndr,$header) = @_;
 
        $res =  "";
        $res .= "/* server functions auto-generated by pidl */\n";
+       $res .= "#include \"$header\"\n";
        $res .= "\n";
 
        foreach my $x (@{$ndr}) {

diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c
index c98fe980592ee50d0de7d721b8fb5586d3a3d4bf..cf6d2f2270251817e87194105909e82aae03a3f3 100644 (file)
--- a/source4/rpc_server/common/share_info.c
+++ b/source4/rpc_server/common/share_info.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
 #include "rpc_server/dcerpc_server.h"
 
 /* 

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 3772b62b301dcd8e8d36353e02ba91db6099c418..a22356af15a9c540586a1933f201dbf106f22624 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -29,6 +29,7 @@
 #include "libcli/ldap/ldap.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "smb.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index fde691bea0114af3f321e5fd489f56cb5f2a5518..580cf842f962179fb247e35f4432bff1b2962760 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -27,6 +27,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 6341dda6812bec4cbc4bcb06e61e98132ae2eed8..07a2d678fe4d83b8d7dd6e1023b96ead4cfd0d1d 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -25,6 +25,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "system/time.h"
 #include "lib/crypto/crypto.h"
 #include "ads.h"

diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 7576dc0ec0417d328659a759504ffa5f5cd5cd1a..1c60adb9011cc033b4ac51342637cfdad216449e 100644 (file)
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -25,6 +25,7 @@
 #include "lib/registry/registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "rpc_server/common/common.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 enum handle_types { HTYPE_REGVAL, HTYPE_REGKEY };
 

diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 3fb2ac0903d40c5fdb0150ae454d7cc65d7599fc..36d67790cd230c4ad6cedfb3803ebe21c0889992 100644 (file)
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -24,8 +24,8 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/winreg.h"
 #include "scripting/ejs/ejsrpc.h"
 #include "libcli/security/proto.h"
 

diff --git a/source4/scripting/ejs/smbcalls_nbt.c b/source4/scripting/ejs/smbcalls_nbt.c
index dcefd56a0c3441c3c9bfe436d8ecd6b0fa004fce..4bcb450ee3495b90dd3e67fd55781c6d0feceae6 100644 (file)
--- a/source4/scripting/ejs/smbcalls_nbt.c
+++ b/source4/scripting/ejs/smbcalls_nbt.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
 

diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index e666aa65ccf1743cfe3e034389e992708c4e4767..0d2d34a478d6819fe4f46afce77aebb598144ab5 100644 (file)
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
-#include "librpc/gen_ndr/ndr_echo.h"
+#include "librpc/gen_ndr/echo.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/messaging/irpc.h"
 #include "scripting/ejs/ejsrpc.h"

diff --git a/source4/scripting/ejs/smbcalls_samba3.c b/source4/scripting/ejs/smbcalls_samba3.c
index 0a05e4584fdd5f5c76d6bdd58955ddb352d0426f..1cf0042741c9b544cf12df1d4cd866f817cb8e52 100644 (file)
--- a/source4/scripting/ejs/smbcalls_samba3.c
+++ b/source4/scripting/ejs/smbcalls_samba3.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/samba3/samba3.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 static struct MprVar mprRegistry(struct samba3_regdb *reg)

diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index ea47d99d28c008c948ecca917115adb6a36ba4f9..78d3405e1d5822a25fc97c7066f2bb715bcaad83 100644 (file)
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -26,6 +26,7 @@
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   hold the state of a nttrans op while in progress. Needed to allow for async backend

diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index ac0ab1a16632606022837221f5c9412acb75efe4..00589ce5014aee064e19df41c1e27ad18db7066b 100644 (file)
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 
 /* useful way of catching wct errors with file and line number */

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 2e180bfa2948f72d0e8965159763410ad7bf2054..2c5387391b0381d5edb316d896aaf7b338caa81f 100644 (file)
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static BOOL torture_pac_self_check(void) 
 {

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index b28d92a586947802ee57cd2fb7803427b4fb2731..9bfcbaac64124350918f89038315f93fd90e2a0d 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -24,7 +24,7 @@
 #include "libcli/raw/request.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "auth/gensec/gensec.h"
 #include "torture/torture.h"
 

diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 02b50e81555906b4a5b07d0e8af1b2f4759b0478..3a2b4001b925d6be4eed11f90724cb56d9db4e42 100644 (file)
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "libcli/cldap/cldap.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 18933cb033f9c6123c601052f94ba91cf61c29e0..0151d5fbc2afdf8f84dc8727b10d6c8c998c6c05 100644 (file)
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,

diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 418f57972857bb90cab825db3052abbb79e142cf..4f9348ee4b5ead6f8ba2010b933f71059ca815ec 100644 (file)
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)

diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index b7d877b0975ca507c866f70eddaa57904a9490d7..3366433e401ee31942cc86dfe3d1ec71b47aadf7 100644 (file)
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -24,6 +24,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 

diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 44a0dcf79b6bd00ca4973c7038f5c9f4df5aba1a..1e9b5defbd0cd9c3649b9db1917d41f661eaeb36 100644 (file)
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -24,7 +24,9 @@
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 

diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 2df495a15fc85442f633a35d3a73811913ed87a0..cf25f0d7605cb19c252319cce184d1f2b7a37bcf 100644 (file)
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,6 +23,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/userman.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 #define TEST_USERNAME  "libnetusermantest"

diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c
index 827eb6c58526d476789695c9584fa6db3e4e188c..12637608c6ba6ff3d0f67b5f0bdaba672f643192 100644 (file)
--- a/source4/torture/local/binding_string.c
+++ b/source4/torture/local/binding_string.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {

diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 8d940093d1f6e2815faefc3872bd520643c902ec..5f956808d1fba3c5f55ebb86f08e771935b9563f 100644 (file)
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*

diff --git a/source4/torture/nbt/browse.c b/source4/torture/nbt/browse.c
index 1b2b698a23779b2a3fc58ea4db5f7deebc8ef31b..415994ee868345fda59c08cdd392a00b67f9393c 100644 (file)
--- a/source4/torture/nbt/browse.c
+++ b/source4/torture/nbt/browse.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/nbt.h"
 #include "libcli/resolve/resolve.h"
 
 /*

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 0de55543936e7dfe2526607c8efb39494ed51522..79bc3995ddbe0d36cad954a944fbd640c9144377 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -22,7 +22,9 @@
 
 #include "includes.h"
 #include "libcli/dgram/libdgram.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index fe2ffeb36ea1728b74af9c88ac6803da57fec52b..f983764129a9f036d93259f72d4481e0ec0fb1df 100644 (file)
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -25,6 +25,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_VALUE(v, correct) do { \
        if ((v) != (correct)) { \

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 2ac9d1cfb3dbb6fef7415083c4503b25ed7b6185..07c4865bdfe51652b8203291c14977de0b2b704d 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -28,6 +28,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 7a7780c01ce1069f4868f1a0192bdb0ccba474c8..8c6fbce8516a0d9d674fcb2189d2e714b24ba3e5 100644 (file)
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/lsa.h"
 #include "libcli/util/clilsa.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define BASEDIR "\\testsd"
 

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 97c47acc7e379ffbe22439090f29f9a4824fc512..d8f7a78b11764274798d2299f149db62337956e7 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -29,7 +29,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 
 #define BASEDIR "\\composite"
 

diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 420580847e86eaa03a033d24affb428a3e0ae8d6..94b28f6379265cc6ec0cc8d98051c01898c58542 100644 (file)
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -23,7 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
 

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 65a72818cfeb28200ba67fc284fa2a5b89e6d8f2..5630f94e64e6320b7f6a2bbeb5db491cbf983c25 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 

diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 146131286df7ea52fc326046321c6beef96af992..bd7b98b98704d83ec0b5350aa4a1ab0c6228e1e1 100644 (file)
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -21,12 +21,13 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
 #include "libcli/security/proto.h"
 #include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
                        struct policy_handle **handle)

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 14e7a49305a01e58f6f5a927a8787558ec45a788..ffa62f8fa37f9bb66cd74c274082e294c4fd2a0b 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -30,7 +30,9 @@
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
 static const char *machine_password;

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 950d9184dcf4166c4e99321d379490d356ad1b3a..0c128f9f1f6cadaf1ff2b229691fdcf91dd037d7 100644 (file)
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -25,8 +25,9 @@
 #include "librpc/gen_ndr/ndr_oxidresolver_c.h"
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/epmapper.h"
 #include "torture/rpc/rpc.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
 

diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 13d41394b8a818d508b93ad6b11766406b92abe5..81f609e8b39aa30885bc9cb43930cd0098d698ab 100644 (file)
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
 #include "torture/rpc/rpc.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 10541ccf541f9101c22310a1d1a77805c076403e..fcf0215a1e4ffde05fe8a9fa35b243a68a4396a9 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -22,9 +22,10 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 4ed28ab56381d4ca00ed38b0d369a1abb5af4415..6b55c820d977465e238d4e9054c506ee97a7013e 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -32,9 +32,12 @@
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index efcb27928676543c5a31d61b293b394b905f6e42..b39d1258c2e23b8c9defb91ca7ffc40f78360521 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -23,7 +23,9 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 55fa25fb38763df2ffd29d78ea103a618429bc11..76fe3ec2ae9b16859ed8bfbf5f24bbbd9e5790a0 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -33,6 +33,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 #include "libcli/auth/libcli_auth.h"

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index e8e2f0e3465f754c3e1e9afe68a770634d352660..0e219d4161ea558b06b2a7e648170a1688f4d891 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/proto.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 84a35900a3dd83967136cb8610586006605cdabf..70be00f5fdfffaa13df17fbe93cbc4277c96b0c0 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -26,6 +26,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ae0e1d20fd1e881097331988bb5b9f3bfee42a40..aba6110acb01f6bde29564eb035eb6636762c4b8 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -33,6 +33,7 @@
 #include "auth/credentials/credentials.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "libcli/ldap/ldap_client.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"

diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index 9463b88dd7d2824ab472f679b1d2625b3c6737f7..e94794db16b7c97c3007ea00ae8de25f5913b30d 100644 (file)
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 int net_join(struct net_context *ctx, int argc, const char **argv) 
 {

diff --git a/source4/utils/net/net_vampire.c b/source4/utils/net/net_vampire.c
index 00ae647016e77923970dc2fab24942c31326bdad..864974077717b6362b75ab0c39f80238c0cbb1d3 100644 (file)
--- a/source4/utils/net/net_vampire.c
+++ b/source4/utils/net/net_vampire.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 #include "auth/auth.h"
 
 static int net_samdump_keytab_usage(struct net_context *ctx, int argc, const char **argv)

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index cb32345c2be4139ccccebb91c84b0e0e71f5fd66..79267882fa592795e55fb941e7d9768399f8a1c6 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -28,6 +28,7 @@
 #include "auth/auth.h"
 #include "pstring.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #define SQUID_BUFFER_SIZE 2010
 

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index ad1aaae0d27901fbb0a297a61233e294afb65abb..c1a95b65fd215aa8f02900e13d33a9307251f2fb 100644 (file)
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -26,10 +26,11 @@
 #include "winbind/wb_async_helpers.h"
 
 #include "lib/messaging/irpc.h"
-#include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/irpc.h"
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"

diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 195a20fd1f4a8adf56e1a2b19073b435c45ffead..f0e8f157eec6aad5ff74a56c2e0c0d45542d18f8 100644 (file)
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -29,6 +29,8 @@
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"

diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index 558dfcae492d525a64c63e63a781d6ef5166038a..5db0f3054a0279781946f717c756f7c0d381f8d5 100644 (file)
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -27,6 +27,7 @@
 #include "smbd/service_task.h"
 #include "libcli/auth/credentials.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 /* Oh, there is so much to keep an eye on when authenticating a user.  Oh my! */

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 31365aa9eb323a0b840352616086c96a2110011f..e4a74d16def55a22c1c60bc63793b62a9d068257 100644 (file)
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -27,7 +27,8 @@
 #include "winbind/wb_async_helpers.h"
 #include "libcli/composite/composite.h"
 #include "version.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/proto.h"
 #include "auth/pam_errors.h"
 

diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index e1b4bcbf39181b937be92ed999bd9e14aa4f035c..c080408ea36d122d84f702ec9971ca7bca23132c 100644 (file)
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -29,6 +29,7 @@
 #include "nbt_server/wins/winsdb.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 enum _R_ACTION {
        R_INVALID,

diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index dbcddf859ca821c63ba479847b008b93e1e26930..e1dca206718aeef3c9c674353a75acf8c8b0c647 100644 (file)
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -25,7 +25,7 @@
 #include "lib/socket/socket.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
 #include "libcli/composite/composite.h"

diff --git a/source4/wrepl_server/wrepl_out_pull.c b/source4/wrepl_server/wrepl_out_pull.c
index ada86cc3d4112f2db63a60e7251b1c72f455a8f0..addac0cb6906221622623dc5f289716448018df7 100644 (file)
--- a/source4/wrepl_server/wrepl_out_pull.c
+++ b/source4/wrepl_server/wrepl_out_pull.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
 

diff --git a/source4/wrepl_server/wrepl_out_push.c b/source4/wrepl_server/wrepl_out_push.c
index 9c8c9fad8d5e5706496ee1fc4e1e8b4997a6b119..6c916559dbf754e8ad65b1b60c2c7ef9efbc35bd 100644 (file)
--- a/source4/wrepl_server/wrepl_out_push.c
+++ b/source4/wrepl_server/wrepl_out_push.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
 #include "nbt_server/wins/winsdb.h"

diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index c342656eef2bd76ca41d54552bcd3535bef7069f..661c825177cbc3880ae5284732e81c31ea288be2 100644 (file)
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -24,7 +24,7 @@
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
 #include "smbd/service.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 
 static NTSTATUS wreplsrv_periodic_run(struct wreplsrv_service *service)

diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c
index a4c4c480e0e6496455857038da45ae7a9ab37429..4382195d5320423a7f8edc08ddcfc645a387cffd 100644 (file)
--- a/source4/wrepl_server/wrepl_scavenging.c
+++ b/source4/wrepl_server/wrepl_scavenging.c
@@ -30,6 +30,7 @@
 #include "smbd/service_task.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 
 const char *wreplsrv_owner_filter(struct wreplsrv_service *service,
                                  TALLOC_CTX *mem_ctx,

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 885307d0c363e3308fc929de4457d1a1a18fae96..688471c33281d7fe6bbe6d5c062f077cc32da292 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -25,7 +25,7 @@
 #include "smbd/service_task.h"
 #include "smbd/service.h"
 #include "lib/messaging/irpc.h"
-#include "librpc/gen_ndr/ndr_winsrepl.h"
+#include "librpc/gen_ndr/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "nbt_server/wins/winsdb.h"
 #include "ldb/include/ldb.h"