Author: jra Date: 2004-09-16 22:08:26 +0000 (Thu, 16 Sep 2004) New Revision: 2369
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/rpc_server&rev=2369&nolog=1 Log: Fix from Richard Renard <[EMAIL PROTECTED]> to fix usermgr and trust relationships. Jeremy. Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c Changeset: Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2004-09-16 22:08:21 UTC (rev 2368) +++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2004-09-16 22:08:26 UTC (rev 2369) @@ -728,7 +728,17 @@ for (i = 0; i < num_entries; i++) { pwd = &disp_user_info[i+start_idx]; temp_name = pdb_get_username(pwd); - init_unistr2(&uni_temp_name, temp_name, UNI_STR_TERMINATE); + + /* + * usrmgr expects a non-NULL terminated string with + * trust relationships + */ + if (pdb_get_acct_ctrl(pwd) & ACB_DOMTRUST) { + init_unistr2(&uni_temp_name, temp_name, UNI_FLAGS_NONE); + } else { + init_unistr2(&uni_temp_name, temp_name, UNI_STR_TERMINATE); + } + user_sid = pdb_get_user_sid(pwd); if (!sid_peek_check_rid(domain_sid, user_sid, &user_rid)) {
