diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/time.c | 12 | ||||
| -rw-r--r-- | source3/lib/util_seaccess.c | 40 |
2 files changed, 6 insertions, 46 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c index 5286af37fd..dffc03b1cf 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -198,17 +198,17 @@ char *current_timestring(TALLOC_CTX *ctx, bool hires) void srv_put_dos_date(char *buf,int offset,time_t unixdate) { - push_dos_date(buf, offset, unixdate, server_zone_offset); + push_dos_date((uint8_t *)buf, offset, unixdate, server_zone_offset); } void srv_put_dos_date2(char *buf,int offset, time_t unixdate) { - push_dos_date2(buf, offset, unixdate, server_zone_offset); + push_dos_date2((uint8_t *)buf, offset, unixdate, server_zone_offset); } void srv_put_dos_date3(char *buf,int offset,time_t unixdate) { - push_dos_date3(buf, offset, unixdate, server_zone_offset); + push_dos_date3((uint8_t *)buf, offset, unixdate, server_zone_offset); } void round_timespec(enum timestamp_set_resolution res, struct timespec *ts) @@ -439,17 +439,17 @@ struct timespec interpret_long_date(const char *p) void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate) { - push_dos_date(buf, offset, unixdate, cli->serverzone); + push_dos_date((uint8_t *)buf, offset, unixdate, cli->serverzone); } void cli_put_dos_date2(struct cli_state *cli, char *buf, int offset, time_t unixdate) { - push_dos_date2(buf, offset, unixdate, cli->serverzone); + push_dos_date2((uint8_t *)buf, offset, unixdate, cli->serverzone); } void cli_put_dos_date3(struct cli_state *cli, char *buf, int offset, time_t unixdate) { - push_dos_date3(buf, offset, unixdate, cli->serverzone); + push_dos_date3((uint8_t *)buf, offset, unixdate, cli->serverzone); } time_t cli_make_unix_date(struct cli_state *cli, const void *date_ptr) diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c index 0da7442d19..e5562b5289 100644 --- a/source3/lib/util_seaccess.c +++ b/source3/lib/util_seaccess.c @@ -246,43 +246,3 @@ done: return NT_STATUS_OK; } - -/******************************************************************* - samr_make_sam_obj_sd - ********************************************************************/ - -NTSTATUS samr_make_sam_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size) -{ - DOM_SID adm_sid; - DOM_SID act_sid; - - SEC_ACE ace[3]; - - SEC_ACL *psa = NULL; - - sid_copy(&adm_sid, &global_sid_Builtin); - sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS); - - sid_copy(&act_sid, &global_sid_Builtin); - sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS); - - /*basic access for every one*/ - init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, - GENERIC_RIGHTS_SAM_EXECUTE | GENERIC_RIGHTS_SAM_READ, 0); - - /*full access for builtin aliases Administrators and Account Operators*/ - init_sec_ace(&ace[1], &adm_sid, - SEC_ACE_TYPE_ACCESS_ALLOWED, GENERIC_RIGHTS_SAM_ALL_ACCESS, 0); - init_sec_ace(&ace[2], &act_sid, - SEC_ACE_TYPE_ACCESS_ALLOWED, GENERIC_RIGHTS_SAM_ALL_ACCESS, 0); - - if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 3, ace)) == NULL) - return NT_STATUS_NO_MEMORY; - - if ((*psd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, - SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, - psa, sd_size)) == NULL) - return NT_STATUS_NO_MEMORY; - - return NT_STATUS_OK; -} |