summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2001-11-07 08:15:45 +0000
committerAndrew Bartlett <abartlet@samba.org>2001-11-07 08:15:45 +0000
commit39f9c78d07d7af6abc71b33a6018ac0237608b6a (patch)
tree6829d0072af347ea88718e31c4418f4ef274917b
parent8004cfea19e10ad942c59f2f6a6bd992791017ba (diff)
downloadsamba-39f9c78d07d7af6abc71b33a6018ac0237608b6a.tar.gz
samba-39f9c78d07d7af6abc71b33a6018ac0237608b6a.tar.xz
samba-39f9c78d07d7af6abc71b33a6018ac0237608b6a.zip
UGLY HACK to get machines to join tdbsam domains again.
The problem is that we don't use the bitmap field, and so have to guess what feilds to change. NT4 sets the RID to NULL in its reply, (as a no-change value) and we were attempting to set that as a RID. jfm: Can you get me the info on that bitmap, so I can construct a proper fix to all this? Thanks!
-rw-r--r--source/passdb/passdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 05d448f963f..971e9c5fafb 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -782,8 +782,10 @@ void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
select_name(to->unknown_str , &from->uni_unknown_str );
select_name(to->munged_dial , &from->uni_munged_dial );
- to->user_rid = from->user_rid;
- to->group_rid = from->group_rid;
+ if (from->user_rid)
+ to->user_rid = from->user_rid;
+ if (from->group_rid)
+ to->group_rid = from->group_rid;
to->acct_ctrl = from->acb_info;
to->unknown_3 = from->unknown_3;