sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code
b97fbf5888
samba-mirror/source3/rpc_server/srv_samr_util.c

717 lines
26 KiB
C
Raw Normal View History

Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
/*
Unix SMB/CIFS implementation.
SAMR Pipe utility functions.
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Copyright (C) Luke Kenneth Casson Leighton 1996-1998
Copyright (C) Gerald (Jerry) Carter 2000-2001
Copyright (C) Andrew Bartlett 2001-2002
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Copyright (C) Stefan (metze) Metzmacher 2002
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
r23779: Change from v2 or later to v3 or later. Jeremy. (This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3)
2007-07-09 23:25:36 +04:00
the Free Software Foundation; either version 3 of the License, or
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
(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
r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text (This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07)
2007-07-10 04:52:41 +04:00
along with this program. If not, see <http://www.gnu.org/licenses/>.
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
*/
#include "includes.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
#define STRING_CHANGED (old_string && !new_string) ||\
(!old_string && new_string) ||\
(old_string && new_string && (strcmp(old_string, new_string) != 0))
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
#define STRING_CHANGED_NC(s1,s2) ((s1) && !(s2)) ||\
(!(s1) && (s2)) ||\
((s1) && (s2) && (strcmp((s1), (s2)) != 0))
/*************************************************************
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
Copies a SAM_USER_INFO_20 to a struct samu
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
**************************************************************/
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
void copy_id20_to_sam_passwd(struct samu *to, SAM_USER_INFO_20 *from)
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
{
const char *old_string;
char *new_string;
DATA_BLOB mung;
if (from == NULL || to == NULL)
return;
if (from->hdr_munged_dial.buffer) {
old_string = pdb_get_munged_dial(to);
mung.length = from->hdr_munged_dial.uni_str_len;
mung.data = (uint8 *) from->uni_munged_dial.buffer;
r20546: Fix some IBM checker errors (This used to be commit 8f67efd582655e03fea746eee499f3cab6cbdb4d)
2007-01-05 17:52:10 +03:00
mung.free = NULL;
r545: Handing a NULL blob to base64_encode_data_blob leads to an invalid write of a 0 in base64_encode_data_blob. I don't know what the base64 encoding of a NULL string is, so fix the problematic caller I found. The real fix should go into base64_encode_data_blob. Volker (This used to be commit 55fd1e490efbe91c391c27101166284034cd32ef)
2004-05-07 12:42:13 +04:00
new_string = (mung.length == 0) ?
NULL : base64_encode_data_blob(mung);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
DEBUG(10,("INFO_20 UNI_MUNGED_DIAL: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED_NC(old_string,new_string))
pdb_set_munged_dial(to , new_string, PDB_CHANGED);
Make base64_encode_data_blob return a talloced string (This used to be commit 5f205ab48d8ac3b7af573ea0be1ce095ab835448)
2007-10-28 21:15:08 +03:00
TALLOC_FREE(new_string);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
}
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
/*************************************************************
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
Copies a SAM_USER_INFO_21 to a struct samu
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
**************************************************************/
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
void copy_id21_to_sam_passwd(struct samu *to, SAM_USER_INFO_21 *from)
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
{
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
time_t unix_time, stored_time;
const char *old_string, *new_string;
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
DATA_BLOB mung;
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
if (from == NULL || to == NULL)
return;
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LAST_LOGON) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logon_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_21 LOGON_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
}
if (from->fields_present & ACCT_LAST_LOGOFF) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logoff_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_21 LOGOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_EXPIRY) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->kickoff_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_21 KICKOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->pass_last_set_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_21 PASS_LAST_SET: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_USERNAME) &&
(from->hdr_user_name.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_username(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_user_name);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_USER_NAME: %s -> %s\n", old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_username(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_FULL_NAME) &&
(from->hdr_full_name.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_fullname(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_full_name);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_FULL_NAME: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_fullname(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_homedir(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_home_dir);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_HOME_DIR: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_homedir(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_HOME_DRIVE) &&
(from->hdr_dir_drive.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_dir_drive(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_dir_drive);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_DIR_DRIVE: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_dir_drive(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_LOGON_SCRIPT) &&
(from->hdr_logon_script.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_logon_script(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_logon_script);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logon_script(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_PROFILE) &&
(from->hdr_profile_path.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_profile_path(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_profile_path);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_profile_path(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_acct_desc(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_acct_desc);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_ACCT_DESC: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_workstations(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_workstations);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_21 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_workstations(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if ((from->fields_present & ACCT_COMMENT) &&
(from->hdr_comment.buffer)) {
old_string = pdb_get_comment(to);
new_string = unistr2_static(&from->uni_comment);
DEBUG(10,("INFO_21 UNI_COMMENT: %s -> %s\n",old_string, new_string));
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
if (STRING_CHANGED)
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
pdb_set_comment(to, new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
char *newstr;
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_munged_dial(to);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
mung.length = from->hdr_munged_dial.uni_str_len;
mung.data = (uint8 *) from->uni_munged_dial.buffer;
r20546: Fix some IBM checker errors (This used to be commit 8f67efd582655e03fea746eee499f3cab6cbdb4d)
2007-01-05 17:52:10 +03:00
mung.free = NULL;
r545: Handing a NULL blob to base64_encode_data_blob leads to an invalid write of a 0 in base64_encode_data_blob. I don't know what the base64 encoding of a NULL string is, so fix the problematic caller I found. The real fix should go into base64_encode_data_blob. Volker (This used to be commit 55fd1e490efbe91c391c27101166284034cd32ef)
2004-05-07 12:42:13 +04:00
newstr = (mung.length == 0) ?
NULL : base64_encode_data_blob(mung);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
DEBUG(10,("INFO_21 UNI_MUNGED_DIAL: %s -> %s\n",old_string, newstr));
if (STRING_CHANGED_NC(old_string,newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
Make base64_encode_data_blob return a talloced string (This used to be commit 5f205ab48d8ac3b7af573ea0be1ce095ab835448)
2007-10-28 21:15:08 +03:00
TALLOC_FREE(newstr);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_21: Asked to set User RID to 0 !? Skipping change!\n"));
} else if (from->user_rid != pdb_get_user_rid(to)) {
DEBUG(10,("INFO_21 USER_RID: %u -> %u NOT UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_PRIMARY_GID) {
if (from->group_rid == 0) {
DEBUG(10, ("INFO_21: Asked to set Group RID to 0 !? Skipping change!\n"));
} else if (from->group_rid != pdb_get_group_rid(to)) {
DEBUG(10,("INFO_21 GROUP_RID: %u -> %u\n",pdb_get_group_rid(to),from->group_rid));
pdb_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_21 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
r1171: Patch from "Lu, Jianliang" <Jianliang.Lu@getronics.com> to reset password counts when account is reset. Jeremy. (This used to be commit 6fb64d8b368d1b24768c5817d5deac1e502e694a)
2004-06-16 22:05:47 +04:00
if (!(from->acb_info & ACB_AUTOLOCK) && (pdb_get_acct_ctrl(to) & ACB_AUTOLOCK)) {
/* We're unlocking a previously locked user. Reset bad password counts.
Patch from Jianliang Lu. <Jianliang.Lu@getronics.com> */
pdb_set_bad_password_count(to, 0, PDB_CHANGED);
pdb_set_bad_password_time(to, 0, PDB_CHANGED);
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
pdb_set_acct_ctrl(to, from->acb_info, PDB_CHANGED);
}
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LOGON_HOURS) {
Remove pstring from everything in rpc_server except srv_spoolss_nt.c and srv_srvsvc_nt.c. They're next :-). Jeremy. (This used to be commit 55b4f9d003b036af69085f7b64e0df08c5ba440d)
2007-11-27 22:22:58 +03:00
char oldstr[44]; /* hours strings are 42 bytes. */
char newstr[44];
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
DEBUG(15,("INFO_21 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
if (from->logon_divs != pdb_get_logon_divs(to)) {
pdb_set_logon_divs(to, from->logon_divs, PDB_CHANGED);
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
DEBUG(15,("INFO_21 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
if (from->logon_hrs.len != pdb_get_hours_len(to)) {
pdb_set_hours_len(to, from->logon_hrs.len, PDB_CHANGED);
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
DEBUG(15,("INFO_21 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
pdb_sethexhours(oldstr, pdb_get_hours(to));
pdb_sethexhours(newstr, from->logon_hrs.hours);
if (!strequal(oldstr, newstr)) {
r4351: Vampire Logon-Hours. Update Logon-Hours only when they have changed. Guenther (This used to be commit 0930ad662770278cbe9fd4e3deaa523957b96697)
2004-12-24 03:08:15 +03:00
pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
}
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_BAD_PWD_COUNT) {
DEBUG(10,("INFO_21 BAD_PASSWORD_COUNT: %08X -> %08X\n",pdb_get_bad_password_count(to),from->bad_password_count));
if (from->bad_password_count != pdb_get_bad_password_count(to)) {
pdb_set_bad_password_count(to, from->bad_password_count, PDB_CHANGED);
}
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_NUM_LOGONS) {
DEBUG(10,("INFO_21 LOGON_COUNT: %08X -> %08X\n",pdb_get_logon_count(to),from->logon_count));
if (from->logon_count != pdb_get_logon_count(to)) {
pdb_set_logon_count(to, from->logon_count, PDB_CHANGED);
}
The "unknown_5" 32 bit field in the user structs is actually 2 16-bit fields, bad_password_count and logon_count. Ensure this is stored/fetched in the various SAMs. As it replaces the unknown_5 field this fits exactly into the tdb SAM without any binary problems. It also is added to the LDAP SAM as two extra attributes. It breaks compatibility with the experimental SAMs xml and mysql. The maintainers of these SAMs must fix them so upgrades like this can be done transparently. I will insist on the "experimental" status until this is solved. Jeremy. (This used to be commit cd7bd8c2daff3293d48f3376a7c5a708a140fd94)
2003-09-19 03:53:48 +04:00
}
r18722: Fix up password change times. The can change and must change times are calculated based on the last change time, policies, and acb flags. Next step will be to not bother storing them. Right now I'm just trying to get them reported correctly. (This used to be commit fd5761c9e52cbf8f1f7e45e71693598b27ecbf57)
2006-09-20 21:25:46 +04:00
/* If the must change flag is set, the last set time goes to zero.
the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_21 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
r18724: Fixup time(0) -> time(NULL) (This used to be commit 6b17af0769ab0d04ec01cc83ed6e7fad822b00b1)
2006-09-20 21:37:20 +04:00
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
r9229: merge from trunk: allow admins to uncheck the "User must change Password at next Logon" checkbox in Usermanager. Guenther (This used to be commit b1e4b72c1c36869c4dfc5ed284be24edc99f6774)
2005-08-10 20:02:32 +04:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
DEBUG(10,("INFO_21 PADDING_2: %02X\n",from->padding2));
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
}
/*************************************************************
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
Copies a SAM_USER_INFO_23 to a struct samu
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
**************************************************************/
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
r13576: This is the beginnings of moving the SAM_ACCOUNT data structure to make full use of the new talloc() interface. Discussed with Volker and Jeremy. * remove the internal mem_ctx and simply use the talloc() structure as the context. * replace the internal free_fn() with a talloc_destructor() function * remove the unnecessary private nested structure * rename SAM_ACCOUNT to 'struct samu' to indicate the current an upcoming changes. Groups will most likely be replaced with a 'struct samg' in the future. Note that there are now passbd API changes. And for the most part, the wrapper functions remain the same. While this code has been tested on tdb and ldap based Samba PDC's as well as Samba member servers, there are probably still some bugs. The code also needs more testing under valgrind to ensure it's not leaking memory. But it's a start...... (This used to be commit 19b7593972480540283c5bf02c02e5ecd8d2c3f0)
2006-02-20 23:09:36 +03:00
void copy_id23_to_sam_passwd(struct samu *to, SAM_USER_INFO_23 *from)
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
{
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
time_t unix_time, stored_time;
const char *old_string, *new_string;
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
DATA_BLOB mung;
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
if (from == NULL || to == NULL)
return;
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LAST_LOGON) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logon_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_23 LOGON_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
}
if (from->fields_present & ACCT_LAST_LOGOFF) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logoff_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_23 LOGOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_EXPIRY) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->kickoff_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_23 KICKOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->pass_last_set_time);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_23 PASS_LAST_SET: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
/* Backend should check this for sanity */
if ((from->fields_present & ACCT_USERNAME) &&
(from->hdr_user_name.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_username(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_user_name);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_USER_NAME: %s -> %s\n", old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_username(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_FULL_NAME) &&
(from->hdr_full_name.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_fullname(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_full_name);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_FULL_NAME: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_fullname(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_homedir(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_home_dir);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_HOME_DIR: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_homedir(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_HOME_DRIVE) &&
(from->hdr_dir_drive.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_dir_drive(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_dir_drive);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_DIR_DRIVE: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_dir_drive(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_LOGON_SCRIPT) &&
(from->hdr_logon_script.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_logon_script(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_logon_script);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_logon_script(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_PROFILE) &&
(from->hdr_profile_path.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_profile_path(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_profile_path);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_profile_path(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_acct_desc(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_acct_desc);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_ACCT_DESC: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_workstations(to);
Merge from HEAD - we already have one function for converting a unistr2 to a static 'unix' string, so we don't need a second pdb specific version. Andrew Bartlett (This used to be commit 91ca4771c6b834747b06fff21822a14e929de2c1)
2003-01-04 11:57:51 +03:00
new_string = unistr2_static(&from->uni_workstations);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
pdb_set_workstations(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if ((from->fields_present & ACCT_COMMENT) &&
(from->hdr_comment.buffer)) {
old_string = pdb_get_comment(to);
new_string = unistr2_static(&from->uni_comment);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
DEBUG(10,("INFO_23 UNI_UNKNOWN_STR: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
pdb_set_comment(to , new_string, PDB_CHANGED);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
char *newstr;
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
old_string = pdb_get_munged_dial(to);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
mung.length = from->hdr_munged_dial.uni_str_len;
mung.data = (uint8 *) from->uni_munged_dial.buffer;
r20546: Fix some IBM checker errors (This used to be commit 8f67efd582655e03fea746eee499f3cab6cbdb4d)
2007-01-05 17:52:10 +03:00
mung.free = NULL;
r545: Handing a NULL blob to base64_encode_data_blob leads to an invalid write of a 0 in base64_encode_data_blob. I don't know what the base64 encoding of a NULL string is, so fix the problematic caller I found. The real fix should go into base64_encode_data_blob. Volker (This used to be commit 55fd1e490efbe91c391c27101166284034cd32ef)
2004-05-07 12:42:13 +04:00
newstr = (mung.length == 0) ?
NULL : base64_encode_data_blob(mung);
Handle munged dial string. Patch from Aur?lien Degr?mont <adegremont@idealx.com>with memory leak fixes by me. Jeremy. (This used to be commit e591854eda8568ed1a4ad6b9de64e523c02b4392)
2003-11-07 21:32:23 +03:00
DEBUG(10,("INFO_23 UNI_MUNGED_DIAL: %s -> %s\n",old_string, newstr));
if (STRING_CHANGED_NC(old_string, newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
Make base64_encode_data_blob return a talloced string (This used to be commit 5f205ab48d8ac3b7af573ea0be1ce095ab835448)
2007-10-28 21:15:08 +03:00
TALLOC_FREE(newstr);
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_23: Asked to set User RID to 0 !? Skipping change!\n"));
} else if (from->user_rid != pdb_get_user_rid(to)) {
DEBUG(10,("INFO_23 USER_RID: %u -> %u NOT UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
}
}
if (from->fields_present & ACCT_PRIMARY_GID) {
if (from->group_rid == 0) {
DEBUG(10, ("INFO_23: Asked to set Group RID to 0 !? Skipping change!\n"));
} else if (from->group_rid != pdb_get_group_rid(to)) {
DEBUG(10,("INFO_23 GROUP_RID: %u -> %u\n",pdb_get_group_rid(to),from->group_rid));
pdb_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_23 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
pdb_set_acct_ctrl(to, from->acb_info, PDB_CHANGED);
}
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_LOGON_HOURS) {
DEBUG(15,("INFO_23 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
if (from->logon_divs != pdb_get_logon_divs(to)) {
pdb_set_logon_divs(to, from->logon_divs, PDB_CHANGED);
}
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
DEBUG(15,("INFO_23 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
if (from->logon_hrs.len != pdb_get_hours_len(to)) {
pdb_set_hours_len(to, from->logon_hrs.len, PDB_CHANGED);
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
DEBUG(15,("INFO_23 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
/* Fix me: only update if it changes --metze */
pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_BAD_PWD_COUNT) {
DEBUG(10,("INFO_23 BAD_PASSWORD_COUNT: %08X -> %08X\n",pdb_get_bad_password_count(to),from->bad_password_count));
if (from->bad_password_count != pdb_get_bad_password_count(to)) {
pdb_set_bad_password_count(to, from->bad_password_count, PDB_CHANGED);
}
The "unknown_5" 32 bit field in the user structs is actually 2 16-bit fields, bad_password_count and logon_count. Ensure this is stored/fetched in the various SAMs. As it replaces the unknown_5 field this fits exactly into the tdb SAM without any binary problems. It also is added to the LDAP SAM as two extra attributes. It breaks compatibility with the experimental SAMs xml and mysql. The maintainers of these SAMs must fix them so upgrades like this can be done transparently. I will insist on the "experimental" status until this is solved. Jeremy. (This used to be commit cd7bd8c2daff3293d48f3376a7c5a708a140fd94)
2003-09-19 03:53:48 +04:00
}
Merge fields_present function from HEAD. Now, a field will not be updated on setuserinfo levels which include this field, unless the corresponding bit (defined in passdb.h) is turned on. Without this, newer versions of usrmgr break us pretty bad. (This used to be commit 840340bd96d3c6693b451bc61e155b7b426271e4)
2004-03-03 00:02:09 +03:00
if (from->fields_present & ACCT_NUM_LOGONS) {
DEBUG(10,("INFO_23 LOGON_COUNT: %08X -> %08X\n",pdb_get_logon_count(to),from->logon_count));
if (from->logon_count != pdb_get_logon_count(to)) {
pdb_set_logon_count(to, from->logon_count, PDB_CHANGED);
}
Merge passdb from HEAD -> 3.0 The work here includes: - metze' set/changed patch, which avoids making changes to ldap on unmodified attributes. - volker's group mapping in passdb patch - volker's samsync stuff - volkers SAMR changes. - mezte's connection caching patch - my recent changes (fix magic root check, ldap ssl) Andrew Bartlett (This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 06:47:48 +03:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
r18722: Fix up password change times. The can change and must change times are calculated based on the last change time, policies, and acb flags. Next step will be to not bother storing them. Right now I'm just trying to get them reported correctly. (This used to be commit fd5761c9e52cbf8f1f7e45e71693598b27ecbf57)
2006-09-20 21:25:46 +04:00
/* If the must change flag is set, the last set time goes to zero.
the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_23 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
r18724: Fixup time(0) -> time(NULL) (This used to be commit 6b17af0769ab0d04ec01cc83ed6e7fad822b00b1)
2006-09-20 21:37:20 +04:00
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
r9229: merge from trunk: allow admins to uncheck the "User must change Password at next Logon" checkbox in Usermanager. Guenther (This used to be commit b1e4b72c1c36869c4dfc5ed284be24edc99f6774)
2005-08-10 20:02:32 +04:00
}
syncing up with HEAD again.... (This used to be commit e026b84815ad1a5fa981c24fff197fefa73b4928)
2002-09-26 22:37:55 +04:00
}
DEBUG(10,("INFO_23 PADDING_2: %02X\n",from->padding2));
Break up the passdb objects (to allow RPC clients to link without brining in *.o) and implment new enum_dom_users code in the SAMR RPC subsystem. Incresingly, we are using the pdb_get_{user,group}_sid() functions, in the eventual hope that we might one day support muliple domains off a single passdb. To extract the RID, we use sid_peek_check_rid(), and supply an 'expected' domain SID. The id21 -> SAM_ACCOUNT and id23 -> SAM_ACCOUNT code has been moved to srv_samr_util.c, to ease linking in passdb users. Compatiblity code that uses 'get_global_sam_sid()' for the 'expected' sid is in pdb_compat.c Andrew Bartlett (This used to be commit 5a2a6f1ba316489d118a8bdd9551b155226de94f)
2002-07-03 11:37:54 +04:00
}
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
/*************************************************************
Copies a SAM_USER_INFO_25 to a struct samu
**************************************************************/
void copy_id25_to_sam_passwd(struct samu *to, SAM_USER_INFO_25 *from)
{
time_t unix_time, stored_time;
const char *old_string, *new_string;
DATA_BLOB mung;
if (from == NULL || to == NULL)
return;
if (from->fields_present & ACCT_LAST_LOGON) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logon_time);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
stored_time = pdb_get_logon_time(to);
DEBUG(10,("INFO_25 LOGON_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
}
if (from->fields_present & ACCT_LAST_LOGOFF) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->logoff_time);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
stored_time = pdb_get_logoff_time(to);
DEBUG(10,("INFO_25 LOGOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
}
if (from->fields_present & ACCT_EXPIRY) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->kickoff_time);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
stored_time = pdb_get_kickoff_time(to);
DEBUG(10,("INFO_25 KICKOFF_TIME: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
}
if (from->fields_present & ACCT_LAST_PWD_CHANGE) {
r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
2006-09-06 22:32:20 +04:00
unix_time=nt_time_to_unix(from->pass_last_set_time);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
stored_time = pdb_get_pass_last_set_time(to);
DEBUG(10,("INFO_25 PASS_LAST_SET: %lu -> %lu\n",(long unsigned int)stored_time, (long unsigned int)unix_time));
if (stored_time != unix_time)
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
}
if ((from->fields_present & ACCT_USERNAME) &&
(from->hdr_user_name.buffer)) {
old_string = pdb_get_username(to);
new_string = unistr2_static(&from->uni_user_name);
DEBUG(10,("INFO_25 UNI_USER_NAME: %s -> %s\n", old_string, new_string));
if (STRING_CHANGED)
pdb_set_username(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_FULL_NAME) &&
(from->hdr_full_name.buffer)) {
old_string = pdb_get_fullname(to);
new_string = unistr2_static(&from->uni_full_name);
DEBUG(10,("INFO_25 UNI_FULL_NAME: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
pdb_set_fullname(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_HOME_DIR) &&
(from->hdr_home_dir.buffer)) {
old_string = pdb_get_homedir(to);
new_string = unistr2_static(&from->uni_home_dir);
DEBUG(10,("INFO_25 UNI_HOME_DIR: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
pdb_set_homedir(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_HOME_DRIVE) &&
(from->hdr_dir_drive.buffer)) {
old_string = pdb_get_dir_drive(to);
new_string = unistr2_static(&from->uni_dir_drive);
DEBUG(10,("INFO_25 UNI_DIR_DRIVE: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
pdb_set_dir_drive(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_LOGON_SCRIPT) &&
(from->hdr_logon_script.buffer)) {
old_string = pdb_get_logon_script(to);
new_string = unistr2_static(&from->uni_logon_script);
DEBUG(10,("INFO_25 UNI_LOGON_SCRIPT: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
pdb_set_logon_script(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_PROFILE) &&
(from->hdr_profile_path.buffer)) {
old_string = pdb_get_profile_path(to);
new_string = unistr2_static(&from->uni_profile_path);
DEBUG(10,("INFO_25 UNI_PROFILE_PATH: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
pdb_set_profile_path(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_DESCRIPTION) &&
(from->hdr_acct_desc.buffer)) {
old_string = pdb_get_acct_desc(to);
new_string = unistr2_static(&from->uni_acct_desc);
DEBUG(10,("INFO_25 UNI_ACCT_DESC: %s -> %s\n",old_string,new_string));
if (STRING_CHANGED)
pdb_set_acct_desc(to , new_string, PDB_CHANGED);
}
if ((from->fields_present & ACCT_WORKSTATIONS) &&
(from->hdr_workstations.buffer)) {
old_string = pdb_get_workstations(to);
new_string = unistr2_static(&from->uni_workstations);
DEBUG(10,("INFO_25 UNI_WORKSTATIONS: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
pdb_set_workstations(to , new_string, PDB_CHANGED);
}
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if ((from->fields_present & ACCT_COMMENT) &&
(from->hdr_comment.buffer)) {
old_string = pdb_get_comment(to);
new_string = unistr2_static(&from->uni_comment);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
DEBUG(10,("INFO_25 UNI_UNKNOWN_STR: %s -> %s\n",old_string, new_string));
if (STRING_CHANGED)
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
pdb_set_comment(to , new_string, PDB_CHANGED);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
}
if ((from->fields_present & ACCT_CALLBACK) &&
(from->hdr_munged_dial.buffer)) {
char *newstr;
old_string = pdb_get_munged_dial(to);
mung.length = from->hdr_munged_dial.uni_str_len;
mung.data = (uint8 *) from->uni_munged_dial.buffer;
r20546: Fix some IBM checker errors (This used to be commit 8f67efd582655e03fea746eee499f3cab6cbdb4d)
2007-01-05 17:52:10 +03:00
mung.free = NULL;
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
newstr = (mung.length == 0) ?
NULL : base64_encode_data_blob(mung);
DEBUG(10,("INFO_25 UNI_MUNGED_DIAL: %s -> %s\n",old_string, newstr));
if (STRING_CHANGED_NC(old_string,newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
Make base64_encode_data_blob return a talloced string (This used to be commit 5f205ab48d8ac3b7af573ea0be1ce095ab835448)
2007-10-28 21:15:08 +03:00
TALLOC_FREE(newstr);
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
}
if (from->fields_present & ACCT_RID) {
if (from->user_rid == 0) {
DEBUG(10, ("INFO_25: Asked to set User RID to 0 !? Skipping change!\n"));
} else if (from->user_rid != pdb_get_user_rid(to)) {
DEBUG(10,("INFO_25 USER_RID: %u -> %u NOT UPDATED!\n",pdb_get_user_rid(to),from->user_rid));
}
}
if (from->fields_present & ACCT_PRIMARY_GID) {
if (from->group_rid == 0) {
DEBUG(10, ("INFO_25: Asked to set Group RID to 0 !? Skipping change!\n"));
} else if (from->group_rid != pdb_get_group_rid(to)) {
DEBUG(10,("INFO_25 GROUP_RID: %u -> %u\n",pdb_get_group_rid(to),from->group_rid));
pdb_set_group_sid_from_rid(to, from->group_rid, PDB_CHANGED);
}
}
if (from->fields_present & ACCT_FLAGS) {
DEBUG(10,("INFO_25 ACCT_CTRL: %08X -> %08X\n",pdb_get_acct_ctrl(to),from->acb_info));
if (from->acb_info != pdb_get_acct_ctrl(to)) {
if (!(from->acb_info & ACB_AUTOLOCK) && (pdb_get_acct_ctrl(to) & ACB_AUTOLOCK)) {
/* We're unlocking a previously locked user. Reset bad password counts.
Patch from Jianliang Lu. <Jianliang.Lu@getronics.com> */
pdb_set_bad_password_count(to, 0, PDB_CHANGED);
pdb_set_bad_password_time(to, 0, PDB_CHANGED);
}
pdb_set_acct_ctrl(to, from->acb_info, PDB_CHANGED);
}
}
r23616: Fix bugzilla #4719: must change password is not set from usrmgr.exe. This was only affecting the newer versions of usrmgr.exe, because they use a user_info_25 struct. The password is getting set separately inside that code, so the password last set time was getting set from the password change logic. We also were not parsing a number of fields (like logon hours) from the user_info_25. That should also be fixed. (This used to be commit afabd68b6ae874aceba708dc36808ed007ad496c)
2007-06-27 00:09:41 +04:00
if (from->fields_present & ACCT_LOGON_HOURS) {
DEBUG(15,("INFO_25 LOGON_DIVS: %08X -> %08X\n",pdb_get_logon_divs(to),from->logon_divs));
if (from->logon_divs != pdb_get_logon_divs(to)) {
pdb_set_logon_divs(to, from->logon_divs, PDB_CHANGED);
}
DEBUG(15,("INFO_25 LOGON_HRS.LEN: %08X -> %08X\n",pdb_get_hours_len(to),from->logon_hrs.len));
if (from->logon_hrs.len != pdb_get_hours_len(to)) {
pdb_set_hours_len(to, from->logon_hrs.len, PDB_CHANGED);
}
DEBUG(15,("INFO_25 LOGON_HRS.HOURS: %s -> %s\n",pdb_get_hours(to),from->logon_hrs.hours));
/* Fix me: only update if it changes --metze */
pdb_set_hours(to, from->logon_hrs.hours, PDB_CHANGED);
}
if (from->fields_present & ACCT_BAD_PWD_COUNT) {
DEBUG(10,("INFO_25 BAD_PASSWORD_COUNT: %08X -> %08X\n",pdb_get_bad_password_count(to),from->bad_password_count));
if (from->bad_password_count != pdb_get_bad_password_count(to)) {
pdb_set_bad_password_count(to, from->bad_password_count, PDB_CHANGED);
}
}
if (from->fields_present & ACCT_NUM_LOGONS) {
DEBUG(10,("INFO_25 LOGON_COUNT: %08X -> %08X\n",pdb_get_logon_count(to),from->logon_count));
if (from->logon_count != pdb_get_logon_count(to)) {
pdb_set_logon_count(to, from->logon_count, PDB_CHANGED);
}
}
/* If the must change flag is set, the last set time goes to zero.
the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_25 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(NULL),PDB_CHANGED);
}
}
r16060: This is one of the more dirty patches I've put in lately. Parse enough of SetUserInfo level 25 to survive the join method XP uses if the user did not exist before. For good taste this contains way too much cut&paste, but for a real fix there is just not enough time. Up to 3.0.22 we completely ignored that a full level 21 is being sent together with level 25, but we got away with that because on creation we did not set the "disabled" flag on the workstation account. Now we correctly follow W2k3 in this regard, and we end up with a disabled workstation after join. Man, I hate rpc_parse/. The correct fix would be to import PIDL generated samr parsing, but this is would probably be a bit too much for .23... Thanks to Tom Bork for finding this one. Volker (This used to be commit 5a37aba10551456042266443cc0a92f28f8c3d0d)
2006-06-06 18:18:12 +04:00
}
Copy Permalink