diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-16 00:23:11 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:27 -0500 |
commit | 8528016978b084213ef53d66e1b6e831b1a01acc (patch) | |
tree | 860fdc4f5a795de773104e8c4b93816495107879 /source4 | |
parent | 753bf8fb995d5cd9abe4c23b5dc79e2392dfa1cb (diff) | |
download | samba-8528016978b084213ef53d66e1b6e831b1a01acc.tar.gz |
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)
Diffstat (limited to 'source4')
154 files changed, 181 insertions, 73 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index 0eff955c716..32a4f019f47 100644 --- 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 86854dfcec7..4a031e6b94b 100644 --- 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 01a00c3dfcd..ee90c8228ab 100644 --- 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 dd510f97f1b..6afd5ea828f 100644 --- 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 67c73d2230a..aa9a113e8d9 100644 --- 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 f3b5f8c1195..8d1cef1cbdf 100644 --- 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 e2c9596ac45..48f748cb19e 100644 --- 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 61edcade346..20c5854098e 100644 --- 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 13d89c2db65..1efb1afd544 100644 --- 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 b9864f96713..2f03ca09727 100644 --- 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 150179b841a..4105ba74b14 100644 --- 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 af3fdd89261..8ccab1df3da 100644 --- 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 653ba27454e..87446328f64 100644 --- 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 32d226b2b7e..047cb97b35d 100644 --- 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 8a4a871627d..6ab33031df4 100644 --- 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 358f565283a..0f6e57c9cf7 100644 --- 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 0a776d46ce0..9315f62a0be 100644 --- 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 c05e1fdceb6..0bd83c800a2 100644 --- 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 8829d862d33..c0bffa78e56 100644 --- 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 02864b60165..479fedbc28b 100644 --- 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 27c5a4e689e..2e781f701f2 100644 --- 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 9e407ba2006..2773dba1d75 100644 --- 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 944510077bc..98cb54ddedb 100644 --- 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 f67e561afcf..18ab398c796 100644 --- 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 326ec7e9083..16bb9d2fb72 100644 --- 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 830d81257d6..26675cb420e 100644 --- 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 df8c63fa878..08b9b0e641a 100644 --- 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 84ad814fa03..f480212b79a 100644 --- 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 085aa352ac0..9ed20b77ba0 100644 --- 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 b4411d6fe69..e828beb29f9 100644 --- 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 5c7e86367f7..957f87abfdd 100644 --- 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 42b92b14cce..eca52531138 100644 --- 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 df5c608d081..2ad155e9b95 100644 --- 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 96a06b9bec5..f115a18d231 100644 --- 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 59ac65a3401..6f35b7f829f 100644 --- 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 6f8befebfe2..d889b500fb0 100644 --- 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 cf8f2f71b49..b33d0df8285 100644 --- 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 c283f0fda17..781ea957dfd 100644 --- 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 e8473966b48..7188faba7b0 100644 --- 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 c3fdf4bc25f..8bacab8cd76 100644 --- 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 a1e9985edd2..862a25e20d1 100644 --- 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 7760ee7c22c..1391a4654da 100644 --- 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 b36e37a1a4f..a28d33cf7f7 100644 --- 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 7cafef829a9..f1f0f01c1d4 100644 --- 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 3fb142ea0b3..c37d5f98731 100644 --- 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 2fea11bd63a..3ea672327bf 100644 --- 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 515db2a7927..916e3061249 100644 --- 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 3b0d861e010..a517aa37337 100644 --- 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 3b233950b02..aa0b244f6d6 100644 --- 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 e5059c5f08c..c8c80db1839 100644 --- 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 3e9f069fb57..b9d493fdf8d 100644 --- 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 8936d6829a7..0f97263b477 100644 --- 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 8cc0cada839..4f75d784f69 100644 --- 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 35980fdcbba..08a5b599e22 100644 --- 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 efe54742711..fdf162a066a 100644 --- 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 d1d8298e3c4..211cbc9e7f7 100644 --- 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 ba9fd0cc83d..1fca102d177 100644 --- 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 352dde27e6a..8f229c04e10 100644 --- 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 fcd93c3654f..a3735d18487 100644 --- 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 5ccfe56a611..99dfba64a8d 100644 --- 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 ad38fce9a54..6794b9cb1e0 100644 --- 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 f57b1b43350..0d830c3f5fd 100644 --- 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 8c72742f881..f3c84c591a4 100644 --- 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 3c65cd7b6a4..12a7877ec0c 100644 --- 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 ee01536ede5..fb18d48909d 100644 --- 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 a6cd0fc62ed..8325aef93d1 100644 --- 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 0d589bad6be..ca77202aa72 100644 --- 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 72ebf0c301b..fbd650b1044 100644 --- 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 4cef705f021..37a00519ce0 100644 --- 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 eea36060dd4..632f987c37f 100644 --- 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 580422f1de5..165a9f461a3 100644 --- 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 f28170c1065..d307acfb9cf 100644 --- 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 adcdbfd7049..3f82bbd757c 100644 --- 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 9203f20fd91..3b70c0a3305 100644 --- 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 140451d74af..d87e5c470e1 100644 --- 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 d73a3b027af..da275dee887 100644 --- 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 078a876c8e7..9223e2ee3cf 100644 --- 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 958ab42a3dd..7d178991efb 100644 --- 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 70cc0e9ae8d..bfaf1edbdea 100644 --- 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 7e726aedf27..a0b65bec258 100644 --- 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 85ffd7bce5a..9f9e72cbdc7 100644 --- 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 70f7dea9558..c22d29a7232 100644 --- 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 a5939996932..8ec62dff8b0 100644 --- 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 246290ae913..84ad62fcc83 100644 --- 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 553681a3d4c..72293fb746f 100644 --- 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 fe2c5d0467f..047b6f45a7a 100644 --- 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 174cab51eca..4f0615087ab 100644 --- 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 c23a3c83481..fb1b0aa3f93 100644 --- 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 c88f49d1160..411fbd9c27c 100644 --- 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 81f6ef1bf72..8629ecabf25 100644 --- 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 c74bac5a3d6..7ee64887fb4 100644 --- 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 45edaa5b946..4997207a8b3 100644 --- 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 3910baadd09..159cf7470d8 100644 --- 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 6930a0ba41f..9c23b3e4fda 100644 --- 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 d0894a735e8..cf38d3c1cb8 100644 --- 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 31588fdf782..3f1c676df35 100644 --- 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 84828fb3cee..71120965c2f 100644 --- 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 0d871c58cb6..931eed626fd 100644 --- 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 42375674f5f..972368195b4 100644 --- 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 8710f08cc74..fd6d303330b 100644 --- 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 c98fe980592..cf6d2f22702 100644 --- 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 3772b62b301..a22356af15a 100644 --- 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 fde691bea01..580cf842f96 100644 --- 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 6341dda6812..07a2d678fe4 100644 --- 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 7576dc0ec04..1c60adb9011 100644 --- 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 3fb2ac0903d..36d67790cd2 100644 --- 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 dcefd56a0c3..4bcb450ee34 100644 --- 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 e666aa65ccf..0d2d34a478d 100644 --- 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 0a05e4584fd..1cf0042741c 100644 --- 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 ea47d99d28c..78d3405e1d5 100644 --- 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 ac0ab1a1663..00589ce5014 100644 --- 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 2e180bfa294..2c5387391b0 100644 --- 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 b28d92a5869..9bfcbaac641 100644 --- 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 02b50e81555..3a2b4001b92 100644 --- 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 18933cb033f..0151d5fbc2a 100644 --- 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 418f5797285..4f9348ee4b5 100644 --- 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 b7d877b0975..3366433e401 100644 --- 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 44a0dcf79b6..1e9b5defbd0 100644 --- 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 2df495a15fc..cf25f0d7605 100644 --- 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 827eb6c5852..12637608c6b 100644 --- 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 8d940093d1f..5f956808d1f 100644 --- 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 1b2b698a237..415994ee868 100644 --- 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 0de55543936..79bc3995ddb 100644 --- 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 fe2ffeb36ea..f983764129a 100644 --- 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 2ac9d1cfb3d..07c4865bdfe 100644 --- 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 7a7780c01ce..8c6fbce8516 100644 --- 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 97c47acc7e3..d8f7a78b117 100644 --- 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 420580847e8..94b28f63792 100644 --- 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 65a72818cfe..5630f94e64e 100644 --- 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 146131286df..bd7b98b9870 100644 --- 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 14e7a49305a..ffa62f8fa37 100644 --- 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 950d9184dcf..0c128f9f1f6 100644 --- 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 13d41394b8a..81f609e8b39 100644 --- 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 10541ccf541..fcf0215a1e4 100644 --- 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 4ed28ab5638..6b55c820d97 100644 --- 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 efcb2792867..b39d1258c2e 100644 --- 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 55fa25fb387..76fe3ec2ae9 100644 --- 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 e8e2f0e3465..0e219d4161e 100644 --- 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 84a35900a3d..70be00f5fdf 100644 --- 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 ae0e1d20fd1..aba6110acb0 100644 --- 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 9463b88dd7d..e94794db16b 100644 --- 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 00ae647016e..86497407771 100644 --- 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 cb32345c2be..79267882fa5 100644 --- 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 ad1aaae0d27..c1a95b65fd2 100644 --- 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 195a20fd1f4..f0e8f157eec 100644 --- 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 558dfcae492..5db0f3054a0 100644 --- 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 31365aa9eb3..e4a74d16def 100644 --- 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 e1b4bcbf391..c080408ea36 100644 --- 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 dbcddf859ca..e1dca206718 100644 --- 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 ada86cc3d41..addac0cb690 100644 --- 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 9c8c9fad8d5..6c916559dbf 100644 --- 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 c342656eef2..661c825177c 100644 --- 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 a4c4c480e0e..4382195d532 100644 --- 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 885307d0c36..688471c3328 100644 --- 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" |