1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00

Makefile: added lsaparse.c and smbparse.c

lsaparse.c, smbparse.c, smb.h: more functions / structures.
proto.h:                       the usual.
This commit is contained in:
Luke Leighton 0001-01-01 00:00:00 +00:00
parent 2f722fe289
commit a1c718728c
4 changed files with 442 additions and 4 deletions

View File

@ -314,6 +314,17 @@ BOOL remove_share_oplock(int fnum, share_lock_token token);
char* lsa_io_q_query(BOOL io, LSA_Q_QUERY_INFO *q_q, char *q, char *base, int align);
char* lsa_io_r_query(BOOL io, LSA_R_QUERY_INFO *r_q, char *q, char *base, int align);
char* lsa_io_q_lookup_sids(BOOL io, LSA_Q_LOOKUP_SIDS *q_s, char *q, char *base, int align);
char* lsa_io_r_lookup_sids(BOOL io, LSA_R_LOOKUP_SIDS *r_s, char *q, char *base, int align);
char* lsa_io_q_lookup_rids(BOOL io, LSA_Q_LOOKUP_RIDS *q_r, char *q, char *base, int align);
char* lsa_io_r_lookup_rids(BOOL io, LSA_R_LOOKUP_RIDS *r_r, char *q, char *base, int align);
char* lsa_io_q_req_chal(BOOL io, LSA_Q_REQ_CHAL *q_c, char *q, char *base, int align);
char* lsa_io_r_req_chal(BOOL io, LSA_R_REQ_CHAL *r_c, char *q, char *base, int align);
char* lsa_io_q_auth2(BOOL io, LSA_Q_AUTH_2 *q_a, char *q, char *base, int align);
char* lsa_io_r_auth_2(BOOL io, LSA_R_AUTH_2 *r_a, char *q, char *base, int align);
char* lsa_io_q_srv_pwset(BOOL io, LSA_Q_SRV_PWSET *q_s, char *q, char *base, int align);
char* lsa_io_r_srv_pwset(BOOL io, LSA_R_SRV_PWSET *r_s, char *q, char *base, int align);
char* lsa_io_user_info(BOOL io, LSA_USER_INFO *usr, char *q, char *base, int align);
/*The following definitions come from mangle.c */
@ -803,6 +814,8 @@ char* smb_io_dom_query_3(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int ali
char* smb_io_dom_query_5(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int align);
char* smb_io_dom_query(BOOL io, DOM_QUERY *d_q, char *q, char *base, int align);
char* smb_io_dom_r_ref(BOOL io, DOM_R_REF *r_r, char *q, char *base, int align);
char* smb_io_dom_name(BOOL io, DOM_NAME *name, char *q, char *base, int align);
char* smb_io_neg_flags(BOOL io, NEG_FLAGS *neg, char *q, char *base, int align);
/*The following definitions come from smbpass.c */

View File

@ -545,7 +545,7 @@ typedef struct lsa_r_lookup_sids
DOM_R_REF dom_ref; /* domain reference info */
uint32 num_entries;
uint32 undoc_buffer2; /* undocumented buffer pointer */
uint32 undoc_buffer; /* undocumented buffer pointer */
uint32 num_entries2;
DOM_SID2 dom_sid[MAX_LOOKUP_SIDS]; /* domain SIDs being looked up */
@ -558,7 +558,11 @@ typedef struct lsa_r_lookup_sids
typedef struct dom_name_info
{
uint32 uni_str_len;
#if 1 /* don't know if buffer is null-terminated */
UNISTR buffer;
#else /* or length indicated by uni_str_len member */
uint16 buffer[MAX_UNISTRLEN];
#endif
} DOM_NAME;
@ -582,9 +586,10 @@ typedef struct lsa_q_lookup_rids
/* LSA_R_LOOKUP_RIDS - response to LSA Lookup Names */
typedef struct lsa_r_lookup_rids
{
DOM_R_REF dom_ref; /* domain reference info */
uint32 num_entries;
uint32 undoc_buffer2; /* undocumented buffer pointer */
uint32 undoc_buffer; /* undocumented buffer pointer */
uint32 num_entries2;
DOM_RID2 dom_rid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */

View File

@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
Samba utility functions
Copyright (C) Luke Leighton 1996 - 1997
Copyright (C) Luke Leighton 1996 - 1997 Paul Ashton 1997
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -71,6 +71,285 @@ char* lsa_io_r_query(BOOL io, LSA_R_QUERY_INFO *r_q, char *q, char *base, int al
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_q_lookup_sids(BOOL io, LSA_Q_LOOKUP_SIDS *q_s, char *q, char *base, int align)
{
int i;
if (q_s == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_pol_hnd(io, &(q_s->pol_hnd), q, base, align); /* policy handle */
RW_IVAL(io, q, q_s->num_entries, 0); q += 4;
RW_IVAL(io, q, q_s->buffer_dom_sid, 0); q += 4; /* undocumented domain SID buffer pointer */
RW_IVAL(io, q, q_s->buffer_dom_name, 0); q += 4; /* undocumented domain name buffer pointer */
for (i = 0; i < q_s->num_entries; i++)
{
RW_IVAL(io, q, q_s->buffer_lookup_sids[i], 0); q += 4; /* undocumented domain SID pointers to be looked up. */
}
for (i = 0; i < q_s->num_entries; i++)
{
q = smb_io_dom_sid(io, &(q_s->dom_sids[i]), q, base, align); /* domain SIDs to be looked up. */
}
RW_PCVAL(io, q, q_s->undoc, 16); q += 16; /* completely undocumented 16 bytes */
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_r_lookup_sids(BOOL io, LSA_R_LOOKUP_SIDS *r_s, char *q, char *base, int align)
{
int i;
if (r_s == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_dom_r_ref(io, &(r_s->dom_ref), q, base, align); /* domain reference info */
RW_IVAL(io, q, r_s->num_entries, 0); q += 4;
RW_IVAL(io, q, r_s->undoc_buffer, 0); q += 4;
RW_IVAL(io, q, r_s->num_entries2, 0); q += 4;
for (i = 0; i < r_s->num_entries2; i++)
{
q = smb_io_dom_sid2(io, &(r_s->dom_sid[i]), q, base, align); /* domain SIDs being looked up */
}
RW_IVAL(io, q, r_s->num_entries3, 0); q += 4;
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_q_lookup_rids(BOOL io, LSA_Q_LOOKUP_RIDS *q_r, char *q, char *base, int align)
{
int i;
if (q_r == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_pol_hnd(io, &(q_r->pol_hnd), q, base, align); /* policy handle */
RW_IVAL(io, q, q_r->num_entries, 0); q += 4;
RW_IVAL(io, q, q_r->num_entries2, 0); q += 4;
RW_IVAL(io, q, q_r->buffer_dom_sid, 0); q += 4; /* undocumented domain SID buffer pointer */
RW_IVAL(io, q, q_r->buffer_dom_name, 0); q += 4; /* undocumented domain name buffer pointer */
for (i = 0; i < q_r->num_entries; i++)
{
q = smb_io_dom_name(io, &(q_r->lookup_name[i]), q, base, 0); /* names to be looked up */
}
RW_PCVAL(io, q, q_r->undoc, UNKNOWN_LEN); q += UNKNOWN_LEN; /* completely undocumented bytes of unknown length */
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_r_lookup_rids(BOOL io, LSA_R_LOOKUP_RIDS *r_r, char *q, char *base, int align)
{
int i;
if (r_r == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_dom_r_ref(io, &(r_r->dom_ref), q, base, align); /* domain reference info */
RW_IVAL(io, q, r_r->num_entries, 0); q += 4;
RW_IVAL(io, q, r_r->undoc_buffer, 0); q += 4;
RW_IVAL(io, q, r_r->num_entries2, 0); q += 4;
for (i = 0; i < r_r->num_entries2; i++)
{
q = smb_io_dom_rid2(io, &(r_r->dom_rid[i]), q, base, align); /* domain RIDs being looked up */
}
RW_IVAL(io, q, r_r->num_entries3, 0); q += 4;
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_q_req_chal(BOOL io, LSA_Q_REQ_CHAL *q_c, char *q, char *base, int align)
{
if (q_c == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_unistr2(io, &(q_c->uni_logon_srv), q, base, align); /* logon server unicode string */
q = smb_io_unistr2(io, &(q_c->uni_logon_clnt), q, base, align); /* logon client unicode string */
q = smb_io_chal(io, &(q_c->clnt_chal), q, base, align); /* client challenge */
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_r_req_chal(BOOL io, LSA_R_REQ_CHAL *r_c, char *q, char *base, int align)
{
if (r_c == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_chal(io, &(r_c->srv_chal), q, base, align); /* server challenge */
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_q_auth2(BOOL io, LSA_Q_AUTH_2 *q_a, char *q, char *base, int align)
{
if (q_a == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_log_info (io, &(q_a->clnt_id), q, base, align); /* client identification info */
q = smb_io_chal (io, &(q_a->clnt_chal), q, base, align); /* client-calculated credentials */
q = smb_io_neg_flags(io, &(q_a->clnt_flgs), q, base, align);
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_r_auth_2(BOOL io, LSA_R_AUTH_2 *r_a, char *q, char *base, int align)
{
if (r_a == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_chal (io, &(r_a->srv_chal), q, base, align); /* server challenge */
q = smb_io_neg_flags(io, &(r_a->srv_flgs), q, base, align);
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_q_srv_pwset(BOOL io, LSA_Q_SRV_PWSET *q_s, char *q, char *base, int align)
{
if (q_s == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_clnt_info(io, &(q_s->clnt_id), q, base, align); /* client identification/authentication info */
RW_PCVAL(io, q, q_s->pwd, 16); q += 16; /* new password - undocumented */
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_r_srv_pwset(BOOL io, LSA_R_SRV_PWSET *r_s, char *q, char *base, int align)
{
if (r_s == NULL) return NULL;
q = align_offset(q, base, align);
q = smb_io_chal(io, &(r_s->srv_chal), q, base, align); /* server challenge */
return q;
}
/* LSA_USER_INFO */
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* lsa_io_user_info(BOOL io, LSA_USER_INFO *usr, char *q, char *base, int align)
{
int i;
if (usr == NULL) return NULL;
q = align_offset(q, base, align);
RW_IVAL(io, q, usr->undoc_buffer, 0); q += 4;
q = smb_io_time(io, &(usr->logon_time) , q, base, align); /* logon time */
q = smb_io_time(io, &(usr->logoff_time) , q, base, align); /* logoff time */
q = smb_io_time(io, &(usr->kickoff_time) , q, base, align); /* kickoff time */
q = smb_io_time(io, &(usr->pass_last_set_time) , q, base, align); /* password last set time */
q = smb_io_time(io, &(usr->pass_can_change_time) , q, base, align); /* password can change time */
q = smb_io_time(io, &(usr->pass_must_change_time), q, base, align); /* password must change time */
q = smb_io_unihdr(io, &(usr->hdr_user_name) , q, base, align); /* username unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_full_name) , q, base, align); /* user's full name unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_logon_script), q, base, align); /* logon script unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_profile_path), q, base, align); /* profile path unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_home_dir) , q, base, align); /* home directory unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_dir_drive) , q, base, align); /* home directory drive unicode string header */
RW_SVAL(io, q, usr->logon_count , 0); q += 2; /* logon count */
RW_SVAL(io, q, usr->bad_pw_count, 0); q += 2; /* bad password count */
RW_IVAL(io, q, usr->user_id , 0); q += 4; /* User ID */
RW_IVAL(io, q, usr->group_id , 0); q += 4; /* Group ID */
RW_IVAL(io, q, usr->num_groups , 0); q += 4; /* num groups */
RW_IVAL(io, q, usr->buffer_groups, 0); q += 4; /* undocumented buffer pointer to groups. */
RW_IVAL(io, q, usr->user_flgs , 0); q += 4; /* user flags */
RW_PCVAL(io, q, usr->sess_key, 16); q += 16; /* unused user session key */
q = smb_io_unihdr(io, &(usr->hdr_logon_srv), q, base, align); /* logon server unicode string header */
q = smb_io_unihdr(io, &(usr->hdr_logon_dom), q, base, align); /* logon domain unicode string header */
RW_IVAL(io, q, usr->buffer_dom_id, 0); q += 4; /* undocumented logon domain id pointer */
RW_PCVAL(io, q, usr->padding, 40); q += 40; /* unused padding bytes? */
RW_IVAL(io, q, usr->num_sids, 0); q += 4; /* 0 - num_sids */
RW_IVAL(io, q, usr->buffer_sids, 0); q += 4; /* NULL - undocumented pointer to SIDs. */
q = smb_io_unistr2(io, &(usr->uni_user_name) , q, base, align); /* username unicode string */
q = smb_io_unistr2(io, &(usr->uni_full_name) , q, base, align); /* user's full name unicode string */
q = smb_io_unistr2(io, &(usr->uni_logon_script), q, base, align); /* logon script unicode string */
q = smb_io_unistr2(io, &(usr->uni_profile_path), q, base, align); /* profile path unicode string */
q = smb_io_unistr2(io, &(usr->uni_home_dir) , q, base, align); /* home directory unicode string */
q = smb_io_unistr2(io, &(usr->uni_dir_drive) , q, base, align); /* home directory drive unicode string */
RW_IVAL(io, q, usr->num_groups2, 0); q += 4; /* num groups */
for (i = 0; i < usr->num_groups2; i++)
{
q = smb_io_gid(io, &(usr->gids[i]), q, base, align); /* group info */
}
q = smb_io_unistr2(io, &( usr->uni_logon_srv), q, base, align); /* logon server unicode string */
q = smb_io_unistr2(io, &( usr->uni_logon_dom), q, base, align); /* logon domain unicode string */
q = smb_io_dom_sid(io, &(usr->undoc_dom_sids[0]), q, base, align); /* undocumented - domain SIDs */
q = smb_io_dom_sid(io, &(usr->undoc_dom_sids[1]), q, base, align); /* undocumented - domain SIDs */
q = smb_io_dom_sid(io, &(usr->dom_sid), q, base, align); /* domain SID */
return q;
}
#if 0
/*******************************************************************
reads or writes a structure.
@ -85,6 +364,112 @@ reads or writes a structure.
return q;
}
#endif
#if 0 /* to be done... */
#define LSA_MAX_GROUPS 32
/* LSA_USER_INFO */
typedef struct lsa_q_user_info
{
uint32 undoc_buffer;
NTTIME logon_time; /* logon time */
NTTIME logoff_time; /* logoff time */
NTTIME kickoff_time; /* kickoff time */
NTTIME pass_last_set_time; /* password last set time */
NTTIME pass_can_change_time; /* password can change time */
NTTIME pass_must_change_time; /* password must change time */
UNIHDR hdr_user_name; /* username unicode string header */
UNIHDR hdr_full_name; /* user's full name unicode string header */
UNIHDR hdr_logon_script; /* logon script unicode string header */
UNIHDR hdr_profile_path; /* profile path unicode string header */
UNIHDR hdr_home_dir; /* home directory unicode string header */
UNIHDR hdr_dir_drive; /* home directory drive unicode string header */
uint16 logon_count; /* logon count */
uint16 bad_pw_count; /* bad password count */
uint32 user_id; /* User ID */
uint32 group_id; /* Group ID */
uint32 num_groups; /* num groups */
uint32 buffer_groups; /* undocumented buffer pointer to groups. */
uint32 user_flgs; /* user flags */
char sess_key[16]; /* unused user session key */
UNIHDR hdr_logon_srv; /* logon server unicode string header */
UNIHDR hdr_logon_dom; /* logon domain unicode string header */
uint32 buffer_dom_id; /* undocumented logon domain id pointer */
char padding[40]; /* unused padding bytes? */
uint32 num_sids; /* 0 - num_sids */
uint32 buffer_sids; /* NULL - undocumented pointer to SIDs. */
UNISTR2 uni_user_name; /* username unicode string */
UNISTR2 uni_full_name; /* user's full name unicode string */
UNISTR2 uni_logon_script; /* logon script unicode string */
UNISTR2 uni_profile_path; /* profile path unicode string */
UNISTR2 uni_home_dir; /* home directory unicode string */
UNISTR2 uni_dir_drive; /* home directory drive unicode string */
uint32 num_groups2; /* num groups */
DOM_GID gids[LSA_MAX_GROUPS]; /* group info */
UNISTR2 uni_logon_srv; /* logon server unicode string */
UNISTR2 uni_logon_dom; /* logon domain unicode string */
DOM_SID undoc_dom_sids[2]; /* undocumented - domain SIDs */
DOM_SID dom_sid; /* domain SID */
} LSA_USER_INFO;
/* LSA_Q_SAM_LOGON */
typedef struct lsa_q_sam_logon_info
{
DOM_SAM_INFO sam_id;
} LSA_Q_SAM_LOGON;
/* LSA_R_SAM_LOGON */
typedef struct lsa_r_sam_logon_info
{
uint32 buffer_creds; /* undocumented buffer pointer */
DOM_CRED srv_creds; /* server credentials. server time stamp appears to be ignored. */
uint32 buffer_user;
LSA_USER_INFO user;
uint32 auth_resp; /* 1 - Authoritative response; 0 - Non-Auth? */
} LSA_R_SAM_LOGON;
/* LSA_Q_SAM_LOGOFF */
typedef struct lsa_q_sam_logoff_info
{
DOM_SAM_INFO sam_id;
} LSA_Q_SAM_LOGOFF;
/* LSA_R_SAM_LOGOFF */
typedef struct lsa_r_sam_logoff_info
{
uint32 buffer_creds; /* undocumented buffer pointer */
DOM_CRED srv_creds; /* server credentials. server time stamp appears to be ignored. */
} LSA_R_SAM_LOGOFF;
#endif
#if 0
/*******************************************************************
reads or writes a structure.
********************************************************************/

View File

@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
Samba utility functions
Copyright (C) Luke Leighton 1996 - 1997
Copyright (C) Luke Leighton 1996 - 1997 Paul Ashton 1997
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -498,6 +498,41 @@ char* smb_io_dom_r_ref(BOOL io, DOM_R_REF *r_r, char *q, char *base, int align)
return q;
}
/*******************************************************************
reads or writes a DOM_NAME structure.
********************************************************************/
char* smb_io_dom_name(BOOL io, DOM_NAME *name, char *q, char *base, int align)
{
if (name == NULL) return NULL;
q = align_offset(q, base, align);
RW_IVAL(io, q, name->uni_str_len, 0); q += 4;
/* don't know if len is specified by uni_str_len member... */
/* assume unicode string is unicode-null-terminated, instead */
q = smb_io_unistr(io, &(name->buffer), q, base, align);
return q;
}
/*******************************************************************
reads or writes a structure.
********************************************************************/
char* smb_io_neg_flags(BOOL io, NEG_FLAGS *neg, char *q, char *base, int align)
{
if (neg == NULL) return NULL;
q = align_offset(q, base, align);
RW_IVAL(io, q, neg->neg_flags, 0); q += 4;
return q;
}
#if 0
/*******************************************************************
reads or writes a structure.