r24561: merge from SAMBA_4_0:

rename some DCERPC_ prefixes into NDR_

metze
(This used to be commit 8f07b8ab658ae3d63487ca5fb20065318cdd9d0e)

1 files changed, 52 insertions, 52 deletions

diff --git a/source3/librpc/gen_ndr/ndr_netlogon.h b/source3/librpc/gen_ndr/ndr_netlogon.h
index f3c9d16d95..e91e961b03 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.h
+++ b/source3/librpc/gen_ndr/ndr_netlogon.h
@@ -6,107 +6,107 @@
 #define _HEADER_NDR_netlogon
 
 #include "librpc/ndr/libndr.h"
-#define DCERPC_NETLOGON_UUID "12345678-1234-abcd-ef00-01234567cffb"
-#define DCERPC_NETLOGON_VERSION 1.0
-#define DCERPC_NETLOGON_NAME "netlogon"
-#define DCERPC_NETLOGON_HELPSTRING NULL
+#define NDR_NETLOGON_UUID "12345678-1234-abcd-ef00-01234567cffb"
+#define NDR_NETLOGON_VERSION 1.0
+#define NDR_NETLOGON_NAME "netlogon"
+#define NDR_NETLOGON_HELPSTRING NULL
 extern const struct ndr_interface_table ndr_table_netlogon;
 NTSTATUS dcerpc_server_netlogon_init(void);
-#define DCERPC_NETR_LOGONUASLOGON (0x00)
+#define NDR_NETR_LOGONUASLOGON (0x00)
 
-#define DCERPC_NETR_LOGONUASLOGOFF (0x01)
+#define NDR_NETR_LOGONUASLOGOFF (0x01)
 
-#define DCERPC_NETR_LOGONSAMLOGON (0x02)
+#define NDR_NETR_LOGONSAMLOGON (0x02)
 
-#define DCERPC_NETR_LOGONSAMLOGOFF (0x03)
+#define NDR_NETR_LOGONSAMLOGOFF (0x03)
 
-#define DCERPC_NETR_SERVERREQCHALLENGE (0x04)
+#define NDR_NETR_SERVERREQCHALLENGE (0x04)
 
-#define DCERPC_NETR_SERVERAUTHENTICATE (0x05)
+#define NDR_NETR_SERVERAUTHENTICATE (0x05)
 
-#define DCERPC_NETR_SERVERPASSWORDSET (0x06)
+#define NDR_NETR_SERVERPASSWORDSET (0x06)
 
-#define DCERPC_NETR_DATABASEDELTAS (0x07)
+#define NDR_NETR_DATABASEDELTAS (0x07)
 
-#define DCERPC_NETR_DATABASESYNC (0x08)
+#define NDR_NETR_DATABASESYNC (0x08)
 
-#define DCERPC_NETR_ACCOUNTDELTAS (0x09)
+#define NDR_NETR_ACCOUNTDELTAS (0x09)
 
-#define DCERPC_NETR_ACCOUNTSYNC (0x0a)
+#define NDR_NETR_ACCOUNTSYNC (0x0a)
 
-#define DCERPC_NETR_GETDCNAME (0x0b)
+#define NDR_NETR_GETDCNAME (0x0b)
 
-#define DCERPC_NETR_LOGONCONTROL (0x0c)
+#define NDR_NETR_LOGONCONTROL (0x0c)
 
-#define DCERPC_NETR_GETANYDCNAME (0x0d)
+#define NDR_NETR_GETANYDCNAME (0x0d)
 
-#define DCERPC_NETR_LOGONCONTROL2 (0x0e)
+#define NDR_NETR_LOGONCONTROL2 (0x0e)
 
-#define DCERPC_NETR_SERVERAUTHENTICATE2 (0x0f)
+#define NDR_NETR_SERVERAUTHENTICATE2 (0x0f)
 
-#define DCERPC_NETR_DATABASESYNC2 (0x10)
+#define NDR_NETR_DATABASESYNC2 (0x10)
 
-#define DCERPC_NETR_DATABASEREDO (0x11)
+#define NDR_NETR_DATABASEREDO (0x11)
 
-#define DCERPC_NETR_LOGONCONTROL2EX (0x12)
+#define NDR_NETR_LOGONCONTROL2EX (0x12)
 
-#define DCERPC_NETR_NETRENUMERATETRUSTEDDOMAINS (0x13)
+#define NDR_NETR_NETRENUMERATETRUSTEDDOMAINS (0x13)
 
-#define DCERPC_NETR_DSRGETDCNAME (0x14)
+#define NDR_NETR_DSRGETDCNAME (0x14)
 
-#define DCERPC_NETR_NETRLOGONDUMMYROUTINE1 (0x15)
+#define NDR_NETR_NETRLOGONDUMMYROUTINE1 (0x15)
 
