1998-05-07 22:19:05 +04:00
/*
2002-01-30 09:08:46 +03:00
Unix SMB / CIFS implementation .
1998-05-07 22:19:05 +04:00
Password and authentication handling
2001-09-26 00:21:21 +04:00
Copyright ( C ) Jeremy Allison 1996 - 2001
2000-11-14 02:03:34 +03:00
Copyright ( C ) Luke Kenneth Casson Leighton 1996 - 1998
2001-04-26 02:12:13 +04:00
Copyright ( C ) Gerald ( Jerry ) Carter 2000 - 2001
2002-01-12 04:55:09 +03:00
Copyright ( C ) Andrew Bartlett 2001 - 2002
1998-05-19 01:30:57 +04:00
1998-05-07 22:19:05 +04:00
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
the Free Software Foundation ; either version 2 of the License , or
( at your option ) any later version .
This program is distributed in the hope that it will be useful ,
but WITHOUT ANY WARRANTY ; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the
GNU General Public License for more details .
You should have received a copy of the GNU General Public License
along with this program ; if not , write to the Free Software
Foundation , Inc . , 675 Mass Ave , Cambridge , MA 0213 9 , USA .
*/
# include "includes.h"
2002-07-15 14:35:28 +04:00
# undef DBGC_CLASS
# define DBGC_CLASS DBGC_PASSDB
1999-12-13 16:27:58 +03:00
/*
* This is set on startup - it defines the SID for this
* machine , and therefore the SAM database for which it is
* responsible .
*/
2002-07-15 14:35:28 +04:00
extern pstring global_myname ;
1998-05-07 22:19:05 +04:00
2001-09-27 13:13:26 +04:00
/************************************************************
Fill the SAM_ACCOUNT with default values .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-01-15 04:02:13 +03:00
static void pdb_fill_default_sam ( SAM_ACCOUNT * user )
2001-09-27 13:13:26 +04:00
{
2002-01-15 04:02:13 +03:00
ZERO_STRUCT ( user - > private ) ; /* Don't touch the talloc context */
2001-10-04 03:08:10 +04:00
/* Don't change these timestamp settings without a good reason.
They are important for NT member server compatibility . */
2002-01-02 10:41:54 +03:00
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 */
2002-01-15 04:14:58 +03:00
/* 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 = " " ;
2001-09-27 13:13:26 +04:00
}
2002-01-15 04:02:13 +03:00
static void destroy_pdb_talloc ( SAM_ACCOUNT * * user )
{
if ( * user ) {
talloc_destroy ( ( * user ) - > mem_ctx ) ;
* user = NULL ;
}
}
2001-09-27 13:13:26 +04:00
2002-01-15 04:02:13 +03:00
/**********************************************************************
Alloc memory and initialises a struct sam_passwd on supplied mem_ctx .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2002-01-15 04:02:13 +03:00
NTSTATUS pdb_init_sam_talloc ( TALLOC_CTX * mem_ctx , SAM_ACCOUNT * * user )
1998-05-07 22:19:05 +04:00
{
2001-05-04 19:44:27 +04:00
if ( * user ! = NULL ) {
2002-07-15 14:35:28 +04:00
DEBUG ( 0 , ( " pdb_init_sam_talloc: SAM_ACCOUNT was non NULL \n " ) ) ;
2001-05-04 19:44:27 +04:00
#if 0
2002-03-21 06:53:44 +03:00
smb_panic ( " non-NULL pointer passed to pdb_init_sam \n " ) ;
2001-05-04 19:44:27 +04:00
# endif
2002-01-15 04:02:13 +03:00
return NT_STATUS_UNSUCCESSFUL ;
2001-05-04 19:44:27 +04:00
}
2002-01-15 04:02:13 +03:00
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 ) ) ;
2002-01-02 10:41:54 +03:00
2001-05-04 19:44:27 +04:00
if ( * user = = NULL ) {
2002-07-15 14:35:28 +04:00
DEBUG ( 0 , ( " pdb_init_sam_talloc: error while allocating memory \n " ) ) ;
2002-01-15 04:02:13 +03:00
return NT_STATUS_NO_MEMORY ;
2001-05-04 19:44:27 +04:00
}
2001-09-27 13:13:26 +04:00
2002-01-15 04:02:13 +03:00
( * user ) - > mem_ctx = mem_ctx ;
( * user ) - > free_fn = NULL ;
2001-09-27 13:13:26 +04:00
pdb_fill_default_sam ( * user ) ;
2002-01-15 04:02:13 +03:00
return NT_STATUS_OK ;
}
2001-09-27 13:13:26 +04:00
2002-01-15 04:02:13 +03:00
/*************************************************************
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 ;
2001-09-27 13:13:26 +04:00
}
/*************************************************************
Initialises a struct sam_passwd with sane values .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-07-15 14:35:28 +04:00
NTSTATUS pdb_fill_sam_pw ( SAM_ACCOUNT * sam_account , const struct passwd * pwd )
2001-09-27 13:13:26 +04:00
{
2001-12-02 03:03:35 +03:00
GROUP_MAP map ;
This commit is number 2 of 4.
In particular this commit focuses on:
The guts of the moving about inside passdb.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes allow for the introduction of a large dose of 'const' to
the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
passdb/
- Kill off disp_info stuff, it isn't used any more - Kill off
support for writing to the old smbpasswd format, it isn't relevent
to Samba 3.0
- Move around and modify the pdb_...() helper functions, adding
one that sets the last changed time to 'now' and that sets the
must change time appropriately.
- Remove the ugly forced update of the LCT- value in
pdb_smbpasswd. - Remove the implicit modification of the ACB
flags when both NT and LM passwords are set.
- Removed substation in pdb_getsampwnam output, as a single
password change will render them inoperable in any case (they
will be substituted and stored)
- Added a default RID to the init_sam_from_pw() function, based on
our rid algorithm.
- Added checks that an smbpasswd stored user has a uid-based RID.
- Fail to store tdb based users without a RID
lib/
- Change the substituion code to use global_myname if there is
no connection (and therefore no called name) at the present time.
(This used to be commit 8f607810eb24ed1157bbd2e896c2c167bc34d986)
2001-10-29 10:24:49 +03:00
2001-09-27 13:13:26 +04:00
if ( ! pwd ) {
2002-01-15 04:02:13 +03:00
return NT_STATUS_UNSUCCESSFUL ;
2001-09-27 13:13:26 +04:00
}
2002-07-15 14:35:28 +04:00
pdb_fill_default_sam ( sam_account ) ;
pdb_set_username ( sam_account , pwd - > pw_name ) ;
pdb_set_fullname ( sam_account , pwd - > pw_gecos ) ;
2001-09-27 13:13:26 +04:00
2002-07-15 14:35:28 +04:00
pdb_set_unix_homedir ( sam_account , pwd - > pw_dir ) ;
2001-10-31 13:46:25 +03:00
2002-07-15 14:35:28 +04:00
pdb_set_domain ( sam_account , lp_workgroup ( ) ) ;
pdb_set_uid ( sam_account , pwd - > pw_uid ) ;
pdb_set_gid ( sam_account , pwd - > pw_gid ) ;
2001-12-27 09:38:04 +03:00
2002-07-15 14:35:28 +04:00
/* When we get a proper uid -> SID and SID -> uid allocation
mechinism , we should call it here .
We can ' t just set this to 0 or allow it only to be filled
in when added to the backend , becouse the user ' s SID
may already be in security descriptors etc .
- - abartlet 11 - May - 02
*/
if ( ! pdb_set_user_sid_from_rid ( sam_account ,
fallback_pdb_uid_to_user_rid ( pwd - > pw_uid ) ) ) {
DEBUG ( 0 , ( " Can't set User SID from RID! \n " ) ) ;
return NT_STATUS_INVALID_PARAMETER ;
}
2001-12-02 03:03:35 +03:00
/* call the mapping code here */
2001-12-05 00:53:47 +03:00
if ( get_group_map_from_gid ( pwd - > pw_gid , & map , MAPPING_WITHOUT_PRIV ) ) {
2002-07-15 14:35:28 +04:00
if ( ! pdb_set_group_sid ( sam_account , & map . sid ) ) {
DEBUG ( 0 , ( " Can't set Group SID! \n " ) ) ;
return NT_STATUS_INVALID_PARAMETER ;
}
2001-12-27 09:38:04 +03:00
}
else {
2002-07-15 14:35:28 +04:00
if ( ! pdb_set_group_sid_from_rid ( sam_account , pdb_gid_to_group_rid ( pwd - > pw_gid ) ) ) {
DEBUG ( 0 , ( " Can't set Group SID \n " ) ) ;
return NT_STATUS_INVALID_PARAMETER ;
}
2001-12-27 09:38:04 +03:00
}
2002-07-15 14:35:28 +04:00
/* check if this is a user account or a machine account */
if ( pwd - > pw_name [ strlen ( pwd - > pw_name ) - 1 ] ! = ' $ ' )
{
pdb_set_profile_path ( sam_account ,
talloc_sub_specified ( ( sam_account ) - > mem_ctx ,
lp_logon_path ( ) ,
pwd - > pw_name , global_myname ,
pwd - > pw_uid , pwd - > pw_gid ) ,
False ) ;
pdb_set_homedir ( sam_account ,
talloc_sub_specified ( ( sam_account ) - > mem_ctx ,
lp_logon_home ( ) ,
pwd - > pw_name , global_myname ,
pwd - > pw_uid , pwd - > pw_gid ) ,
False ) ;
2001-12-27 09:38:04 +03:00
2002-07-15 14:35:28 +04:00
pdb_set_dir_drive ( sam_account ,
talloc_sub_specified ( ( sam_account ) - > mem_ctx ,
lp_logon_drive ( ) ,
pwd - > pw_name , global_myname ,
pwd - > pw_uid , pwd - > pw_gid ) ,
False ) ;
pdb_set_logon_script ( sam_account ,
talloc_sub_specified ( ( sam_account ) - > mem_ctx ,
lp_logon_script ( ) ,
pwd - > pw_name , global_myname ,
pwd - > pw_uid , pwd - > pw_gid ) ,
False ) ;
}
return NT_STATUS_OK ;
}
This commit is number 2 of 4.
In particular this commit focuses on:
The guts of the moving about inside passdb.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes allow for the introduction of a large dose of 'const' to
the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
passdb/
- Kill off disp_info stuff, it isn't used any more - Kill off
support for writing to the old smbpasswd format, it isn't relevent
to Samba 3.0
- Move around and modify the pdb_...() helper functions, adding
one that sets the last changed time to 'now' and that sets the
must change time appropriately.
- Remove the ugly forced update of the LCT- value in
pdb_smbpasswd. - Remove the implicit modification of the ACB
flags when both NT and LM passwords are set.
- Removed substation in pdb_getsampwnam output, as a single
password change will render them inoperable in any case (they
will be substituted and stored)
- Added a default RID to the init_sam_from_pw() function, based on
our rid algorithm.
- Added checks that an smbpasswd stored user has a uid-based RID.
- Fail to store tdb based users without a RID
lib/
- Change the substituion code to use global_myname if there is
no connection (and therefore no called name) at the present time.
(This used to be commit 8f607810eb24ed1157bbd2e896c2c167bc34d986)
2001-10-29 10:24:49 +03:00
2002-07-15 14:35:28 +04:00
/*************************************************************
Initialises a struct sam_passwd with sane values .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
NTSTATUS pdb_init_sam_pw ( SAM_ACCOUNT * * new_sam_acct , const struct passwd * pwd )
{
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 ;
}
if ( ! NT_STATUS_IS_OK ( nt_status = pdb_fill_sam_pw ( * new_sam_acct , pwd ) ) ) {
pdb_free_sam ( new_sam_acct ) ;
new_sam_acct = NULL ;
return nt_status ;
}
2002-01-15 04:02:13 +03:00
return NT_STATUS_OK ;
1998-05-07 22:19:05 +04:00
}
2001-09-27 13:13:26 +04:00
2002-01-02 10:41:54 +03:00
/**
* Free the contets of the SAM_ACCOUNT , but not the structure .
*
2002-07-15 14:35:28 +04:00
* Also wipes the LM and NT hashes and plaintext passwrod from
* memory .
2002-01-02 10:41:54 +03:00
*
* @ param user SAM_ACCOUNT to free members of .
* */
2001-09-26 00:21:21 +04:00
2002-01-15 04:02:13 +03:00
static void pdb_free_sam_contents ( SAM_ACCOUNT * user )
1998-05-07 22:19:05 +04:00
{
2002-07-15 14:35:28 +04:00
/* Kill off sensitive data. Free()ed by the
talloc mechinism */
2001-09-27 13:13:26 +04:00
2002-01-02 10:41:54 +03:00
data_blob_clear_free ( & ( user - > private . lm_pw ) ) ;
data_blob_clear_free ( & ( user - > private . nt_pw ) ) ;
2002-07-15 14:35:28 +04:00
data_blob_clear_free ( & ( user - > private . plaintext_pw ) ) ;
1998-05-07 22:19:05 +04:00
}
2001-09-27 13:13:26 +04:00
2001-05-07 18:04:46 +04:00
/************************************************************
2001-09-27 13:13:26 +04:00
Reset the SAM_ACCOUNT and free the NT / LM hashes .
2001-05-07 18:04:46 +04:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-01-15 04:02:13 +03:00
NTSTATUS pdb_reset_sam ( SAM_ACCOUNT * user )
2001-05-07 18:04:46 +04:00
{
if ( user = = NULL ) {
DEBUG ( 0 , ( " pdb_reset_sam: SAM_ACCOUNT was NULL \n " ) ) ;
2001-09-29 17:14:19 +04:00
#if 0
smb_panic ( " NULL pointer passed to pdb_free_sam \n " ) ;
# endif
2002-01-15 04:02:13 +03:00
return NT_STATUS_UNSUCCESSFUL ;
2001-05-07 18:04:46 +04:00
}
2002-01-15 04:02:13 +03:00
pdb_free_sam_contents ( user ) ;
2001-09-27 13:13:26 +04:00
2002-01-15 04:02:13 +03:00
pdb_fill_default_sam ( user ) ;
2001-05-07 18:04:46 +04:00
2002-01-15 04:02:13 +03:00
return NT_STATUS_OK ;
2001-05-07 18:04:46 +04:00
}
2000-02-26 01:25:25 +03:00
2001-09-27 13:13:26 +04:00
/************************************************************
2002-01-02 10:41:54 +03:00
Free the SAM_ACCOUNT and the member pointers .
2001-09-27 13:13:26 +04:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-01-15 04:02:13 +03:00
NTSTATUS pdb_free_sam ( SAM_ACCOUNT * * user )
2001-09-27 13:13:26 +04:00
{
2001-09-29 17:14:19 +04:00
if ( * user = = NULL ) {
2001-09-27 13:13:26 +04:00
DEBUG ( 0 , ( " pdb_free_sam: SAM_ACCOUNT was NULL \n " ) ) ;
#if 0
smb_panic ( " NULL pointer passed to pdb_free_sam \n " ) ;
# endif
2002-01-15 04:02:13 +03:00
return NT_STATUS_UNSUCCESSFUL ;
2001-09-27 13:13:26 +04:00
}
2002-01-15 04:02:13 +03:00
pdb_free_sam_contents ( * user ) ;
if ( ( * user ) - > free_fn ) {
( * user ) - > free_fn ( user ) ;
2001-09-27 13:13:26 +04:00
}
2002-01-15 04:02:13 +03:00
return NT_STATUS_OK ;
2001-09-27 13:13:26 +04:00
}
2001-09-26 00:21:21 +04:00
/**********************************************************
Encode the account control bits into a string .
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 ;
size_t i = 0 ;
acct_str [ i + + ] = ' [ ' ;
if ( acct_ctrl & ACB_PWNOTREQ ) acct_str [ i + + ] = ' N ' ;
if ( acct_ctrl & ACB_DISABLED ) acct_str [ i + + ] = ' D ' ;
if ( acct_ctrl & ACB_HOMDIRREQ ) acct_str [ i + + ] = ' H ' ;
if ( acct_ctrl & ACB_TEMPDUP ) acct_str [ i + + ] = ' T ' ;
if ( acct_ctrl & ACB_NORMAL ) acct_str [ i + + ] = ' U ' ;
if ( acct_ctrl & ACB_MNS ) acct_str [ i + + ] = ' M ' ;
if ( acct_ctrl & ACB_WSTRUST ) acct_str [ i + + ] = ' W ' ;
if ( acct_ctrl & ACB_SVRTRUST ) acct_str [ i + + ] = ' S ' ;
if ( acct_ctrl & ACB_AUTOLOCK ) acct_str [ i + + ] = ' L ' ;
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 ] = ' ' ;
i = length - 2 ;
acct_str [ i + + ] = ' ] ' ;
acct_str [ i + + ] = ' \0 ' ;
return acct_str ;
}
/**********************************************************
Decode the account control bits from a string .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
uint16 pdb_decode_acct_ctrl ( const char * p )
{
uint16 acct_ctrl = 0 ;
BOOL finished = False ;
/*
* Check if the account type bits have been encoded after the
* NT password ( in the form [ NDHTUWSLXI ] ) .
*/
if ( * p ! = ' [ ' )
return 0 ;
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. */ }
case ' T ' : { acct_ctrl | = ACB_TEMPDUP ; break ; /* 'T'emp account. */ }
case ' U ' : { acct_ctrl | = ACB_NORMAL ; break ; /* 'U'ser account (normal). */ }
case ' M ' : { acct_ctrl | = ACB_MNS ; break ; /* 'M'NS logon user account. What is this ? */ }
case ' W ' : { acct_ctrl | = ACB_WSTRUST ; break ; /* 'W'orkstation account. */ }
case ' S ' : { acct_ctrl | = ACB_SVRTRUST ; break ; /* 'S'erver account. */ }
case ' L ' : { acct_ctrl | = ACB_AUTOLOCK ; break ; /* 'L'ocked account. */ }
case ' X ' : { acct_ctrl | = ACB_PWNOEXP ; break ; /* No 'X'piry on password */ }
case ' I ' : { acct_ctrl | = ACB_DOMTRUST ; break ; /* 'I'nterdomain trust account. */ }
case ' ' : { break ; }
case ' : ' :
case ' \n ' :
case ' \0 ' :
case ' ] ' :
default : { finished = True ; }
}
}
return acct_ctrl ;
}
/*************************************************************
Routine to set 32 hex password characters from a 16 byte array .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
void pdb_sethexpwd ( char * p , const unsigned char * pwd , uint16 acct_ctrl )
2001-09-26 00:21:21 +04:00
{
if ( pwd ! = NULL ) {
int i ;
for ( i = 0 ; i < 16 ; i + + )
slprintf ( & p [ i * 2 ] , 3 , " %02X " , pwd [ i ] ) ;
} else {
if ( acct_ctrl & ACB_PWNOTREQ )
safe_strcpy ( p , " NO PASSWORDXXXXXXXXXXXXXXXXXXXXX " , 33 ) ;
else
safe_strcpy ( p , " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " , 33 ) ;
}
}
/*************************************************************
Routine to get the 32 hex characters and turn them
into a 16 byte array .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
BOOL pdb_gethexpwd ( const char * p , unsigned char * pwd )
2001-09-26 00:21:21 +04:00
{
int i ;
unsigned char lonybble , hinybble ;
char * hexchars = " 0123456789ABCDEF " ;
char * p1 , * p2 ;
if ( ! p )
return ( False ) ;
for ( i = 0 ; i < 32 ; i + = 2 ) {
hinybble = toupper ( p [ i ] ) ;
lonybble = toupper ( p [ i + 1 ] ) ;
p1 = strchr ( hexchars , hinybble ) ;
p2 = strchr ( hexchars , lonybble ) ;
if ( ! p1 | | ! p2 )
return ( False ) ;
hinybble = PTR_DIFF ( p1 , hexchars ) ;
lonybble = PTR_DIFF ( p2 , hexchars ) ;
pwd [ i / 2 ] = ( hinybble < < 4 ) | lonybble ;
}
return ( True ) ;
}
2000-11-14 02:03:34 +03:00
/*******************************************************************
Converts NT user RID to a UNIX uid .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2002-07-15 14:35:28 +04:00
uid_t fallback_pdb_user_rid_to_uid ( uint32 user_rid )
1999-12-13 16:27:58 +03:00
{
2002-07-15 14:35:28 +04:00
int rid_offset = lp_algorithmic_rid_base ( ) ;
return ( uid_t ) ( ( ( user_rid & ( ~ USER_RID_TYPE ) ) - rid_offset ) / RID_MULTIPLIER ) ;
1999-12-13 16:27:58 +03:00
}
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
/*******************************************************************
2002-03-18 14:35:53 +03:00
converts UNIX uid to an NT User RID .
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-07-15 14:35:28 +04:00
uint32 fallback_pdb_uid_to_user_rid ( uid_t uid )
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
{
2002-07-15 14:35:28 +04:00
int rid_offset = lp_algorithmic_rid_base ( ) ;
return ( ( ( ( ( uint32 ) uid ) * RID_MULTIPLIER ) + rid_offset ) | USER_RID_TYPE ) ;
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
}
2000-11-14 02:03:34 +03:00
/*******************************************************************
2002-03-18 14:35:53 +03:00
Converts NT group RID to a UNIX gid .
2000-11-14 02:03:34 +03:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
1999-12-13 16:27:58 +03:00
2002-03-18 14:35:53 +03:00
gid_t pdb_group_rid_to_gid ( uint32 group_rid )
1999-12-13 16:27:58 +03:00
{
2002-07-15 14:35:28 +04:00
int rid_offset = lp_algorithmic_rid_base ( ) ;
return ( gid_t ) ( ( ( group_rid & ( ~ GROUP_RID_TYPE ) ) - rid_offset ) / RID_MULTIPLIER ) ;
1999-12-13 16:27:58 +03:00
}
2000-11-14 02:03:34 +03:00
/*******************************************************************
converts NT Group RID to a UNIX uid .
2001-12-02 03:03:35 +03:00
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 .
2000-11-14 02:03:34 +03:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2000-10-07 19:56:36 +04:00
2000-11-14 02:03:34 +03:00
uint32 pdb_gid_to_group_rid ( gid_t gid )
2000-10-07 19:56:36 +04:00
{
2002-07-15 14:35:28 +04:00
int rid_offset = lp_algorithmic_rid_base ( ) ;
return ( ( ( ( ( uint32 ) gid ) * RID_MULTIPLIER ) + rid_offset ) | GROUP_RID_TYPE ) ;
2000-10-07 19:56:36 +04:00
}
2000-11-14 02:03:34 +03:00
/*******************************************************************
Decides if a RID is a well known RID .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static BOOL pdb_rid_is_well_known ( uint32 rid )
2000-10-07 19:56:36 +04:00
{
2002-07-15 14:35:28 +04:00
/* Not using rid_offset here, becouse this is the actual
NT fixed value ( 1000 ) */
return ( rid < BASE_RID ) ;
2000-10-07 19:56:36 +04:00
}
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
/*******************************************************************
Decides if a RID is a user or group RID .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2000-11-14 02:03:34 +03:00
BOOL pdb_rid_is_user ( uint32 rid )
{
/* lkcl i understand that NT attaches an enumeration to a RID
* such that it can be identified as either a user , group etc
* type . there are 5 such categories , and they are documented .
*/
if ( pdb_rid_is_well_known ( rid ) ) {
/*
* The only well known user RIDs are DOMAIN_USER_RID_ADMIN
* and DOMAIN_USER_RID_GUEST .
*/
if ( rid = = DOMAIN_USER_RID_ADMIN | | rid = = DOMAIN_USER_RID_GUEST )
return True ;
} else if ( ( rid & RID_TYPE_MASK ) = = USER_RID_TYPE ) {
return True ;
}
return False ;
}
/*******************************************************************
Convert a rid into a name . Used in the lookup SID rpc .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2001-12-05 00:53:47 +03:00
BOOL local_lookup_sid ( DOM_SID * sid , char * name , enum SID_NAME_USE * psid_name_use )
2000-11-14 02:03:34 +03:00
{
2001-12-05 00:53:47 +03:00
uint32 rid ;
2002-01-26 15:24:18 +03:00
SAM_ACCOUNT * sam_account = NULL ;
2002-04-12 14:18:46 +04:00
GROUP_MAP map ;
1999-12-13 16:27:58 +03:00
2002-07-15 14:35:28 +04:00
if ( ! sid_peek_check_rid ( get_global_sam_sid ( ) , sid , & rid ) ) {
DEBUG ( 0 , ( " local_sid_to_gid: sid_peek_check_rid return False! SID: %s \n " ,
sid_string_static ( & map . sid ) ) ) ;
return False ;
}
2001-10-10 00:54:56 +04:00
* psid_name_use = SID_NAME_UNKNOWN ;
2002-04-12 14:18:46 +04:00
DEBUG ( 5 , ( " local_lookup_sid: looking up RID %u. \n " , ( unsigned int ) rid ) ) ;
if ( rid = = DOMAIN_USER_RID_ADMIN ) {
char * * admin_list = lp_admin_users ( - 1 ) ;
* psid_name_use = SID_NAME_USER ;
if ( admin_list ) {
char * p = * admin_list ;
2000-11-14 02:03:34 +03:00
if ( ! next_token ( & p , name , NULL , sizeof ( fstring ) ) )
2002-04-12 14:18:46 +04:00
fstrcpy ( name , " Administrator " ) ;
2000-11-14 02:03:34 +03:00
} else {
2002-04-12 14:18:46 +04:00
fstrcpy ( name , " Administrator " ) ;
}
return True ;
2002-01-26 15:24:18 +03:00
2002-04-12 14:18:46 +04:00
} else if ( rid = = DOMAIN_USER_RID_GUEST ) {
char * p = lp_guestaccount ( ) ;
* psid_name_use = SID_NAME_USER ;
if ( ! next_token ( & p , name , NULL , sizeof ( fstring ) ) )
fstrcpy ( name , " Guest " ) ;
return True ;
}
/*
* Don ' t try to convert the rid to a name if
* running in appliance mode
*/
if ( lp_hide_local_users ( ) )
return False ;
if ( ! NT_STATUS_IS_OK ( pdb_init_sam ( & sam_account ) ) ) {
return False ;
}
2002-07-15 14:35:28 +04:00
/* This now does the 'generic' mapping in pdb_unix */
if ( pdb_getsampwsid ( sam_account , sid ) ) {
2002-04-12 14:18:46 +04:00
fstrcpy ( name , pdb_get_username ( sam_account ) ) ;
* psid_name_use = SID_NAME_USER ;
pdb_free_sam ( & sam_account ) ;
2002-01-26 15:24:18 +03:00
2002-04-12 14:18:46 +04:00
return True ;
}
2002-07-15 14:35:28 +04:00
2002-04-12 14:18:46 +04:00
pdb_free_sam ( & sam_account ) ;
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 ) ) ;
2002-07-15 14:35:28 +04:00
} else {
DEBUG ( 5 , ( " local_lookup_sid: mapped group %s to no unix gid. Returning name. \n " , map . nt_name ) ) ;
2002-04-12 14:18:46 +04:00
}
2002-07-15 14:35:28 +04:00
fstrcpy ( name , map . nt_name ) ;
* psid_name_use = map . sid_name_use ;
return True ;
}
2002-04-12 14:18:46 +04:00
if ( pdb_rid_is_user ( rid ) ) {
2002-07-15 14:35:28 +04:00
uid_t uid ;
DEBUG ( 5 , ( " assuming RID %u is a user \n " , ( unsigned ) rid ) ) ;
uid = fallback_pdb_user_rid_to_uid ( rid ) ;
slprintf ( name , sizeof ( fstring ) - 1 , " unix_user.%u " , ( unsigned int ) uid ) ;
return False ; /* Indicates that this user was 'not mapped' */
2000-11-14 02:03:34 +03:00
} else {
2001-09-26 00:21:21 +04:00
gid_t gid ;
2001-01-10 19:05:41 +03:00
struct group * gr ;
2002-04-12 14:18:46 +04:00
2002-07-15 14:35:28 +04:00
DEBUG ( 5 , ( " assuming RID %u is a group \n " , ( unsigned ) rid ) ) ;
2001-12-02 03:03:35 +03:00
gid = pdb_group_rid_to_gid ( rid ) ;
2001-05-04 19:44:27 +04:00
gr = getgrgid ( gid ) ;
2002-04-12 14:18:46 +04:00
2001-09-26 00:21:21 +04:00
* psid_name_use = SID_NAME_ALIAS ;
2002-04-12 14:18:46 +04:00
2001-12-05 00:53:47 +03:00
DEBUG ( 5 , ( " local_lookup_sid: looking up gid %u %s \n " , ( unsigned int ) gid ,
2002-04-12 14:18:46 +04:00
gr ? " succeeded " : " failed " ) ) ;
2000-11-14 02:03:34 +03:00
if ( ! gr ) {
slprintf ( name , sizeof ( fstring ) - 1 , " unix_group.%u " , ( unsigned int ) gid ) ;
2002-07-15 14:35:28 +04:00
return False ; /* Indicates that this group was 'not mapped' */
2000-11-14 02:03:34 +03:00
}
2002-04-12 14:18:46 +04:00
2000-11-14 02:03:34 +03:00
fstrcpy ( name , gr - > gr_name ) ;
2002-04-12 14:18:46 +04:00
2001-12-05 00:53:47 +03:00
DEBUG ( 5 , ( " local_lookup_sid: found group %s for rid %u \n " , name ,
2002-04-12 14:18:46 +04:00
( unsigned int ) rid ) ) ;
2002-07-15 14:35:28 +04:00
return True ;
2000-11-14 02:03:34 +03:00
}
1998-05-18 19:50:56 +04:00
}
2000-11-14 02:03:34 +03:00
/*******************************************************************
Convert a name into a SID . Used in the lookup name rpc .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
1999-12-13 16:27:58 +03:00
2002-01-26 12:56:47 +03:00
BOOL local_lookup_name ( const char * c_user , DOM_SID * psid , enum SID_NAME_USE * psid_name_use )
1998-05-18 18:43:06 +04:00
{
2000-11-14 02:03:34 +03:00
extern DOM_SID global_sid_World_Domain ;
DOM_SID local_sid ;
2001-03-21 02:07:36 +03:00
fstring user ;
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
SAM_ACCOUNT * sam_account = NULL ;
2002-07-15 14:35:28 +04:00
struct group * grp ;
GROUP_MAP map ;
2001-10-10 00:54:56 +04:00
* psid_name_use = SID_NAME_UNKNOWN ;
2001-03-21 02:07:36 +03:00
/*
2002-01-26 12:56:47 +03:00
* user may be quoted a const string , and map_username and
* friends can modify it . Make a modifiable copy . JRA .
2001-03-21 02:07:36 +03:00
*/
fstrcpy ( user , c_user ) ;
2000-11-14 02:03:34 +03:00
2002-07-15 14:35:28 +04:00
sid_copy ( & local_sid , get_global_sam_sid ( ) ) ;
2000-11-14 02:03:34 +03:00
/*
* Special case for MACHINE \ Everyone . Map to the world_sid .
*/
if ( strequal ( user , " Everyone " ) ) {
sid_copy ( psid , & global_sid_World_Domain ) ;
sid_append_rid ( psid , 0 ) ;
* psid_name_use = SID_NAME_ALIAS ;
return True ;
}
2001-01-10 19:05:41 +03:00
/*
* Don ' t lookup local unix users if running in appliance mode
*/
if ( lp_hide_local_users ( ) )
return False ;
2000-11-14 02:03:34 +03:00
( void ) map_username ( user ) ;
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
if ( ! NT_STATUS_IS_OK ( pdb_init_sam ( & sam_account ) ) ) {
return False ;
}
if ( pdb_getsampwnam ( sam_account , user ) ) {
2002-07-15 14:35:28 +04:00
sid_copy ( psid , pdb_get_user_sid ( sam_account ) ) ;
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
* psid_name_use = SID_NAME_USER ;
2002-01-26 15:24:18 +03:00
2002-04-12 14:18:46 +04:00
pdb_free_sam ( & sam_account ) ;
return True ;
2002-01-26 15:24:18 +03:00
}
pdb_free_sam ( & sam_account ) ;
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
2002-07-15 14:35:28 +04:00
/*
* Maybe it was a group ?
*/
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
2002-07-15 14:35:28 +04:00
/* 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 ;
}
2002-04-12 14:18:46 +04:00
} else {
2002-07-15 14:35:28 +04:00
/* it's not a mapped group */
grp = getgrnam ( user ) ;
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
2000-11-14 02:03:34 +03:00
*/
2001-11-23 18:11:22 +03:00
2002-07-15 14:35:28 +04:00
if ( get_group_map_from_gid ( grp - > gr_gid , & map , MAPPING_WITHOUT_PRIV ) ) {
return False ;
2001-11-23 18:11:22 +03:00
}
2002-07-15 14:35:28 +04:00
sid_append_rid ( & local_sid , pdb_gid_to_group_rid ( grp - > gr_gid ) ) ;
* psid_name_use = SID_NAME_ALIAS ;
2000-11-14 02:03:34 +03:00
}
sid_copy ( psid , & local_sid ) ;
return True ;
1998-05-18 18:43:06 +04:00
}
2000-11-14 02:03:34 +03:00
/****************************************************************************
Convert a uid to SID - locally .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2000-11-14 02:03:34 +03:00
DOM_SID * local_uid_to_sid ( DOM_SID * psid , uid_t uid )
1999-12-13 16:27:58 +03:00
{
2002-03-19 16:57:53 +03:00
struct passwd * pass ;
2002-03-21 06:53:44 +03:00
SAM_ACCOUNT * sam_user = NULL ;
2002-04-12 14:18:46 +04:00
fstring str ; /* sid string buffer */
2000-11-14 02:03:34 +03:00
2002-07-15 14:35:28 +04:00
sid_copy ( psid , get_global_sam_sid ( ) ) ;
2002-03-19 16:57:53 +03:00
2002-04-12 14:18:46 +04:00
if ( ( pass = getpwuid_alloc ( uid ) ) ) {
2002-03-19 16:57:53 +03:00
2002-04-12 14:18:46 +04:00
if ( NT_STATUS_IS_ERR ( pdb_init_sam ( & sam_user ) ) ) {
passwd_free ( & pass ) ;
return NULL ;
}
if ( pdb_getsampwnam ( sam_user , pass - > pw_name ) ) {
2002-07-15 14:35:28 +04:00
sid_copy ( psid , pdb_get_user_sid ( sam_user ) ) ;
2002-04-12 14:18:46 +04:00
} else {
sid_append_rid ( psid , fallback_pdb_uid_to_user_rid ( uid ) ) ;
}
2002-03-19 16:57:53 +03:00
2002-04-12 14:18:46 +04:00
DEBUG ( 10 , ( " local_uid_to_sid: uid %u -> SID (%s) (%s). \n " ,
( unsigned ) uid , sid_to_string ( str , psid ) ,
pass - > pw_name ) ) ;
2002-03-19 16:57:53 +03:00
2002-04-12 14:18:46 +04:00
passwd_free ( & pass ) ;
pdb_free_sam ( & sam_user ) ;
} else {
sid_append_rid ( psid , fallback_pdb_uid_to_user_rid ( uid ) ) ;
2002-03-19 16:57:53 +03:00
2002-04-12 14:18:46 +04:00
DEBUG ( 10 , ( " local_uid_to_sid: uid %u -> SID (%s) (unknown user). \n " ,
( unsigned ) uid , sid_to_string ( str , psid ) ) ) ;
}
2000-11-14 02:03:34 +03:00
return psid ;
1999-12-13 16:27:58 +03:00
}
2000-11-14 02:03:34 +03:00
/****************************************************************************
Convert a SID to uid - locally .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2000-11-14 02:03:34 +03:00
BOOL local_sid_to_uid ( uid_t * puid , DOM_SID * psid , enum SID_NAME_USE * name_type )
1999-12-13 16:27:58 +03:00
{
2000-11-14 02:03:34 +03:00
DOM_SID dom_sid ;
uint32 rid ;
2001-01-16 01:46:22 +03:00
fstring str ;
2002-03-21 06:53:44 +03:00
SAM_ACCOUNT * sam_user = NULL ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
* name_type = SID_NAME_UNKNOWN ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
sid_copy ( & dom_sid , psid ) ;
sid_split_rid ( & dom_sid , & rid ) ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
/*
* We can only convert to a uid if this is our local
* Domain SID ( ie . we are the controling authority ) .
*/
2002-07-15 14:35:28 +04:00
if ( ! sid_equal ( get_global_sam_sid ( ) , & dom_sid ) )
2000-11-14 02:03:34 +03:00
return False ;
1999-12-13 16:27:58 +03:00
2002-03-19 16:57:53 +03:00
if ( NT_STATUS_IS_ERR ( pdb_init_sam ( & sam_user ) ) )
return False ;
2002-07-15 14:35:28 +04:00
if ( pdb_getsampwsid ( sam_user , psid ) ) {
2002-04-12 14:18:46 +04:00
* puid = pdb_get_uid ( sam_user ) ;
if ( * puid = = - 1 ) {
pdb_free_sam ( & sam_user ) ;
return False ;
}
DEBUG ( 10 , ( " local_sid_to_uid: SID %s -> uid (%u) (%s). \n " , sid_to_string ( str , psid ) ,
( unsigned int ) * puid , pdb_get_username ( sam_user ) ) ) ;
} else {
2002-07-15 14:35:28 +04:00
DEBUG ( 5 , ( " local_sid_to_uid: SID %s not mapped becouse RID was not found in passdb. \n " , sid_to_string ( str , psid ) ) ) ;
pdb_free_sam ( & sam_user ) ;
return False ;
2002-03-19 16:57:53 +03:00
}
pdb_free_sam ( & sam_user ) ;
1999-12-13 16:27:58 +03:00
2001-10-10 00:54:56 +04:00
* name_type = SID_NAME_USER ;
2000-11-14 02:03:34 +03:00
return True ;
}
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
/****************************************************************************
Convert a gid to SID - locally .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2000-11-14 02:03:34 +03:00
DOM_SID * local_gid_to_sid ( DOM_SID * psid , gid_t gid )
{
2001-12-02 03:03:35 +03:00
GROUP_MAP map ;
1999-12-13 16:27:58 +03:00
2002-07-15 14:35:28 +04:00
sid_copy ( psid , get_global_sam_sid ( ) ) ;
2001-12-02 03:03:35 +03:00
2001-12-05 00:53:47 +03:00
if ( get_group_map_from_gid ( gid , & map , MAPPING_WITHOUT_PRIV ) ) {
2001-12-02 03:03:35 +03:00
sid_copy ( psid , & map . sid ) ;
2002-07-15 14:35:28 +04:00
}
2001-12-02 03:03:35 +03:00
else {
sid_append_rid ( psid , pdb_gid_to_group_rid ( gid ) ) ;
}
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
return psid ;
1999-12-13 16:27:58 +03:00
}
2000-11-14 02:03:34 +03:00
/****************************************************************************
Convert a SID to gid - locally .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-26 00:21:21 +04:00
2000-11-14 02:03:34 +03:00
BOOL local_sid_to_gid ( gid_t * pgid , DOM_SID * psid , enum SID_NAME_USE * name_type )
{
DOM_SID dom_sid ;
uint32 rid ;
2001-01-16 01:46:22 +03:00
fstring str ;
2001-12-02 03:03:35 +03:00
GROUP_MAP map ;
2000-11-14 02:03:34 +03:00
* name_type = SID_NAME_UNKNOWN ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
sid_copy ( & dom_sid , psid ) ;
sid_split_rid ( & dom_sid , & rid ) ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
/*
* We can only convert to a gid if this is our local
* Domain SID ( ie . we are the controling authority ) .
2001-12-02 03:03:35 +03:00
*
* Or in the Builtin SID too . JFM , 11 / 30 / 2001
2000-11-14 02:03:34 +03:00
*/
2002-07-15 14:35:28 +04:00
if ( ! sid_equal ( get_global_sam_sid ( ) , & dom_sid ) )
2000-11-14 02:03:34 +03:00
return False ;
1999-12-13 16:27:58 +03:00
2001-12-05 00:53:47 +03:00
if ( get_group_map_from_sid ( * psid , & map , MAPPING_WITHOUT_PRIV ) ) {
2001-12-31 17:05:22 +03:00
2001-12-02 03:03:35 +03:00
/* the SID is in the mapping table but not mapped */
if ( map . gid = = - 1 )
return False ;
2002-07-15 14:35:28 +04:00
if ( ! sid_peek_check_rid ( get_global_sam_sid ( ) , & map . sid , & rid ) ) {
DEBUG ( 0 , ( " local_sid_to_gid: sid_peek_check_rid return False! SID: %s \n " ,
sid_string_static ( & map . sid ) ) ) ;
return False ;
}
2002-04-12 14:18:46 +04:00
* pgid = map . gid ;
2001-12-02 03:03:35 +03:00
* name_type = map . sid_name_use ;
2002-07-15 14:35:28 +04:00
DEBUG ( 10 , ( " local_sid_to_gid: mapped SID %s (%s) -> gid (%u). \n " , sid_to_string ( str , psid ) ,
map . nt_name , ( unsigned int ) * pgid ) ) ;
2001-12-02 03:03:35 +03:00
} else {
2002-04-12 14:18:46 +04:00
if ( pdb_rid_is_user ( rid ) )
return False ;
2001-12-02 03:03:35 +03:00
* pgid = pdb_group_rid_to_gid ( rid ) ;
* name_type = SID_NAME_ALIAS ;
2002-07-15 14:35:28 +04:00
DEBUG ( 10 , ( " local_sid_to_gid: SID %s -> gid (%u). \n " , sid_to_string ( str , psid ) ,
( unsigned int ) * pgid ) ) ;
2001-12-02 03:03:35 +03:00
}
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
return True ;
1999-12-13 16:27:58 +03:00
}
2002-01-02 10:41:54 +03:00
/**
* Quick hack to do an easy ucs2 - > mulitbyte conversion
* @ return static buffer containing the converted string
* */
2002-07-15 14:35:28 +04:00
const char * pdb_unistr2_convert ( const UNISTR2 * from )
2000-10-07 19:56:36 +04:00
{
2002-01-02 10:41:54 +03:00
static pstring convert_buffer ;
* convert_buffer = 0 ;
if ( ! from ) {
return convert_buffer ;
}
unistr2_to_ascii ( convert_buffer , from , sizeof ( pstring ) ) ;
return convert_buffer ;
2000-10-07 19:56:36 +04:00
}
2000-11-14 02:03:34 +03:00
/*************************************************************
2001-09-26 00:21:21 +04:00
Change a password entry in the local smbpasswd file .
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
FIXME ! ! The function needs to be abstracted into the
passdb interface or something . It is currently being called
2001-09-29 17:14:19 +04:00
by _api_samr_create_user ( ) in rpc_server / srv_samr . c ,
in SWAT and by smbpasswd / pdbedit .
2000-11-14 02:03:34 +03:00
- - jerry
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
1999-12-13 16:27:58 +03:00
This commit is number 4 of 4.
In particular this commit focuses on:
Actually adding the 'const' to the passdb interface, and the flow-on changes.
Also kill off the 'disp_info' stuff, as its no longer used.
While these changes have been mildly tested, and are pretty small, any
assistance in this is appreciated.
----
These changes introduces a large dose of 'const' to the Samba tree.
There are a number of good reasons to do this:
- I want to allow the SAM_ACCOUNT structure to move from wasteful
pstrings and fstrings to allocated strings. We can't do that if
people are modifying these outputs, as they may well make
assumptions about getting pstrings and fstrings
- I want --with-pam_smbpass to compile with a slightly sane
volume of warnings, currently its pretty bad, even in 2.2
where is compiles at all.
- Tridge assures me that he no longer opposes 'const religion'
based on the ability to #define const the problem away.
- Changed Get_Pwnam(x,y) into two variants (so that the const
parameter can work correctly): - Get_Pwnam(const x) and
Get_Pwnam_Modify(x).
- Reworked smbd/chgpasswd.c to work with these mods, passing
around a 'struct passwd' rather than the modified username
---
This finishes this line of commits off, your tree should now compile again :-)
Andrew Bartlett
(This used to be commit c95f5aeb9327347674589ae313b75bee3bf8e317)
2001-10-29 10:35:11 +03:00
BOOL local_password_change ( const char * user_name , int local_flags ,
const char * new_passwd ,
2000-11-14 02:03:34 +03:00
char * err_str , size_t err_str_len ,
char * msg_str , size_t msg_str_len )
{
struct passwd * pwd = NULL ;
2001-05-04 19:44:27 +04:00
SAM_ACCOUNT * sam_pass = NULL ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
* err_str = ' \0 ' ;
* msg_str = ' \0 ' ;
1999-12-13 16:27:58 +03:00
2000-11-14 02:03:34 +03:00
/* Get the smb passwd entry for this user */
2001-05-04 19:44:27 +04:00
pdb_init_sam ( & sam_pass ) ;
2001-09-26 00:21:21 +04:00
if ( ! pdb_getsampwnam ( sam_pass , user_name ) ) {
2001-09-29 17:14:19 +04:00
pdb_free_sam ( & sam_pass ) ;
2001-05-07 18:04:46 +04:00
2001-09-29 17:14:19 +04:00
if ( local_flags & LOCAL_ADD_USER ) {
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
pwd = getpwnam_alloc ( user_name ) ;
2002-01-30 15:06:22 +03:00
} else if ( local_flags & LOCAL_DELETE_USER ) {
/* Might not exist in /etc/passwd */
2001-09-29 17:14:19 +04:00
} else {
2000-11-14 02:03:34 +03:00
slprintf ( err_str , err_str_len - 1 , " Failed to find entry for user %s. \n " , user_name ) ;
return False ;
}
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
if ( pwd ) {
/* Local user found, so init from this */
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 ;
}
2002-01-17 11:45:58 +03:00
passwd_free ( & pwd ) ;
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
} else {
if ( ! NT_STATUS_IS_OK ( pdb_init_sam ( & sam_pass ) ) ) {
slprintf ( err_str , err_str_len - 1 , " Failed initialise SAM_ACCOUNT for user %s. \n " , user_name ) ;
return False ;
}
if ( ! pdb_set_username ( sam_pass , user_name ) ) {
slprintf ( err_str , err_str_len - 1 , " Failed to set username for user %s. \n " , user_name ) ;
pdb_free_sam ( & sam_pass ) ;
return False ;
}
2001-09-27 13:13:26 +04:00
}
2001-12-14 17:35:38 +03:00
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 ;
}
2000-11-14 02:03:34 +03:00
}
2001-12-14 17:35:38 +03:00
2001-05-04 19:44:27 +04:00
} else {
2000-11-14 02:03:34 +03:00
/* the entry already existed */
local_flags & = ~ LOCAL_ADD_USER ;
}
1999-12-13 16:27:58 +03:00
/*
2000-11-14 02:03:34 +03:00
* We are root - just write the new password
* and the valid last change time .
1999-12-13 16:27:58 +03:00
*/
2001-09-29 17:14:19 +04:00
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 ;
}
2001-09-26 00:21:21 +04:00
} else if ( local_flags & LOCAL_ENABLE_USER ) {
2001-09-29 17:14:19 +04:00
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 ( 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 ;
1999-12-13 16:27:58 +03:00
}
2001-10-30 08:21:16 +03:00
} else if ( local_flags & LOCAL_SET_PASSWORD ) {
1999-12-13 16:27:58 +03:00
/*
2000-11-14 02:03:34 +03:00
* If we ' re dealing with setting a completely empty user account
* ie . One with a password of ' XXXX ' , but not set disabled ( like
* an account created from scratch ) then if the old password was
* ' XX ' s then getsmbpwent will have set the ACB_DISABLED flag .
* We remove that as we ' re giving this user their first password
* and the decision hasn ' t really been made to disable them ( ie .
* don ' t create them disabled ) . JRA .
1999-12-13 16:27:58 +03:00
*/
2001-09-29 17:14:19 +04:00
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 ;
}
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_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 ;
}
2002-01-30 15:06:22 +03:00
} else if ( local_flags & LOCAL_DELETE_USER ) {
if ( ! pdb_delete_sam_account ( sam_pass ) ) {
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 ) ;
2001-09-26 00:21:21 +04:00
} else {
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the
one in use in the auth subsystem. In this case, only one backend may be active
at a time by the 'normal' interface, and only one backend per passdb_context is
permitted outside that.
This pluggable interface is designed to allow any number of passdb backends to
be compiled in, with the selection at runtime. The 'passdb backend' paramater
has been created (and documented!) to support this.
As such, configure has been modfied to allow (for example) --with-ldap and the
old smbpasswd to be selected at the same time.
This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua.
These two backends accept 'non unix accounts', where the user does *not* exist
in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to
avoid conflicts in the algroitmic mapping of RIDs, they use the values
specified in the 'non unix account range' paramter - in the same way as the
winbind ranges are specifed.
While I was at it, I cleaned up some of the code in pdb_tdb (code copied
directly from smbpasswd and not really considered properly). Most of this was
to do with % macro expansion on stored data. It isn't easy to get the macros
into the tdb, and the first password change will 'expand' them. tdbsam needs
to use a similar system to pdb_ldap in this regard.
This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I
don't have the test facilities for these. I plan to incoroprate at least
pdb_ldap into this scheme after consultation with Jerry.
Each (converted) passdb module now no longer has any 'static' variables, and
only exports 1 init function outside its .c file.
The non-unix-account support in this patch has been proven! It is now possible
to join a win2k machine to a Samba PDC without an account in /etc/passwd!
Other changes:
Minor interface adjustments:
pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*.
pdb_update_sam_account() no longer takes the 'override' argument that was being
ignored so often (every other passdb backend). Extra checks have been added in
some places.
Minor code changes:
smbpasswd no longer attempts to initialise the passdb at startup, this is
now done on first use.
pdbedit has lost some of its 'machine account' logic, as this behaviour is now
controlled by the passdb subsystem directly.
The samr subsystem no longer calls 'local password change', but does the pdb
interactions directly. This allow the ACB_ flags specifed to be transferred
direct to the backend, without interference.
Doco:
I've updated the doco to reflect some of the changes, and removed some paramters
no longer applicable to HEAD.
(This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
2002-01-20 17:30:58 +03:00
if ( ! pdb_update_sam_account ( sam_pass ) ) {
2000-11-14 02:03:34 +03:00
slprintf ( err_str , err_str_len - 1 , " Failed to modify entry for user %s. \n " , user_name ) ;
2001-09-29 17:14:19 +04:00
pdb_free_sam ( & sam_pass ) ;
2000-11-14 02:03:34 +03:00
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 ) ;
1999-03-03 23:48:48 +03:00
}
2000-11-14 02:03:34 +03:00
2001-09-29 17:14:19 +04:00
pdb_free_sam ( & sam_pass ) ;
2000-11-14 02:03:34 +03:00
return True ;
1999-12-13 16:27:58 +03:00
}