/*
Unix SMB/Netbios implementation.
- Version 1.9.
+ Version 3.0
Password and authentication handling
- Copyright (C) Jeremy Allison 1996-1998
+ 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
#include "includes.h"
-extern int DEBUGLEVEL;
-
/*
* This is set on startup - it defines the SID for this
* machine, and therefore the SAM database for which it is
struct passdb_ops *pdb_ops;
+#if 0 /* JERRY */
static void* pdb_handle = NULL;
+#endif
/***************************************************************
Initialize the password db operations.
***************************************************************/
-BOOL initialize_password_db(BOOL reload)
-{
- char* modulename = lp_passdb_module_path();
-
- /* This function is unfinished right now, so just
- ignore the details and always return True. It is here
- only as a placeholder --jerry */
+BOOL initialize_password_db(BOOL reload)
+{
+ /*
+ * This function is unfinished right now, so just
+ * ignore the details and always return True. It
+ * is here only as a placeholder --jerry
+ */
return True;
- /* load another module? */
- if (reload && pdb_handle)
- {
- sys_dlclose (pdb_handle);
- pdb_handle = NULL;
+}
+
+
+/************************************************************
+ Fill the SAM_ACCOUNT with default values.
+ ***********************************************************/
+
+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) {
+ talloc_destroy((*user)->mem_ctx);
+ *user = NULL;
}
-
- /* do we have a module defined or use the default? */
- if (strlen (modulename) != 0)
- {
- if ((pdb_handle=sys_dlopen (modulename, RTLD_LAZY)) == NULL)
- {
- DEBUG(0,("initialize_password_db: ERROR - Unable to open passdb module \"%s\"!\n%s\n",
- modulename, dlerror()));
- }
- else
- DEBUG(1,("initialize_password_db: passdb module \"%s\" loaded successfully\n", modulename));
- }
-
- /* either no module name defined or the one that was failed
- to open. Let's try the default */
- if (pdb_handle == NULL)
- {
- if ((pdb_handle=sys_dlopen ("libpdbfile.so", RTLD_LAZY)) == NULL)
- {
- DEBUG(0,("initialize_password_db: ERROR - Unable to open \"libpdbfile.so\" passdb module! No user authentication possible!\n%s\n",
- dlerror()));
- return False;
- }
- else
- DEBUG(1,("initialize_password_db: passdb module \"libpdbfile.so\" loaded successfully\n"));
+}
+
+
+/**********************************************************************
+ Alloc memory and initialises a struct sam_passwd on supplied mem_ctx.
+***********************************************************************/
+
+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 NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (!mem_ctx) {
+ DEBUG(0,("pdb_init_sam_talloc: mem_ctx was NULL!\n"));
+ return NT_STATUS_UNSUCCESSFUL;
}
-
- return (pdb_handle != NULL);
+ *user=(SAM_ACCOUNT *)talloc(mem_ctx, sizeof(SAM_ACCOUNT));
+
+ if (*user==NULL) {
+ DEBUG(0,("pdb_init_sam: error while allocating memory\n"));
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ (*user)->mem_ctx = mem_ctx;
+
+ (*user)->free_fn = NULL;
+
+ pdb_fill_default_sam(*user);
+
+ return NT_STATUS_OK;
}
+
/*************************************************************
- initialises a struct sam_disp_info.
- **************************************************************/
-static void pdb_init_dispinfo(struct sam_disp_info *user)
+ Alloc memory and initialises a struct sam_passwd.
+ ************************************************************/
+
+NTSTATUS pdb_init_sam(SAM_ACCOUNT **user)
{
- if (user == NULL)
- return;
- ZERO_STRUCTP(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.
+ Initialises a struct sam_passwd with sane values.
************************************************************/
-void pdb_init_sam(SAM_ACCOUNT *user)
+
+NTSTATUS pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, const struct passwd *pwd)
{
- if (user == NULL)
- return;
+ pstring str;
+ GROUP_MAP map;
+ uint32 rid;
+ NTSTATUS nt_status;
+
+ if (!pwd) {
+ new_sam_acct = NULL;
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(new_sam_acct))) {
+ new_sam_acct = NULL;
+ 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_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);
- ZERO_STRUCTP(user);
-
- user->mem_ctx = talloc_init();
- DEBUG(10, ("pdb_init_sam: obtained a talloc context of 0x%x\n",
- (unsigned)user->mem_ctx));
-
- user->logon_time = (time_t)0;
- user->logoff_time = (time_t)-1;
- user->kickoff_time = (time_t)-1;
- user->pass_last_set_time = (time_t)-1;
- user->pass_can_change_time = (time_t)-1;
- user->pass_must_change_time = (time_t)-1;
-
- 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 NT_STATUS_OK;
}
-/************************************************************
- free all pointer members and then reinit the SAM_ACCOUNT
- ***********************************************************/
-void pdb_clear_sam(SAM_ACCOUNT *user)
+
+/**
+ * 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 void pdb_free_sam_contents(SAM_ACCOUNT *user)
{
- if (user == NULL)
- return;
+ /* As we start mallocing more strings this is where
+ we should free them. */
- /* free upany memory used */
- DEBUG(10, ("pdb_clear_sam: releasing memory. talloc context is 0x%x\n",(unsigned)user->mem_ctx));
- talloc_destroy (user->mem_ctx);
-
- /* now initialize */
- pdb_init_sam(user);
-
+ data_blob_clear_free(&(user->private.lm_pw));
+ data_blob_clear_free(&(user->private.nt_pw));
}
-/*************************************************************************
- Routine to return the next entry in the sam passwd list.
- *************************************************************************/
-struct sam_disp_info *pdb_sam_to_dispinfo(SAM_ACCOUNT *user)
+/************************************************************
+ Reset the SAM_ACCOUNT and free the NT/LM hashes.
+ ***********************************************************/
+
+NTSTATUS pdb_reset_sam(SAM_ACCOUNT *user)
{
- static struct sam_disp_info disp_info;
+ 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 NT_STATUS_UNSUCCESSFUL;
+ }
+
+ pdb_free_sam_contents(user);
+
+ pdb_fill_default_sam(user);
+
+ return NT_STATUS_OK;
+}
- if (user == NULL)
- return NULL;
- pdb_init_dispinfo(&disp_info);
+/************************************************************
+ Free the SAM_ACCOUNT and the member pointers.
+ ***********************************************************/
+
+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 NT_STATUS_UNSUCCESSFUL;
+ }
- disp_info.smb_name = user->username;
- disp_info.full_name = user->full_name;
- disp_info.user_rid = user->user_rid;
+ pdb_free_sam_contents(*user);
+
+ if ((*user)->free_fn) {
+ (*user)->free_fn(user);
+ }
- return &disp_info;
+ return NT_STATUS_OK;
}
length = length of string to encode into (including terminating
null). length *MUST BE MORE THAN 2* !
**********************************************************/
+
char *pdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length)
{
static fstring acct_str;
if (acct_ctrl & ACB_PWNOEXP ) acct_str[i++] = 'X';
if (acct_ctrl & ACB_DOMTRUST ) acct_str[i++] = 'I';
- for ( ; i < length - 2 ; i++ ) { acct_str[i] = ' '; }
+ for ( ; i < length - 2 ; i++ )
+ acct_str[i] = ' ';
i = length - 2;
acct_str[i++] = ']';
/**********************************************************
Decode the account control bits from a string.
-
- this function breaks coding standards minimum line width of 80 chars.
- reason: vertical line-up code clarity - all case statements fit into
- 15 lines, which is more important.
**********************************************************/
uint16 pdb_decode_acct_ctrl(const char *p)
* NT password (in the form [NDHTUWSLXI]).
*/
- if (*p != '[') return 0;
+ if (*p != '[')
+ return 0;
- for (p++; *p && !finished; p++)
- {
- switch (*p)
- {
+ for (p++; *p && !finished; p++) {
+ switch (*p) {
case 'N': { acct_ctrl |= ACB_PWNOTREQ ; break; /* 'N'o password. */ }
case 'D': { acct_ctrl |= ACB_DISABLED ; break; /* 'D'isabled. */ }
case 'H': { acct_ctrl |= ACB_HOMDIRREQ; break; /* 'H'omedir required. */ }
/*************************************************************
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;
Routine to get the 32 hex characters and turn them
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;
char *hexchars = "0123456789ABCDEF";
char *p1, *p2;
- if (!p) return (False);
+ if (!p)
+ return (False);
- for (i = 0; i < 32; i += 2)
- {
+ for (i = 0; i < 32; i += 2) {
hinybble = toupper(p[i]);
lonybble = toupper(p[i + 1]);
p2 = strchr(hexchars, lonybble);
if (!p1 || !p2)
- {
return (False);
- }
hinybble = PTR_DIFF(p1, hexchars);
lonybble = PTR_DIFF(p2, hexchars);
/*******************************************************************
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;
- }
- if (!pw)
- {
+ if (!pw) {
DEBUG(1,("Username %s is invalid on this system\n", user_name));
return False;
}
- if (user_in_list(user_name, lp_domain_guest_users()))
- {
- *u_rid = DOMAIN_USER_RID_GUEST;
- }
- else if (user_in_list(user_name, lp_domain_admin_users()))
- {
- *u_rid = DOMAIN_USER_RID_ADMIN;
- }
- else
- {
- /* turn the unix UID into a Domain RID. this is what the posix
- sub-system does (adds 1000 to the uid) */
- *u_rid = pdb_uid_to_user_rid(pw->pw_uid);
- }
+ /* turn the unix UID into a Domain RID. this is what the posix
+ sub-system does (adds 1000 to the uid) */
+ *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;
}
/*******************************************************************
Converts NT user RID to a UNIX uid.
********************************************************************/
+
uid_t pdb_user_rid_to_uid(uint32 user_rid)
{
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)
/*******************************************************************
Decides if a RID is a user or group RID.
********************************************************************/
+
BOOL pdb_rid_is_user(uint32 rid)
{
/* lkcl i understand that NT attaches an enumeration to a RID
/*******************************************************************
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)
{
+ uint32 rid;
+ BOOL is_user;
- BOOL is_user = pdb_rid_is_user(rid);
+ 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;
- pstrcpy( admin_users, lp_domain_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;
- pstrcpy( guest_users, lp_domain_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, True))) {
+ 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);
-
- if(!grp)
- return False;
+ 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;
- sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
- *psid_name_use = SID_NAME_ALIAS;
- } else {
+ /*
+ *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_uid_to_user_rid(pass->pw_uid));
- *psid_name_use = SID_NAME_USER;
+ sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
+ *psid_name_use = SID_NAME_ALIAS;
+ }
}
sid_copy( psid, &local_sid);
/****************************************************************************
Convert a uid to SID - locally.
****************************************************************************/
+
DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
{
extern DOM_SID global_sam_sid;
return psid;
}
-
/****************************************************************************
Convert a SID to uid - locally.
****************************************************************************/
+
BOOL local_sid_to_uid(uid_t *puid, DOM_SID *psid, enum SID_NAME_USE *name_type)
{
extern DOM_SID global_sam_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;
}
/****************************************************************************
Convert a gid to SID - locally.
****************************************************************************/
+
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;
}
/****************************************************************************
Convert a SID to gid - locally.
****************************************************************************/
+
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(fstring *string, char **name, 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(*string));
- *name = *string;
+ static pstring convert_buffer;
+ *convert_buffer = 0;
+ if (!from) {
+ return convert_buffer;
}
+
+ unistr2_to_ascii(convert_buffer, from, sizeof(pstring));
+ return convert_buffer;
}
/*************************************************************
- copies a SAM_USER_INFO_23 to a SAM_ACCOUNT
+ Copies a SAM_USER_INFO_23 to a SAM_ACCOUNT
**************************************************************/
+
void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
{
- static fstring smb_name;
- static fstring full_name;
- static fstring home_dir;
- static fstring dir_drive;
- static fstring logon_script;
- static fstring profile_path;
- static fstring acct_desc;
- static fstring workstations;
- static fstring unknown_str;
- static fstring munged_dial;
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(&smb_name , &to->username , &from->uni_user_name );
- select_name(&full_name , &to->full_name , &from->uni_full_name );
- select_name(&home_dir , &to->home_dir , &from->uni_home_dir );
- select_name(&dir_drive , &to->dir_drive , &from->uni_dir_drive );
- select_name(&logon_script, &to->logon_script, &from->uni_logon_script);
- select_name(&profile_path, &to->profile_path, &from->uni_profile_path);
- select_name(&acct_desc , &to->acct_desc , &from->uni_acct_desc );
- select_name(&workstations, &to->workstations, &from->uni_workstations);
- select_name(&unknown_str , &to->unknown_str , &from->uni_unknown_str );
- select_name(&munged_dial , &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.
+ Copies a sam passwd.
**************************************************************/
+
void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
{
- static fstring smb_name;
- static fstring full_name;
- static fstring home_dir;
- static fstring dir_drive;
- static fstring logon_script;
- static fstring profile_path;
- static fstring acct_desc;
- static fstring workstations;
- static fstring unknown_str;
- static fstring munged_dial;
-
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(&smb_name , &to->username , &from->uni_user_name );
- select_name(&full_name , &to->full_name , &from->uni_full_name );
- select_name(&home_dir , &to->home_dir , &from->uni_home_dir );
- select_name(&dir_drive , &to->dir_drive , &from->uni_dir_drive );
- select_name(&logon_script, &to->logon_script, &from->uni_logon_script);
- select_name(&profile_path, &to->profile_path, &from->uni_profile_path);
- select_name(&acct_desc , &to->acct_desc , &from->uni_acct_desc );
- select_name(&workstations, &to->workstations, &from->uni_workstations);
- select_name(&unknown_str , &to->unknown_str , &from->uni_unknown_str );
- select_name(&munged_dial , &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;
-
- 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 passwd.
- **************************************************************/
-void copy_sam_passwd(SAM_ACCOUNT *to, const SAM_ACCOUNT *from)
-{
- int len;
-
- if (!from || !to) return;
-
- pdb_clear_sam (to);
-
- /* copy all non-pointers */
- memcpy(to, from, sizeof(*from));
-
- if (from->username) {
- len=strlen(from->username)+1;
- to->username = talloc(to->mem_ctx, len);
- StrnCpy (to->username, from->username, len-1);
- }
-
- if (from->full_name) {
- len=strlen(from->full_name)+1;
- to->full_name = talloc(to->mem_ctx, len);
- StrnCpy (to->full_name, from->full_name, len-1);
- }
-
- if (from->nt_username) {
- len=strlen(from->nt_username)+1;
- to->nt_username = talloc(to->mem_ctx, len);
- StrnCpy (to->nt_username, from->nt_username, len-1);
- }
-
- if (from->profile_path) {
- len=strlen(from->profile_path)+1;
- to->profile_path = talloc(to->mem_ctx, len);
- StrnCpy (to->profile_path, from->profile_path, len-1);
- }
-
- if (from->logon_script) {
- len=strlen(from->logon_script)+1;
- to->logon_script = talloc(to->mem_ctx, len);
- StrnCpy (to->logon_script, from->logon_script, len-1);
- }
-
- if (from->home_dir) {
- len=strlen(from->home_dir)+1;
- to->home_dir = talloc(to->mem_ctx, len);
- StrnCpy (to->home_dir, from->home_dir, len-1);
- }
-
- if (from->dir_drive) {
- len=strlen(from->dir_drive)+1;
- to->dir_drive = talloc(to->mem_ctx, len);
- StrnCpy (to->dir_drive, from->dir_drive, len-1);
- }
-
- if (from->workstations) {
- len=strlen(from->workstations)+1;
- to->workstations = talloc(to->mem_ctx, len);
- StrnCpy (to->workstations, from->workstations, len-1);
- }
-
- if (from->acct_desc) {
- len=strlen(from->acct_desc)+1;
- to->acct_desc = talloc(to->mem_ctx, len);
- StrnCpy (to->acct_desc, from->acct_desc, len-1);
- }
-
- if (from->munged_dial) {
- len=strlen(from->munged_dial)+1;
- to->munged_dial = talloc(to->mem_ctx, len);
- StrnCpy (to->munged_dial, from->munged_dial, len);
- }
-
- if (from->unknown_str) {
- len=strlen(from->unknown_str)+1;
- to->unknown_str = talloc(to->mem_ctx, len);
- StrnCpy (to->unknown_str, from->unknown_str, len-1);
- }
+ /* Passwords dealt with in caller --abartlet */
+ pdb_set_acct_ctrl(to, from->acb_info);
+ pdb_set_unknown_3(to, from->unknown_3);
- if (from->nt_pw) {
- to->nt_pw = talloc(to->mem_ctx, 16);
- memcpy (to->nt_pw, from->nt_pw, 16);
- }
-
- if (from->lm_pw) {
- to->lm_pw = talloc(to->mem_ctx, 16);
- memcpy (to->lm_pw, from->lm_pw, 16);
- }
+ 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);
- return;
+ 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
+ Change a password entry in the local smbpasswd file.
FIXME!! The function needs to be abstracted into the
passdb interface or something. It is currently being called
- by _api_samr_create_user() in rpc_server/srv_samr.c
+ by _api_samr_create_user() in rpc_server/srv_samr.c,
+ in SWAT and by smbpasswd/pdbedit.
--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)
{
struct passwd *pwd = NULL;
- SAM_ACCOUNT *sam_pass;
- SAM_ACCOUNT new_sam_acct;
- uchar new_p16[16];
- uchar new_nt_p16[16];
+ SAM_ACCOUNT *sam_pass=NULL;
*err_str = '\0';
*msg_str = '\0';
- if (local_flags & LOCAL_ADD_USER) {
-
- /*
- * Check for a local account - if we're adding only.
- */
-
- if(!(pwd = sys_getpwnam(user_name))) {
- slprintf(err_str, err_str_len - 1, "User %s does not \
+ /* Get the smb passwd entry for this user */
+ pdb_init_sam(&sam_pass);
+ if(!pdb_getsampwnam(sam_pass, user_name)) {
+ pdb_free_sam(&sam_pass);
+
+ if (local_flags & LOCAL_ADD_USER) {
+ /*
+ * Check for a local account - if we're adding only.
+ */
+
+ 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;
- }
- }
-
- /* Calculate the MD4 hash (NT compatible) of the new password. */
- nt_lm_owf_gen(new_passwd, new_nt_p16, new_p16);
-
- /* Get the smb passwd entry for this user */
- sam_pass = pdb_getsampwnam(user_name);
- if (sam_pass == NULL)
- {
- if(!(local_flags & LOCAL_ADD_USER))
- {
+ return False;
+ }
+ } else {
slprintf(err_str, err_str_len-1,"Failed to find entry for user %s.\n", user_name);
return False;
}
- /* create the SAM_ACCOUNT struct and call pdb_add_sam_account.
- Because the new_sam_pwd only exists in the scope of this function
- we will not allocate memory for members */
- pdb_init_sam (&new_sam_acct);
- pdb_set_username (&new_sam_acct, user_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_pass_last_set_time(&new_sam_acct, time(NULL));
- 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());
-
- /* set account flags */
- pdb_set_acct_ctrl(&new_sam_acct,((local_flags & LOCAL_TRUST_ACCOUNT) ? ACB_WSTRUST : ACB_NORMAL) );
- if (local_flags & LOCAL_DISABLE_USER)
- {
- pdb_set_acct_ctrl (&new_sam_acct, pdb_get_acct_ctrl(&new_sam_acct)|ACB_DISABLED);
- }
- if (local_flags & LOCAL_SET_NO_PASSWORD)
- {
- pdb_set_acct_ctrl (&new_sam_acct, pdb_get_acct_ctrl(&new_sam_acct)|ACB_PWNOTREQ);
- }
- else
- {
- /* set the passwords here. if we get to here it means
- we have a valid, active account */
- pdb_set_lanman_passwd (&new_sam_acct, new_p16);
- pdb_set_nt_passwd (&new_sam_acct, new_nt_p16);
+ 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;
}
-
- if (pdb_add_sam_account(&new_sam_acct))
- {
- slprintf(msg_str, msg_str_len-1, "Added user %s.\n", user_name);
- pdb_clear_sam (&new_sam_acct);
- return True;
- }
- else
- {
- slprintf(err_str, err_str_len-1, "Failed to add entry for user %s.\n", user_name);
- 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
- {
+
+ } else {
/* the entry already existed */
local_flags &= ~LOCAL_ADD_USER;
}
* and the valid last change time.
*/
- if(local_flags & LOCAL_DISABLE_USER)
- {
- pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_DISABLED);
+ if (local_flags & LOCAL_DISABLE_USER) {
+ if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_DISABLED)) {
+ slprintf(err_str, err_str_len-1, "Failed to set 'disabled' flag for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ } else if (local_flags & LOCAL_ENABLE_USER) {
+ 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);
+ return False;
+ }
}
- else if (local_flags & LOCAL_ENABLE_USER)
- {
- if(pdb_get_lanman_passwd(sam_pass) == NULL)
- {
- pdb_set_lanman_passwd (sam_pass, new_p16);
- pdb_set_nt_passwd (sam_pass, new_nt_p16);
+
+ if (local_flags & LOCAL_SET_NO_PASSWORD) {
+ if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ)) {
+ slprintf(err_str, err_str_len-1, "Failed to set 'no password required' flag for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
}
- pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED));
- } else if (local_flags & LOCAL_SET_NO_PASSWORD)
- {
- pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ);
-
- /* This is needed to preserve ACB_PWNOTREQ in mod_smbfilepwd_entry */
- pdb_set_lanman_passwd (sam_pass, NULL);
- pdb_set_nt_passwd (sam_pass, NULL);
- }
- 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
* and the decision hasn't really been made to disable them (ie.
* don't create them disabled). JRA.
*/
- if ((pdb_get_lanman_passwd(sam_pass)==NULL) && (pdb_get_acct_ctrl(sam_pass)&ACB_DISABLED))
- pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED));
- pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_PWNOTREQ));
- pdb_set_lanman_passwd (sam_pass, new_p16);
- pdb_set_nt_passwd (sam_pass, new_nt_p16);
- }
-
- if(local_flags & LOCAL_DELETE_USER)
- {
- if (!pdb_delete_sam_account(user_name))
- {
- slprintf(err_str,err_str_len-1, "Failed to delete entry for user %s.\n", user_name);
+ if ((pdb_get_lanman_passwd(sam_pass)==NULL) && (pdb_get_acct_ctrl(sam_pass)&ACB_DISABLED)) {
+ 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);
+ return False;
+ }
+ }
+ if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_PWNOTREQ))) {
+ slprintf(err_str, err_str_len-1, "Failed to unset 'no password required' flag for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
return False;
}
- slprintf(msg_str, msg_str_len-1, "Deleted user %s.\n", user_name);
- }
- else
- {
- if(!pdb_update_sam_account(sam_pass, True))
- {
- slprintf(err_str, err_str_len-1, "Failed to modify entry for user %s.\n", user_name);
+
+ 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(local_flags & LOCAL_DISABLE_USER)
- slprintf(msg_str, msg_str_len-1, "Disabled user %s.\n", user_name);
- else if (local_flags & LOCAL_ENABLE_USER)
- slprintf(msg_str, msg_str_len-1, "Enabled user %s.\n", user_name);
- else if (local_flags & LOCAL_SET_NO_PASSWORD)
- slprintf(msg_str, msg_str_len-1, "User %s password set to none.\n", user_name);
- }
+ }
- 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;
-}
-
-BOOL pdb_set_group_rid (SAM_ACCOUNT *sampass, uint32 grid)
-{
- if (!sampass)
- return False;
-
- sampass->group_rid = grid;
- return True;
-}
-
-BOOL pdb_set_username (SAM_ACCOUNT *sampass, char *username)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!username)
- {
- sampass->username = NULL;
- return True;
- }
-
- len = strlen(username)+1;
- sampass->username = (char*)talloc(sampass->mem_ctx, len);
-
- if (sampass->username == NULL )
- {
- DEBUG (0,("pdb_set_username: ERROR - Unable to talloc memory for [%s]\n", username));
- return False;
- }
-
- StrnCpy (sampass->username, username, len-1);
-
- return True;
-}
-
-BOOL pdb_set_domain (SAM_ACCOUNT *sampass, char *domain)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!domain)
- {
- sampass->domain = NULL;
- return True;
- }
-
- len = strlen(domain)+1;
- sampass->domain = talloc (sampass->mem_ctx, len);
-
- if (sampass->domain == NULL )
- {
- DEBUG (0,("pdb_set_domain: ERROR - Unable to talloc memory for [%s]\n", domain));
- return False;
- }
-
- StrnCpy (sampass->domain, domain, len-1);
-
- return True;
-}
-
-BOOL pdb_set_nt_username (SAM_ACCOUNT *sampass, char *nt_username)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!nt_username)
- {
- sampass->nt_username = NULL;
- return True;
- }
-
- len = strlen(nt_username)+1;
- sampass->nt_username = talloc (sampass->mem_ctx, len);
-
- if (sampass->nt_username == NULL )
- {
- DEBUG (0,("pdb_set_nt_username: ERROR - Unable to talloc memory for [%s]\n", nt_username));
- return False;
- }
-
- StrnCpy (sampass->nt_username, nt_username, len-1);
-
- return True;
-}
-
-BOOL pdb_set_fullname (SAM_ACCOUNT *sampass, char *fullname)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!fullname)
- {
- sampass->full_name = NULL;
- return True;
- }
-
- len = strlen(fullname)+1;
- sampass->full_name = talloc (sampass->mem_ctx, len);
-
- if (sampass->full_name == NULL )
- {
- DEBUG (0,("pdb_set_fullname: ERROR - Unable to talloc memory for [%s]\n", fullname));
- return False;
- }
-
- StrnCpy (sampass->full_name, fullname, len-1);
-
- return True;
-}
-
-BOOL pdb_set_logon_script (SAM_ACCOUNT *sampass, char *logon_script)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!logon_script)
- {
- sampass->logon_script = NULL;
- return True;
- }
-
- len = strlen(logon_script)+1;
- sampass->logon_script = talloc (sampass->mem_ctx, len);
-
- if (sampass->logon_script == NULL )
- {
- DEBUG (0,("pdb_set_logon_script: ERROR - Unable to talloc memory for [%s]\n", logon_script));
- return False;
- }
-
- StrnCpy (sampass->logon_script, logon_script, len-1);
-
- return True;
-}
-
-BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, char *profile_path)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!profile_path)
- {
- sampass->profile_path = NULL;
- return True;
- }
-
- len = strlen(profile_path)+1;
- sampass->profile_path = talloc (sampass->mem_ctx, len);
-
- if (!sampass->profile_path)
- {
- DEBUG (0,("pdb_set_profile_path: ERROR - Unable to talloc memory for [%s]\n", profile_path));
- return False;
- }
-
- StrnCpy (sampass->profile_path, profile_path, len-1);
-
- return True;
-}
-
-BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, char *dir_drive)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!dir_drive)
- {
- sampass->dir_drive = NULL;
- return True;
- }
-
- len = strlen(dir_drive)+1;
- sampass->dir_drive = talloc (sampass->mem_ctx, len);
-
- if (sampass->dir_drive == NULL )
- {
- DEBUG (0,("pdb_set_dir_drive: ERROR - Unable to talloc memory for [%s]\n", dir_drive));
- return False;
- }
-
- StrnCpy (sampass->dir_drive, dir_drive, len-1);
-
- return True;
-}
-
-BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, char *homedir)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!homedir)
- {
- sampass->home_dir = NULL;
- return True;
- }
-
- len = strlen(homedir)+1;
- sampass->home_dir = talloc (sampass->mem_ctx, len);
-
- if (sampass->home_dir == NULL )
- {
- DEBUG (0,("pdb_set_homedir: ERROR - Unable to talloc memory for [%s]\n", homedir));
- return False;
+ if (local_flags & LOCAL_ADD_USER) {
+ if (pdb_add_sam_account(sam_pass)) {
+ slprintf(msg_str, msg_str_len-1, "Added user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return True;
+ } else {
+ slprintf(err_str, err_str_len-1, "Failed to add entry for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ } else if (local_flags & LOCAL_DELETE_USER) {
+ if (!pdb_delete_sam_account(user_name)) {
+ slprintf(err_str,err_str_len-1, "Failed to delete entry for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ slprintf(msg_str, msg_str_len-1, "Deleted user %s.\n", user_name);
+ } else {
+ if(!pdb_update_sam_account(sam_pass, True)) {
+ slprintf(err_str, err_str_len-1, "Failed to modify entry for user %s.\n", user_name);
+ pdb_free_sam(&sam_pass);
+ return False;
+ }
+ if(local_flags & LOCAL_DISABLE_USER)
+ slprintf(msg_str, msg_str_len-1, "Disabled user %s.\n", user_name);
+ else if (local_flags & LOCAL_ENABLE_USER)
+ slprintf(msg_str, msg_str_len-1, "Enabled user %s.\n", user_name);
+ else if (local_flags & LOCAL_SET_NO_PASSWORD)
+ slprintf(msg_str, msg_str_len-1, "User %s password set to none.\n", user_name);
}
-
- StrnCpy (sampass->home_dir, homedir, len-1);
+ pdb_free_sam(&sam_pass);
return True;
}
-BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, char *acct_desc)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!acct_desc)
- {
- sampass->acct_desc = NULL;
- return True;
- }
-
- len = strlen(acct_desc)+1;
- sampass->acct_desc = talloc (sampass->mem_ctx, len);
+/***************************************************************************
+ Search by uid. Wrapper around pdb_getsampwnam()
+ **************************************************************************/
- if (sampass->acct_desc == NULL )
- {
- DEBUG (0,("pdb_set_acct_desc: ERROR - Unable to talloc memory for [%s]\n", acct_desc));
- return False;
- }
-
- StrnCpy (sampass->acct_desc, acct_desc, len-1);
-
- return True;
-}
-
-BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, char *workstations)
+BOOL pdb_getsampwuid (SAM_ACCOUNT* user, uid_t uid)
{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!workstations)
- {
- sampass->workstations = NULL;
- return True;
- }
+ struct passwd *pw;
+ fstring name;
- len = strlen(workstations)+1;
- sampass->workstations = talloc (sampass->mem_ctx, len);
-
- if (sampass->workstations == NULL )
- {
- DEBUG (0,("pdb_set_workstations: ERROR - Unable to talloc memory for [%s]\n", workstations));
+ if (user==NULL) {
+ DEBUG(0,("pdb_getsampwuid: SAM_ACCOUNT is NULL.\n"));
return False;
}
-
- StrnCpy (sampass->workstations, workstations, len-1);
-
- return True;
-}
-
-BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, char *munged_dial)
-{
- int len;
-
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!munged_dial)
- {
- sampass->munged_dial = NULL;
- return True;
- }
- len = strlen(munged_dial)+1;
- sampass->munged_dial = talloc (sampass->mem_ctx, len);
-
- if (sampass->munged_dial == NULL )
- {
- DEBUG (0,("pdb_set_munged_dial: ERROR - Unable to talloc memory for [%s]\n", munged_dial));
+ /*
+ * 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;
}
- StrnCpy (sampass->munged_dial, munged_dial, len-1);
-
- return True;
-}
+ fstrcpy (name, pw->pw_name);
-BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, uint8 *pwd)
-{
- if (!sampass || !sampass->mem_ctx) return False;
+ passwd_free(&pw);
- if (!pwd)
- {
- sampass->nt_pw = NULL;
- return True;
- }
-
- sampass->nt_pw = talloc (sampass->mem_ctx, 16);
+ return pdb_getsampwnam (user, name);
- if (sampass->nt_pw == NULL )
- {
- DEBUG (0,("pdb_set_nt_passwd: ERROR - Unable to talloc memory for [%s]\n", pwd));
- return False;
- }
-
- memcpy (sampass->nt_pw, pwd, 16);
-
- return True;
}
-BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, uint8 *pwd)
-{
- if (!sampass || !sampass->mem_ctx) return False;
-
- if (!pwd)
- {
- sampass->lm_pw = NULL;
- return True;
- }
-
- sampass->lm_pw = talloc (sampass->mem_ctx, 16);
-
- if (sampass->lm_pw == NULL )
- {
- DEBUG (0,("pdb_set_lanman_passwd: ERROR - Unable to talloc memory for [%s]\n", pwd));
- return False;
- }
-
- memcpy (sampass->lm_pw, pwd, 16);
-
- return True;
-}
git.samba.org / ira / wip.git / blobdiff