-#define DCERPC_NETR_NETRLOGONSETSERVICEBITS (0x16)
+#define NDR_NETR_NETRLOGONSETSERVICEBITS (0x16)
 
-#define DCERPC_NETR_NETRLOGONGETTRUSTRID (0x17)
+#define NDR_NETR_NETRLOGONGETTRUSTRID (0x17)
 
-#define DCERPC_NETR_NETRLOGONCOMPUTESERVERDIGEST (0x18)
+#define NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST (0x18)
 
-#define DCERPC_NETR_NETRLOGONCOMPUTECLIENTDIGEST (0x19)
+#define NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST (0x19)
 
-#define DCERPC_NETR_SERVERAUTHENTICATE3 (0x1a)
+#define NDR_NETR_SERVERAUTHENTICATE3 (0x1a)
 
-#define DCERPC_NETR_DSRGETDCNAMEEX (0x1b)
+#define NDR_NETR_DSRGETDCNAMEEX (0x1b)
 
-#define DCERPC_NETR_DSRGETSITENAME (0x1c)
+#define NDR_NETR_DSRGETSITENAME (0x1c)
 
-#define DCERPC_NETR_LOGONGETDOMAININFO (0x1d)
+#define NDR_NETR_LOGONGETDOMAININFO (0x1d)
 
-#define DCERPC_NETR_SERVERPASSWORDSET2 (0x1e)
+#define NDR_NETR_SERVERPASSWORDSET2 (0x1e)
 
-#define DCERPC_NETR_NETRSERVERPASSWORDGET (0x1f)
+#define NDR_NETR_NETRSERVERPASSWORDGET (0x1f)
 
-#define DCERPC_NETR_NETRLOGONSENDTOSAM (0x20)
+#define NDR_NETR_NETRLOGONSENDTOSAM (0x20)
 
-#define DCERPC_NETR_DSRADDRESSTOSITENAMESW (0x21)
+#define NDR_NETR_DSRADDRESSTOSITENAMESW (0x21)
 
-#define DCERPC_NETR_DSRGETDCNAMEEX2 (0x22)
+#define NDR_NETR_DSRGETDCNAMEEX2 (0x22)
 
-#define DCERPC_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN (0x23)
+#define NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN (0x23)
 
-#define DCERPC_NETR_NETRENUMERATETRUSTEDDOMAINSEX (0x24)
+#define NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX (0x24)
 
-#define DCERPC_NETR_DSRADDRESSTOSITENAMESEXW (0x25)
+#define NDR_NETR_DSRADDRESSTOSITENAMESEXW (0x25)
 
-#define DCERPC_NETR_DSRGETDCSITECOVERAGEW (0x26)
+#define NDR_NETR_DSRGETDCSITECOVERAGEW (0x26)
 
-#define DCERPC_NETR_LOGONSAMLOGONEX (0x27)
+#define NDR_NETR_LOGONSAMLOGONEX (0x27)
 
-#define DCERPC_NETR_DSRENUMERATEDOMAINTRUSTS (0x28)
+#define NDR_NETR_DSRENUMERATEDOMAINTRUSTS (0x28)
 
-#define DCERPC_NETR_DSRDEREGISTERDNSHOSTRECORDS (0x29)
+#define NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS (0x29)
 
-#define DCERPC_NETR_NETRSERVERTRUSTPASSWORDSGET (0x2a)
+#define NDR_NETR_NETRSERVERTRUSTPASSWORDSGET (0x2a)
 
-#define DCERPC_NETR_DSRGETFORESTTRUSTINFORMATION (0x2b)
+#define NDR_NETR_DSRGETFORESTTRUSTINFORMATION (0x2b)
 
-#define DCERPC_NETR_NETRGETFORESTTRUSTINFORMATION (0x2c)
+#define NDR_NETR_NETRGETFORESTTRUSTINFORMATION (0x2c)
 
-#define DCERPC_NETR_LOGONSAMLOGONWITHFLAGS (0x2d)
+#define NDR_NETR_LOGONSAMLOGONWITHFLAGS (0x2d)
 
-#define DCERPC_NETR_NETRSERVERGETTRUSTINFO (0x2e)
+#define NDR_NETR_NETRSERVERGETTRUSTINFO (0x2e)
 
-#define DCERPC_NETLOGON_CALL_COUNT (47)
+#define NDR_NETLOGON_CALL_COUNT (47)
 void ndr_print_netr_UasInfo(struct ndr_print *ndr, const char *name, const struct netr_UasInfo *r);
 void ndr_print_netr_UasLogoffInfo(struct ndr_print *ndr, const char *name, const struct netr_UasLogoffInfo *r);
 void ndr_print_netr_AcctLockStr(struct ndr_print *ndr, const char *name, const struct netr_AcctLockStr *r);