#include "includes.h"
#include "winbindd.h"
#include "winbindd_rpc.h"
-
+#include "rpc_client/rpc_client.h"
#include "../librpc/gen_ndr/ndr_samr_c.h"
#include "rpc_client/cli_samr.h"
-#include "../librpc/gen_ndr/srv_samr.h"
#include "../librpc/gen_ndr/ndr_lsa_c.h"
#include "rpc_client/cli_lsarpc.h"
-#include "../librpc/gen_ndr/srv_lsa.h"
#include "rpc_server/rpc_ncacn_np.h"
#include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
+#include "auth.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
struct rpc_pipe_client **samr_pipe)
{
struct rpc_pipe_client *cli = NULL;
- struct auth_serversupplied_info *session_info = NULL;
+ struct auth_session_info *session_info = NULL;
NTSTATUS status;
- if (cli != NULL) {
- goto done;
- }
-
if (session_info == NULL) {
status = make_session_info_system(mem_ctx, &session_info);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("open_samr_pipe: Could not create auth_serversupplied_info: %s\n",
+ DEBUG(0, ("open_samr_pipe: Could not create auth_session_info: %s\n",
nt_errstr(status)));
return status;
}
}
/* create a samr connection */
- status = rpc_pipe_open_interface(mem_ctx,
+ status = rpc_pipe_open_internal(mem_ctx,
&ndr_table_samr.syntax_id,
session_info,
NULL,
return status;
}
-done:
if (samr_pipe) {
*samr_pipe = cli;
}
struct rpc_pipe_client **lsa_pipe)
{
struct rpc_pipe_client *cli = NULL;
- struct auth_serversupplied_info *session_info = NULL;
+ struct auth_session_info *session_info = NULL;
NTSTATUS status;
- if (cli != NULL) {
- goto done;
- }
-
if (session_info == NULL) {
status = make_session_info_system(mem_ctx, &session_info);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("open_lsa_pipe: Could not create auth_serversupplied_info: %s\n",
+ DEBUG(0, ("open_lsa_pipe: Could not create auth_session_info: %s\n",
nt_errstr(status)));
return status;
}
}
/* create a lsa connection */
- status = rpc_pipe_open_interface(mem_ctx,
+ status = rpc_pipe_open_internal(mem_ctx,
&ndr_table_lsarpc.syntax_id,
session_info,
NULL,
return status;
}
-done:
if (lsa_pipe) {
*lsa_pipe = cli;
}
static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
uint32_t *pnum_info,
- struct acct_info **pinfo)
+ struct wb_acct_info **pinfo)
{
struct rpc_pipe_client *samr_pipe;
struct policy_handle dom_pol;
- struct acct_info *info = NULL;
+ struct wb_acct_info *info = NULL;
uint32_t num_info = 0;
TALLOC_CTX *tmp_ctx;
NTSTATUS status, result;
}
if (pnum_names) {
- pnum_names = 0;
+ *pnum_names = 0;
}
tmp_ctx = talloc_stackframe();
static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
uint32 *num_entries,
- struct acct_info **info)
+ struct wb_acct_info **info)
{
/* BUILTIN doesn't have domain groups */
*num_entries = 0;
static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
uint32_t *pnum_info,
- struct acct_info **pinfo)
+ struct wb_acct_info **pinfo)
{
struct rpc_pipe_client *samr_pipe;
struct policy_handle dom_pol;
- struct acct_info *info = NULL;
+ struct wb_acct_info *info = NULL;
uint32_t num_info = 0;
TALLOC_CTX *tmp_ctx;
NTSTATUS status, result;
static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- const struct dom_sid *sid,
+ const struct dom_sid *domain_sid,
uint32 *rids,
size_t num_rids,
char **pdomain_name,
ZERO_STRUCT(lsa_policy);
/* Paranoia check */
- if (!sid_check_is_builtin(sid) &&
- !sid_check_is_domain(sid) &&
- !sid_check_is_unix_users(sid) &&
- !sid_check_is_unix_groups(sid) &&
- !sid_check_is_in_wellknown_domain(sid)) {
+ if (!sid_check_is_builtin(domain_sid) &&
+ !sid_check_is_domain(domain_sid) &&
+ !sid_check_is_unix_users(domain_sid) &&
+ !sid_check_is_unix_groups(domain_sid) &&
+ !sid_check_is_in_wellknown_domain(domain_sid)) {
DEBUG(0, ("sam_rids_to_names: possible deadlock - trying to "
- "lookup SID %s\n", sid_string_dbg(sid)));
+ "lookup SID %s\n", sid_string_dbg(domain_sid)));
return NT_STATUS_NONE_MAPPED;
}
lsa_pipe,
&lsa_policy,
domain,
- sid,
+ domain_sid,
rids,
num_rids,
&domain_name,