The branch, master has been updated
via f6f3bb1... s3-passdb: move get_logon_hours_from_pdb() into samr
server.
via 8478770... s3-rpc_client: move protos to init_samr.h
via 5a6f3a0... s3-rpc_client: move protos to init_spoolss.h
via cc06133... s3-rpc_client: move protos to cli_spoolss.h
via 230b880... s3-rpc_client: move protos to cli_lsarpc.h
via 5ed3654... s3-rpc_client: move protos to cli_netlogon.h
via 3f2719c... s3-rpc_client: move protos to cli_samr.h
via 7a8e34f... s3:split secrets.c to put machine account secrets in a
new file
from 1ffc65d... s4:smb_server/smb/trans2.c - remove unused define
"DEFAULT_SITE_NAME"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f6f3bb1813b5f030616e422ed420b938244be84e
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:54:56 2010 +0200
s3-passdb: move get_logon_hours_from_pdb() into samr server.
Guenther
commit 8478770c357f712f1fc3b8a0a9a5f9e730388abb
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:59:45 2010 +0200
s3-rpc_client: move protos to init_samr.h
Guenther
commit 5a6f3a06665ea343e2a212924cfce9edb358876f
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:58:45 2010 +0200
s3-rpc_client: move protos to init_spoolss.h
Guenther
commit cc06133b0a0f3a4a150d587a7d43c678cfba16a0
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:26:48 2010 +0200
s3-rpc_client: move protos to cli_spoolss.h
Guenther
commit 230b880d142eea46d4131f2b44774465c9c214bc
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:26:16 2010 +0200
s3-rpc_client: move protos to cli_lsarpc.h
Guenther
commit 5ed365411278ca19d69216ca969e91c4725c2c08
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:26:03 2010 +0200
s3-rpc_client: move protos to cli_netlogon.h
Guenther
commit 3f2719c20296d55766bf6d9f43dea50ab259e0e6
Author: Günther Deschner <g...@samba.org>
Date: Tue May 18 18:25:50 2010 +0200
s3-rpc_client: move protos to cli_samr.h
Guenther
commit 7a8e34fe868158ee5591e1640477d28c62de5b67
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon May 17 13:39:42 2010 +1000
s3:split secrets.c to put machine account secrets in a new file
This helps the s3compat effort by allowing these functions to be
replaced by functions that query the cli_credentials and secrets.ldb
APIs.
Also, this changes a couple of DOM_SID to struct dom_sid along the
way.
Andrew Bartlett
Signed-off-by: Günther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/auth/auth_domain.c | 1 +
source3/auth/auth_netlogond.c | 1 +
source3/include/proto.h | 290 +---------------------
source3/lib/netapi/localgroup.c | 1 +
source3/lib/netapi/samr.c | 1 +
source3/lib/netapi/user.c | 1 +
source3/libads/ldap_printer.c | 1 +
source3/libnet/libnet_join.c | 3 +
source3/libsmb/libsmb_server.c | 1 +
source3/libsmb/libsmb_xattr.c | 1 +
source3/libsmb/passchange.c | 1 +
source3/libsmb/trusts_util.c | 2 +
source3/passdb/machine_account_secrets.c | 398 ++++++++++++++++++++++++++++++
source3/passdb/passdb.c | 23 --
source3/passdb/secrets.c | 366 ---------------------------
source3/rpc_client/cli_lsarpc.c | 1 +
source3/rpc_client/cli_lsarpc.h | 44 ++++
source3/rpc_client/cli_netlogon.c | 1 +
source3/rpc_client/cli_netlogon.h | 48 ++++
source3/rpc_client/cli_pipe.c | 1 +
source3/rpc_client/cli_samr.c | 1 +
source3/rpc_client/cli_samr.h | 33 +++
source3/rpc_client/cli_spoolss.c | 1 +
source3/rpc_client/cli_spoolss.h | 124 +++++++++
source3/rpc_client/init_samr.c | 1 +
source3/rpc_client/init_samr.h | 9 +
source3/rpc_client/init_spoolss.c | 1 +
source3/rpc_client/init_spoolss.h | 14 +
source3/rpc_server/srv_samr_nt.c | 26 ++
source3/rpc_server/srv_spoolss_nt.c | 1 +
source3/rpcclient/cmd_lsarpc.c | 1 +
source3/rpcclient/cmd_netlogon.c | 1 +
source3/rpcclient/cmd_samr.c | 2 +
source3/rpcclient/cmd_spoolss.c | 2 +
source3/rpcclient/cmd_test.c | 1 +
source3/rpcclient/rpcclient.c | 2 +
source3/smbd/lanman.c | 2 +
source3/utils/net_rpc.c | 3 +
source3/utils/net_rpc_audit.c | 1 +
source3/utils/net_rpc_join.c | 3 +
source3/utils/net_rpc_printer.c | 1 +
source3/utils/net_rpc_rights.c | 1 +
source3/utils/net_util.c | 1 +
source3/utils/netlookup.c | 1 +
source3/utils/smbcacls.c | 1 +
source3/utils/smbcquotas.c | 1 +
source3/winbindd/winbindd_cm.c | 2 +
source3/winbindd/winbindd_pam.c | 2 +
source3/winbindd/winbindd_rpc.c | 2 +
50 files changed, 757 insertions(+), 672 deletions(-)
create mode 100644 source3/passdb/machine_account_secrets.c
create mode 100644 source3/rpc_client/cli_lsarpc.h
create mode 100644 source3/rpc_client/cli_netlogon.h
create mode 100644 source3/rpc_client/cli_samr.h
create mode 100644 source3/rpc_client/cli_spoolss.h
create mode 100644 source3/rpc_client/init_samr.h
create mode 100644 source3/rpc_client/init_spoolss.h
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f644c28..56bee17 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -453,7 +453,7 @@ LIBADS_SERVER_OBJ = libads/kerberos_verify.o
libads/authdata.o \
../librpc/ndr/ndr_krb5pac.o \
librpc/gen_ndr/ndr_krb5pac.o
-SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o \
+SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o
passdb/machine_sid.o \
librpc/gen_ndr/ndr_secrets.o
LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 82e8182..ef58250 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 08dc4dc..e5f2a1b 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9a2320b..154efeb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4341,10 +4341,10 @@ bool sid_to_gid(const DOM_SID *psid, gid_t *pgid);
/* The following definitions come from passdb/machine_sid.c */
-DOM_SID *get_global_sam_sid(void);
+struct dom_sid *get_global_sam_sid(void);
void reset_global_sam_sid(void) ;
-bool sid_check_is_domain(const DOM_SID *sid);
-bool sid_check_is_in_our_domain(const DOM_SID *sid);
+bool sid_check_is_domain(const struct dom_sid *sid);
+bool sid_check_is_in_our_domain(const struct dom_sid *sid);
/* The following definitions come from passdb/passdb.c */
@@ -4387,8 +4387,7 @@ bool get_trust_pw_clear(const char *domain, char
**ret_pwd,
bool get_trust_pw_hash(const char *domain, uint8 ret_pwd[16],
const char **account_name,
enum netr_SchannelType *channel);
-struct samr_LogonHours get_logon_hours_from_pdb(TALLOC_CTX *mem_ctx,
- struct samu *pw);
+
/* The following definitions come from passdb/pdb_compat.c */
uint32 pdb_get_user_rid (const struct samu *sampass);
@@ -4612,8 +4611,8 @@ void secrets_shutdown(void);
void *secrets_fetch(const char *key, size_t *size);
bool secrets_store(const char *key, const void *data, size_t size);
bool secrets_delete(const char *key);
-bool secrets_store_domain_sid(const char *domain, const DOM_SID *sid);
-bool secrets_fetch_domain_sid(const char *domain, DOM_SID *sid);
+bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid);
+bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid);
bool secrets_store_domain_guid(const char *domain, struct GUID *guid);
bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid);
void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain);
@@ -4626,9 +4625,9 @@ bool secrets_fetch_trust_account_password(const char
*domain, uint8 ret_pwd[16],
time_t *pass_last_set_time,
enum netr_SchannelType *channel);
bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
- DOM_SID *sid, time_t
*pass_last_set_time);
+ struct dom_sid *sid, time_t
*pass_last_set_time);
bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
- const DOM_SID *sid);
+ const struct dom_sid *sid);
bool secrets_delete_machine_password(const char *domain);
bool secrets_delete_machine_password_ex(const char *domain);
bool secrets_delete_domain_sid(const char *domain);
@@ -4862,99 +4861,6 @@ TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb,
const char *printer_name,
void set_profile_level(int level, struct server_id src);
bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
-
-/* The following definitions come from rpc_client/cli_lsarpc.c */
-
-NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- bool sec_qos, uint32 des_access,
- struct policy_handle *pol);
-NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx, bool sec_qos,
- uint32 des_access, struct policy_handle *pol);
-NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *pol,
- int num_sids,
- const DOM_SID *sids,
- char ***pdomains,
- char ***pnames,
- enum lsa_SidType **ptypes);
-NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *pol,
- int num_sids,
- const DOM_SID *sids,
- char ***pdomains,
- char ***pnames,
- enum lsa_SidType **ptypes);
-NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *pol, int num_names,
- const char **names,
- const char ***dom_names,
- int level,
- DOM_SID **sids,
- enum lsa_SidType **types);
-NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *pol, int num_names,
- const char **names,
- const char ***dom_names,
- int level,
- DOM_SID **sids,
- enum lsa_SidType **types);
-
-bool fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid);
-
-/* The following definitions come from rpc_client/cli_netlogon.c */
-
-NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
- const char *server_name,
- const char *domain,
- const char *clnt_name,
- const char *machine_account,
- const unsigned char machine_pwd[16],
- enum netr_SchannelType sec_chan_type,
- uint32_t *neg_flags_inout);
-NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32 logon_parameters,
- const char *domain,
- const char *username,
- const char *password,
- const char *workstation,
- int logon_type);
-NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32 logon_parameters,
- const char *server,
- const char *username,
- const char *domain,
- const char *workstation,
- const uint8 chal[8],
- DATA_BLOB lm_response,
- DATA_BLOB nt_response,
- struct netr_SamInfo3 **info3);
-NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32 logon_parameters,
- const char *server,
- const char *username,
- const char *domain,
- const char *workstation,
- const uint8 chal[8],
- DATA_BLOB lm_response,
- DATA_BLOB nt_response,
- 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],
- enum netr_SchannelType
sec_channel_type);
-
/* The following definitions come from rpc_client/cli_pipe.c */
struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
@@ -5104,177 +5010,6 @@ struct cli_state *rpc_pipe_smbd_smb_conn(struct
rpc_pipe_client *p);
NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
struct rpc_cli_transport **presult);
-/* The following definitions come from rpc_client/cli_samr.c */
-
-NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *user_handle,
- const char *newpassword,
- const char *oldpassword);
-NTSTATUS rpccli_samr_chgpasswd_user2(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *username,
- const char *newpassword,
- const char *oldpassword);
-NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *username,
- DATA_BLOB new_nt_password_blob,
- DATA_BLOB old_nt_hash_enc_blob,
- DATA_BLOB new_lm_password_blob,
- DATA_BLOB old_lm_hash_enc_blob);
-NTSTATUS rpccli_samr_chgpasswd_user3(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *username,
- const char *newpassword,
- const char *oldpassword,
- struct samr_DomInfo1 **dominfo1,
- struct userPwdChangeFailureInformation
**reject);
-void get_query_dispinfo_params(int loop_count, uint32 *max_entries,
- uint32 *max_size);
-NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32_t access_mask,
- struct policy_handle *connect_pol);
-
-/* The following definitions come from rpc_client/cli_spoolss.c */
-
-WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *printername,
- uint32_t access_desired,
- struct policy_handle *handle);
-WERROR rpccli_spoolss_getprinterdriver(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- const char *architecture,
- uint32_t level,
- uint32_t offered,
- union spoolss_DriverInfo *info);
-WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- const char *architecture,
- uint32_t level,
- uint32_t offered,
- uint32_t client_major_version,
- uint32_t client_minor_version,
- union spoolss_DriverInfo *info,
- uint32_t *server_major_version,
- uint32_t *server_minor_version);
-WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct spoolss_SetPrinterInfoCtr *info_ctr);
-WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- uint32_t level,
- uint32_t offered,
- union spoolss_PrinterInfo *info);
-WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- uint32_t job_id,
- uint32_t level,
- uint32_t offered,
- union spoolss_JobInfo *info);
-WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_FormInfo **info);
-WERROR rpccli_spoolss_enumprintprocessors(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *servername,
- const char *environment,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_PrintProcessorInfo
**info);
-WERROR rpccli_spoolss_enumprintprocessordatatypes(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *servername,
- const char
*print_processor_name,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union
spoolss_PrintProcDataTypesInfo **info);
-WERROR rpccli_spoolss_enumports(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *servername,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_PortInfo **info);
-WERROR rpccli_spoolss_enummonitors(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *servername,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_MonitorInfo **info);
-WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- uint32_t firstjob,
- uint32_t numjobs,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_JobInfo **info);
-WERROR rpccli_spoolss_enumprinterdrivers(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *server,
- const char *environment,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_DriverInfo **info);
-WERROR rpccli_spoolss_enumprinters(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32_t flags,
- const char *server,
- uint32_t level,
- uint32_t offered,
- uint32_t *count,
- union spoolss_PrinterInfo **info);
-WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- const char *value_name,
- uint32_t offered,
- enum winreg_Type *type,
- uint32_t *needed_p,
- uint8_t **data_p);
-WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- const char *key_name,
- const char ***key_buffer,
- uint32_t offered);
-WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct policy_handle *handle,
- const char *key_name,
- uint32_t offered,
- uint32_t *count,
- struct spoolss_PrinterEnumValues
**info);
-
-/* The following definitions come from rpc_client/init_spoolss.c */
-
-bool init_systemtime(struct spoolss_Time *r,
- struct tm *unixtime);
-time_t spoolss_Time_to_time_t(const struct spoolss_Time *r);
-WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx,
- const DATA_BLOB *blob,
- union spoolss_PrinterData *data,
- enum winreg_Type type);
-WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
- enum winreg_Type type,
- union spoolss_PrinterData *data);
-
/* The following definitions come from rpc_client/init_lsa.c */
void init_lsa_String(struct lsa_String *name, const char *s);
@@ -5300,15 +5035,6 @@ void init_netr_CryptPassword(const char *pwd,
unsigned char session_key[16],
struct netr_CryptPassword *pwd_buf);
-/* The following definitions come from rpc_client/init_samr.c */
-
-void init_samr_CryptPasswordEx(const char *pwd,
- DATA_BLOB *session_key,
- struct samr_CryptPasswordEx *pwd_buf);
-void init_samr_CryptPassword(const char *pwd,
- DATA_BLOB *session_key,
- struct samr_CryptPassword *pwd_buf);
-
/* The following definitions come from rpc_client/ndr.c */
struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index b9c0b4c..dd0f8d2 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -25,6 +25,7 @@
#include "lib/netapi/libnetapi.h"
#include "../librpc/gen_ndr/cli_samr.h"
#include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client
*pipe_cli,
diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index bef02c4..fa190e6 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -21,6 +21,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/cli_samr.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 1ad4a6f..249123e 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -24,6 +24,7 @@
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/init_samr.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 6f49a57..cff11bd 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "rpc_client/cli_spoolss.h"
#include "registry.h"
#ifdef HAVE_ADS
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7d19c63..a4aecd2 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -22,8 +22,11 @@
#include "libnet/libnet.h"
#include "libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/init_samr.h"
#include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
#include "../librpc/gen_ndr/cli_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
#include "lib/smbconf/smbconf.h"
#include "lib/smbconf/smbconf_reg.h"
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 9784253..2150768 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -27,6 +27,7 @@
#include "libsmbclient.h"
#include "libsmb_internal.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
/*
* Check a server for being alive and well.
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index c9eb103..38a9462 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -26,6 +26,7 @@
#include "libsmbclient.h"
#include "libsmb_internal.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
/*
diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 466dfae..4a81a21 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "rpc_client/cli_samr.h"
/*************************************************************
Change a password on a remote machine using IPC calls.
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 8acdc0f..6e549f4 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -21,6 +21,8 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/cli_netlogon.h"
/*********************************************************
Change the domain password on the PDC.
diff --git a/source3/passdb/machine_account_secrets.c
b/source3/passdb/machine_account_secrets.c
new file mode 100644
index 0000000..4a1c3fa
--- /dev/null
+++ b/source3/passdb/machine_account_secrets.c
--
Samba Shared Repository
