2000-10-26 03:31:41 +00:00
/*
2002-01-30 06:08:46 +00:00
* Unix SMB / CIFS implementation .
* SMB parameters and setup
2000-10-26 03:31:41 +00:00
* Copyright ( C ) Andrew Tridgell 1992 - 1998
2002-07-15 10:35:28 +00:00
* Copyright ( C ) Simo Sorce 2000 - 2002
2000-12-06 18:22:29 +00:00
* Copyright ( C ) Gerald Carter 2000
2001-09-25 20:21:21 +00:00
* Copyright ( C ) Jeremy Allison 2001
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 14:30:58 +00:00
* Copyright ( C ) Andrew Bartlett 2002
2000-10-26 03:31:41 +00: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 10:35:28 +00:00
#if 0 /* when made a module use this */
static int tdbsam_debug_level = DBGC_ALL ;
# undef DBGC_CLASS
# define DBGC_CLASS tdbsam_debug_level
# else
# undef DBGC_CLASS
# define DBGC_CLASS DBGC_PASSDB
# endif
2001-08-31 01:29:53 +00:00
# define PDB_VERSION "20010830"
2002-02-01 23:20:08 +00:00
# define PASSDB_FILE_NAME "passdb.tdb"
2001-08-31 01:29:53 +00:00
# define TDB_FORMAT_STRING "ddddddBBBBBBBBBBBBddBBwdwdBdd"
2000-11-21 05:55:16 +00:00
# define USERPREFIX "USER_"
2000-12-06 18:22:29 +00:00
# define RIDPREFIX "RID_"
2000-10-26 03:31:41 +00:00
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 14:30:58 +00:00
struct tdbsam_privates {
2000-11-21 05:55:16 +00:00
TDB_CONTEXT * passwd_tdb ;
TDB_DATA key ;
2000-10-26 03:31:41 +00:00
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 14:30:58 +00:00
/* retrive-once info */
const char * tdbsam_location ;
BOOL permit_non_unix_accounts ;
2002-07-15 10:35:28 +00:00
BOOL algorithmic_rids ;
uint32 low_nua_rid ;
uint32 high_nua_rid ;
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 14:30:58 +00:00
} ;
2000-11-13 23:03:34 +00:00
2000-11-21 05:55:16 +00:00
/**********************************************************************
Intialize a SAM_ACCOUNT struct from a BYTE buffer of size len
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
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 14:30:58 +00:00
static BOOL init_sam_from_buffer ( struct tdbsam_privates * tdb_state ,
SAM_ACCOUNT * sampass , uint8 * buf , uint32 buflen )
2000-10-26 03:31:41 +00:00
{
2001-08-31 01:29:53 +00:00
/* times are stored as 32bit integer
take care on system with 64 bit wide time_t
- - SSS */
uint32 logon_time ,
2001-05-04 14:01:33 +00:00
logoff_time ,
kickoff_time ,
pass_last_set_time ,
pass_can_change_time ,
pass_must_change_time ;
char * username ;
char * domain ;
char * nt_username ;
char * dir_drive ;
char * unknown_str ;
char * munged_dial ;
char * fullname ;
char * homedir ;
char * logon_script ;
char * profile_path ;
char * acct_desc ;
char * workstations ;
uint32 username_len , domain_len , nt_username_len ,
dir_drive_len , unknown_str_len , munged_dial_len ,
fullname_len , homedir_len , logon_script_len ,
profile_path_len , acct_desc_len , workstations_len ;
2002-03-19 13:57:53 +00:00
uint32 user_rid , group_rid , unknown_3 , hours_len , unknown_5 , unknown_6 ;
2001-05-04 14:01:33 +00:00
uint16 acct_ctrl , logon_divs ;
uint8 * hours ;
2001-09-25 20:21:21 +00:00
static uint8 * lm_pw_ptr , * nt_pw_ptr ;
2000-11-21 05:55:16 +00:00
uint32 len = 0 ;
2002-07-15 10:35:28 +00:00
uint32 lm_pw_len , nt_pw_len , hourslen ;
2001-09-25 20:21:21 +00:00
BOOL ret = True ;
2002-03-19 13:57:53 +00:00
struct passwd * pw ;
2002-07-15 10:35:28 +00:00
uid_t uid = - 1 ;
2002-03-19 13:57:53 +00:00
gid_t gid = - 1 ; /* This is what standard sub advanced expects if no gid is known */
2001-12-30 19:21:25 +00:00
if ( sampass = = NULL | | buf = = NULL ) {
DEBUG ( 0 , ( " init_sam_from_buffer: NULL parameters found! \n " ) ) ;
return False ;
}
2000-12-06 18:22:29 +00:00
2000-11-21 05:55:16 +00:00
/* unpack the buffer into variables */
len = tdb_unpack ( buf , buflen , TDB_FORMAT_STRING ,
2001-08-31 01:29:53 +00:00
& logon_time ,
& logoff_time ,
& kickoff_time ,
& pass_last_set_time ,
& pass_can_change_time ,
& pass_must_change_time ,
2001-05-04 14:01:33 +00:00
& username_len , & username ,
& domain_len , & domain ,
& nt_username_len , & nt_username ,
& fullname_len , & fullname ,
& homedir_len , & homedir ,
& dir_drive_len , & dir_drive ,
& logon_script_len , & logon_script ,
& profile_path_len , & profile_path ,
& acct_desc_len , & acct_desc ,
& workstations_len , & workstations ,
& unknown_str_len , & unknown_str ,
& munged_dial_len , & munged_dial ,
& user_rid ,
& group_rid ,
2002-07-15 10:35:28 +00:00
& lm_pw_len , & lm_pw_ptr ,
& nt_pw_len , & nt_pw_ptr ,
2001-05-04 14:01:33 +00:00
& acct_ctrl ,
& unknown_3 ,
& logon_divs ,
& hours_len ,
& hourslen , & hours ,
& unknown_5 ,
& unknown_6 ) ;
2000-11-21 05:55:16 +00:00
2001-09-25 20:21:21 +00:00
if ( len = = - 1 ) {
ret = False ;
goto done ;
}
2000-11-21 05:55:16 +00:00
2002-03-19 13:57:53 +00:00
/* validate the account and fill in UNIX uid and gid. Standard
* getpwnam ( ) is used instead of Get_Pwnam ( ) as we do not need
* to try case permutations
*/
if ( ! username | | ! ( pw = getpwnam_alloc ( username ) ) ) {
if ( ! ( tdb_state - > permit_non_unix_accounts ) ) {
DEBUG ( 0 , ( " tdbsam: getpwnam_alloc(%s) return NULL. User does not exist! \n " , username ) ) ;
2002-01-20 17:03:23 +00:00
ret = False ;
goto done ;
}
2002-03-19 13:57:53 +00:00
}
if ( pw ) {
2002-01-21 07:55:35 +00:00
uid = pw - > pw_uid ;
2002-01-20 17:03:23 +00:00
gid = pw - > pw_gid ;
2002-01-23 12:59:24 +00:00
2002-11-02 03:47:48 +00:00
pdb_set_unix_homedir ( sampass , pw - > pw_dir , PDB_SET ) ;
2002-07-15 10:35:28 +00:00
2002-01-23 12:59:24 +00:00
passwd_free ( & pw ) ;
2002-01-21 07:54:09 +00:00
2002-11-02 03:47:48 +00:00
pdb_set_uid ( sampass , uid , PDB_SET ) ;
pdb_set_gid ( sampass , gid , PDB_SET ) ;
2002-01-20 17:03:23 +00:00
}
2002-11-02 03:47:48 +00:00
pdb_set_logon_time ( sampass , logon_time , PDB_SET ) ;
pdb_set_logoff_time ( sampass , logoff_time , PDB_SET ) ;
pdb_set_kickoff_time ( sampass , kickoff_time , PDB_SET ) ;
pdb_set_pass_can_change_time ( sampass , pass_can_change_time , PDB_SET ) ;
pdb_set_pass_must_change_time ( sampass , pass_must_change_time , PDB_SET ) ;
pdb_set_pass_last_set_time ( sampass , pass_last_set_time , PDB_SET ) ;
2001-05-04 14:01:33 +00:00
2002-11-02 03:47:48 +00:00
pdb_set_username ( sampass , username , PDB_SET ) ;
pdb_set_domain ( sampass , domain , PDB_SET ) ;
pdb_set_nt_username ( sampass , nt_username , PDB_SET ) ;
pdb_set_fullname ( sampass , fullname , PDB_SET ) ;
2002-01-20 17:03:23 +00:00
2002-07-15 10:35:28 +00:00
if ( homedir ) {
2002-11-02 03:47:48 +00:00
pdb_set_homedir ( sampass , homedir , PDB_SET ) ;
2002-01-20 17:03:23 +00:00
}
else {
2002-07-15 10:35:28 +00:00
pdb_set_homedir ( sampass ,
talloc_sub_specified ( sampass - > mem_ctx ,
lp_logon_home ( ) ,
username , domain ,
uid , gid ) ,
2002-11-02 03:47:48 +00:00
PDB_DEFAULT ) ;
2002-01-20 17:03:23 +00:00
}
2002-07-15 10:35:28 +00:00
if ( dir_drive )
2002-11-02 03:47:48 +00:00
pdb_set_dir_drive ( sampass , dir_drive , PDB_SET ) ;
2002-01-20 17:03:23 +00:00
else {
2002-07-15 10:35:28 +00:00
pdb_set_dir_drive ( sampass ,
talloc_sub_specified ( sampass - > mem_ctx ,
lp_logon_drive ( ) ,
username , domain ,
uid , gid ) ,
2002-11-02 03:47:48 +00:00
PDB_DEFAULT ) ;
2002-01-20 17:03:23 +00:00
}
2002-07-15 10:35:28 +00:00
if ( logon_script )
2002-11-02 03:47:48 +00:00
pdb_set_logon_script ( sampass , logon_script , PDB_SET ) ;
2002-01-20 17:03:23 +00:00
else {
2002-07-15 10:35:28 +00:00
pdb_set_logon_script ( sampass ,
talloc_sub_specified ( sampass - > mem_ctx ,
lp_logon_script ( ) ,
username , domain ,
uid , gid ) ,
2002-11-02 03:47:48 +00:00
PDB_DEFAULT ) ;
2002-07-15 10:35:28 +00:00
}
if ( profile_path ) {
2002-11-02 03:47:48 +00:00
pdb_set_profile_path ( sampass , profile_path , PDB_SET ) ;
2002-07-15 10:35:28 +00:00
} else {
pdb_set_profile_path ( sampass ,
talloc_sub_specified ( sampass - > mem_ctx ,
lp_logon_path ( ) ,
username , domain ,
uid , gid ) ,
2002-11-02 03:47:48 +00:00
PDB_DEFAULT ) ;
2002-01-20 17:03:23 +00:00
}
2002-11-02 03:47:48 +00:00
pdb_set_acct_desc ( sampass , acct_desc , PDB_SET ) ;
pdb_set_workstations ( sampass , workstations , PDB_SET ) ;
pdb_set_munged_dial ( sampass , munged_dial , PDB_SET ) ;
2002-07-15 10:35:28 +00:00
if ( lm_pw_ptr & & lm_pw_len = = LM_HASH_LEN ) {
2002-11-02 03:47:48 +00:00
if ( ! pdb_set_lanman_passwd ( sampass , lm_pw_ptr , PDB_SET ) ) {
2002-07-15 10:35:28 +00:00
ret = False ;
goto done ;
}
2001-12-31 15:48:03 +00:00
}
2002-07-15 10:35:28 +00:00
if ( nt_pw_ptr & & nt_pw_len = = NT_HASH_LEN ) {
2002-11-02 03:47:48 +00:00
if ( ! pdb_set_nt_passwd ( sampass , nt_pw_ptr , PDB_SET ) ) {
2002-07-15 10:35:28 +00:00
ret = False ;
goto done ;
}
2001-12-31 15:48:03 +00:00
}
2001-05-04 14:01:33 +00:00
2002-11-02 03:47:48 +00:00
pdb_set_user_sid_from_rid ( sampass , user_rid , PDB_SET ) ;
pdb_set_group_sid_from_rid ( sampass , group_rid , PDB_SET ) ;
pdb_set_unknown_3 ( sampass , unknown_3 , PDB_SET ) ;
pdb_set_hours_len ( sampass , hours_len , PDB_SET ) ;
pdb_set_unknown_5 ( sampass , unknown_5 , PDB_SET ) ;
pdb_set_unknown_6 ( sampass , unknown_6 , PDB_SET ) ;
pdb_set_acct_ctrl ( sampass , acct_ctrl , PDB_SET ) ;
pdb_set_logon_divs ( sampass , logon_divs , PDB_SET ) ;
pdb_set_hours ( sampass , hours , PDB_SET ) ;
2001-05-04 14:01:33 +00:00
2001-09-25 20:21:21 +00:00
done :
SAFE_FREE ( username ) ;
SAFE_FREE ( domain ) ;
SAFE_FREE ( nt_username ) ;
SAFE_FREE ( fullname ) ;
SAFE_FREE ( homedir ) ;
SAFE_FREE ( dir_drive ) ;
SAFE_FREE ( logon_script ) ;
SAFE_FREE ( profile_path ) ;
SAFE_FREE ( acct_desc ) ;
SAFE_FREE ( workstations ) ;
SAFE_FREE ( munged_dial ) ;
return ret ;
2000-11-21 05:55:16 +00:00
}
/**********************************************************************
Intialize a BYTE buffer from a SAM_ACCOUNT struct
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2002-03-18 11:35:53 +00:00
static uint32 init_buffer_from_sam ( struct tdbsam_privates * tdb_state ,
uint8 * * buf , const SAM_ACCOUNT * sampass )
2000-11-21 05:55:16 +00:00
{
size_t len , buflen ;
2001-08-31 01:29:53 +00:00
/* times are stored as 32bit integer
take care on system with 64 bit wide time_t
- - SSS */
uint32 logon_time ,
2001-05-04 14:01:33 +00:00
logoff_time ,
kickoff_time ,
pass_last_set_time ,
pass_can_change_time ,
pass_must_change_time ;
2002-03-18 11:35:53 +00:00
uint32 user_rid , group_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 07:35:11 +00:00
const char * username ;
const char * domain ;
const char * nt_username ;
const char * dir_drive ;
const char * unknown_str ;
const char * munged_dial ;
const char * fullname ;
const char * homedir ;
const char * logon_script ;
const char * profile_path ;
const char * acct_desc ;
const char * workstations ;
2001-05-04 14:01:33 +00:00
uint32 username_len , domain_len , nt_username_len ,
dir_drive_len , unknown_str_len , munged_dial_len ,
fullname_len , homedir_len , logon_script_len ,
profile_path_len , acct_desc_len , workstations_len ;
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 07:35:11 +00:00
const uint8 * lm_pw ;
const uint8 * nt_pw ;
2001-05-10 20:52:20 +00:00
uint32 lm_pw_len = 16 ;
uint32 nt_pw_len = 16 ;
2000-11-21 05:55:16 +00:00
/* do we have a valid SAM_ACCOUNT pointer? */
2001-12-30 19:21:25 +00:00
if ( sampass = = NULL ) {
DEBUG ( 0 , ( " init_buffer_from_sam: SAM_ACCOUNT is NULL! \n " ) ) ;
2000-11-21 05:55:16 +00:00
return - 1 ;
2001-12-30 19:21:25 +00:00
}
2000-11-21 05:55:16 +00:00
* buf = NULL ;
buflen = 0 ;
2001-09-25 20:21:21 +00:00
logon_time = ( uint32 ) pdb_get_logon_time ( sampass ) ;
logoff_time = ( uint32 ) pdb_get_logoff_time ( sampass ) ;
kickoff_time = ( uint32 ) pdb_get_kickoff_time ( sampass ) ;
pass_can_change_time = ( uint32 ) pdb_get_pass_can_change_time ( sampass ) ;
pass_must_change_time = ( uint32 ) pdb_get_pass_must_change_time ( sampass ) ;
pass_last_set_time = ( uint32 ) pdb_get_pass_last_set_time ( sampass ) ;
2001-05-04 14:01:33 +00:00
2002-03-18 11:35:53 +00:00
user_rid = pdb_get_user_rid ( sampass ) ;
group_rid = pdb_get_group_rid ( sampass ) ;
2001-05-04 14:01:33 +00:00
username = pdb_get_username ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( username ) username_len = strlen ( username ) + 1 ;
else username_len = 0 ;
2001-05-04 14:01:33 +00:00
domain = pdb_get_domain ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( domain ) domain_len = strlen ( domain ) + 1 ;
else domain_len = 0 ;
2001-05-04 14:01:33 +00:00
nt_username = pdb_get_nt_username ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( nt_username ) nt_username_len = strlen ( nt_username ) + 1 ;
else nt_username_len = 0 ;
2001-05-04 14:01:33 +00:00
fullname = pdb_get_fullname ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( fullname ) fullname_len = strlen ( fullname ) + 1 ;
else fullname_len = 0 ;
/*
* Only updates fields which have been set ( not defaults from smb . conf )
*/
2002-11-02 03:47:48 +00:00
if ( ! IS_SAM_DEFAULT ( sampass , PDB_DRIVE ) )
2002-08-17 17:00:51 +00:00
dir_drive = pdb_get_dir_drive ( sampass ) ;
2002-01-20 17:03:23 +00:00
else dir_drive = NULL ;
if ( dir_drive ) dir_drive_len = strlen ( dir_drive ) + 1 ;
else dir_drive_len = 0 ;
2002-11-02 03:47:48 +00:00
if ( ! IS_SAM_DEFAULT ( sampass , PDB_SMBHOME ) ) homedir = pdb_get_homedir ( sampass ) ;
2002-01-20 17:03:23 +00:00
else homedir = NULL ;
if ( homedir ) homedir_len = strlen ( homedir ) + 1 ;
else homedir_len = 0 ;
2002-11-02 03:47:48 +00:00
if ( ! IS_SAM_DEFAULT ( sampass , PDB_LOGONSCRIPT ) ) logon_script = pdb_get_logon_script ( sampass ) ;
2002-01-20 17:03:23 +00:00
else logon_script = NULL ;
if ( logon_script ) logon_script_len = strlen ( logon_script ) + 1 ;
else logon_script_len = 0 ;
2002-11-02 03:47:48 +00:00
if ( ! IS_SAM_DEFAULT ( sampass , PDB_PROFILE ) ) profile_path = pdb_get_profile_path ( sampass ) ;
2002-01-20 17:03:23 +00:00
else profile_path = NULL ;
if ( profile_path ) profile_path_len = strlen ( profile_path ) + 1 ;
else profile_path_len = 0 ;
2001-05-04 14:01:33 +00:00
lm_pw = pdb_get_lanman_passwd ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( ! lm_pw ) lm_pw_len = 0 ;
2001-05-04 14:01:33 +00:00
nt_pw = pdb_get_nt_passwd ( sampass ) ;
2002-01-20 17:03:23 +00:00
if ( ! nt_pw ) nt_pw_len = 0 ;
acct_desc = pdb_get_acct_desc ( sampass ) ;
if ( acct_desc ) acct_desc_len = strlen ( acct_desc ) + 1 ;
else acct_desc_len = 0 ;
workstations = pdb_get_workstations ( sampass ) ;
if ( workstations ) workstations_len = strlen ( workstations ) + 1 ;
else workstations_len = 0 ;
unknown_str = NULL ;
unknown_str_len = 0 ;
munged_dial = pdb_get_munged_dial ( sampass ) ;
if ( munged_dial ) munged_dial_len = strlen ( munged_dial ) + 1 ;
else munged_dial_len = 0 ;
2000-11-21 05:55:16 +00:00
/* one time to get the size needed */
len = tdb_pack ( NULL , 0 , TDB_FORMAT_STRING ,
2001-08-31 01:29:53 +00:00
logon_time ,
logoff_time ,
kickoff_time ,
pass_last_set_time ,
pass_can_change_time ,
pass_must_change_time ,
2001-05-04 14:01:33 +00:00
username_len , username ,
domain_len , domain ,
nt_username_len , nt_username ,
fullname_len , fullname ,
homedir_len , homedir ,
dir_drive_len , dir_drive ,
logon_script_len , logon_script ,
profile_path_len , profile_path ,
acct_desc_len , acct_desc ,
workstations_len , workstations ,
unknown_str_len , unknown_str ,
munged_dial_len , munged_dial ,
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 14:30:58 +00:00
user_rid ,
group_rid ,
2001-05-10 20:52:20 +00:00
lm_pw_len , lm_pw ,
nt_pw_len , nt_pw ,
2001-05-04 14:01:33 +00:00
pdb_get_acct_ctrl ( sampass ) ,
2002-11-02 03:47:48 +00:00
pdb_get_unknown_3 ( sampass ) ,
2001-05-04 14:01:33 +00:00
pdb_get_logon_divs ( sampass ) ,
pdb_get_hours_len ( sampass ) ,
MAX_HOURS_LEN , pdb_get_hours ( sampass ) ,
2002-11-02 03:47:48 +00:00
pdb_get_unknown_5 ( sampass ) ,
pdb_get_unknown_6 ( sampass ) ) ;
2000-11-21 05:55:16 +00:00
/* malloc the space needed */
2001-09-25 20:21:21 +00:00
if ( ( * buf = ( uint8 * ) malloc ( len ) ) = = NULL ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " init_buffer_from_sam: Unable to malloc() memory for buffer! \n " ) ) ;
return ( - 1 ) ;
}
/* now for the real call to tdb_pack() */
buflen = tdb_pack ( * buf , len , TDB_FORMAT_STRING ,
2001-08-31 01:29:53 +00:00
logon_time ,
logoff_time ,
kickoff_time ,
pass_last_set_time ,
pass_can_change_time ,
pass_must_change_time ,
2001-05-04 14:01:33 +00:00
username_len , username ,
domain_len , domain ,
nt_username_len , nt_username ,
fullname_len , fullname ,
homedir_len , homedir ,
dir_drive_len , dir_drive ,
logon_script_len , logon_script ,
profile_path_len , profile_path ,
acct_desc_len , acct_desc ,
workstations_len , workstations ,
unknown_str_len , unknown_str ,
munged_dial_len , munged_dial ,
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 14:30:58 +00:00
user_rid ,
group_rid ,
2001-05-10 20:52:20 +00:00
lm_pw_len , lm_pw ,
nt_pw_len , nt_pw ,
2001-05-04 14:01:33 +00:00
pdb_get_acct_ctrl ( sampass ) ,
2002-11-02 03:47:48 +00:00
pdb_get_unknown_3 ( sampass ) ,
2001-05-04 14:01:33 +00:00
pdb_get_logon_divs ( sampass ) ,
pdb_get_hours_len ( sampass ) ,
MAX_HOURS_LEN , pdb_get_hours ( sampass ) ,
2002-11-02 03:47:48 +00:00
pdb_get_unknown_5 ( sampass ) ,
pdb_get_unknown_6 ( sampass ) ) ;
2000-11-21 05:55:16 +00:00
/* check to make sure we got it correct */
2001-09-25 20:21:21 +00:00
if ( buflen ! = len ) {
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 14:30:58 +00:00
DEBUG ( 0 , ( " init_buffer_from_sam: somthing odd is going on here: bufflen (%d) != len (%d) in tdb_pack operations! \n " ,
buflen , len ) ) ;
2000-11-21 05:55:16 +00:00
/* error */
2001-09-17 05:04:17 +00:00
SAFE_FREE ( * buf ) ;
2000-11-21 05:55:16 +00:00
return ( - 1 ) ;
}
2000-10-26 03:31:41 +00:00
2000-11-21 05:55:16 +00:00
return ( buflen ) ;
}
2000-10-26 03:31:41 +00:00
/***************************************************************
2000-12-12 16:50:23 +00:00
Open the TDB passwd database for SAM account enumeration .
2000-10-26 03:31:41 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_setsampwent ( struct pdb_methods * my_methods , BOOL update )
2000-10-26 03:31:41 +00:00
{
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2000-11-21 05:55:16 +00:00
2000-11-13 23:03:34 +00:00
/* Open tdb passwd */
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 14:30:58 +00:00
if ( ! ( tdb_state - > passwd_tdb = tdb_open_log ( tdb_state - > tdbsam_location , 0 , TDB_DEFAULT , update ? ( O_RDWR | O_CREAT ) : O_RDONLY , 0600 ) ) )
2001-09-27 02:05:30 +00:00
{
DEBUG ( 0 , ( " Unable to open/create TDB passwd \n " ) ) ;
2002-09-26 18:37:55 +00:00
return NT_STATUS_UNSUCCESSFUL ;
2000-11-13 23:03:34 +00:00
}
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 14:30:58 +00:00
tdb_state - > key = tdb_firstkey ( tdb_state - > passwd_tdb ) ;
2000-11-21 05:55:16 +00:00
2002-09-26 18:37:55 +00:00
return NT_STATUS_OK ;
2000-10-26 03:31:41 +00:00
}
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 14:30:58 +00:00
static void close_tdb ( struct tdbsam_privates * tdb_state )
{
if ( tdb_state - > passwd_tdb ) {
tdb_close ( tdb_state - > passwd_tdb ) ;
tdb_state - > passwd_tdb = NULL ;
}
}
2000-10-26 03:31:41 +00:00
/***************************************************************
End enumeration of the TDB passwd list .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-07-15 10:35:28 +00:00
static void tdbsam_endsampwent ( struct pdb_methods * my_methods )
2000-10-26 03:31:41 +00:00
{
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
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 14:30:58 +00:00
close_tdb ( tdb_state ) ;
2000-11-21 05:55:16 +00:00
2001-12-30 19:21:25 +00:00
DEBUG ( 7 , ( " endtdbpwent: closed sam database. \n " ) ) ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/*****************************************************************
Get one SAM_ACCOUNT from the TDB ( next in line )
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_getsampwent ( struct pdb_methods * my_methods , SAM_ACCOUNT * user )
2000-10-26 03:31:41 +00:00
{
2002-09-26 18:37:55 +00:00
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL ;
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2000-12-12 16:50:23 +00:00
TDB_DATA data ;
2003-01-03 08:28:12 +00:00
const char * prefix = USERPREFIX ;
2001-05-04 14:01:33 +00:00
int prefixlen = strlen ( prefix ) ;
2001-12-31 15:48:03 +00:00
2001-05-04 15:44:27 +00:00
if ( user = = NULL ) {
DEBUG ( 0 , ( " pdb_get_sampwent: SAM_ACCOUNT is NULL. \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2001-05-04 15:44:27 +00:00
}
2001-12-30 19:21:25 +00:00
/* skip all non-USER entries (eg. RIDs) */
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 14:30:58 +00:00
while ( ( tdb_state - > key . dsize ! = 0 ) & & ( strncmp ( tdb_state - > key . dptr , prefix , prefixlen ) ) )
2001-05-04 14:01:33 +00:00
/* increment to next in line */
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 14:30:58 +00:00
tdb_state - > key = tdb_nextkey ( tdb_state - > passwd_tdb , tdb_state - > key ) ;
2000-10-26 03:31:41 +00:00
2002-08-17 17:00:51 +00:00
/* do we have an valid iteration pointer? */
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 14:30:58 +00:00
if ( tdb_state - > passwd_tdb = = NULL ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " pdb_get_sampwent: Bad TDB Context pointer. \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
2000-10-26 03:31:41 +00:00
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 14:30:58 +00:00
data = tdb_fetch ( tdb_state - > passwd_tdb , tdb_state - > key ) ;
2001-09-25 20:21:21 +00:00
if ( ! data . dptr ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 5 , ( " pdb_getsampwent: database entry not found. \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
2000-10-26 03:31:41 +00:00
2000-11-21 05:55:16 +00:00
/* unpack the buffer */
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 14:30:58 +00:00
if ( ! init_sam_from_buffer ( tdb_state , user , data . dptr , data . dsize ) ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB! \n " ) ) ;
2001-09-25 09:58:36 +00:00
SAFE_FREE ( data . dptr ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
2001-09-25 09:58:36 +00:00
SAFE_FREE ( data . dptr ) ;
2000-11-21 05:55:16 +00:00
/* increment to next in line */
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 14:30:58 +00:00
tdb_state - > key = tdb_nextkey ( tdb_state - > passwd_tdb , tdb_state - > key ) ;
2000-11-21 05:55:16 +00:00
2002-09-26 18:37:55 +00:00
return NT_STATUS_OK ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/******************************************************************
Lookup a name in the SAM TDB
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_getsampwnam ( struct pdb_methods * my_methods , SAM_ACCOUNT * user , const char * sname )
2000-10-26 03:31:41 +00:00
{
2002-09-26 18:37:55 +00:00
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL ;
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2000-12-12 16:50:23 +00:00
TDB_CONTEXT * pwd_tdb ;
TDB_DATA data , key ;
fstring keystr ;
fstring name ;
2001-05-04 15:44:27 +00:00
if ( user = = NULL ) {
DEBUG ( 0 , ( " pdb_getsampwnam: SAM_ACCOUNT is NULL. \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2001-05-04 15:44:27 +00:00
}
2003-04-23 00:56:06 +00:00
2001-09-26 11:36:37 +00:00
/* Data is stored in all lower-case */
2003-04-23 00:56:06 +00:00
fstrcpy ( name , sname ) ;
strlower ( name ) ;
2001-09-26 11:36:37 +00:00
2000-11-21 05:55:16 +00:00
/* set search key */
2001-04-08 20:31:39 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%s " , USERPREFIX , name ) ;
2000-11-21 05:55:16 +00:00
key . dptr = keystr ;
2001-12-30 19:21:25 +00:00
key . dsize = strlen ( keystr ) + 1 ;
2000-10-26 03:31:41 +00:00
2000-11-21 05:55:16 +00:00
/* open the accounts TDB */
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 14:30:58 +00:00
if ( ! ( pwd_tdb = tdb_open_log ( tdb_state - > tdbsam_location , 0 , TDB_DEFAULT , O_RDONLY , 0600 ) ) ) {
DEBUG ( 0 , ( " pdb_getsampwnam: Unable to open TDB passwd (%s)! \n " , tdb_state - > tdbsam_location ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
2000-10-26 03:31:41 +00:00
2000-11-21 05:55:16 +00:00
/* get the record */
2001-12-30 19:21:25 +00:00
data = tdb_fetch ( pwd_tdb , key ) ;
2001-09-25 20:21:21 +00:00
if ( ! data . dptr ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 5 , ( " pdb_getsampwnam (TDB): error fetching database. \n " ) ) ;
2000-12-06 18:22:29 +00:00
DEBUGADD ( 5 , ( " Error: %s \n " , tdb_errorstr ( pwd_tdb ) ) ) ;
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 14:30:58 +00:00
DEBUGADD ( 5 , ( " Key: %s \n " , keystr ) ) ;
2001-12-30 19:21:25 +00:00
tdb_close ( pwd_tdb ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/* unpack the buffer */
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 14:30:58 +00:00
if ( ! init_sam_from_buffer ( tdb_state , user , data . dptr , data . dsize ) ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB! \n " ) ) ;
2001-09-25 09:58:36 +00:00
SAFE_FREE ( data . dptr ) ;
2001-12-30 19:21:25 +00:00
tdb_close ( pwd_tdb ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
2001-09-25 09:58:36 +00:00
SAFE_FREE ( data . dptr ) ;
2001-12-30 19:21:25 +00:00
2001-12-31 15:48:03 +00:00
/* no further use for database, close it now */
2001-12-30 19:21:25 +00:00
tdb_close ( pwd_tdb ) ;
2000-11-21 05:55:16 +00:00
2002-09-26 18:37:55 +00:00
return NT_STATUS_OK ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/***************************************************************************
Search by rid
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_getsampwrid ( struct pdb_methods * my_methods , SAM_ACCOUNT * user , uint32 rid )
2000-10-26 03:31:41 +00:00
{
2002-09-26 18:37:55 +00:00
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL ;
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2000-12-06 18:22:29 +00:00
TDB_CONTEXT * pwd_tdb ;
TDB_DATA data , key ;
fstring keystr ;
fstring name ;
2001-05-04 15:44:27 +00:00
if ( user = = NULL ) {
DEBUG ( 0 , ( " pdb_getsampwrid: SAM_ACCOUNT is NULL. \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2001-05-04 15:44:27 +00:00
}
2000-12-06 18:22:29 +00:00
/* set search key */
2001-04-08 20:31:39 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%.8x " , RIDPREFIX , rid ) ;
2000-12-06 18:22:29 +00:00
key . dptr = keystr ;
key . dsize = strlen ( keystr ) + 1 ;
2000-10-26 03:31:41 +00:00
2000-12-06 18:22:29 +00:00
/* open the accounts TDB */
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 14:30:58 +00:00
if ( ! ( pwd_tdb = tdb_open_log ( tdb_state - > tdbsam_location , 0 , TDB_DEFAULT , O_RDONLY , 0600 ) ) ) {
2000-12-06 18:22:29 +00:00
DEBUG ( 0 , ( " pdb_getsampwrid: Unable to open TDB rid database! \n " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-12-06 18:22:29 +00:00
}
/* get the record */
data = tdb_fetch ( pwd_tdb , key ) ;
2001-09-25 20:21:21 +00:00
if ( ! data . dptr ) {
2002-01-26 01:52:52 +00:00
DEBUG ( 5 , ( " pdb_getsampwrid (TDB): error looking up RID %d by key %s. \n " , rid , keystr ) ) ;
2000-12-06 18:22:29 +00:00
DEBUGADD ( 5 , ( " Error: %s \n " , tdb_errorstr ( pwd_tdb ) ) ) ;
tdb_close ( pwd_tdb ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-12-06 18:22:29 +00:00
}
fstrcpy ( name , data . dptr ) ;
2001-09-25 09:58:36 +00:00
SAFE_FREE ( data . dptr ) ;
2000-11-21 05:55:16 +00:00
2000-12-06 18:22:29 +00:00
tdb_close ( pwd_tdb ) ;
2002-07-15 10:35:28 +00:00
return tdbsam_getsampwnam ( my_methods , user , name ) ;
}
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_getsampwsid ( struct pdb_methods * my_methods , SAM_ACCOUNT * user , const DOM_SID * sid )
2002-07-15 10:35:28 +00:00
{
uint32 rid ;
if ( ! sid_peek_check_rid ( get_global_sam_sid ( ) , sid , & rid ) )
2002-09-26 18:37:55 +00:00
return NT_STATUS_UNSUCCESSFUL ;
2002-07-15 10:35:28 +00:00
return tdbsam_getsampwrid ( my_methods , user , rid ) ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/***************************************************************************
Delete a SAM_ACCOUNT
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_delete_sam_account ( struct pdb_methods * my_methods , SAM_ACCOUNT * sam_pass )
2000-10-26 03:31:41 +00:00
{
2002-09-26 18:37:55 +00:00
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL ;
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2000-11-21 05:55:16 +00:00
TDB_CONTEXT * pwd_tdb ;
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 14:30:58 +00:00
TDB_DATA key ;
2000-11-21 05:55:16 +00:00
fstring keystr ;
2000-12-06 18:22:29 +00:00
uint32 rid ;
fstring name ;
2003-04-23 00:56:06 +00:00
fstrcpy ( name , pdb_get_username ( sam_pass ) ) ;
strlower ( name ) ;
2000-11-21 05:55:16 +00:00
/* open the TDB */
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 14:30:58 +00:00
if ( ! ( pwd_tdb = tdb_open_log ( tdb_state - > tdbsam_location , 0 , TDB_DEFAULT , O_RDWR , 0600 ) ) ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " Unable to open TDB passwd! " ) ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
/* set the search key */
2001-04-08 20:31:39 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%s " , USERPREFIX , name ) ;
2000-11-21 05:55:16 +00:00
key . dptr = keystr ;
key . dsize = strlen ( keystr ) + 1 ;
2001-09-25 14:40:25 +00:00
rid = pdb_get_user_rid ( sam_pass ) ;
2000-12-06 18:22:29 +00:00
/* it's outaa here! 8^) */
2001-09-25 20:21:21 +00:00
if ( tdb_delete ( pwd_tdb , key ) ! = TDB_SUCCESS ) {
2000-12-06 18:22:29 +00:00
DEBUG ( 5 , ( " Error deleting entry from tdb passwd database! \n " ) ) ;
DEBUGADD ( 5 , ( " Error: %s \n " , tdb_errorstr ( pwd_tdb ) ) ) ;
tdb_close ( pwd_tdb ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-12-06 18:22:29 +00:00
}
2001-05-04 14:01:33 +00:00
/* delete also the RID key */
2000-12-06 18:22:29 +00:00
/* set the search key */
2001-04-08 20:31:39 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%.8x " , RIDPREFIX , rid ) ;
2000-12-06 18:22:29 +00:00
key . dptr = keystr ;
key . dsize = strlen ( keystr ) + 1 ;
2000-11-21 05:55:16 +00:00
/* it's outaa here! 8^) */
2001-09-25 20:21:21 +00:00
if ( tdb_delete ( pwd_tdb , key ) ! = TDB_SUCCESS ) {
2000-12-06 18:22:29 +00:00
DEBUG ( 5 , ( " Error deleting entry from tdb rid database! \n " ) ) ;
DEBUGADD ( 5 , ( " Error: %s \n " , tdb_errorstr ( pwd_tdb ) ) ) ;
2000-11-21 05:55:16 +00:00
tdb_close ( pwd_tdb ) ;
2002-09-26 18:37:55 +00:00
return nt_status ;
2000-11-21 05:55:16 +00:00
}
tdb_close ( pwd_tdb ) ;
2000-12-06 18:22:29 +00:00
2002-09-26 18:37:55 +00:00
return NT_STATUS_OK ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/***************************************************************************
Update the TDB SAM
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-07-15 10:35:28 +00:00
static BOOL tdb_update_sam ( struct pdb_methods * my_methods , SAM_ACCOUNT * newpwd , int flag )
2000-10-26 03:31:41 +00:00
{
2002-07-15 10:35:28 +00:00
struct tdbsam_privates * tdb_state = ( struct tdbsam_privates * ) my_methods - > private_data ;
2001-09-26 11:44:25 +00:00
TDB_CONTEXT * pwd_tdb = NULL ;
2000-11-21 05:55:16 +00:00
TDB_DATA key , data ;
2001-03-11 00:51:54 +00:00
uint8 * buf = NULL ;
2000-11-21 05:55:16 +00:00
fstring keystr ;
2000-12-06 18:22:29 +00:00
fstring name ;
2001-09-25 09:58:36 +00:00
BOOL ret = True ;
2002-03-18 11:35:53 +00:00
uint32 user_rid ;
2002-07-15 10:35:28 +00:00
BOOL tdb_ret ;
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 14:30:58 +00:00
/* invalidate the existing TDB iterator if it is open */
if ( tdb_state - > passwd_tdb ) {
tdb_close ( tdb_state - > passwd_tdb ) ;
tdb_state - > passwd_tdb = NULL ;
}
/* open the account TDB passwd*/
pwd_tdb = tdb_open_log ( tdb_state - > tdbsam_location , 0 , TDB_DEFAULT , O_RDWR | O_CREAT , 0600 ) ;
if ( ! pwd_tdb )
{
DEBUG ( 0 , ( " tdb_update_sam: Unable to open TDB passwd (%s)! \n " , tdb_state - > tdbsam_location ) ) ;
return False ;
}
2002-03-18 11:35:53 +00:00
/* if flag == TDB_INSERT then make up a new RID else throw an error. */
2002-03-19 13:57:53 +00:00
if ( ! ( user_rid = pdb_get_user_rid ( newpwd ) ) ) {
2002-03-18 11:35:53 +00:00
if ( flag & TDB_INSERT ) {
2002-07-15 10:35:28 +00:00
if ( IS_SAM_UNIX_USER ( newpwd ) ) {
if ( tdb_state - > algorithmic_rids ) {
user_rid = fallback_pdb_uid_to_user_rid ( pdb_get_uid ( newpwd ) ) ;
} else {
user_rid = BASE_RID ;
tdb_ret = tdb_change_uint32_atomic ( pwd_tdb , " RID_COUNTER " , & user_rid , RID_MULTIPLIER ) ;
if ( ! tdb_ret ) {
ret = False ;
goto done ;
}
}
2002-11-02 03:47:48 +00:00
pdb_set_user_sid_from_rid ( newpwd , user_rid , PDB_CHANGED ) ;
2002-07-15 10:35:28 +00:00
} else {
user_rid = tdb_state - > low_nua_rid ;
tdb_ret = tdb_change_uint32_atomic ( pwd_tdb , " NUA_RID_COUNTER " , & user_rid , RID_MULTIPLIER ) ;
if ( ! tdb_ret ) {
ret = False ;
goto done ;
}
if ( user_rid > tdb_state - > high_nua_rid ) {
DEBUG ( 0 , ( " tdbsam: no NUA rids available, cannot add user %s! \n " , pdb_get_username ( newpwd ) ) ) ;
ret = False ;
goto done ;
}
2002-11-02 03:47:48 +00:00
pdb_set_user_sid_from_rid ( newpwd , user_rid , PDB_CHANGED ) ;
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 14:30:58 +00:00
}
2002-03-18 11:35:53 +00:00
} else {
DEBUG ( 0 , ( " tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a RID \n " , pdb_get_username ( newpwd ) ) ) ;
ret = False ;
goto done ;
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 14:30:58 +00:00
}
}
2002-03-18 11:35:53 +00:00
if ( ! pdb_get_group_rid ( newpwd ) ) {
if ( flag & TDB_INSERT ) {
if ( ! tdb_state - > permit_non_unix_accounts ) {
DEBUG ( 0 , ( " tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a primary group RID \n " , pdb_get_username ( newpwd ) ) ) ;
ret = False ;
goto done ;
} else {
/* This seems like a good default choice for non-unix users */
2002-11-02 03:47:48 +00:00
pdb_set_group_sid_from_rid ( newpwd , DOMAIN_GROUP_RID_USERS , PDB_DEFAULT ) ;
2002-03-18 11:35:53 +00: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 14:30:58 +00:00
DEBUG ( 0 , ( " tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a primary group RID \n " , pdb_get_username ( newpwd ) ) ) ;
ret = False ;
goto done ;
}
}
2001-05-04 14:01:33 +00:00
2000-11-21 05:55:16 +00:00
/* copy the SAM_ACCOUNT struct into a BYTE buffer for storage */
2002-03-18 11:35:53 +00:00
if ( ( data . dsize = init_buffer_from_sam ( tdb_state , & buf , newpwd ) ) = = - 1 ) {
2000-11-21 05:55:16 +00:00
DEBUG ( 0 , ( " tdb_update_sam: ERROR - Unable to copy SAM_ACCOUNT info BYTE buffer! \n " ) ) ;
2001-09-25 09:58:36 +00:00
ret = False ;
goto done ;
2000-11-21 05:55:16 +00:00
}
data . dptr = buf ;
2000-10-26 03:31:41 +00:00
2003-04-23 00:56:06 +00:00
fstrcpy ( name , pdb_get_username ( newpwd ) ) ;
strlower ( name ) ;
2000-12-06 18:22:29 +00:00
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 14:30:58 +00:00
DEBUG ( 5 , ( " Storing %saccount %s with RID %d \n " , flag = = TDB_INSERT ? " (new) " : " " , name , user_rid ) ) ;
2000-12-06 18:22:29 +00:00
/* setup the USER index key */
2001-04-08 20:31:39 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%s " , USERPREFIX , name ) ;
2000-11-21 05:55:16 +00:00
key . dptr = keystr ;
key . dsize = strlen ( keystr ) + 1 ;
/* add the account */
2001-09-25 20:21:21 +00:00
if ( tdb_store ( pwd_tdb , key , data , flag ) ! = TDB_SUCCESS ) {
2001-05-04 14:01:33 +00:00
DEBUG ( 0 , ( " Unable to modify passwd TDB! " ) ) ;
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 14:30:58 +00:00
DEBUGADD ( 0 , ( " Error: %s " , tdb_errorstr ( pwd_tdb ) ) ) ;
DEBUGADD ( 0 , ( " occured while storing the main record (%s) \n " , keystr ) ) ;
2001-09-25 09:58:36 +00:00
ret = False ;
goto done ;
2000-11-21 05:55:16 +00:00
}
2000-12-06 18:22:29 +00:00
2000-12-12 16:50:23 +00:00
/* setup RID data */
2000-12-06 18:22:29 +00:00
data . dsize = sizeof ( fstring ) ;
data . dptr = name ;
2000-11-21 05:55:16 +00:00
2000-12-06 18:22:29 +00:00
/* setup the RID index key */
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 14:30:58 +00:00
slprintf ( keystr , sizeof ( keystr ) - 1 , " %s%.8x " , RIDPREFIX , user_rid ) ;
2000-12-06 18:22:29 +00:00
key . dptr = keystr ;
key . dsize = strlen ( keystr ) + 1 ;
/* add the reference */
2001-09-25 20:21:21 +00:00
if ( tdb_store ( pwd_tdb , key , data , flag ) ! = TDB_SUCCESS ) {
2001-05-04 14:01:33 +00:00
DEBUG ( 0 , ( " Unable to modify TDB passwd ! " ) ) ;
2000-12-06 18:22:29 +00:00
DEBUGADD ( 0 , ( " Error: %s \n " , tdb_errorstr ( pwd_tdb ) ) ) ;
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 14:30:58 +00:00
DEBUGADD ( 0 , ( " occured while storing the RID index (%s) \n " , keystr ) ) ;
2001-09-25 09:58:36 +00:00
ret = False ;
goto done ;
2000-12-06 18:22:29 +00:00
}
2001-09-25 09:58:36 +00:00
done :
2000-12-06 18:22:29 +00:00
/* cleanup */
tdb_close ( pwd_tdb ) ;
2001-09-25 09:58:36 +00:00
SAFE_FREE ( buf ) ;
2001-09-27 02:05:30 +00:00
return ( ret ) ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/***************************************************************************
Modifies an existing SAM_ACCOUNT
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_update_sam_account ( struct pdb_methods * my_methods , SAM_ACCOUNT * newpwd )
2000-10-26 03:31:41 +00:00
{
2002-09-26 18:37:55 +00:00
if ( tdb_update_sam ( my_methods , newpwd , TDB_MODIFY ) )
return NT_STATUS_OK ;
else
return NT_STATUS_UNSUCCESSFUL ;
2000-10-26 03:31:41 +00:00
}
2000-11-21 05:55:16 +00:00
/***************************************************************************
Adds an existing SAM_ACCOUNT
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2001-09-25 20:21:21 +00:00
2002-09-26 18:37:55 +00:00
static NTSTATUS tdbsam_add_sam_account ( struct pdb_methods * my_methods , SAM_ACCOUNT * newpwd )
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 14:30:58 +00:00
{
2002-09-26 18:37:55 +00:00
if ( tdb_update_sam ( my_methods , newpwd , TDB_INSERT ) )
return NT_STATUS_OK ;
else
return NT_STATUS_UNSUCCESSFUL ;
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 14:30:58 +00:00
}
static void free_private_data ( void * * vp )
2000-10-26 03:31:41 +00:00
{
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 14:30:58 +00:00
struct tdbsam_privates * * tdb_state = ( struct tdbsam_privates * * ) vp ;
close_tdb ( * tdb_state ) ;
* tdb_state = NULL ;
/* No need to free any further, as it is talloc()ed */
2000-10-26 03:31:41 +00:00
}
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 14:30:58 +00:00
NTSTATUS pdb_init_tdbsam ( PDB_CONTEXT * pdb_context , PDB_METHODS * * pdb_method , const char * location )
{
NTSTATUS nt_status ;
struct tdbsam_privates * tdb_state ;
2002-07-15 10:35:28 +00:00
#if 0 /* when made a module use this */
tdbsam_debug_level = debug_add_class ( " tdbsam " ) ;
if ( tdbsam_debug_level = = - 1 ) {
tdbsam_debug_level = DBGC_ALL ;
DEBUG ( 0 , ( " tdbsam: Couldn't register custom debugging class! \n " ) ) ;
}
# endif
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 14:30:58 +00:00
if ( ! NT_STATUS_IS_OK ( nt_status = make_pdb_methods ( pdb_context - > mem_ctx , pdb_method ) ) ) {
return nt_status ;
}
2002-01-25 11:44:15 +00:00
( * pdb_method ) - > name = " tdbsam " ;
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 14:30:58 +00:00
( * pdb_method ) - > setsampwent = tdbsam_setsampwent ;
( * pdb_method ) - > endsampwent = tdbsam_endsampwent ;
( * pdb_method ) - > getsampwent = tdbsam_getsampwent ;
( * pdb_method ) - > getsampwnam = tdbsam_getsampwnam ;
2002-07-15 10:35:28 +00:00
( * pdb_method ) - > getsampwsid = tdbsam_getsampwsid ;
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 14:30:58 +00:00
( * pdb_method ) - > add_sam_account = tdbsam_add_sam_account ;
( * pdb_method ) - > update_sam_account = tdbsam_update_sam_account ;
( * pdb_method ) - > delete_sam_account = tdbsam_delete_sam_account ;
tdb_state = talloc_zero ( pdb_context - > mem_ctx , sizeof ( struct tdbsam_privates ) ) ;
if ( ! tdb_state ) {
DEBUG ( 0 , ( " talloc() failed for tdbsam private_data! \n " ) ) ;
return NT_STATUS_NO_MEMORY ;
}
if ( location ) {
tdb_state - > tdbsam_location = talloc_strdup ( pdb_context - > mem_ctx , location ) ;
} else {
pstring tdbfile ;
get_private_directory ( tdbfile ) ;
2002-02-01 23:20:08 +00:00
pstrcat ( tdbfile , " / " ) ;
pstrcat ( tdbfile , PASSDB_FILE_NAME ) ;
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 14:30:58 +00:00
tdb_state - > tdbsam_location = talloc_strdup ( pdb_context - > mem_ctx , tdbfile ) ;
}
2002-07-15 10:35:28 +00:00
tdb_state - > algorithmic_rids = True ;
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 14:30:58 +00:00
( * pdb_method ) - > private_data = tdb_state ;
( * pdb_method ) - > free_private_data = free_private_data ;
return NT_STATUS_OK ;
}
NTSTATUS pdb_init_tdbsam_nua ( PDB_CONTEXT * pdb_context , PDB_METHODS * * pdb_method , const char * location )
{
NTSTATUS nt_status ;
struct tdbsam_privates * tdb_state ;
uint32 low_nua_uid , high_nua_uid ;
if ( ! NT_STATUS_IS_OK ( nt_status = pdb_init_tdbsam ( pdb_context , pdb_method , location ) ) ) {
return nt_status ;
}
2002-01-25 11:44:15 +00:00
( * pdb_method ) - > name = " tdbsam_nua " ;
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 14:30:58 +00:00
tdb_state = ( * pdb_method ) - > private_data ;
2002-07-15 10:35:28 +00:00
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 14:30:58 +00:00
tdb_state - > permit_non_unix_accounts = True ;
if ( ! lp_non_unix_account_range ( & low_nua_uid , & high_nua_uid ) ) {
DEBUG ( 0 , ( " cannot use tdbsam_nua without 'non unix account range' in smb.conf! \n " ) ) ;
return NT_STATUS_UNSUCCESSFUL ;
}
2002-07-15 10:35:28 +00:00
tdb_state - > low_nua_rid = fallback_pdb_uid_to_user_rid ( low_nua_uid ) ;
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 14:30:58 +00:00
2002-03-18 11:35:53 +00:00
tdb_state - > high_nua_rid = fallback_pdb_uid_to_user_rid ( high_nua_uid ) ;
2002-07-15 10:35:28 +00:00
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 14:30:58 +00:00
return NT_STATUS_OK ;
}
2003-04-15 16:01:14 +00:00
int pdb_tdbsam_init ( void )
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 14:30:58 +00:00
{
2003-04-15 16:01:14 +00:00
smb_register_passdb ( " tdbsam " , pdb_init_tdbsam , PASSDB_INTERFACE_VERSION ) ;
smb_register_passdb ( " tdbsam_nua " , pdb_init_tdbsam_nua , PASSDB_INTERFACE_VERSION ) ;
return True ;
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 14:30:58 +00:00
}
