summaryrefslogtreecommitdiff
path: root/source3
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
commitaa0ceb125582df43cf3cc99b7b8d219462d34947 (patch)
treefdc6a0c929d4f71f523bdf1841bc1280b8eb882e /source3
parent848d01cde5eeb2d445e4a0b5364d9f163aef41fd (diff)
downloadsamba-aa0ceb125582df43cf3cc99b7b8d219462d34947.tar.gz
samba-aa0ceb125582df43cf3cc99b7b8d219462d34947.tar.bz2
samba-aa0ceb125582df43cf3cc99b7b8d219462d34947.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! (This used to be commit 39f9c78d07d7af6abc71b33a6018ac0237608b6a)
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/passdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 05d448f963..971e9c5faf 100644
--- a/source3/passdb/passdb.c
+++ b/source3/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;