summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-17 02:25:33 +0100
committerGünther Deschner <gd@samba.org>2008-02-17 02:25:33 +0100
commit966333e744f02cd1d3347d087686255d3ac9489f (patch)
tree6e740fa89a0b467a1c0941e966dfae22132e7b46 /source3
parent9f8f9c1483207b8cf265fefb2a31fc65bdcc416e (diff)
downloadsamba-966333e744f02cd1d3347d087686255d3ac9489f.tar.gz
samba-966333e744f02cd1d3347d087686255d3ac9489f.tar.bz2
samba-966333e744f02cd1d3347d087686255d3ac9489f.zip
Remove unused marshalling for NET_SAM_LOGON.
Guenther (This used to be commit eefc6bb86fb9196818da9d5c6384c85355794981)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/rpc_netlogon.h28
-rw-r--r--source3/rpc_parse/parse_net.c322
2 files changed, 0 insertions, 350 deletions
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index e9d9c30497..ed69cf7722 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -338,15 +338,6 @@ typedef struct net_id_info_ctr_info {
} auth;
} NET_ID_INFO_CTR;
-/* SAM_INFO - sam logon/off id structure */
-typedef struct sam_info {
- DOM_CLNT_INFO2 client;
- uint32 ptr_rtn_cred; /* pointer to return credentials */
- DOM_CRED rtn_cred; /* return credentials */
- uint16 logon_level;
- NET_ID_INFO_CTR *ctr;
-} DOM_SAM_INFO;
-
/* SAM_INFO - sam logon/off id structure - no creds */
typedef struct sam_info_ex {
DOM_CLNT_SRV client;
@@ -354,12 +345,6 @@ typedef struct sam_info_ex {
NET_ID_INFO_CTR *ctr;
} DOM_SAM_INFO_EX;
-/* NET_Q_SAM_LOGON */
-typedef struct net_q_sam_logon_info {
- DOM_SAM_INFO sam_id;
- uint16 validation_level;
-} NET_Q_SAM_LOGON;
-
/* NET_Q_SAM_LOGON_EX */
typedef struct net_q_sam_logon_info_ex {
DOM_SAM_INFO_EX sam_id;
@@ -367,19 +352,6 @@ typedef struct net_q_sam_logon_info_ex {
uint32 flags;
} NET_Q_SAM_LOGON_EX;
-/* NET_R_SAM_LOGON */
-typedef struct net_r_sam_logon_info {
- uint32 buffer_creds; /* undocumented buffer pointer */
- DOM_CRED srv_creds; /* server credentials. server time stamp appears to be ignored. */
-
- uint16 switch_value; /* 3 - indicates type of USER INFO */
- NET_USER_INFO_3 *user;
-
- uint32 auth_resp; /* 1 - Authoritative response; 0 - Non-Auth? */
-
- NTSTATUS status; /* return code */
-} NET_R_SAM_LOGON;
-
/* NET_R_SAM_LOGON_EX */
typedef struct net_r_sam_logon_info_ex {
uint16 switch_value; /* 3 - indicates type of USER INFO */
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index eab8e9b00d..70dc505c78 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -163,62 +163,6 @@ bool net_io_r_auth_3(const char *desc, NET_R_AUTH_3 *r_a, prs_struct *ps, int de
return True;
}
-
-/*************************************************************************
- Init DOM_SID2 array from a string containing multiple sids
- *************************************************************************/
-
-static int init_dom_sid2s(TALLOC_CTX *ctx, const char *sids_str, DOM_SID2 **ppsids)
-{
- const char *ptr;
- char *s2;
- int count = 0;
-
- DEBUG(4,("init_dom_sid2s: %s\n", sids_str ? sids_str:""));
-
- *ppsids = NULL;
-
- if(sids_str) {
- int number;
- DOM_SID2 *sids;
- TALLOC_CTX *frame = talloc_stackframe();
-
- /* Count the number of valid SIDs. */
- for (count = 0, ptr = sids_str;
- next_token_talloc(frame,&ptr, &s2, NULL); ) {
- DOM_SID tmpsid;
- if (string_to_sid(&tmpsid, s2))
- count++;
- }
-
- /* Now allocate space for them. */
- if (count) {
- *ppsids = TALLOC_ZERO_ARRAY(ctx, DOM_SID2, count);
- if (*ppsids == NULL) {
- TALLOC_FREE(frame);
- return 0;
- }
- } else {
- *ppsids = NULL;
- }
-
- sids = *ppsids;
-
- for (number = 0, ptr = sids_str;
- next_token_talloc(frame, &ptr, &s2, NULL); ) {
- DOM_SID tmpsid;
- if (string_to_sid(&tmpsid, s2)) {
- /* count only valid sids */
- init_dom_sid2(&sids[number], &tmpsid);
- number++;
- }
- }
- TALLOC_FREE(frame);
- }
-
- return count;
-}
-
/*******************************************************************
Inits a NET_ID_INFO_1 structure.
********************************************************************/
@@ -439,32 +383,6 @@ static bool net_io_id_info2(const char *desc, NET_ID_INFO_2 *id, prs_struct *ps
return True;
}
-
-/*******************************************************************
- Inits a DOM_SAM_INFO structure.
-********************************************************************/
-
-void init_sam_info(DOM_SAM_INFO *sam,
- const char *logon_srv, const char *comp_name,
- DOM_CRED *clnt_cred,
- DOM_CRED *rtn_cred, uint16 logon_level,
- NET_ID_INFO_CTR *ctr)
-{
- DEBUG(5,("init_sam_info: %d\n", __LINE__));
-
- init_clnt_info2(&sam->client, logon_srv, comp_name, clnt_cred);
-
- if (rtn_cred != NULL) {
- sam->ptr_rtn_cred = 1;
- memcpy(&sam->rtn_cred, rtn_cred, sizeof(sam->rtn_cred));
- } else {
- sam->ptr_rtn_cred = 0;
- }
-
- sam->logon_level = logon_level;
- sam->ctr = ctr;
-}
-
/*******************************************************************
Inits a DOM_SAM_INFO structure.
********************************************************************/
@@ -524,42 +442,6 @@ static bool net_io_id_info_ctr(const char *desc, NET_ID_INFO_CTR **pp_ctr, prs_s
}
/*******************************************************************
- Reads or writes a DOM_SAM_INFO structure.
- ********************************************************************/
-
-static bool smb_io_sam_info(const char *desc, DOM_SAM_INFO *sam, prs_struct *ps, int depth)
-{
- if (sam == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "smb_io_sam_info");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_clnt_info2("", &sam->client, ps, depth))
- return False;
-
- if(!prs_uint32("ptr_rtn_cred ", ps, depth, &sam->ptr_rtn_cred))
- return False;
- if (sam->ptr_rtn_cred) {
- if(!smb_io_cred("", &sam->rtn_cred, ps, depth))
- return False;
- }
-
- if(!prs_uint16("logon_level ", ps, depth, &sam->logon_level))
- return False;
-
- if (sam->logon_level != 0) {
- if(!net_io_id_info_ctr("logon_info", &sam->ctr, ps, depth))
- return False;
- }
-
- return True;
-}
-
-/*******************************************************************
Reads or writes a DOM_SAM_INFO_EX structure.
********************************************************************/
@@ -588,137 +470,6 @@ static bool smb_io_sam_info_ex(const char *desc, DOM_SAM_INFO_EX *sam, prs_struc
return True;
}
-/*************************************************************************
- Inits a NET_USER_INFO_3 structure.
-
- This is a network logon reply packet, and contains much information about
- the user. This information is passed as a (very long) paramater list
- to avoid having to link in the PASSDB code to every program that deals
- with this file.
- *************************************************************************/
-
-void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr,
- uint32 user_rid,
- uint32 group_rid,
-
- const char* user_name,
- const char* full_name,
- const char* home_dir,
- const char* dir_drive,
- const char* logon_script,
- const char* profile_path,
-
- time_t unix_logon_time,
- time_t unix_logoff_time,
- time_t unix_kickoff_time,
- time_t unix_pass_last_set_time,
- time_t unix_pass_can_change_time,
- time_t unix_pass_must_change_time,
-
- uint16 logon_count, uint16 bad_pw_count,
- uint32 num_groups, const DOM_GID *gids,
- uint32 user_flgs, uint32 acct_flags,
- uchar user_session_key[16],
- uchar lm_session_key[16],
- const char *logon_srv, const char *logon_dom,
- const DOM_SID *dom_sid)
-{
- /* only cope with one "other" sid, right now. */
- /* need to count the number of space-delimited sids */
- unsigned int i;
- int num_other_sids = 0;
-
- NTTIME logon_time, logoff_time, kickoff_time,
- pass_last_set_time, pass_can_change_time,
- pass_must_change_time;
-
- ZERO_STRUCTP(usr);
-
- usr->ptr_user_info = 1; /* yes, we're bothering to put USER_INFO data here */
-
- /* Create NTTIME structs */
- unix_to_nt_time (&logon_time, unix_logon_time);
- unix_to_nt_time (&logoff_time, unix_logoff_time);
- unix_to_nt_time (&kickoff_time, unix_kickoff_time);
- unix_to_nt_time (&pass_last_set_time, unix_pass_last_set_time);
- unix_to_nt_time (&pass_can_change_time, unix_pass_can_change_time);
- unix_to_nt_time (&pass_must_change_time, unix_pass_must_change_time);
-
- usr->logon_time = logon_time;
- usr->logoff_time = logoff_time;
- usr->kickoff_time = kickoff_time;
- usr->pass_last_set_time = pass_last_set_time;
- usr->pass_can_change_time = pass_can_change_time;
- usr->pass_must_change_time = pass_must_change_time;
-
- usr->logon_count = logon_count;
- usr->bad_pw_count = bad_pw_count;
-
- usr->user_rid = user_rid;
- usr->group_rid = group_rid;
- usr->num_groups = num_groups;
-
- usr->buffer_groups = 1; /* indicates fill in groups, below, even if there are none */
- usr->user_flgs = user_flgs;
- usr->acct_flags = acct_flags;
-
- if (user_session_key != NULL)
- memcpy(usr->user_sess_key, user_session_key, sizeof(usr->user_sess_key));
- else
- memset((char *)usr->user_sess_key, '\0', sizeof(usr->user_sess_key));
-
- usr->buffer_dom_id = dom_sid ? 1 : 0; /* yes, we're bothering to put a domain SID in */
-
- memset((char *)usr->lm_sess_key, '\0', sizeof(usr->lm_sess_key));
-
- for (i=0; i<7; i++) {
- memset(&usr->unknown[i], '\0', sizeof(usr->unknown));
- }
-
- if (lm_session_key != NULL) {
- memcpy(usr->lm_sess_key, lm_session_key, sizeof(usr->lm_sess_key));
- }
-
- num_other_sids = init_dom_sid2s(ctx, NULL, &usr->other_sids);
-
- usr->num_other_sids = num_other_sids;
- usr->buffer_other_sids = (num_other_sids != 0) ? 1 : 0;
-
- init_unistr2(&usr->uni_user_name, user_name, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_user_name, &usr->uni_user_name);
- init_unistr2(&usr->uni_full_name, full_name, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_full_name, &usr->uni_full_name);
- init_unistr2(&usr->uni_logon_script, logon_script, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_logon_script, &usr->uni_logon_script);
- init_unistr2(&usr->uni_profile_path, profile_path, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_profile_path, &usr->uni_profile_path);
- init_unistr2(&usr->uni_home_dir, home_dir, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_home_dir, &usr->uni_home_dir);
- init_unistr2(&usr->uni_dir_drive, dir_drive, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_dir_drive, &usr->uni_dir_drive);
-
- usr->num_groups2 = num_groups;
-
- if (num_groups) {
- usr->gids = TALLOC_ZERO_ARRAY(ctx,DOM_GID,num_groups);
- if (usr->gids == NULL)
- return;
- } else {
- usr->gids = NULL;
- }
-
- for (i = 0; i < num_groups; i++)
- usr->gids[i] = gids[i];
-
- init_unistr2(&usr->uni_logon_srv, logon_srv, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_logon_srv, &usr->uni_logon_srv);
- init_unistr2(&usr->uni_logon_dom, logon_dom, UNI_FLAGS_NONE);
- init_uni_hdr(&usr->hdr_logon_dom, &usr->uni_logon_dom);
-
- init_dom_sid2(&usr->dom_sid, dom_sid);
- /* "other" sids are set up above */
-}
-
static void dump_acct_flags(uint32 acct_flags) {
int lvl = 10;
@@ -1005,79 +756,6 @@ bool net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
Reads or writes a structure.
********************************************************************/
-bool net_io_q_sam_logon(const char *desc, NET_Q_SAM_LOGON *q_l, prs_struct *ps, int depth)
-{
- if (q_l == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "net_io_q_sam_logon");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_sam_info("", &q_l->sam_id, ps, depth))
- return False;
-
- if(!prs_align_uint16(ps))
- return False;
-
- if(!prs_uint16("validation_level", ps, depth, &q_l->validation_level))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool net_io_r_sam_logon(const char *desc, NET_R_SAM_LOGON *r_l, prs_struct *ps, int depth)
-{
- if (r_l == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "net_io_r_sam_logon");
- depth++;
-
- if(!prs_uint32("buffer_creds", ps, depth, &r_l->buffer_creds)) /* undocumented buffer pointer */
- return False;
- if (&r_l->buffer_creds) {
- if(!smb_io_cred("", &r_l->srv_creds, ps, depth)) /* server credentials. server time stamp appears to be ignored. */
- return False;
- }
-
- if(!prs_uint16("switch_value", ps, depth, &r_l->switch_value))
- return False;
- if(!prs_align(ps))
- return False;
-
-#if 1 /* W2k always needs this - even for bad passwd. JRA */
- if(!net_io_user_info3("", r_l->user, ps, depth, r_l->switch_value, False))
- return False;
-#else
- if (r_l->switch_value != 0) {
- if(!net_io_user_info3("", r_l->user, ps, depth, r_l->switch_value, False))
- return False;
- }
-#endif
-
- if(!prs_uint32("auth_resp ", ps, depth, &r_l->auth_resp)) /* 1 - Authoritative response; 0 - Non-Auth? */
- return False;
-
- if(!prs_ntstatus("status ", ps, depth, &r_l->status))
- return False;
-
- if(!prs_align(ps))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
bool net_io_q_sam_logon_ex(const char *desc, NET_Q_SAM_LOGON_EX *q_l, prs_struct *ps, int depth)
{
if (q_l == NULL)