diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-13 10:03:57 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-13 10:03:57 +1100 |
| commit | ae507f620ae34b69c5df86980ea6e374c9c1e548 (patch) | |
| tree | c2669a72121c02ecc2d1e4aee16a3129960a5c66 /source3/include | |
| parent | dfbaf79a1b7455a0eef61813e07cb661cf17e995 (diff) | |
| parent | 4a1b50afd567313cc25d5bbc14e01e170aa62a00 (diff) | |
| download | samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.tar.gz samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.tar.bz2 samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index dd46bdda83..7e31da064f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3307,6 +3307,7 @@ void update_trustdom_cache( void ); NTSTATUS trust_pw_change_and_store_it(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *domain, + const char *account_name, unsigned char orig_trust_passwd_hash[16], uint32 sec_channel_type); NTSTATUS trust_pw_find_change_and_store_it(struct rpc_pipe_client *cli, @@ -3976,6 +3977,7 @@ char *lp_ldap_suffix(void); char *lp_ldap_admin_dn(void); int lp_ldap_ssl(void); bool lp_ldap_ssl_ads(void); +int lp_ldap_ref_follow(void); int lp_ldap_passwd_sync(void); bool lp_ldap_delete_dn(void); int lp_ldap_replication_sleep(void); @@ -5237,6 +5239,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli, struct netr_SamInfo3 **info3); NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, + const char *account_name, const unsigned char orig_trust_passwd_hash[16], const char *new_trust_pwd_cleartext, const unsigned char new_trust_passwd_hash[16], |