svn commit: samba r4352 - branches/SAMBA_3_0/source/utils trunk/source/utils

[gd at samba.org]

Author: gd
Date: 2004-12-24 00:38:22 +0000 (Fri, 24 Dec 2004)
New Revision: 4352

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4352

Log:
Base64-encode munged-dial with correct length in 'net rpc vampire'.

Guenther

Modified:
   branches/SAMBA_3_0/source/utils/net_rpc_samsync.c
   trunk/source/utils/net_rpc_samsync.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc_samsync.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_samsync.c	2004-12-24 00:08:15 UTC (rev 4351)
+++ branches/SAMBA_3_0/source/utils/net_rpc_samsync.c	2004-12-24 00:38:22 UTC (rev 4352)
@@ -380,8 +380,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 * 2;
+		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);

Modified: trunk/source/utils/net_rpc_samsync.c
===================================================================
--- trunk/source/utils/net_rpc_samsync.c	2004-12-24 00:08:15 UTC (rev 4351)
+++ trunk/source/utils/net_rpc_samsync.c	2004-12-24 00:38:22 UTC (rev 4352)
@@ -388,8 +388,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 * 2;
+		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);