Luke - this is the new rpc malloc code I described to you.
Look at how it is used for guidence in re-writing the other
rpc calls.
The nt security descriptor stuff is now re-written to use this,
but doesn't give any advantage over the current SD stuff.
I am in the process of adding the mapping from UNIX perms
to displayed NT ACLs.
Jeremy.
BOOL sid_append_rid(DOM_SID *sid, uint32 rid);
BOOL sid_split_rid(DOM_SID *sid, uint32 *rid);
void sid_copy(DOM_SID *sid1, DOM_SID *sid2);
+DOM_SID *sid_dup(DOM_SID *src);
BOOL sid_linearize(char *outbuf, size_t len, DOM_SID *sid);
BOOL sid_equal(DOM_SID *sid1, DOM_SID *sid2);
size_t sid_size(DOM_SID *sid);
BOOL do_reg_unknown_1a(struct cli_state *cli, POLICY_HND *hnd, uint32 *unk);
BOOL do_reg_query_info(struct cli_state *cli, POLICY_HND *hnd,
char *type, uint32 *unk_0, uint32 *unk_1);
-BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd,
- uint32 sec_buf_size, SEC_DESC *sec_buf);
-BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd,
- uint32 *sec_buf_size, SEC_DESC_BUF *sec_buf);
+BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd, SEC_DESC_BUF *sec_desc_buf);
+BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd, uint32 *sec_buf_size, SEC_DESC_BUF **ppsec_desc_buf);
BOOL do_reg_delete_val(struct cli_state *cli, POLICY_HND *hnd, char *val_name);
BOOL do_reg_delete_key(struct cli_state *cli, POLICY_HND *hnd, char *key_name);
BOOL do_reg_create_key(struct cli_state *cli, POLICY_HND *hnd,
uint32 get_enum_hnd(ENUM_HND *enh);
void make_enum_hnd(ENUM_HND *enh, uint32 hnd);
void smb_io_enum_hnd(char *desc, ENUM_HND *hnd, prs_struct *ps, int depth);
-void smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth);
+BOOL smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth);
void make_dom_sid(DOM_SID *sid, char *str_sid);
void make_dom_sid2(DOM_SID2 *sid2, DOM_SID *sid);
void smb_io_dom_sid2(char *desc, DOM_SID2 *sid, prs_struct *ps, int depth);
void reg_io_q_flush_key(char *desc, REG_Q_FLUSH_KEY *r_q, prs_struct *ps, int depth);
void reg_io_r_flush_key(char *desc, REG_R_FLUSH_KEY *r_r, prs_struct *ps, int depth);
void make_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd,
- char *name, char *class,
- SEC_ACCESS *sam_access,
- SEC_DESC_BUF *sec_buf,
- int sec_len, SEC_DESC *sec);
+ char *name, char *class, SEC_ACCESS *sam_access,
+ SEC_DESC_BUF *sec_buf);
void reg_io_q_create_key(char *desc, REG_Q_CREATE_KEY *r_q, prs_struct *ps, int depth);
void reg_io_r_create_key(char *desc, REG_R_CREATE_KEY *r_r, prs_struct *ps, int depth);
void make_reg_q_delete_val(REG_Q_DELETE_VALUE *q_c, POLICY_HND *hnd,
void make_reg_q_close(REG_Q_CLOSE *q_c, POLICY_HND *hnd);
void reg_io_q_close(char *desc, REG_Q_CLOSE *q_u, prs_struct *ps, int depth);
void reg_io_r_close(char *desc, REG_R_CLOSE *r_u, prs_struct *ps, int depth);
-void make_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_i, POLICY_HND *pol,
- uint32 buf_len, SEC_DESC *sec_desc);
+void make_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_i, POLICY_HND *pol, SEC_DESC_BUF *sec_desc_buf);
void reg_io_q_set_key_sec(char *desc, REG_Q_SET_KEY_SEC *r_q, prs_struct *ps, int depth);
void reg_io_r_set_key_sec(char *desc, REG_R_SET_KEY_SEC *r_q, prs_struct *ps, int depth);
void make_reg_q_get_key_sec(REG_Q_GET_KEY_SEC *q_i, POLICY_HND *pol,
- uint32 buf_len, SEC_DESC_BUF *sec_buf);
+ uint32 sec_buf_size, SEC_DESC_BUF *psdb);
void reg_io_q_get_key_sec(char *desc, REG_Q_GET_KEY_SEC *r_q, prs_struct *ps, int depth);
void reg_io_r_get_key_sec(char *desc, REG_R_GET_KEY_SEC *r_q, prs_struct *ps, int depth);
void make_reg_q_info(REG_Q_INFO *q_i, POLICY_HND *pol, char *product_type,
/*The following definitions come from rpc_parse/parse_sec.c */
-void make_sec_access(SEC_ACCESS *t, uint32 mask);
-void sec_io_access(char *desc, SEC_ACCESS *t, prs_struct *ps, int depth);
-void make_sec_ace(SEC_ACE *t, DOM_SID *sid, uint8 type, SEC_ACCESS mask, uint8 flag);
-void sec_io_ace(char *desc, SEC_ACE *t, prs_struct *ps, int depth);
-void make_sec_acl(SEC_ACL *t, uint16 revision, int num_aces, SEC_ACE *ace);
-void free_sec_acl(SEC_ACL *t);
-void sec_io_acl(char *desc, SEC_ACL *t, prs_struct *ps, int depth);
-int make_sec_desc(SEC_DESC *t, uint16 revision, uint16 type,
- DOM_SID *owner_sid, DOM_SID *grp_sid,
- SEC_ACL *sacl, SEC_ACL *dacl);
-void free_sec_desc(SEC_DESC *t);
-void make_sec_desc_buf(SEC_DESC_BUF *buf, int len, SEC_DESC *data);
-void free_sec_desc_buf(SEC_DESC_BUF *buf);
-void sec_io_desc_buf(char *desc, SEC_DESC_BUF *sec, prs_struct *ps, int depth);
+void init_sec_access(SEC_ACCESS *t, uint32 mask);
+BOOL sec_io_access(char *desc, SEC_ACCESS *t, prs_struct *ps, int depth);
+void init_sec_ace(SEC_ACE *t, DOM_SID *sid, uint8 type, SEC_ACCESS mask, uint8 flag);
+BOOL sec_io_ace(char *desc, SEC_ACE *psa, prs_struct *ps, int depth);
+SEC_ACL *make_sec_acl(uint16 revision, int num_aces, SEC_ACE *ace_list);
+SEC_ACL *dup_sec_acl( SEC_ACL *src);
+void free_sec_acl(SEC_ACL **ppsa);
+BOOL sec_io_acl(char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth);
+SEC_DESC *make_sec_desc(uint16 revision, uint16 type,
+ DOM_SID *owner_sid, DOM_SID *grp_sid,
+ SEC_ACL *sacl, SEC_ACL *dacl, size_t *sec_desc_size);
+SEC_DESC *dup_sec_desc( SEC_DESC *src);
+void free_sec_desc(SEC_DESC **ppsd);
+SEC_DESC *make_standard_sec_desc(DOM_SID *owner_sid, DOM_SID *grp_sid,
+ SEC_ACL *dacl, size_t *sec_desc_size);
+BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth);
+SEC_DESC_BUF *make_sec_desc_buf(int len, SEC_DESC *sec_desc);
+SEC_DESC_BUF *dup_sec_desc_buf(SEC_DESC_BUF *src);
+void free_sec_desc_buf(SEC_DESC_BUF **ppsdb);
+BOOL sec_io_desc_buf(char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int depth);
/*The following definitions come from rpc_parse/parse_srv.c */
uint16 revision; /* 0x0002 */
uint16 size; /* size in bytes of the entire ACL structure */
uint32 num_aces; /* number of Access Control Entries */
-
- SEC_ACE *ace;
+ SEC_ACE *ace_list;
} SEC_ACL;
} SEC_DESC_BUF;
#endif /* _RPC_SECDES_H */
-
sid1->sid_rev_num = sid2->sid_rev_num;
}
+/*****************************************************************
+ Duplicates a sid - mallocs the target.
+*****************************************************************/
+
+DOM_SID *sid_dup(DOM_SID *src)
+{
+ DOM_SID *dst;
+
+ if(!src)
+ return NULL;
+
+ if((dst = malloc(sizeof(DOM_SID))) != NULL) {
+ memset(dst, '\0', sizeof(DOM_SID));
+ sid_copy( dst, src);
+ }
+
+ return dst;
+}
+
/*****************************************************************
Write a sid out into on-the-wire format.
*****************************************************************/
/****************************************************************************
do a REG Set Key Security
****************************************************************************/
-BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd,
- uint32 sec_buf_size, SEC_DESC *sec_buf)
+BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd, SEC_DESC_BUF *sec_desc_buf)
{
prs_struct rbuf;
prs_struct buf;
DEBUG(4,("REG Set Key security.\n"));
- make_reg_q_set_key_sec(&q_o, hnd, sec_buf_size, sec_buf);
+ make_reg_q_set_key_sec(&q_o, hnd, sec_desc_buf);
/* turn parameters into data stream */
reg_io_q_set_key_sec("", &q_o, &buf, 0);
/****************************************************************************
do a REG Query Key Security
****************************************************************************/
-BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd,
- uint32 *sec_buf_size, SEC_DESC_BUF *sec_buf)
+
+BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd, uint32 *sec_buf_size, SEC_DESC_BUF **ppsec_desc_buf)
{
prs_struct rbuf;
prs_struct buf;
DEBUG(4,("REG query key security. buf_size: %d\n", *sec_buf_size));
- make_reg_q_get_key_sec(&q_o, hnd, *sec_buf_size, sec_buf);
+ make_reg_q_get_key_sec(&q_o, hnd, *sec_buf_size, NULL);
/* turn parameters into data stream */
reg_io_q_get_key_sec("", &q_o, &buf, 0);
ZERO_STRUCT(r_o);
- r_o.data = sec_buf;
- if (*sec_buf_size != 0)
- {
- sec_buf->sec = (SEC_DESC*)malloc(*sec_buf_size);
- }
reg_io_r_get_key_sec("", &r_o, &rbuf, 0);
p = rbuf.offset != 0;
{
valid_query = True;
(*sec_buf_size) = r_o.data->len;
+ *ppsec_desc_buf = r_o.data;
}
}
prs_struct buf;
REG_Q_CREATE_KEY q_o;
BOOL valid_create = False;
- SEC_DESC sec;
- SEC_DESC_BUF sec_buf;
- int sec_len;
+ SEC_DESC *sec;
+ SEC_DESC_BUF *sec_buf;
+ size_t sec_len;
ZERO_STRUCT(sec);
ZERO_STRUCT(sec_buf);
DEBUG(4,("REG Create Key: %s %s 0x%08x\n", key_name, key_class,
sam_access != NULL ? sam_access->mask : 0));
- sec_len = make_sec_desc(&sec, 1, SEC_DESC_SELF_RELATIVE,
- NULL, NULL, NULL, NULL);
+ if((sec = make_sec_desc( 1, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, NULL, &sec_len)) == NULL)
+ {
+ DEBUG(0,("make_sec_desc : malloc fail.\n"));
+ return False;
+ }
DEBUG(10,("make_sec_desc: len = %d\n", sec_len));
- make_reg_q_create_key(&q_o, hnd, key_name, key_class, sam_access,
- &sec_buf, sec_len, &sec);
+ if((sec_buf = make_sec_desc_buf( (int)sec_len, sec)) == NULL)
+ {
+ DEBUG(0,("make_sec_desc : malloc fail (1)\n"));
+ free_sec_desc(&sec);
+ return False;
+ }
+ free_sec_desc(&sec);
+
+ make_reg_q_create_key(&q_o, hnd, key_name, key_class, sam_access, sec_buf);
/* turn parameters into data stream */
reg_io_q_create_key("", &q_o, &buf, 0);
}
}
- free_sec_desc(&sec);
-
+ free_sec_desc_buf(&sec_buf);
prs_mem_free(&rbuf);
prs_mem_free(&buf );
/*******************************************************************
reads or writes a DOM_SID structure.
********************************************************************/
-void smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth)
+
+BOOL smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth)
{
int i;
- if (sid == NULL) return;
+ if (sid == NULL)
+ return False;
prs_debug(ps, depth, desc, "smb_io_dom_sid");
depth++;
if (sid->num_auths > MAXSUBAUTHS) sid->num_auths = MAXSUBAUTHS;
prs_uint32s(False, "sub_auths ", ps, depth, sid->sub_auths, sid->num_auths);
+ return True;
}
/*******************************************************************
}
if (ptr3 == NULL || *ptr3 != 0)
{
- sec_io_desc_buf("data ", data , ps, depth);
+ sec_io_desc_buf("data ", &data , ps, depth); /* JRA - this line is probably wrong... */
}
smb_io_hdrbuf_post("hdr_sec", hdr_sec, ps, depth, hdr_offset,
data->max_len, data->len);
creates a structure.
********************************************************************/
void make_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd,
- char *name, char *class,
- SEC_ACCESS *sam_access,
- SEC_DESC_BUF *sec_buf,
- int sec_len, SEC_DESC *sec)
+ char *name, char *class, SEC_ACCESS *sam_access,
+ SEC_DESC_BUF *sec_buf)
{
int len_name = name != NULL ? strlen(name ) + 1: 0;
int len_class = class != NULL ? strlen(class) + 1: 0;
q_c->data = sec_buf;
q_c->ptr2 = 1;
- make_buf_hdr(&(q_c->hdr_sec), sec_len, sec_len);
+ make_buf_hdr(&(q_c->hdr_sec), sec_buf->len, sec_buf->len);
q_c->ptr3 = 1;
- make_sec_desc_buf(q_c->data, sec_len, sec);
-
q_c->unknown_2 = 0x00000000;
}
/*******************************************************************
makes a structure.
********************************************************************/
-void make_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_i, POLICY_HND *pol,
- uint32 buf_len, SEC_DESC *sec_desc)
+void make_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_i, POLICY_HND *pol, SEC_DESC_BUF *sec_desc_buf)
{
if (q_i == NULL) return;
q_i->sec_info = DACL_SECURITY_INFORMATION;
q_i->ptr = 1;
- make_buf_hdr(&(q_i->hdr_sec), buf_len, buf_len);
- make_sec_desc_buf(q_i->data, buf_len, sec_desc);
+ make_buf_hdr(&(q_i->hdr_sec), sec_desc_buf->len, sec_desc_buf->len);
+ q_i->data = sec_desc_buf;
}
/*******************************************************************
makes a structure.
********************************************************************/
void make_reg_q_get_key_sec(REG_Q_GET_KEY_SEC *q_i, POLICY_HND *pol,
- uint32 buf_len, SEC_DESC_BUF *sec_buf)
+ uint32 sec_buf_size, SEC_DESC_BUF *psdb)
{
if (q_i == NULL) return;
GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION;
- q_i->ptr = sec_buf != NULL ? 1 : 0;
- q_i->data = sec_buf;
+ q_i->ptr = psdb != NULL ? 1 : 0;
+ q_i->data = psdb;
- if (sec_buf != NULL)
- {
- make_buf_hdr(&(q_i->hdr_sec), buf_len, 0);
- make_sec_desc_buf(q_i->data, buf_len, NULL);
- }
+ make_buf_hdr(&(q_i->hdr_sec), sec_buf_size, 0);
}
/*******************************************************************
if (r_q->ptr != 0)
{
smb_io_hdrbuf("", &(r_q->hdr_sec), ps, depth);
- sec_io_desc_buf("", r_q->data, ps, depth);
-
+ sec_io_desc_buf("", &r_q->data, ps, depth);
prs_align(ps);
}
/*******************************************************************
-makes a structure.
+ Sets up a SEC_ACCESS structure.
********************************************************************/
-void make_sec_access(SEC_ACCESS *t, uint32 mask)
+
+void init_sec_access(SEC_ACCESS *t, uint32 mask)
{
t->mask = mask;
}
/*******************************************************************
-reads or writes a structure.
+ Reads or writes a SEC_ACCESS structure.
********************************************************************/
-void sec_io_access(char *desc, SEC_ACCESS *t, prs_struct *ps, int depth)
+
+BOOL sec_io_access(char *desc, SEC_ACCESS *t, prs_struct *ps, int depth)
{
- if (t == NULL) return;
+ if (t == NULL)
+ return False;
prs_debug(ps, depth, desc, "sec_io_access");
depth++;
prs_align(ps);
prs_uint32("mask", ps, depth, &(t->mask));
+ return True;
}
/*******************************************************************
-makes a structure.
+ Sets up a SEC_ACE structure.
********************************************************************/
-void make_sec_ace(SEC_ACE *t, DOM_SID *sid, uint8 type, SEC_ACCESS mask, uint8 flag)
+
+void init_sec_ace(SEC_ACE *t, DOM_SID *sid, uint8 type, SEC_ACCESS mask, uint8 flag)
{
t->type = type;
t->flags = flag;
t->size = sid_size(sid) + 8;
t->info = mask;
+ ZERO_STRUCTP(&t->sid);
sid_copy(&t->sid, sid);
}
/*******************************************************************
-reads or writes a structure.
+ Reads or writes a SEC_ACE structure.
********************************************************************/
-void sec_io_ace(char *desc, SEC_ACE *t, prs_struct *ps, int depth)
+
+BOOL sec_io_ace(char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
{
uint32 old_offset;
uint32 offset_ace_size;
- if (t == NULL) return;
+
+ if (psa == NULL)
+ return False;
prs_debug(ps, depth, desc, "sec_io_ace");
depth++;
old_offset = ps->offset;
- prs_uint8 ("type ", ps, depth, &(t->type));
- prs_uint8 ("flags", ps, depth, &(t->flags));
- prs_uint16_pre("size ", ps, depth, &(t->size ), &offset_ace_size);
+ prs_uint8 ("type ", ps, depth, &psa->type);
+ prs_uint8 ("flags", ps, depth, &psa->flags);
+ prs_uint16_pre("size ", ps, depth, &psa->size, &offset_ace_size);
+
+ if(!sec_io_access("info ", &psa->info, ps, depth))
+ return False;
- sec_io_access ("info ", &t->info, ps, depth);
prs_align(ps);
- smb_io_dom_sid("sid ", &t->sid , ps, depth);
+ if(!smb_io_dom_sid("sid ", &psa->sid , ps, depth))
+ return False;
+
- prs_uint16_post("size ", ps, depth, &t->size, offset_ace_size, old_offset);
+ prs_uint16_post("size ", ps, depth, &psa->size, offset_ace_size, old_offset);
+ return True;
}
/*******************************************************************
-makes a structure.
+ Create a SEC_ACL structure.
********************************************************************/
-void make_sec_acl(SEC_ACL *t, uint16 revision, int num_aces, SEC_ACE *ace)
+
+SEC_ACL *make_sec_acl(uint16 revision, int num_aces, SEC_ACE *ace_list)
{
+ SEC_ACL *dst;
int i;
- t->revision = revision;
- t->num_aces = num_aces;
- t->size = 4;
- t->ace = ace;
+
+ if((dst = (SEC_ACL *)malloc(sizeof(SEC_ACL))) == NULL)
+ return NULL;
+
+ ZERO_STRUCTP(dst);
+
+ dst->revision = revision;
+ dst->num_aces = num_aces;
+ dst->size = 4;
+
+ if((dst->ace_list = (SEC_ACE *)malloc( sizeof(SEC_ACE) * num_aces )) == NULL) {
+ free_sec_acl(&dst);
+ return NULL;
+ }
for (i = 0; i < num_aces; i++)
{
- t->size += ace[i].size;
+ dst->ace_list[i] = ace_list[i]; /* Structure copy. */
+ dst->size += ace_list[i].size;
}
+
+ return dst;
}
/*******************************************************************
-frees a structure.
+ Duplicate a SEC_ACL structure.
********************************************************************/
-void free_sec_acl(SEC_ACL *t)
+
+SEC_ACL *dup_sec_acl( SEC_ACL *src)
{
- if (t->ace != NULL)
- {
- free(t->ace);
- }
+ if(src == NULL)
+ return NULL;
+
+ return make_sec_acl( src->revision, src->num_aces, src->ace_list);
}
/*******************************************************************
-reads or writes a structure.
+ Delete a SEC_ACL structure.
+********************************************************************/
-first of the xx_io_xx functions that allocates its data structures
-for you as it reads them.
+void free_sec_acl(SEC_ACL **ppsa)
+{
+ SEC_ACL *psa;
+
+ if(ppsa == NULL || *ppsa == NULL)
+ return;
+
+ psa = *ppsa;
+ if (psa->ace_list != NULL)
+ free(psa->ace_list);
+
+ free(psa);
+ *ppsa = NULL;
+}
+
+/*******************************************************************
+ Reads or writes a SEC_ACL structure.
+
+ First of the xx_io_xx functions that allocates its data structures
+ for you as it reads them.
********************************************************************/
-void sec_io_acl(char *desc, SEC_ACL *t, prs_struct *ps, int depth)
+
+BOOL sec_io_acl(char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
{
int i;
uint32 old_offset;
uint32 offset_acl_size;
+ SEC_ACL *psa;
+
+ if (ppsa == NULL)
+ return False;
+
+ psa = *ppsa;
- if (t == NULL) return;
+ if(ps->io && psa == NULL)
+ {
+ /*
+ * This is a read and we must allocate the stuct to read into.
+ */
+ if((psa = (SEC_ACL *)malloc(sizeof(SEC_ACL))) == NULL)
+ return False;
+ ZERO_STRUCTP(psa);
+ *ppsa = psa;
+ }
prs_debug(ps, depth, desc, "sec_io_acl");
depth++;
old_offset = ps->offset;
- prs_uint16("revision", ps, depth, &(t->revision));
- prs_uint16_pre("size ", ps, depth, &(t->size ), &offset_acl_size);
- prs_uint32("num_aces ", ps, depth, &(t->num_aces ));
+ prs_uint16("revision", ps, depth, &psa->revision);
+ prs_uint16_pre("size ", ps, depth, &psa->size, &offset_acl_size);
+ prs_uint32("num_aces ", ps, depth, &psa->num_aces);
- if (ps->io && t->num_aces != 0)
+ if (ps->io && psa->num_aces != 0)
{
/* reading */
- t->ace = malloc(sizeof(t->ace[0]) * t->num_aces);
- ZERO_STRUCTP(t->ace);
- }
-
- if (t->ace == NULL && t->num_aces != 0)
- {
- DEBUG(0,("INVALID ACL\n"));
- ps->offset = 0xfffffffe;
- return;
+ if((psa->ace_list = malloc(sizeof(psa->ace_list[0]) * psa->num_aces)) == NULL)
+ return False;
+ ZERO_STRUCTP(psa->ace_list);
}
- for (i = 0; i < MIN(t->num_aces, MAX_SEC_ACES); i++)
+ for (i = 0; i < MIN(psa->num_aces, MAX_SEC_ACES); i++)
{
fstring tmp;
- slprintf(tmp, sizeof(tmp)-1, "ace[%02d]: ", i);
- sec_io_ace(tmp, &t->ace[i], ps, depth);
+ slprintf(tmp, sizeof(tmp)-1, "ace_list[%02d]: ", i);
+ if(!sec_io_ace(tmp, &psa->ace_list[i], ps, depth))
+ return False;
}
prs_align(ps);
- prs_uint16_post("size ", ps, depth, &t->size , offset_acl_size, old_offset);
+ prs_uint16_post("size ", ps, depth, &psa->size, offset_acl_size, old_offset);
+
+ return True;
}
/*******************************************************************
-makes a structure
+ Creates a SEC_DESC structure
********************************************************************/
-int make_sec_desc(SEC_DESC *t, uint16 revision, uint16 type,
- DOM_SID *owner_sid, DOM_SID *grp_sid,
- SEC_ACL *sacl, SEC_ACL *dacl)
+
+SEC_DESC *make_sec_desc(uint16 revision, uint16 type,
+ DOM_SID *owner_sid, DOM_SID *grp_sid,
+ SEC_ACL *sacl, SEC_ACL *dacl, size_t *sec_desc_size)
{
+ SEC_DESC *dst;
uint32 offset;
- t->revision = revision;
- t->type = type;
+ *sec_desc_size = 0;
+
+ if(( dst = (SEC_DESC *)malloc(sizeof(SEC_DESC))) == NULL) {
+ return NULL;
+ }
+
+ ZERO_STRUCTP(dst);
- t->off_owner_sid = 0;
- t->off_grp_sid = 0;
- t->off_sacl = 0;
- t->off_dacl = 0;
+ dst->revision = revision;
+ dst->type = type;
- t->dacl = dacl;
- t->sacl = sacl;
- t->owner_sid = owner_sid;
- t->grp_sid = grp_sid;
+ dst->off_owner_sid = 0;
+ dst->off_grp_sid = 0;
+ dst->off_sacl = 0;
+ dst->off_dacl = 0;
+
+ if(dacl && ((dst->dacl = dup_sec_acl(dacl)) == NULL))
+ goto error_exit;
+
+ if(sacl && ((dst->sacl = dup_sec_acl(sacl)) == NULL))
+ goto error_exit;
+
+ if(owner_sid && ((dst->owner_sid = sid_dup(owner_sid)) == NULL))
+ goto error_exit;
+
+ if(grp_sid && ((dst->grp_sid = sid_dup(grp_sid)) == NULL))
+ goto error_exit;
offset = 0x0;
- if (dacl != NULL)
+ /*
+ * Work out the linearization sizes.
+ */
+
+ if (dst->dacl != NULL)
{
if (offset == 0)
{
offset = 0x14;
}
- t->off_dacl = offset;
+ dst->off_dacl = offset;
offset += dacl->size;
}
- if (sacl != NULL)
+ if (dst->sacl != NULL)
{
if (offset == 0)
{
offset = 0x14;
}
- t->off_dacl = offset;
- offset += dacl->size;
+ dst->off_sacl = offset;
+ offset += sacl->size;
}
- if (owner_sid != NULL)
+ if (dst->owner_sid != NULL)
{
if (offset == 0)
{
offset = 0x14;
}
- t->off_owner_sid = offset;
- offset += sid_size(owner_sid);
+ dst->off_owner_sid = offset;
+ offset += sid_size(dst->owner_sid);
}
- if (grp_sid != NULL)
+ if (dst->grp_sid != NULL)
{
if (offset == 0)
{
offset = 0x14;
}
- t->off_grp_sid = offset;
- offset += sid_size(grp_sid);
+ dst->off_grp_sid = offset;
+ offset += sid_size(dst->grp_sid);
}
- return (offset == 0) ? 0x14 : offset;
+ *sec_desc_size = (size_t)((offset == 0) ? 0x14 : offset);
+ return dst;
+
+error_exit:
+
+ *sec_desc_size = 0;
+ free_sec_desc(&dst);
+ return NULL;
}
+/*******************************************************************
+ Duplicate a SEC_DESC structure.
+********************************************************************/
+
+SEC_DESC *dup_sec_desc( SEC_DESC *src)
+{
+ size_t dummy;
+
+ if(src == NULL)
+ return NULL;
+
+ return make_sec_desc( src->revision, src->type,
+ src->owner_sid, src->grp_sid, src->sacl,
+ src->dacl, &dummy);
+}
/*******************************************************************
-frees a structure
+ Deletes a SEC_DESC structure
********************************************************************/
-void free_sec_desc(SEC_DESC *t)
+
+void free_sec_desc(SEC_DESC **ppsd)
{
- if (t->dacl != NULL)
- {
- free_sec_acl(t->dacl);
- }
+ SEC_DESC *psd;
- if (t->sacl != NULL)
- {
- free_sec_acl(t->dacl);
- }
+ if(ppsd == NULL || *ppsd == NULL)
+ return;
- if (t->owner_sid != NULL)
- {
- free(t->owner_sid);
- }
+ psd = *ppsd;
- if (t->grp_sid != NULL)
- {
- free(t->grp_sid);
- }
+ free_sec_acl(&psd->dacl);
+ free_sec_acl(&psd->dacl);
+ free(psd->owner_sid);
+ free(psd->grp_sid);
+ free(psd);
+ *ppsd = NULL;
+}
+
+/*******************************************************************
+ Creates a SEC_DESC structure with typical defaults.
+********************************************************************/
+
+SEC_DESC *make_standard_sec_desc(DOM_SID *owner_sid, DOM_SID *grp_sid,
+ SEC_ACL *dacl, size_t *sec_desc_size)
+{
+ return make_sec_desc(1, SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
+ owner_sid, grp_sid, NULL, dacl, sec_desc_size);
}
/*******************************************************************
-reads or writes a structure.
+ Reads or writes a SEC_DESC structure.
+ If reading and the *ppsd = NULL, allocates the structure.
********************************************************************/
-static void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth)
+
+BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
{
-#if 0
- uint32 off_owner_sid;
- uint32 off_grp_sid ;
- uint32 off_sacl ;
- uint32 off_dacl ;
-#endif
uint32 old_offset;
uint32 max_offset = 0; /* after we're done, move offset to end */
+ SEC_DESC *psd;
- if (t == NULL) return;
+ if (ppsd == NULL)
+ return False;
+
+ psd = *ppsd;
+
+ if(ps->io && psd == NULL)
+ {
+ if((psd = (SEC_DESC *)malloc(sizeof(SEC_DESC))) == NULL)
+ return False;
+ ZERO_STRUCTP(psd);
+ *ppsd = psd;
+ }
prs_debug(ps, depth, desc, "sec_io_desc");
depth++;
/* start of security descriptor stored for back-calc offset purposes */
old_offset = ps->offset;
- prs_uint16("revision ", ps, depth, &(t->revision ));
- prs_uint16("type ", ps, depth, &(t->type ));
-
- prs_uint32("off_owner_sid", ps, depth, &(t->off_owner_sid));
- prs_uint32("off_grp_sid ", ps, depth, &(t->off_grp_sid ));
- prs_uint32("off_sacl ", ps, depth, &(t->off_sacl ));
- prs_uint32("off_dacl ", ps, depth, &(t->off_dacl ));
-#if 0
- prs_uint32_pre("off_owner_sid", ps, depth, &(t->off_owner_sid), &off_owner_sid);
- prs_uint32_pre("off_grp_sid ", ps, depth, &(t->off_grp_sid ), &off_grp_sid );
- prs_uint32_pre("off_sacl ", ps, depth, &(t->off_sacl ), &off_sacl );
- prs_uint32_pre("off_dacl ", ps, depth, &(t->off_dacl ), &off_dacl );
-#endif
- max_offset = MAX(max_offset, ps->offset);
+ prs_uint16("revision ", ps, depth, &psd->revision);
+ prs_uint16("type ", ps, depth, &psd->type);
- if (IS_BITS_SET_ALL(t->type, SEC_DESC_DACL_PRESENT))
- {
-#if 0
- prs_uint32_post("off_dacl ", ps, depth, &(t->off_dacl ), off_dacl , ps->offset - old_offset);
-#endif
- ps->offset = old_offset + t->off_dacl;
- if (ps->io)
- {
- /* reading */
- t->dacl = malloc(sizeof(*t->dacl));
- ZERO_STRUCTP(t->dacl);
- }
+ prs_uint32("off_owner_sid", ps, depth, &psd->off_owner_sid);
+ prs_uint32("off_grp_sid ", ps, depth, &psd->off_grp_sid);
+ prs_uint32("off_sacl ", ps, depth, &psd->off_sacl);
+ prs_uint32("off_dacl ", ps, depth, &psd->off_dacl);
- if (t->dacl == NULL)
- {
- DEBUG(0,("INVALID DACL\n"));
- ps->offset = 0xfffffffe;
- return;
- }
+ max_offset = MAX(max_offset, ps->offset);
- sec_io_acl ("dacl" , t->dacl , ps, depth);
- prs_align(ps);
- }
-#if 0
- else
+ if (IS_BITS_SET_ALL(psd->type, SEC_DESC_DACL_PRESENT) && psd->dacl)
{
- prs_uint32_post("off_dacl ", ps, depth, &(t->off_dacl ), off_dacl , 0);
+ ps->offset = old_offset + psd->off_dacl;
+ if(!sec_io_acl("dacl", &psd->dacl, ps, depth))
+ return False;
+ prs_align(ps);
}
-#endif
max_offset = MAX(max_offset, ps->offset);
- if (IS_BITS_SET_ALL(t->type, SEC_DESC_SACL_PRESENT))
+ if (IS_BITS_SET_ALL(psd->type, SEC_DESC_SACL_PRESENT) && psd->sacl)
{
-#if 0
- prs_uint32_post("off_sacl ", ps, depth, &(t->off_sacl ), off_sacl , ps->offset - old_offset);
-#endif
- ps->offset = old_offset + t->off_sacl;
- if (ps->io)
- {
- /* reading */
- t->sacl = malloc(sizeof(*t->sacl));
- ZERO_STRUCTP(t->sacl);
- }
-
- if (t->sacl == NULL)
- {
- DEBUG(0,("INVALID SACL\n"));
- ps->offset = 0xfffffffe;
- return;
- }
-
- sec_io_acl ("sacl" , t->sacl , ps, depth);
+ ps->offset = old_offset + psd->off_sacl;
+ if(!sec_io_acl("sacl", &psd->sacl, ps, depth))
+ return False;
prs_align(ps);
}
-#if 0
- else
- {
- prs_uint32_post("off_sacl ", ps, depth, &(t->off_sacl ), off_sacl , 0);
- }
-#endif
max_offset = MAX(max_offset, ps->offset);
-#if 0
- prs_uint32_post("off_owner_sid", ps, depth, &(t->off_owner_sid), off_owner_sid, ps->offset - old_offset);
-#endif
- if (t->off_owner_sid != 0)
+ if (psd->off_owner_sid != 0)
{
if (ps->io)
{
- ps->offset = old_offset + t->off_owner_sid;
- }
- if (ps->io)
- {
+ ps->offset = old_offset + psd->off_owner_sid;
/* reading */
- t->owner_sid = malloc(sizeof(*t->owner_sid));
- ZERO_STRUCTP(t->owner_sid);
- }
-
- if (t->owner_sid == NULL)
- {
- DEBUG(0,("INVALID OWNER SID\n"));
- ps->offset = 0xfffffffe;
- return;
+ if((psd->owner_sid = malloc(sizeof(*psd->owner_sid))) == NULL)
+ return False;
+ ZERO_STRUCTP(psd->owner_sid);
}
- smb_io_dom_sid("owner_sid ", t->owner_sid , ps, depth);
+ if(!smb_io_dom_sid("owner_sid ", psd->owner_sid , ps, depth))
+ return False;
prs_align(ps);
}
max_offset = MAX(max_offset, ps->offset);
-#if 0
- prs_uint32_post("off_grp_sid ", ps, depth, &(t->off_grp_sid ), off_grp_sid , ps->offset - old_offset);
-#endif
- if (t->off_grp_sid != 0)
+ if (psd->off_grp_sid != 0)
{
- if (ps->io)
- {
- ps->offset = old_offset + t->off_grp_sid;
- }
if (ps->io)
{
/* reading */
- t->grp_sid = malloc(sizeof(*t->grp_sid));
- ZERO_STRUCTP(t->grp_sid);
- }
-
- if (t->grp_sid == NULL)
- {
- DEBUG(0,("INVALID GROUP SID\n"));
- ps->offset = 0xfffffffe;
- return;
+ ps->offset = old_offset + psd->off_grp_sid;
+ if((psd->grp_sid = malloc(sizeof(*psd->grp_sid))) == NULL)
+ return False;
+ ZERO_STRUCTP(psd->grp_sid);
}
- smb_io_dom_sid("grp_sid", t->grp_sid, ps, depth);
+ if(!smb_io_dom_sid("grp_sid", psd->grp_sid, ps, depth))
+ return False;
prs_align(ps);
}
max_offset = MAX(max_offset, ps->offset);
ps->offset = max_offset;
+ return True;
}
/*******************************************************************
-creates a SEC_DESC_BUF structure.
+ Creates a SEC_DESC_BUF structure.
********************************************************************/
-void make_sec_desc_buf(SEC_DESC_BUF *buf, int len, SEC_DESC *data)
+
+SEC_DESC_BUF *make_sec_desc_buf(int len, SEC_DESC *sec_desc)
{
- ZERO_STRUCTP(buf);
+ SEC_DESC_BUF *dst;
+
+ if((dst = (SEC_DESC_BUF *)malloc(sizeof(SEC_DESC_BUF))) == NULL)
+ return NULL;
+
+ ZERO_STRUCTP(dst);
/* max buffer size (allocated size) */
- buf->max_len = len;
- buf->undoc = 0;
- buf->len = data != NULL ? len : 0;
- buf->sec = data;
+ dst->max_len = len;
+ dst->len = len;
+
+ if(sec_desc && ((dst->sec = dup_sec_desc(sec_desc)) == NULL))
+ {
+ free_sec_desc_buf(&dst);
+ return NULL;
+ }
+
+ return dst;
}
/*******************************************************************
-frees a SEC_DESC_BUF structure.
+ Duplicates a SEC_DESC_BUF structure.
********************************************************************/
-void free_sec_desc_buf(SEC_DESC_BUF *buf)
+
+SEC_DESC_BUF *dup_sec_desc_buf(SEC_DESC_BUF *src)
{
- if (buf->sec != NULL)
- {
- free_sec_desc(buf->sec);
- free(buf->sec);
- }
+ if(src == NULL)
+ return NULL;
+
+ return make_sec_desc_buf( src->len, src->sec);
+}
+
+/*******************************************************************
+ Deletes a SEC_DESC_BUF structure.
+********************************************************************/
+
+void free_sec_desc_buf(SEC_DESC_BUF **ppsdb)
+{
+ SEC_DESC_BUF *psdb;
+
+ if(ppsdb == NULL || *ppsdb == NULL)
+ return;
+
+ psdb = *ppsdb;
+ free_sec_desc(&psdb->sec);
+ free(psdb);
+ *ppsdb = NULL;
}
/*******************************************************************
-reads or writes a SEC_DESC_BUF structure.
+ Reads or writes a SEC_DESC_BUF structure.
********************************************************************/
-void sec_io_desc_buf(char *desc, SEC_DESC_BUF *sec, prs_struct *ps, int depth)
+
+BOOL sec_io_desc_buf(char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int depth)
{
uint32 off_len;
uint32 off_max_len;
uint32 old_offset;
uint32 size;
+ SEC_DESC_BUF *psdb;
- if (sec == NULL) return;
+ if (ppsdb == NULL)
+ return False;
+
+ psdb = *ppsdb;
+
+ if (ps->io && psdb == NULL)
+ {
+ if((psdb = (SEC_DESC_BUF *)malloc(sizeof(SEC_DESC_BUF))) == NULL)
+ return False;
+ ZERO_STRUCTP(psdb);
+ *ppsdb = psdb;
+ }
prs_debug(ps, depth, desc, "sec_io_desc_buf");
depth++;
prs_align(ps);
- prs_uint32_pre("max_len", ps, depth, &(sec->max_len), &off_max_len);
- prs_uint32 ("undoc ", ps, depth, &(sec->undoc ));
- prs_uint32_pre("len ", ps, depth, &(sec->len ), &off_len);
+ prs_uint32_pre("max_len", ps, depth, &psdb->max_len, &off_max_len);
+ prs_uint32 ("undoc ", ps, depth, &psdb->undoc);
+ prs_uint32_pre("len ", ps, depth, &psdb->len, &off_len);
old_offset = ps->offset;
- if (sec->len != 0 && ps->io)
- {
- /* reading */
- sec->sec = malloc(sizeof(*sec->sec));
- ZERO_STRUCTP(sec->sec);
-
- if (sec->sec == NULL)
- {
- DEBUG(0,("INVALID SEC_DESC\n"));
- ps->offset = 0xfffffffe;
- return;
- }
- }
-
/* reading, length is non-zero; writing, descriptor is non-NULL */
- if ((sec->len != 0 || (!ps->io)) && sec->sec != NULL)
+ if ((psdb->len != 0 || (!ps->io)) && psdb->sec != NULL)
{
- sec_io_desc("sec ", sec->sec, ps, depth);
+ if(!sec_io_desc("sec ", &psdb->sec, ps, depth))
+ return False;
}
size = ps->offset - old_offset;
- prs_uint32_post("max_len", ps, depth, &(sec->max_len), off_max_len, size == 0 ? sec->max_len : size);
- prs_uint32_post("len ", ps, depth, &(sec->len ), off_len , size);
-}
+ prs_uint32_post("max_len", ps, depth, &psdb->max_len, off_max_len, size == 0 ? psdb->max_len : size);
+ prs_uint32_post("len ", ps, depth, &psdb->len, off_len, size);
+ return True;
+}
*/
uint32 sec_buf_size;
- SEC_DESC_BUF sec_buf;
+ SEC_DESC_BUF *psdb;
DEBUG(5, ("cmd_reg_get_key_sec: smb_cli->fd:%d\n", smb_cli->fd));
key_name, 0x02000000, &key_pol) : False;
/* query key sec info. first call sets sec_buf_size. */
- sec_buf_size = 0;
- ZERO_STRUCT(sec_buf);
+ sec_buf_size = 0;
res4 = res3 ? do_reg_get_key_sec(smb_cli, &key_pol,
- &sec_buf_size, &sec_buf) : False;
+ &sec_buf_size, &psdb) : False;
- if (res4)
- {
- free_sec_desc_buf(&sec_buf);
- }
+ free_sec_desc_buf(&psdb);
res4 = res4 ? do_reg_get_key_sec(smb_cli, &key_pol,
- &sec_buf_size, &sec_buf) : False;
+ &sec_buf_size, &psdb) : False;
- if (res4 && sec_buf.len > 0 && sec_buf.sec != NULL)
+ if (res4 && psdb->len > 0 && psdb->sec != NULL)
{
- display_sec_desc(out_hnd, ACTION_HEADER , sec_buf.sec);
- display_sec_desc(out_hnd, ACTION_ENUMERATE, sec_buf.sec);
- display_sec_desc(out_hnd, ACTION_FOOTER , sec_buf.sec);
+ display_sec_desc(out_hnd, ACTION_HEADER , psdb->sec);
+ display_sec_desc(out_hnd, ACTION_ENUMERATE, psdb->sec);
+ display_sec_desc(out_hnd, ACTION_FOOTER , psdb->sec);
- res4 = res4 ? do_reg_set_key_sec(smb_cli, &key_pol,
- sec_buf_size, sec_buf.sec) : False;
-
- free_sec_desc_buf(&sec_buf);
+ res4 = res4 ? do_reg_set_key_sec(smb_cli, &key_pol, psdb) : False;
}
+ free_sec_desc_buf(&psdb);
+
/* close the key handle */
if ((*key_name) != 0)
{
*/
uint32 sec_buf_size;
- SEC_DESC_BUF sec_buf;
+ SEC_DESC_BUF *psdb;
DEBUG(5, ("cmd_reg_get_key_sec: smb_cli->fd:%d\n", smb_cli->fd));
res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
key_name, 0x02000000, &key_pol) : False;
- /* query key sec info. first call sets sec_buf_size. */
+ /* Get the size. */
sec_buf_size = 0;
- ZERO_STRUCT(sec_buf);
-
res4 = res3 ? do_reg_get_key_sec(smb_cli, &key_pol,
- &sec_buf_size, &sec_buf) : False;
+ &sec_buf_size, &psdb) : False;
- if (res4)
- {
- free_sec_desc_buf(&sec_buf);
- }
+ free_sec_desc_buf(&psdb);
res4 = res4 ? do_reg_get_key_sec(smb_cli, &key_pol,
- &sec_buf_size, &sec_buf) : False;
+ &sec_buf_size, &psdb) : False;
- if (res4 && sec_buf.len > 0 && sec_buf.sec != NULL)
+ if (res4 && psdb->len > 0 && psdb->sec != NULL)
{
- display_sec_desc(out_hnd, ACTION_HEADER , sec_buf.sec);
- display_sec_desc(out_hnd, ACTION_ENUMERATE, sec_buf.sec);
- display_sec_desc(out_hnd, ACTION_FOOTER , sec_buf.sec);
-
- free(sec_buf.sec);
+ display_sec_desc(out_hnd, ACTION_HEADER , psdb->sec);
+ display_sec_desc(out_hnd, ACTION_ENUMERATE, psdb->sec);
+ display_sec_desc(out_hnd, ACTION_FOOTER , psdb->sec);
}
+ free_sec_desc_buf(&psdb);
+
/* close the key handle */
if ((*key_name) != 0)
{
DEBUG(5,("cmd_reg_get_key_sec: query failed\n"));
}
}
-
int i;
for (i = 0; i < sec_acl->num_aces; i++)
{
- display_sec_ace(out_hnd, ACTION_HEADER , &sec_acl->ace[i]);
- display_sec_ace(out_hnd, ACTION_ENUMERATE, &sec_acl->ace[i]);
- display_sec_ace(out_hnd, ACTION_FOOTER , &sec_acl->ace[i]);
+ display_sec_ace(out_hnd, ACTION_HEADER , &sec_acl->ace_list[i]);
+ display_sec_ace(out_hnd, ACTION_ENUMERATE, &sec_acl->ace_list[i]);
+ display_sec_ace(out_hnd, ACTION_FOOTER , &sec_acl->ace_list[i]);
}
}
gotstart = 1;
}
- if( $0 ~ /^LOCAL_GRP|^DOMAIN_GRP|SMB_STRUCT_DIRENT/ ) {
+ if( $0 ~ /^LOCAL_GRP|^DOMAIN_GRP|^SMB_STRUCT_DIRENT|^SEC_ACL|^SEC_DESC|^SEC_DESC_BUF|^DOM_SID/ ) {
gotstart = 1;
}
}
/****************************************************************************
- Reply to query a security descriptor - currently this is not implemented (it
- is planned to be though). Right now it just returns the same thing NT would
- when queried on a FAT filesystem. JRA.
+ Reply to query a security descriptor from an fsp. If it succeeds it allocates
+ the space for the return elements and returns True.
****************************************************************************/
-#define NO_NT_SEC_DESC_REPLY_SIZE 0x2C
+static size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
+{
+ static DOM_SID world_sid;
+ static BOOL world_sid_initialized = False;
+ SEC_ACL *daclp;
+ DOM_SID owner_sid;
+ DOM_SID group_sid;
+ size_t sec_desc_size;
+
+ /*
+ * The security descriptor returned has no SACL and no DACL
+ * and the owner and group sids are S-1-1-0 (World Sid).
+ * JRA.
+ */
+
+ *ppdesc = NULL;
+
+ if(!world_sid_initialized) {
+ world_sid_initialized = True;
+ string_to_sid( &world_sid, "S-1-1-0");
+ }
+
+ sid_copy( &owner_sid, &world_sid);
+ sid_copy( &group_sid, &world_sid);
+
+ *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, NULL, &sec_desc_size);
+
+ if(!*ppdesc) {
+ DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
+ return 0;
+ }
+
+ return sec_desc_size;
+
+#if 0
+ extern DOM_SID global_sam_sid;
+ static DOM_SID world_sid;
+ static BOOL world_sid_initialized = False;
+ SMB_STRUCT_STAT sbuf;
+ SEC_ACE ace_list[3];
+ DOM_SID owner_sid;
+ DOM_SID group_sid;
+ size_t sec_desc_size;
+
+ *ppdesc = NULL;
+
+ if(fsp->is_directory) {
+ if(sys_stat(fsp->fsp_name, &sbuf) != 0) {
+ return 0;
+ }
+ } else {
+ if(sys_fstat(fsp->fd_ptr->fd,&sbuf) != 0) {
+ return 0;
+ }
+ }
+
+ /*
+ * Get the owner, group and world SIDs.
+ */
-/* This is a hacked up description of the null SD on
- the wire. I'll fix this when we do this properly. JRA. */
+ sid_copy(&owner_sid, &global_sam_sid);
+ sid_copy(&group_sid, &global_sam_sid);
+ sid_append_rid(&owner_sid, pdb_uid_to_user_rid(sbuf.st_uid));
+ sid_append_rid(&group_sid, pdb_uid_to_user_rid(sbuf.st_gid));
-#define SD_REVISION_OFFSET 0
-#define SD_CONTROL_OFFSET 2
-#define SD_OWNER_OFFSET 4
-#define SD_GROUP_OFFSET 8
-#define SD_SACL_OFFSET 0xC
-#define SD_DACL_OFFSET 0x10
-#define SD_OWNER_START_OFFSET 0x14
+ if(!world_sid_initialized) {
+ world_sid_initialized = True;
+ string_to_sid( &world_sid, "S-1-1-0");
+ }
+
+ /*
+ * Create the generic 3 element UNIX acl.
+ */
+
+ init_sec_ace(&ace_list[0], &owner_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
+ init_sec_ace(&ace_list[0], &group_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
+ init_sec_ace(&ace_list[0], &world_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
+#endif
+}
+
+/****************************************************************************
+ Reply to query a security descriptor - currently this is not implemented (it
+ is planned to be though). Right now it just returns the same thing NT would
+ when queried on a FAT filesystem. JRA.
+****************************************************************************/
static int call_nt_transact_query_security_desc(connection_struct *conn,
char *inbuf, char *outbuf,
uint32 max_data_count = IVAL(inbuf,smb_nt_MaxDataCount);
char *params = *ppparams;
char *data = *ppdata;
- static DOM_SID world_sid;
- static BOOL world_sid_initialized = False;
- size_t world_sid_size;
+ prs_struct pd;
+ SEC_DESC *psd;
+ size_t sec_desc_size;
files_struct *fsp = file_fsp(params,0);
if(params == NULL)
return(ERROR(ERRDOS,ERRnomem));
- SIVAL(params,0,NO_NT_SEC_DESC_REPLY_SIZE);
+ /*
+ * Get the permissions to return.
+ */
+
+ if((sec_desc_size = get_nt_acl(fsp, &psd)) == 0) {
+ return(UNIXERROR(ERRDOS,ERRnoaccess));
+ }
- data = *ppdata = Realloc(*ppdata, NO_NT_SEC_DESC_REPLY_SIZE);
- if(data == NULL)
- return(ERROR(ERRDOS,ERRnomem));
+ SIVAL(params,0,(uint32)sec_desc_size);
+
+ if(max_data_count < sec_desc_size) {
+
+ free_sec_desc(&psd);
- if(max_data_count < NO_NT_SEC_DESC_REPLY_SIZE) {
send_nt_replies(inbuf, outbuf, bufsize, 0xC0000000|NT_STATUS_BUFFER_TOO_SMALL,
params, 4, *ppdata, 0);
return -1;
}
- memset(data, '\0', NO_NT_SEC_DESC_REPLY_SIZE);
+ /*
+ * Allocate the data we will point this at.
+ */
+
+ data = *ppdata = Realloc(*ppdata, sec_desc_size + SAFETY_MARGIN);
+ if(data == NULL) {
+ free_sec_desc(&psd);
+ return(ERROR(ERRDOS,ERRnomem));
+ }
+
+ memset(data, '\0', sec_desc_size + SAFETY_MARGIN);
/*
- * The security descriptor returned has no SACL and no DACL
- * and the owner and group sids are S-1-1-0 (World Sid).
- * JRA.
+ * Create the parse struct we will linearize into.
+ * This allocates a mem_buf pointer *dynamically* (why?).
*/
- if(!world_sid_initialized) {
- world_sid_initialized = True;
- string_to_sid( &world_sid, "S-1-1-0");
+ prs_init(&pd, 0, 4, 0, False);
+
+ if(pd.data == NULL) {
+ free_sec_desc(&psd);
+ return(ERROR(ERRDOS,ERRnomem));
}
- world_sid_size = sid_size(&world_sid);
+ /*
+ * Setup the prs_struct to point at the memory we just
+ * allocated. This is a silly way of doing things - I *must*
+ * fix the prs_struct+membuf stuff.... JRA.
+ */
+
+ mem_create( pd.data, data, 0, sec_desc_size, SAFETY_MARGIN, False);
+
+ /*
+ * Finally, linearize into the outgoing buffer.
+ */
+
+ sec_io_desc( "sd data", &psd, &pd, 1);
+
+ /*
+ * Now we can delete the security descriptor
+ * and the dynamically allocated mem_buf in the
+ * parse struct (why is this done.... ?).
+ */
- SSVAL(data, SD_REVISION_OFFSET, 1);
- SSVAL(data, SD_CONTROL_OFFSET, SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT);
- SIVAL(data, SD_OWNER_OFFSET, SD_OWNER_START_OFFSET);
- SIVAL(data, SD_GROUP_OFFSET, SD_OWNER_START_OFFSET + world_sid_size);
- SIVAL(data, SD_SACL_OFFSET, 0);
- SIVAL(data, SD_DACL_OFFSET, 0);
- sid_linearize(&data[SD_OWNER_START_OFFSET], world_sid_size, &world_sid);
- sid_linearize(&data[SD_OWNER_START_OFFSET+world_sid_size], world_sid_size, &world_sid);
+ free_sec_desc(&psd);
+ prs_mem_free(&pd);
- send_nt_replies(inbuf, outbuf, bufsize, 0, params, 4, data, NO_NT_SEC_DESC_REPLY_SIZE);
+ send_nt_replies(inbuf, outbuf, bufsize, 0, params, 4, data, (int)sec_desc_size);
return -1;
}
git.samba.org / samba.git / commitdiff