/*
Unix SMB/Netbios implementation.
- Version 1.9.
+ Version 3.0
Password and authentication handling
Copyright (C) Jeremy Allison 1996-2001
Copyright (C) Luke Kenneth Casson Leighton 1996-1998
Copyright (C) Gerald (Jerry) Carter 2000-2001
+ Copyright (C) Andrew Bartlett 2001-2002
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
}
-/*************************************************************
- Initialises a struct sam_disp_info.
- **************************************************************/
-
-static void pdb_init_dispinfo(struct sam_disp_info *user)
-{
- if (user == NULL)
- return;
- ZERO_STRUCTP(user);
-}
-
/************************************************************
Fill the SAM_ACCOUNT with default values.
***********************************************************/
-static BOOL pdb_fill_default_sam(SAM_ACCOUNT *user)
+static void pdb_fill_default_sam(SAM_ACCOUNT *user)
+{
+ ZERO_STRUCT(user->private); /* Don't touch the talloc context */
+
+ /* Don't change these timestamp settings without a good reason.
+ They are important for NT member server compatibility. */
+
+ user->private.init_flag = FLAG_SAM_UNINIT;
+ user->private.uid = user->private.gid = -1;
+
+ user->private.logon_time = (time_t)0;
+ user->private.pass_last_set_time = (time_t)0;
+ user->private.pass_can_change_time = (time_t)0;
+ user->private.logoff_time =
+ user->private.kickoff_time =
+ user->private.pass_must_change_time = get_time_t_max();
+ user->private.unknown_3 = 0x00ffffff; /* don't know */
+ user->private.logon_divs = 168; /* hours per week */
+ user->private.hours_len = 21; /* 21 times 8 bits = 168 */
+ memset(user->private.hours, 0xff, user->private.hours_len); /* available at all hours */
+ user->private.unknown_5 = 0x00000000; /* don't know */
+ user->private.unknown_6 = 0x000004ec; /* don't know */
+
+ /* Some parts of samba strlen their pdb_get...() returns,
+ so this keeps the interface unchanged for now. */
+
+ user->private.username = "";
+ user->private.domain = "";
+ user->private.nt_username = "";
+ user->private.full_name = "";
+ user->private.home_dir = "";
+ user->private.logon_script = "";
+ user->private.profile_path = "";
+ user->private.acct_desc = "";
+ user->private.workstations = "";
+ user->private.unknown_str = "";
+ user->private.munged_dial = "";
+}
+
+static void destroy_pdb_talloc(SAM_ACCOUNT **user)
{
- if (user == NULL) {
- DEBUG(0,("pdb_fill_default_sam: SAM_ACCOUNT was NULL\n"));
- return False;
+ if (*user) {
+ talloc_destroy((*user)->mem_ctx);
+ *user = NULL;
}
-
- ZERO_STRUCTP(user);
- user->logon_time = (time_t)0;
- user->pass_last_set_time = (time_t)0;
- user->pass_can_change_time = (time_t)0;
- user->logoff_time =
- user->kickoff_time =
- user->pass_must_change_time = get_time_t_max();
-
- user->unknown_3 = 0x00ffffff; /* don't know */
- user->logon_divs = 168; /* hours per week */
- user->hours_len = 21; /* 21 times 8 bits = 168 */
- memset(user->hours, 0xff, user->hours_len); /* available at all hours */
- user->unknown_5 = 0x00000000; /* don't know */
- user->unknown_6 = 0x000004ec; /* don't know */
- return True;
-}
+}
-/*************************************************************
- Alloc memory and initialises a struct sam_passwd.
- ************************************************************/
+/**********************************************************************
+ Alloc memory and initialises a struct sam_passwd on supplied mem_ctx.
+***********************************************************************/
-BOOL pdb_init_sam(SAM_ACCOUNT **user)
+NTSTATUS pdb_init_sam_talloc(TALLOC_CTX *mem_ctx, SAM_ACCOUNT **user)
{
if (*user != NULL) {
DEBUG(0,("pdb_init_sam: SAM_ACCOUNT was non NULL\n"));
#if 0
smb_panic("NULL pointer passed to pdb_init_sam\n");
#endif
- return False;
+ return NT_STATUS_UNSUCCESSFUL;
}
-
- *user=(SAM_ACCOUNT *)malloc(sizeof(SAM_ACCOUNT));
-
+
+ if (!mem_ctx) {
+ DEBUG(0,("pdb_init_sam_talloc: mem_ctx was NULL!\n"));
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ *user=(SAM_ACCOUNT *)talloc(mem_ctx, sizeof(SAM_ACCOUNT));
+
if (*user==NULL) {
DEBUG(0,("pdb_init_sam: error while allocating memory\n"));
- return False;
+ return NT_STATUS_NO_MEMORY;
}
+ (*user)->mem_ctx = mem_ctx;
+
+ (*user)->free_fn = NULL;
+
pdb_fill_default_sam(*user);
+
+ return NT_STATUS_OK;
+}
- return True;
+
+/*************************************************************
+ Alloc memory and initialises a struct sam_passwd.
+ ************************************************************/
+
+NTSTATUS pdb_init_sam(SAM_ACCOUNT **user)
+{
+ TALLOC_CTX *mem_ctx;
+ NTSTATUS nt_status;
+
+ mem_ctx = talloc_init_named("passdb internal SAM_ACCOUNT allocation");
+
+ if (!mem_ctx) {
+ DEBUG(0,("pdb_init_sam: error while doing talloc_init()\n"));
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_talloc(mem_ctx, user))) {
+ talloc_destroy(mem_ctx);
+ return nt_status;
+ }
+
+ (*user)->free_fn = destroy_pdb_talloc;
+
+ return NT_STATUS_OK;
}
Initialises a struct sam_passwd with sane values.
************************************************************/
-BOOL pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, struct passwd *pwd)
+NTSTATUS pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, const struct passwd *pwd)
{
+ pstring str;
+ GROUP_MAP map;
+ uint32 rid;
+ NTSTATUS nt_status;
+
if (!pwd) {
new_sam_acct = NULL;
- return False;
+ return NT_STATUS_UNSUCCESSFUL;
}
- if (!pdb_init_sam(new_sam_acct)) {
+ if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(new_sam_acct))) {
new_sam_acct = NULL;
- return False;
+ return nt_status;
}
pdb_set_username(*new_sam_acct, pwd->pw_name);
pdb_set_fullname(*new_sam_acct, pwd->pw_gecos);
+
pdb_set_uid(*new_sam_acct, pwd->pw_uid);
pdb_set_gid(*new_sam_acct, pwd->pw_gid);
- pdb_set_profile_path(*new_sam_acct, lp_logon_path());
- pdb_set_homedir(*new_sam_acct, lp_logon_home());
- pdb_set_dir_drive(*new_sam_acct, lp_logon_drive());
- pdb_set_logon_script(*new_sam_acct, lp_logon_script());
- return True;
+
+ pdb_set_user_rid(*new_sam_acct, pdb_uid_to_user_rid(pwd->pw_uid));
+
+ /* call the mapping code here */
+ if(get_group_map_from_gid(pwd->pw_gid, &map, MAPPING_WITHOUT_PRIV)) {
+ sid_peek_rid(&map.sid, &rid);
+ }
+ else {
+ rid=pdb_gid_to_group_rid(pwd->pw_gid);
+ }
+
+ pdb_set_group_rid(*new_sam_acct, rid);
+
+ pstrcpy(str, lp_logon_path());
+ standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+ pdb_set_profile_path(*new_sam_acct, str, False);
+
+ pstrcpy(str, lp_logon_home());
+ standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+ pdb_set_homedir(*new_sam_acct, str, False);
+
+ pstrcpy(str, lp_logon_drive());
+ standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+ pdb_set_dir_drive(*new_sam_acct, str, False);
+
+ pstrcpy(str, lp_logon_script());
+ standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+ pdb_set_logon_script(*new_sam_acct, str, False);
+
+ return NT_STATUS_OK;
}
-/************************************************************
- Free the NT/LM hashes only.
- ***********************************************************/
+/**
+ * Free the contets of the SAM_ACCOUNT, but not the structure.
+ *
+ * Also wipes the LM and NT hashes from memory.
+ *
+ * @param user SAM_ACCOUNT to free members of.
+ **/
-static BOOL pdb_free_sam_contents(SAM_ACCOUNT *user)
+static void pdb_free_sam_contents(SAM_ACCOUNT *user)
{
- if (user == NULL) {
- DEBUG(0,("pdb_free_sam_contents: SAM_ACCOUNT was NULL\n"));
-#if 0
- smb_panic("NULL pointer passed to pdb_free_sam_contents\n");
-#endif
- return False;
- }
-
/* As we start mallocing more strings this is where
we should free them. */
- SAFE_FREE(user->nt_pw);
- SAFE_FREE(user->lm_pw);
-
- return True;
+ data_blob_clear_free(&(user->private.lm_pw));
+ data_blob_clear_free(&(user->private.nt_pw));
}
/************************************************************
Reset the SAM_ACCOUNT and free the NT/LM hashes.
- - note: they are not zero'ed out however.
***********************************************************/
-BOOL pdb_reset_sam(SAM_ACCOUNT *user)
+NTSTATUS pdb_reset_sam(SAM_ACCOUNT *user)
{
if (user == NULL) {
DEBUG(0,("pdb_reset_sam: SAM_ACCOUNT was NULL\n"));
#if 0
smb_panic("NULL pointer passed to pdb_free_sam\n");
#endif
- return False;
+ return NT_STATUS_UNSUCCESSFUL;
}
- if (!pdb_free_sam_contents(user)) {
- return False;
- }
+ pdb_free_sam_contents(user);
- if (!pdb_fill_default_sam(user)) {
- return False;
- }
+ pdb_fill_default_sam(user);
- return True;
+ return NT_STATUS_OK;
}
/************************************************************
- Free the SAM_ACCOUNT and the NT/LM hashes.
+ Free the SAM_ACCOUNT and the member pointers.
***********************************************************/
-BOOL pdb_free_sam(SAM_ACCOUNT **user)
+NTSTATUS pdb_free_sam(SAM_ACCOUNT **user)
{
if (*user == NULL) {
DEBUG(0,("pdb_free_sam: SAM_ACCOUNT was NULL\n"));
#if 0
smb_panic("NULL pointer passed to pdb_free_sam\n");
#endif
- return False;
+ return NT_STATUS_UNSUCCESSFUL;
}
- if (!pdb_free_sam_contents(*user)) {
- return False;
+ pdb_free_sam_contents(*user);
+
+ if ((*user)->free_fn) {
+ (*user)->free_fn(user);
}
- SAFE_FREE(*user);
-
- return True;
+ return NT_STATUS_OK;
}
-/*************************************************************************
- Routine to return the next entry in the sam passwd list.
- *************************************************************************/
-
-struct sam_disp_info *pdb_sam_to_dispinfo(SAM_ACCOUNT *user)
-{
- static struct sam_disp_info disp_info;
-
- if (user == NULL)
- return NULL;
-
- pdb_init_dispinfo(&disp_info);
-
- disp_info.smb_name = user->username;
- disp_info.full_name = user->full_name;
- disp_info.user_rid = user->user_rid;
-
- return &disp_info;
-}
-
/**********************************************************
Encode the account control bits into a string.
length = length of string to encode into (including terminating
Routine to set 32 hex password characters from a 16 byte array.
**************************************************************/
-void pdb_sethexpwd(char *p, unsigned char *pwd, uint16 acct_ctrl)
+void pdb_sethexpwd(char *p, const unsigned char *pwd, uint16 acct_ctrl)
{
if (pwd != NULL) {
int i;
into a 16 byte array.
**************************************************************/
-BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
+BOOL pdb_gethexpwd(const char *p, unsigned char *pwd)
{
int i;
unsigned char lonybble, hinybble;
Group and User RID username mapping function
********************************************************************/
-BOOL pdb_name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid)
+BOOL pdb_name_to_rid(const char *user_name, uint32 *u_rid, uint32 *g_rid)
{
- struct passwd *pw = Get_Pwnam(user_name, False);
+ GROUP_MAP map;
+ struct passwd *pw = Get_Pwnam(user_name);
if (u_rid == NULL || g_rid == NULL || user_name == NULL)
return False;
*u_rid = pdb_uid_to_user_rid(pw->pw_uid);
/* absolutely no idea what to do about the unix GID to Domain RID mapping */
- *g_rid = pdb_gid_to_group_rid(pw->pw_gid);
+ /* map it ! */
+ if (get_group_map_from_gid(pw->pw_gid, &map, MAPPING_WITHOUT_PRIV)) {
+ sid_peek_rid(&map.sid, g_rid);
+ } else
+ *g_rid = pdb_gid_to_group_rid(pw->pw_gid);
return True;
}
return (uid_t)(((user_rid & (~USER_RID_TYPE))- 1000)/RID_MULTIPLIER);
}
+
/*******************************************************************
- Converts NT user RID to a UNIX gid.
+ Converts NT group RID to a UNIX gid.
********************************************************************/
-gid_t pdb_user_rid_to_gid(uint32 user_rid)
+gid_t pdb_group_rid_to_gid(uint32 group_rid)
{
- return (uid_t)(((user_rid & (~GROUP_RID_TYPE))- 1000)/RID_MULTIPLIER);
+ return (gid_t)(((group_rid & (~GROUP_RID_TYPE))- 1000)/RID_MULTIPLIER);
}
/*******************************************************************
/*******************************************************************
converts NT Group RID to a UNIX uid.
+
+ warning: you must not call that function only
+ you must do a call to the group mapping first.
+ there is not anymore a direct link between the gid and the rid.
********************************************************************/
uint32 pdb_gid_to_group_rid(gid_t gid)
Convert a rid into a name. Used in the lookup SID rpc.
********************************************************************/
-BOOL local_lookup_rid(uint32 rid, char *name, enum SID_NAME_USE *psid_name_use)
+BOOL local_lookup_sid(DOM_SID *sid, char *name, enum SID_NAME_USE *psid_name_use)
{
- BOOL is_user = pdb_rid_is_user(rid);
+ uint32 rid;
+ BOOL is_user;
+
+ sid_peek_rid(sid, &rid);
+ is_user = pdb_rid_is_user(rid);
+ *psid_name_use = SID_NAME_UNKNOWN;
- DEBUG(5,("local_lookup_rid: looking up %s RID %u.\n", is_user ? "user" :
+ DEBUG(5,("local_lookup_sid: looking up %s RID %u.\n", is_user ? "user" :
"group", (unsigned int)rid));
if(is_user) {
if(rid == DOMAIN_USER_RID_ADMIN) {
pstring admin_users;
char *p = admin_users;
+ *psid_name_use = SID_NAME_USER;
if(!next_token(&p, name, NULL, sizeof(fstring)))
fstrcpy(name, "Administrator");
} else if (rid == DOMAIN_USER_RID_GUEST) {
pstring guest_users;
char *p = guest_users;
+ *psid_name_use = SID_NAME_USER;
if(!next_token(&p, name, NULL, sizeof(fstring)))
fstrcpy(name, "Guest");
} else {
*psid_name_use = SID_NAME_USER;
- DEBUG(5,("local_lookup_rid: looking up uid %u %s\n", (unsigned int)uid,
+ DEBUG(5,("local_lookup_sid: looking up uid %u %s\n", (unsigned int)uid,
pass ? "succeeded" : "failed" ));
if(!pass) {
fstrcpy(name, pass->pw_name);
- DEBUG(5,("local_lookup_rid: found user %s for rid %u\n", name,
+ DEBUG(5,("local_lookup_sid: found user %s for rid %u\n", name,
(unsigned int)rid ));
}
} else {
gid_t gid;
struct group *gr;
-
+ GROUP_MAP map;
+
/*
* Don't try to convert the rid to a name if running
* in appliance mode
if (lp_hide_local_users())
return False;
+
+ /* check if it's a mapped group */
+ if (get_group_map_from_sid(*sid, &map, MAPPING_WITHOUT_PRIV)) {
+ if (map.gid!=-1) {
+ DEBUG(5,("local_lookup_sid: mapped group %s to gid %u\n", map.nt_name, (unsigned int)map.gid));
+ fstrcpy(name, map.nt_name);
+ *psid_name_use = map.sid_name_use;
+ return True;
+ }
+ }
- gid = pdb_user_rid_to_gid(rid);
+ gid = pdb_group_rid_to_gid(rid);
gr = getgrgid(gid);
*psid_name_use = SID_NAME_ALIAS;
- DEBUG(5,("local_local_rid: looking up gid %u %s\n", (unsigned int)gid,
+ DEBUG(5,("local_lookup_sid: looking up gid %u %s\n", (unsigned int)gid,
gr ? "succeeded" : "failed" ));
if(!gr) {
slprintf(name, sizeof(fstring)-1, "unix_group.%u", (unsigned int)gid);
- return True;
+ return False;
}
fstrcpy( name, gr->gr_name);
- DEBUG(5,("local_lookup_rid: found group %s for rid %u\n", name,
+ DEBUG(5,("local_lookup_sid: found group %s for rid %u\n", name,
(unsigned int)rid ));
}
fstring user;
fstring domain;
+ *psid_name_use = SID_NAME_UNKNOWN;
+
/*
* domain and user may be quoted const strings, and map_username and
* friends can modify them. Make a modifiable copy. JRA.
(void)map_username(user);
- if((pass = Get_Pwnam(user, False))) {
+ if((pass = Get_Pwnam(user))) {
sid_append_rid( &local_sid, pdb_uid_to_user_rid(pass->pw_uid));
*psid_name_use = SID_NAME_USER;
} else {
/*
* Maybe it was a group ?
*/
- struct group *grp = getgrnam(user);
+ struct group *grp;
+ GROUP_MAP map;
+
+ /* check if it's a mapped group */
+ if (get_group_map_from_ntname(user, &map, MAPPING_WITHOUT_PRIV)) {
+ if (map.gid!=-1) {
+ /* yes it's a mapped group to a valid unix group */
+ sid_copy(&local_sid, &map.sid);
+ *psid_name_use = map.sid_name_use;
+ }
+ else
+ /* it's a correct name but not mapped so it points to nothing*/
+ return False;
+ } else {
+ /* it's not a mapped group */
+ grp = getgrnam(user);
+ if(!grp)
+ return False;
- if(!grp)
- return False;
+ /*
+ *check if it's mapped, if it is reply it doesn't exist
+ *
+ * that's to prevent this case:
+ *
+ * unix group ug is mapped to nt group ng
+ * someone does a lookup on ug
+ * we must not reply as it doesn't "exist" anymore
+ * for NT. For NT only ng exists.
+ * JFM, 30/11/2001
+ */
+
+ if(get_group_map_from_gid(grp->gr_gid, &map, MAPPING_WITHOUT_PRIV)){
+ return False;
+ }
- sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
- *psid_name_use = SID_NAME_ALIAS;
+ sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
+ *psid_name_use = SID_NAME_ALIAS;
+ }
}
sid_copy( psid, &local_sid);
/*
* Ensure this uid really does exist.
*/
- if(!(pass = sys_getpwuid(*puid)))
+ if(!(pass = getpwuid_alloc(*puid)))
return False;
DEBUG(10,("local_sid_to_uid: SID %s -> uid (%u) (%s).\n", sid_to_string( str, psid),
(unsigned int)*puid, pass->pw_name ));
+ passwd_free(&pass);
+
+ *name_type = SID_NAME_USER;
+
return True;
}
DOM_SID *local_gid_to_sid(DOM_SID *psid, gid_t gid)
{
- extern DOM_SID global_sam_sid;
+ extern DOM_SID global_sam_sid;
+ GROUP_MAP map;
sid_copy(psid, &global_sam_sid);
- sid_append_rid(psid, pdb_gid_to_group_rid(gid));
+
+ if (get_group_map_from_gid(gid, &map, MAPPING_WITHOUT_PRIV)) {
+ sid_copy(psid, &map.sid);
+ }
+ else {
+ sid_append_rid(psid, pdb_gid_to_group_rid(gid));
+ }
return psid;
}
BOOL local_sid_to_gid(gid_t *pgid, DOM_SID *psid, enum SID_NAME_USE *name_type)
{
- extern DOM_SID global_sam_sid;
+ extern DOM_SID global_sam_sid;
DOM_SID dom_sid;
uint32 rid;
fstring str;
struct group *grp;
+ GROUP_MAP map;
*name_type = SID_NAME_UNKNOWN;
/*
* We can only convert to a gid if this is our local
* Domain SID (ie. we are the controling authority).
+ *
+ * Or in the Builtin SID too. JFM, 11/30/2001
*/
if (!sid_equal(&global_sam_sid, &dom_sid))
if (pdb_rid_is_user(rid))
return False;
- *pgid = pdb_user_rid_to_gid(rid);
+ if (get_group_map_from_sid(*psid, &map, MAPPING_WITHOUT_PRIV)) {
+
+ /* the SID is in the mapping table but not mapped */
+ if (map.gid==-1)
+ return False;
+
+ sid_peek_rid(&map.sid, &rid);
+ *pgid = rid;
+ *name_type = map.sid_name_use;
+ } else {
+ *pgid = pdb_group_rid_to_gid(rid);
+ *name_type = SID_NAME_ALIAS;
+ }
/*
* Ensure this gid really does exist.
return True;
}
-static void select_name(pstring string, const UNISTR2 *from)
+/**
+ * Quick hack to do an easy ucs2 -> mulitbyte conversion
+ * @return static buffer containing the converted string
+ **/
+
+static char *pdb_convert(const UNISTR2 *from)
{
- if (from->buffer != 0)
- unistr2_to_ascii(string, from, sizeof(pstring));
+ static pstring convert_buffer;
+ *convert_buffer = 0;
+ if (!from) {
+ return convert_buffer;
+ }
+
+ unistr2_to_ascii(convert_buffer, from, sizeof(pstring));
+ return convert_buffer;
}
/*************************************************************
if (from == NULL || to == NULL)
return;
- to->logon_time = nt_time_to_unix(&from->logon_time);
- to->logoff_time = nt_time_to_unix(&from->logoff_time);
- to->kickoff_time = nt_time_to_unix(&from->kickoff_time);
- to->pass_last_set_time = nt_time_to_unix(&from->pass_last_set_time);
- to->pass_can_change_time = nt_time_to_unix(&from->pass_can_change_time);
- to->pass_must_change_time = nt_time_to_unix(&from->pass_must_change_time);
-
- select_name(to->username , &from->uni_user_name );
- select_name(to->full_name , &from->uni_full_name );
- select_name(to->home_dir , &from->uni_home_dir );
- select_name(to->dir_drive , &from->uni_dir_drive );
- select_name(to->logon_script, &from->uni_logon_script);
- select_name(to->profile_path, &from->uni_profile_path);
- select_name(to->acct_desc , &from->uni_acct_desc );
- select_name(to->workstations, &from->uni_workstations);
- select_name(to->unknown_str , &from->uni_unknown_str );
- select_name(to->munged_dial , &from->uni_munged_dial );
-
- to->user_rid = from->user_rid;
- to->group_rid = from->group_rid;
-
- to->acct_ctrl = from->acb_info;
- to->unknown_3 = from->unknown_3;
-
- to->logon_divs = from->logon_divs;
- to->hours_len = from->logon_hrs.len;
- memcpy(to->hours, from->logon_hrs.hours, MAX_HOURS_LEN);
-
- to->unknown_5 = from->unknown_5;
- to->unknown_6 = from->unknown_6;
+ pdb_set_logon_time(to,nt_time_to_unix(&from->logon_time));
+ pdb_set_logoff_time(to,nt_time_to_unix(&from->logoff_time));
+ pdb_set_kickoff_time(to, nt_time_to_unix(&from->kickoff_time));
+ pdb_set_pass_last_set_time(to, nt_time_to_unix(&from->pass_last_set_time));
+ pdb_set_pass_can_change_time(to, nt_time_to_unix(&from->pass_can_change_time));
+ pdb_set_pass_must_change_time(to, nt_time_to_unix(&from->pass_must_change_time));
+
+ if (from->uni_user_name.buffer)
+ pdb_set_username(to , pdb_convert(&from->uni_user_name ));
+ if (from->uni_full_name.buffer)
+ pdb_set_fullname(to , pdb_convert(&from->uni_full_name ));
+ if (from->uni_home_dir.buffer)
+ pdb_set_homedir(to , pdb_convert(&from->uni_home_dir ), True);
+ if (from->uni_dir_drive.buffer)
+ pdb_set_dir_drive(to , pdb_convert(&from->uni_dir_drive ), True);
+ if (from->uni_logon_script.buffer)
+ pdb_set_logon_script(to , pdb_convert(&from->uni_logon_script), True);
+ if (from->uni_profile_path.buffer)
+ pdb_set_profile_path(to , pdb_convert(&from->uni_profile_path), True);
+ if (from->uni_acct_desc.buffer)
+ pdb_set_acct_desc(to , pdb_convert(&from->uni_acct_desc ));
+ if (from->uni_workstations.buffer)
+ pdb_set_workstations(to , pdb_convert(&from->uni_workstations));
+ if (from->uni_unknown_str.buffer)
+ pdb_set_unknown_str(to , pdb_convert(&from->uni_unknown_str ));
+ if (from->uni_munged_dial.buffer)
+ pdb_set_munged_dial(to , pdb_convert(&from->uni_munged_dial ));
+
+ if (from->user_rid)
+ pdb_set_user_rid(to, from->user_rid);
+ if (from->group_rid)
+ pdb_set_group_rid(to, from->group_rid);
+
+ pdb_set_acct_ctrl(to, from->acb_info);
+ pdb_set_unknown_3(to, from->unknown_3);
+
+ pdb_set_logon_divs(to, from->logon_divs);
+ pdb_set_hours_len(to, from->logon_hrs.len);
+ pdb_set_hours(to, from->logon_hrs.hours);
+
+ pdb_set_unknown_5(to, from->unknown_5);
+ pdb_set_unknown_6(to, from->unknown_6);
}
+
/*************************************************************
Copies a sam passwd.
**************************************************************/
if (from == NULL || to == NULL)
return;
- to->logon_time = nt_time_to_unix(&from->logon_time);
- to->logoff_time = nt_time_to_unix(&from->logoff_time);
- to->kickoff_time = nt_time_to_unix(&from->kickoff_time);
- to->pass_last_set_time = nt_time_to_unix(&from->pass_last_set_time);
- to->pass_can_change_time = nt_time_to_unix(&from->pass_can_change_time);
- to->pass_must_change_time = nt_time_to_unix(&from->pass_must_change_time);
-
- select_name(to->username , &from->uni_user_name );
- select_name(to->full_name , &from->uni_full_name );
- select_name(to->home_dir , &from->uni_home_dir );
- select_name(to->dir_drive , &from->uni_dir_drive );
- select_name(to->logon_script, &from->uni_logon_script);
- select_name(to->profile_path, &from->uni_profile_path);
- select_name(to->acct_desc , &from->uni_acct_desc );
- select_name(to->workstations, &from->uni_workstations);
- select_name(to->unknown_str , &from->uni_unknown_str );
- select_name(to->munged_dial , &from->uni_munged_dial );
-
- to->user_rid = from->user_rid;
- to->group_rid = from->group_rid;
-
+ pdb_set_logon_time(to,nt_time_to_unix(&from->logon_time));
+ pdb_set_logoff_time(to,nt_time_to_unix(&from->logoff_time));
+ pdb_set_kickoff_time(to, nt_time_to_unix(&from->kickoff_time));
+ pdb_set_pass_last_set_time(to, nt_time_to_unix(&from->pass_last_set_time));
+ pdb_set_pass_can_change_time(to, nt_time_to_unix(&from->pass_can_change_time));
+ pdb_set_pass_must_change_time(to, nt_time_to_unix(&from->pass_must_change_time));
+
+ if (from->uni_user_name.buffer)
+ pdb_set_username(to , pdb_convert(&from->uni_user_name ));
+ if (from->uni_full_name.buffer)
+ pdb_set_fullname(to , pdb_convert(&from->uni_full_name ));
+ if (from->uni_home_dir.buffer)
+ pdb_set_homedir(to , pdb_convert(&from->uni_home_dir ), True);
+ if (from->uni_dir_drive.buffer)
+ pdb_set_dir_drive(to , pdb_convert(&from->uni_dir_drive ), True);
+ if (from->uni_logon_script.buffer)
+ pdb_set_logon_script(to , pdb_convert(&from->uni_logon_script), True);
+ if (from->uni_profile_path.buffer)
+ pdb_set_profile_path(to , pdb_convert(&from->uni_profile_path), True);
+ if (from->uni_acct_desc.buffer)
+ pdb_set_acct_desc(to , pdb_convert(&from->uni_acct_desc ));
+ if (from->uni_workstations.buffer)
+ pdb_set_workstations(to , pdb_convert(&from->uni_workstations));
+ if (from->uni_unknown_str.buffer)
+ pdb_set_unknown_str(to , pdb_convert(&from->uni_unknown_str ));
+ if (from->uni_munged_dial.buffer)
+ pdb_set_munged_dial(to , pdb_convert(&from->uni_munged_dial ));
+
+ if (from->user_rid)
+ pdb_set_user_rid(to, from->user_rid);
+ if (from->group_rid)
+ pdb_set_group_rid(to, from->group_rid);
+
/* FIXME!! Do we need to copy the passwords here as well?
I don't know. Need to figure this out --jerry */
- to->acct_ctrl = from->acb_info;
- to->unknown_3 = from->unknown_3;
+ /* Passwords dealt with in caller --abartlet */
- to->logon_divs = from->logon_divs;
- to->hours_len = from->logon_hrs.len;
- memcpy(to->hours, from->logon_hrs.hours, MAX_HOURS_LEN);
-
- to->unknown_5 = from->unknown_5;
- to->unknown_6 = from->unknown_6;
-}
-
-/*************************************************************
- Copies a SAM_ACCOUNT.
- **************************************************************/
+ pdb_set_acct_ctrl(to, from->acb_info);
+ pdb_set_unknown_3(to, from->unknown_3);
-void copy_sam_passwd(SAM_ACCOUNT *to, const SAM_ACCOUNT *from)
-{
- if (!from || !to)
- return;
+ pdb_set_logon_divs(to, from->logon_divs);
+ pdb_set_hours_len(to, from->logon_hrs.len);
+ pdb_set_hours(to, from->logon_hrs.hours);
- memcpy(to, from, sizeof(SAM_ACCOUNT));
+ pdb_set_unknown_5(to, from->unknown_5);
+ pdb_set_unknown_6(to, from->unknown_6);
}
+
/*************************************************************
Change a password entry in the local smbpasswd file.
--jerry
*************************************************************/
-BOOL local_password_change(char *user_name, int local_flags,
- char *new_passwd,
+BOOL local_password_change(const char *user_name, int local_flags,
+ const char *new_passwd,
char *err_str, size_t err_str_len,
char *msg_str, size_t msg_str_len)
{
* Check for a local account - if we're adding only.
*/
- if(!(pwd = sys_getpwnam(user_name))) {
+ if(!(pwd = getpwnam_alloc(user_name))) {
slprintf(err_str, err_str_len - 1, "User %s does not \
exist in system password file (usually /etc/passwd). Cannot add \
account without a valid local system user.\n", user_name);
return False;
}
- if (!pdb_init_sam_pw(&sam_pass, pwd)) {
+ if (!NT_STATUS_IS_OK(pdb_init_sam_pw(&sam_pass, pwd))){
slprintf(err_str, err_str_len-1, "Failed initialise SAM_ACCOUNT for user %s.\n", user_name);
+ passwd_free(&pwd);
return False;
}
-
- /* set account flags. Note that the default is non-expiring accounts */
- if (!pdb_set_acct_ctrl(sam_pass,((local_flags & LOCAL_TRUST_ACCOUNT) ? ACB_WSTRUST : ACB_NORMAL|ACB_PWNOEXP) )) {
- slprintf(err_str, err_str_len-1, "Failed to set 'trust account' flags for user %s.\n", user_name);
- pdb_free_sam(&sam_pass);
- return False;
+
+ passwd_free(&pwd);
+
+ if (local_flags & LOCAL_TRUST_ACCOUNT) {
+ if (!pdb_set_acct_ctrl(sam_pass, ACB_WSTRUST)) {
+ slprintf(err_str, err_str_len - 1, "Failed to set 'trusted workstation account' flags for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
+ if (!pdb_set_acct_ctrl(sam_pass, ACB_DOMTRUST)) {
+ slprintf(err_str, err_str_len - 1, "Failed to set 'domain trust account' flags for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ } else {
+ if (!pdb_set_acct_ctrl(sam_pass, ACB_NORMAL)) {
+ slprintf(err_str, err_str_len - 1, "Failed to set 'normal account' flags for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
}
+
} else {
/* the entry already existed */
local_flags &= ~LOCAL_ADD_USER;
return False;
}
} else if (local_flags & LOCAL_ENABLE_USER) {
- if (pdb_get_lanman_passwd(sam_pass) == NULL) {
- if (!pdb_set_plaintext_passwd (sam_pass, new_passwd)) {
- slprintf(err_str, err_str_len-1, "Failed to set password for user %s.\n", user_name);
- pdb_free_sam(&sam_pass);
- return False;
- }
- }
if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED))) {
slprintf(err_str, err_str_len-1, "Failed to unset 'disabled' flag for user %s.\n", user_name);
pdb_free_sam(&sam_pass);
pdb_free_sam(&sam_pass);
return False;
}
-
- /* This is needed to preserve ACB_PWNOTREQ in mod_smbfilepwd_entry */
- if (!pdb_set_lanman_passwd (sam_pass, NULL)) {
- slprintf(err_str, err_str_len-1, "Failed to set NULL lanman password for user %s.\n", user_name);
- pdb_free_sam(&sam_pass);
- return False;
- }
- if (!pdb_set_nt_passwd (sam_pass, NULL)) {
- slprintf(err_str, err_str_len-1, "Failed to set NULL NT password for user %s.\n", user_name);
- pdb_free_sam(&sam_pass);
- return False;
- }
- } else {
+ } else if (local_flags & LOCAL_SET_PASSWORD) {
/*
* If we're dealing with setting a completely empty user account
* ie. One with a password of 'XXXX', but not set disabled (like
return True;
}
-/*********************************************************************
- Collection of get...() functions for SAM_ACCOUNT_INFO.
- ********************************************************************/
-
-uint16 pdb_get_acct_ctrl (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->acct_ctrl);
- else
- return (ACB_DISABLED);
-}
-
-time_t pdb_get_logon_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->logon_time);
- else
- return (0);
-}
-
-time_t pdb_get_logoff_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->logoff_time);
- else
- return (-1);
-}
-
-time_t pdb_get_kickoff_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->kickoff_time);
- else
- return (-1);
-}
-
-time_t pdb_get_pass_last_set_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->pass_last_set_time);
- else
- return (-1);
-}
-
-time_t pdb_get_pass_can_change_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->pass_can_change_time);
- else
- return (-1);
-}
-
-time_t pdb_get_pass_must_change_time (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->pass_must_change_time);
- else
- return (-1);
-}
-
-uint16 pdb_get_logon_divs (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->logon_divs);
- else
- return (-1);
-}
-
-uint32 pdb_get_hours_len (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->hours_len);
- else
- return (-1);
-}
-
-uint8* pdb_get_hours (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->hours);
- else
- return (NULL);
-}
-
-uint8* pdb_get_nt_passwd (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->nt_pw);
- else
- return (NULL);
-}
-
-uint8* pdb_get_lanman_passwd (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->lm_pw);
- else
- return (NULL);
-}
-
-uint32 pdb_get_user_rid (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->user_rid);
- else
- return (-1);
-}
-
-uint32 pdb_get_group_rid (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->group_rid);
- else
- return (-1);
-}
-
-uid_t pdb_get_uid (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->uid);
- else
- return ((uid_t)-1);
-}
-
-gid_t pdb_get_gid (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->gid);
- else
- return ((gid_t)-1);
-}
-
-char* pdb_get_username (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->username);
- else
- return (NULL);
-}
-
-char* pdb_get_domain (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->domain);
- else
- return (NULL);
-}
-
-char* pdb_get_nt_username (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->nt_username);
- else
- return (NULL);
-}
-
-char* pdb_get_fullname (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->full_name);
- else
- return (NULL);
-}
-
-char* pdb_get_homedir (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->home_dir);
- else
- return (NULL);
-}
-
-char* pdb_get_dirdrive (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->dir_drive);
- else
- return (NULL);
-}
-
-char* pdb_get_logon_script (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->logon_script);
- else
- return (NULL);
-}
-
-char* pdb_get_profile_path (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->profile_path);
- else
- return (NULL);
-}
-
-char* pdb_get_acct_desc (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->acct_desc);
- else
- return (NULL);
-}
-
-char* pdb_get_workstations (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->workstations);
- else
- return (NULL);
-}
-
-char* pdb_get_munged_dial (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->munged_dial);
- else
- return (NULL);
-}
-
-uint32 pdb_get_unknown3 (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->unknown_3);
- else
- return (-1);
-}
-
-uint32 pdb_get_unknown5 (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->unknown_5);
- else
- return (-1);
-}
-
-uint32 pdb_get_unknown6 (SAM_ACCOUNT *sampass)
-{
- if (sampass)
- return (sampass->unknown_6);
- else
- return (-1);
-}
-
-/*********************************************************************
- Collection of set...() functions for SAM_ACCOUNT_INFO.
- ********************************************************************/
-
-BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 flags)
-{
- if (!sampass)
- return False;
-
- if (sampass) {
- sampass->acct_ctrl = flags;
- return True;
- }
-
- return False;
-}
-
-BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->logon_time = mytime;
- return True;
-}
-
-BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->logoff_time = mytime;
- return True;
-}
-
-BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->kickoff_time = mytime;
- return True;
-}
-
-BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->pass_can_change_time = mytime;
- return True;
-}
-
-BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->pass_must_change_time = mytime;
- return True;
-}
-
-BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime)
-{
- if (!sampass)
- return False;
-
- sampass->pass_last_set_time = mytime;
- return True;
-}
-
-BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len)
-{
- if (!sampass)
- return False;
-
- sampass->hours_len = len;
- return True;
-}
-
-BOOL pdb_set_logons_divs (SAM_ACCOUNT *sampass, uint16 hours)
-{
- if (!sampass)
- return False;
-
- sampass->logon_divs = hours;
- return True;
-}
-
-BOOL pdb_set_uid (SAM_ACCOUNT *sampass, uid_t uid)
-{
- if (!sampass)
- return False;
-
- sampass->uid = uid;
- return True;
-}
-
-BOOL pdb_set_gid (SAM_ACCOUNT *sampass, gid_t gid)
-{
- if (!sampass)
- return False;
-
- sampass->gid = gid;
- return True;
-}
-
-BOOL pdb_set_user_rid (SAM_ACCOUNT *sampass, uint32 rid)
-{
- if (!sampass)
- return False;
-
- sampass->user_rid = rid;
- return True;
-}
+/***************************************************************************
+ Search by uid. Wrapper around pdb_getsampwnam()
+ **************************************************************************/
-BOOL pdb_set_group_rid (SAM_ACCOUNT *sampass, uint32 grid)
+BOOL pdb_getsampwuid (SAM_ACCOUNT* user, uid_t uid)
{
- if (!sampass)
- return False;
-
- sampass->group_rid = grid;
- return True;
-}
-
-/*********************************************************************
- Set the user's UNIX name.
- ********************************************************************/
+ struct passwd *pw;
+ fstring name;
-BOOL pdb_set_username(SAM_ACCOUNT *sampass, char *username)
-{
- if (!sampass)
- return False;
- *sampass->username = '\0';
- if (!username)
- return False;
-
- StrnCpy (sampass->username, username, strlen(username));
-
- return True;
-}
-
-/*********************************************************************
- Set the domain name.
- ********************************************************************/
-
-BOOL pdb_set_domain(SAM_ACCOUNT *sampass, char *domain)
-{
- if (!sampass)
- return False;
- *sampass->domain = '\0';
- if (!domain)
+ if (user==NULL) {
+ DEBUG(0,("pdb_getsampwuid: SAM_ACCOUNT is NULL.\n"));
return False;
-
- StrnCpy (sampass->domain, domain, strlen(domain));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's NT name.
- ********************************************************************/
-
-BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, char *nt_username)
-{
- if (!sampass)
- return False;
- *sampass->nt_username = '\0';
- if (!nt_username)
- return False;
-
- StrnCpy (sampass->nt_username, nt_username, strlen(nt_username));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's full name.
- ********************************************************************/
-
-BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, char *fullname)
-{
- if (!sampass)
- return False;
- *sampass->full_name = '\0';
- if (!fullname)
- return False;
-
- StrnCpy (sampass->full_name, fullname, strlen(fullname));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's logon script.
- ********************************************************************/
-
-BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, char *logon_script)
-{
- if (!sampass)
- return False;
- *sampass->logon_script = '\0';
- if (!logon_script)
- return False;
-
- StrnCpy (sampass->logon_script, logon_script, strlen(logon_script));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's profile path.
- ********************************************************************/
-
-BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, char *profile_path)
-{
- if (!sampass)
- return False;
- *sampass->profile_path = '\0';
- if (!profile_path)
- return False;
-
- StrnCpy (sampass->profile_path, profile_path, strlen(profile_path));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's directory drive.
- ********************************************************************/
-
-BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, char *dir_drive)
-{
- if (!sampass)
- return False;
- *sampass->dir_drive = '\0';
- if (!dir_drive)
- return False;
-
- StrnCpy (sampass->dir_drive, dir_drive, strlen(dir_drive));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's home directory.
- ********************************************************************/
-
-BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, char *homedir)
-{
- if (!sampass)
- return False;
- *sampass->home_dir = '\0';
- if (!homedir)
- return False;
-
- StrnCpy (sampass->home_dir, homedir, strlen(homedir));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's account description.
- ********************************************************************/
-
-BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, char *acct_desc)
-{
- if (!sampass)
- return False;
- *sampass->acct_desc = '\0';
- if (!acct_desc)
- return False;
-
- StrnCpy (sampass->acct_desc, acct_desc, strlen(acct_desc));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's workstation allowed list.
- ********************************************************************/
-
-BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, char *workstations)
-{
- if (!sampass)
- return False;
- *sampass->workstations = '\0';
- if (!workstations)
- return False;
-
- StrnCpy (sampass->workstations, workstations, strlen(workstations));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's dial string.
- ********************************************************************/
-
-BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, char *munged_dial)
-{
- if (!sampass)
- return False;
- *sampass->munged_dial = '\0';
- if (!munged_dial)
- return False;
-
- StrnCpy (sampass->munged_dial, munged_dial, strlen(munged_dial));
-
- return True;
-}
-
-/*********************************************************************
- Set the user's NT hash.
- ********************************************************************/
-
-BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, uint8 *pwd)
-{
- if (!sampass)
- return False;
-
- if (!pwd) {
- /* Allow setting to NULL */
- SAFE_FREE(sampass->nt_pw);
- return True;
}
- if (sampass->nt_pw!=NULL)
- DEBUG(4,("pdb_set_nt_passwd: NT hash non NULL overwritting ?\n"));
- else
- sampass->nt_pw=(unsigned char *)malloc(sizeof(unsigned char)*16);
-
- if (sampass->nt_pw==NULL)
- return False;
-
- memcpy (sampass->nt_pw, pwd, 16);
-
- return True;
-}
-
-/*********************************************************************
- Set the user's LM hash.
- ********************************************************************/
-
-BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, uint8 *pwd)
-{
- if (!sampass)
+ /*
+ * Never trust the uid in the passdb. Lookup the username first
+ * and then lokup the user by name in the sam.
+ */
+
+ if ((pw=getpwuid_alloc(uid)) == NULL) {
+ DEBUG(0,("pdb_getsampwuid: getpwuid(%d) return NULL. User does not exist in Unix accounts!\n", uid));
return False;
-
- if (!pwd) {
- /* Allow setting to NULL */
- SAFE_FREE(sampass->lm_pw);
- return True;
}
-
- if (sampass->lm_pw!=NULL)
- DEBUG(4,("pdb_set_lanman_passwd: LM hash non NULL overwritting ?\n"));
- else
- sampass->lm_pw=(unsigned char *)malloc(sizeof(unsigned char)*16);
-
- if (sampass->lm_pw==NULL)
- return False;
-
- memcpy (sampass->lm_pw, pwd, 16);
-
- return True;
-}
-
-/*********************************************************************
- Set the user's PLAINTEXT password. Used as an interface to the above.
- ********************************************************************/
-
-BOOL pdb_set_plaintext_passwd (SAM_ACCOUNT *sampass, char *plaintext)
-{
- uchar new_lanman_p16[16];
- uchar new_nt_p16[16];
-
- if (!sampass || !plaintext)
- return False;
- nt_lm_owf_gen (plaintext, new_nt_p16, new_lanman_p16);
-
- if (!pdb_set_nt_passwd (sampass, new_nt_p16))
- return False;
-
- if (!pdb_set_lanman_passwd (sampass, new_lanman_p16))
- return False;
-
- return True;
-}
+ fstrcpy (name, pw->pw_name);
-BOOL pdb_set_unknown_3 (SAM_ACCOUNT *sampass, uint32 unkn)
-{
- if (!sampass)
- return False;
-
- sampass->unknown_3 = unkn;
- return True;
-}
+ passwd_free(&pw);
-BOOL pdb_set_unknown_5 (SAM_ACCOUNT *sampass, uint32 unkn)
-{
- if (!sampass)
- return False;
+ return pdb_getsampwnam (user, name);
- sampass->unknown_5 = unkn;
- return True;
}
-BOOL pdb_set_unknown_6 (SAM_ACCOUNT *sampass, uint32 unkn)
-{
- if (!sampass)
- return False;
-
- sampass->unknown_6 = unkn;
- return True;
-}
-
-BOOL pdb_set_hours (SAM_ACCOUNT *sampass, uint8 *hours)
-{
- if (!sampass)
- return False;
-
- if (!hours) {
- memset ((char *)sampass->hours, 0, MAX_HOURS_LEN);
- return True;
- }
-
- memcpy (sampass->hours, hours, MAX_HOURS_LEN);
-
- return True;
-}
git.samba.org / ira / wip.git / blobdiff