Index: utils/net_rpc_samsync.c =================================================================== --- utils/net_rpc_samsync.c (revision 4328) +++ utils/net_rpc_samsync.c (working copy) @@ -380,8 +457,11 @@ } if (delta->hdr_parameters.buffer) { + DATA_BLOB mung; old_string = pdb_get_munged_dial(account); - new_string = unistr2_static(&delta->uni_parameters); + mung.length = delta->uni_parameters.uni_str_len; + mung.data = (uint8 *) delta->uni_parameters.buffer; + new_string = (mung.length == 0) ? NULL : base64_encode_data_blob(mung); if (STRING_CHANGED) pdb_set_munged_dial(account, new_string, PDB_CHANGED);