*/
#include "includes.h"
-#include "libnet/libnet.h"
+#include "system/passwd.h"
+#include "libnet/libnet_samsync.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
+#include "lib/util/base64.h"
/* Convert a struct samu_DELTA to a struct samu. */
#define STRING_CHANGED (old_string && !new_string) ||\
if (r->parameters.array) {
DATA_BLOB mung;
- char *newstr;
+ char *newstr = NULL;
old_string = pdb_get_munged_dial(account);
mung.length = r->parameters.length * 2;
mung.data = (uint8_t *) r->parameters.array;
- newstr = (mung.length == 0) ? NULL :
- base64_encode_data_blob(talloc_tos(), mung);
+
+ if (mung.length != 0) {
+ newstr = base64_encode_data_blob(talloc_tos(), mung);
+ SMB_ASSERT(newstr != NULL);
+ }
if (STRING_CHANGED_NC(old_string, newstr))
pdb_set_munged_dial(account, newstr, PDB_CHANGED);
pdb_sethexhours(oldstr, pdb_get_hours(account));
pdb_sethexhours(newstr, r->logon_hours.bits);
if (!strequal(oldstr, newstr))
- pdb_set_hours(account, r->logon_hours.bits, PDB_CHANGED);
+ pdb_set_hours(account, r->logon_hours.bits,
+ pdb_get_hours_len(account), PDB_CHANGED);
}
if (pdb_get_bad_password_count(account) != r->bad_password_count)
/* Create appropriate user */
if (acct_flags & ACB_NORMAL) {
- add_script = talloc_strdup(mem_ctx, lp_adduser_script());
+ add_script = lp_add_user_script(mem_ctx);
} else if ( (acct_flags & ACB_WSTRUST) ||
(acct_flags & ACB_SVRTRUST) ||
(acct_flags & ACB_DOMTRUST) ) {
- add_script = talloc_strdup(mem_ctx, lp_addmachine_script());
+ add_script = lp_add_machine_script(mem_ctx);
} else {
DEBUG(1, ("Unknown user type: %s\n",
pdb_encode_acct_ctrl(acct_flags, NEW_PW_FORMAT_SPACE_PADDED_LEN)));
NTSTATUS nt_ret = NT_STATUS_UNSUCCESSFUL;
fstring account;
struct samu *sam_account=NULL;
- GROUP_MAP map;
+ GROUP_MAP *map = NULL;
struct group *grp;
- DOM_SID user_sid;
- DOM_SID group_sid;
+ struct dom_sid user_sid;
+ struct dom_sid group_sid;
struct passwd *passwd = NULL;
fstring sid_string;
group_sid = *pdb_get_group_sid(sam_account);
- if (!pdb_getgrsid(&map, group_sid)) {
+ map = talloc_zero(mem_ctx, GROUP_MAP);
+ if (!map) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ if (!pdb_getgrsid(map, group_sid)) {
DEBUG(0, ("Primary group of %s has no mapping!\n",
pdb_get_username(sam_account)));
} else {
- if (map.gid != passwd->pw_gid) {
- if (!(grp = getgrgid(map.gid))) {
+ if (map->gid != passwd->pw_gid) {
+ if (!(grp = getgrgid(map->gid))) {
DEBUG(0, ("Could not find unix group %lu for user %s (group SID=%s)\n",
- (unsigned long)map.gid, pdb_get_username(sam_account), sid_string_tos(&group_sid)));
+ (unsigned long)map->gid, pdb_get_username(sam_account), sid_string_tos(&group_sid)));
} else {
smb_set_primary_group(grp->gr_name, pdb_get_username(sam_account));
}
done:
TALLOC_FREE(sam_account);
+ TALLOC_FREE(map);
return nt_ret;
}
uint32_t rid,
struct netr_DELTA_GROUP *r)
{
- fstring name;
- fstring comment;
struct group *grp = NULL;
- DOM_SID group_sid;
+ struct dom_sid group_sid;
fstring sid_string;
- GROUP_MAP map;
+ GROUP_MAP *map;
bool insert = true;
- fstrcpy(name, r->group_name.string);
- fstrcpy(comment, r->description.string);
-
+ map = talloc_zero(mem_ctx, GROUP_MAP);
+ if (!map) {
+ return NT_STATUS_NO_MEMORY;
+ }
/* add the group to the mapping table */
sid_compose(&group_sid, get_global_sam_sid(), rid);
sid_to_fstring(sid_string, &group_sid);
- if (pdb_getgrsid(&map, group_sid)) {
- if ( map.gid != -1 )
- grp = getgrgid(map.gid);
+ if (pdb_getgrsid(map, group_sid)) {
+ if (map->gid != -1) {
+ grp = getgrgid(map->gid);
+ }
insert = false;
}
+ map->nt_name = talloc_strdup(map, r->group_name.string);
+ if (!map->nt_name) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ map->comment = talloc_strdup(map, r->description.string);
+ if (!map->comment) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
if (grp == NULL) {
gid_t gid;
/* No group found from mapping, find it from its name. */
- if ((grp = getgrnam(name)) == NULL) {
+ if ((grp = getgrnam(map->nt_name)) == NULL) {
/* No appropriate group found, create one */
- d_printf("Creating unix group: '%s'\n", name);
+ d_printf("Creating unix group: '%s'\n", map->nt_name);
- if (smb_create_group(name, &gid) != 0)
+ if (smb_create_group(map->nt_name, &gid) != 0)
return NT_STATUS_ACCESS_DENIED;
- if ((grp = getgrnam(name)) == NULL)
+ if ((grp = getgrnam(map->nt_name)) == NULL)
return NT_STATUS_ACCESS_DENIED;
}
}
- map.gid = grp->gr_gid;
- map.sid = group_sid;
- map.sid_name_use = SID_NAME_DOM_GRP;
- fstrcpy(map.nt_name, name);
- if (r->description.string) {
- fstrcpy(map.comment, comment);
+ map->gid = grp->gr_gid;
+ map->sid = group_sid;
+ map->sid_name_use = SID_NAME_DOM_GRP;
+
+ if (insert) {
+ pdb_add_group_mapping_entry(map);
} else {
- fstrcpy(map.comment, "");
+ pdb_update_group_mapping_entry(map);
}
- if (insert)
- pdb_add_group_mapping_entry(&map);
- else
- pdb_update_group_mapping_entry(&map);
-
+ TALLOC_FREE(map);
return NT_STATUS_OK;
}
int i;
char **nt_members = NULL;
char **unix_members;
- DOM_SID group_sid;
- GROUP_MAP map;
+ struct dom_sid group_sid;
+ GROUP_MAP *map;
struct group *grp;
if (r->num_rids == 0) {
sid_compose(&group_sid, get_global_sam_sid(), rid);
- if (!get_domain_group_from_sid(group_sid, &map)) {
+ map = talloc_zero(mem_ctx, GROUP_MAP);
+ if (!map) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ if (!get_domain_group_from_sid(group_sid, map)) {
DEBUG(0, ("Could not find global group %d\n", rid));
+ TALLOC_FREE(map);
return NT_STATUS_NO_SUCH_GROUP;
}
- if (!(grp = getgrgid(map.gid))) {
- DEBUG(0, ("Could not find unix group %lu\n", (unsigned long)map.gid));
+ if (!(grp = getgrgid(map->gid))) {
+ DEBUG(0, ("Could not find unix group %lu\n",
+ (unsigned long)map->gid));
+ TALLOC_FREE(map);
return NT_STATUS_NO_SUCH_GROUP;
}
+ TALLOC_FREE(map);
+
d_printf("Group members of %s: ", grp->gr_name);
if (r->num_rids) {
- if ((nt_members = TALLOC_ZERO_ARRAY(mem_ctx, char *, r->num_rids)) == NULL) {
+ if ((nt_members = talloc_zero_array(mem_ctx, char *, r->num_rids)) == NULL) {
DEBUG(0, ("talloc failed\n"));
return NT_STATUS_NO_MEMORY;
}
for (i=0; i < r->num_rids; i++) {
struct samu *member = NULL;
- DOM_SID member_sid;
+ struct dom_sid member_sid;
if ( !(member = samu_new(mem_ctx)) ) {
return NT_STATUS_NO_MEMORY;
static NTSTATUS fetch_alias_info(TALLOC_CTX *mem_ctx,
uint32_t rid,
struct netr_DELTA_ALIAS *r,
- const DOM_SID *dom_sid)
+ const struct dom_sid *dom_sid)
{
- fstring name;
- fstring comment;
struct group *grp = NULL;
- DOM_SID alias_sid;
+ struct dom_sid alias_sid;
fstring sid_string;
- GROUP_MAP map;
+ GROUP_MAP *map;
bool insert = true;
- fstrcpy(name, r->alias_name.string);
- fstrcpy(comment, r->description.string);
+ map = talloc_zero(mem_ctx, GROUP_MAP);
+ if (!map) {
+ return NT_STATUS_NO_MEMORY;
+ }
/* Find out whether the group is already mapped */
sid_compose(&alias_sid, dom_sid, rid);
sid_to_fstring(sid_string, &alias_sid);
- if (pdb_getgrsid(&map, alias_sid)) {
- grp = getgrgid(map.gid);
+ if (pdb_getgrsid(map, alias_sid)) {
+ grp = getgrgid(map->gid);
insert = false;
}
+ map->nt_name = talloc_strdup(map, r->alias_name.string);
+ if (!map->nt_name) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ map->comment = talloc_strdup(map, r->description.string);
+ if (!map->comment) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
if (grp == NULL) {
gid_t gid;
/* No group found from mapping, find it from its name. */
- if ((grp = getgrnam(name)) == NULL) {
+ if ((grp = getgrnam(map->nt_name)) == NULL) {
/* No appropriate group found, create one */
- d_printf("Creating unix group: '%s'\n", name);
- if (smb_create_group(name, &gid) != 0)
+ d_printf("Creating unix group: '%s'\n", map->nt_name);
+ if (smb_create_group(map->nt_name, &gid) != 0)
return NT_STATUS_ACCESS_DENIED;
if ((grp = getgrgid(gid)) == NULL)
return NT_STATUS_ACCESS_DENIED;
}
}
- map.gid = grp->gr_gid;
- map.sid = alias_sid;
-
- if (sid_equal(dom_sid, &global_sid_Builtin))
- map.sid_name_use = SID_NAME_WKN_GRP;
- else
- map.sid_name_use = SID_NAME_ALIAS;
+ map->gid = grp->gr_gid;
+ map->sid = alias_sid;
- fstrcpy(map.nt_name, name);
- fstrcpy(map.comment, comment);
+ if (dom_sid_equal(dom_sid, &global_sid_Builtin)) {
+ map->sid_name_use = SID_NAME_WKN_GRP;
+ } else {
+ map->sid_name_use = SID_NAME_ALIAS;
+ }
- if (insert)
- pdb_add_group_mapping_entry(&map);
- else
- pdb_update_group_mapping_entry(&map);
+ if (insert) {
+ pdb_add_group_mapping_entry(map);
+ } else {
+ pdb_update_group_mapping_entry(map);
+ }
+ TALLOC_FREE(map);
return NT_STATUS_OK;
}
static NTSTATUS fetch_alias_mem(TALLOC_CTX *mem_ctx,
uint32_t rid,
struct netr_DELTA_ALIAS_MEMBER *r,
- const DOM_SID *dom_sid)
+ const struct dom_sid *dom_sid)
{
return NT_STATUS_OK;
}
nt_errstr(status));
}
- u_max_age = uint64s_nt_time_to_unix_abs((uint64 *)&r->max_password_age);
- u_min_age = uint64s_nt_time_to_unix_abs((uint64 *)&r->min_password_age);
- u_logout = uint64s_nt_time_to_unix_abs((uint64 *)&r->force_logoff_time);
+ u_max_age = uint64s_nt_time_to_unix_abs((uint64_t *)&r->max_password_age);
+ u_min_age = uint64s_nt_time_to_unix_abs((uint64_t *)&r->min_password_age);
+ u_logout = uint64s_nt_time_to_unix_abs((uint64_t *)&r->force_logoff_time);
domname = r->domain_name.string;
if (!domname) {
return nt_status;
if (!pdb_set_account_policy(PDB_POLICY_MAX_PASSWORD_AGE,
- (uint32)u_max_age))
+ (uint32_t)u_max_age))
return nt_status;
if (!pdb_set_account_policy(PDB_POLICY_MIN_PASSWORD_AGE,
- (uint32)u_min_age))
+ (uint32_t)u_min_age))
return nt_status;
if (!pdb_set_account_policy(PDB_POLICY_TIME_TO_LOGOUT,
- (uint32)u_logout))
+ (uint32_t)u_logout))
return nt_status;
if (lockstr) {