Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into extended...

[abartlet/samba.git/.git] / source3 / librpc / gen_ndr / netlogon.h

diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/librpc/gen_ndr/netlogon.h
index e1dc69cca03f02d51732c297f0336be1d8dbc8b7..02a4a447e01bd447e2e05cd9b495a62feb750f84 100644 (file)
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/source3/librpc/gen_ndr/netlogon.h
@@ -8,6 +8,7 @@
 #include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/nbt.h"
 #define netr_DeltaEnum8Bit netr_DeltaEnum
+#define netr_SamDatabaseID8Bit netr_SamDatabaseID
 #ifndef _HEADER_netlogon
 #define _HEADER_netlogon
 
@@ -15,6 +16,8 @@
 #define DS_GFTI_UPDATE_TDO     ( 0x1 )
 enum netr_DeltaEnum8Bit;
 
+enum netr_SamDatabaseID8Bit;
+
 struct netr_UasInfo {
        const char *account_name;/* [unique,charset(UTF16)] */
        uint32_t priv;
@@ -327,7 +330,7 @@ struct netr_DELTA_USER {
        uint8_t lm_password_present;
        uint8_t password_expired;
        struct lsa_String comment;
-       struct lsa_String parameters;
+       struct lsa_BinaryString parameters;
        uint16_t country_code;
        uint16_t code_page;
        struct netr_USER_PRIVATE_INFO user_private_info;
@@ -961,6 +964,13 @@ struct DcSitesCtr {
        struct lsa_String *sites;/* [unique,size_is(num_sites)] */
 };
 
+struct netr_TrustInfo {
+       uint32_t count;
+       uint32_t *data;/* [unique,size_is(count)] */
+       uint32_t entry_count;
+       struct lsa_String *entries;/* [unique,size_is(count)] */
+};
+
 
 struct netr_LogonUasLogon {
        struct {
@@ -1703,8 +1713,20 @@ struct netr_LogonSamLogonWithFlags {
 };
 
 
-struct netr_NETRSERVERGETTRUSTINFO {
+struct netr_ServerGetTrustInfo {
        struct {
+               const char *server_name;/* [unique,charset(UTF16)] */
+               const char *account_name;/* [ref,charset(UTF16)] */
+               enum netr_SchannelType secure_channel_type;
+               const char *computer_name;/* [ref,charset(UTF16)] */
+               struct netr_Authenticator *credential;/* [ref] */
+       } in;
+
+       struct {
+               struct netr_Authenticator *return_authenticator;/* [ref] */
+               struct samr_Password *new_owf_password;/* [ref] */
+               struct samr_Password *old_owf_password;/* [ref] */
+               struct netr_TrustInfo **trust_info;/* [ref] */
                WERROR result;
        } out;