emsmdb: delete ftstream_producer_read_svreid

References: GXH-130

Author: jengelh

exch/emsmdb/ftstream_parser.cpp

@@ -201,57 +201,6 @@ static BOOL ftstream_parser_read_guid(fxstream_parser *pstream, GUID *pguid)
 	return TRUE;
 }
 
-static BOOL ftstream_parser_read_svreid(fxstream_parser *pstream,
-	SVREID *psvreid, BOOL *pb_continue)
-{
-	uint32_t len;
-	uint8_t ours;
-	uint32_t origin_offset;
-	
-	*pb_continue = FALSE;
-	origin_offset = pstream->offset;
-	if (!ftstream_parser_read_uint32(pstream, &len))
-		return FALSE;
-	if (origin_offset + sizeof(uint32_t) + len >
-		pstream->st_size) {
-		*pb_continue = TRUE;
-		return FALSE;
-	}
-	if (len == 0)
-		abort(); /* if this ever happens, make cb=0,pb=NULL */
-	if (read(pstream->fd, &ours, sizeof(uint8_t)) != sizeof(uint8_t))
-		return FALSE;
-	pstream->offset += sizeof(uint8_t);
-	if (0 == ours) {
-		psvreid->pbin = cu_alloc<BINARY>();
-		if (psvreid->pbin == nullptr)
-			return FALSE;
-		psvreid->pbin->cb = len - 1;
-		if (0 == psvreid->pbin->cb) {
-			psvreid->pbin->pb = NULL;
-		} else {
-			psvreid->pbin->pv = common_util_alloc(psvreid->pbin->cb);
-			if (psvreid->pbin->pv == nullptr)
-				return FALSE;
-			auto ret = read(pstream->fd, psvreid->pbin->pv, psvreid->pbin->cb);
-			if (ret < 0 || static_cast<size_t>(ret) != psvreid->pbin->cb)
-				return FALSE;
-			pstream->offset += psvreid->pbin->cb;
-		}
-		return TRUE;
-	}
-	if (len != 21)
-		return FALSE;
-	psvreid->pbin = NULL;
-	if (!ftstream_parser_read_uint64(pstream, &psvreid->folder_id))
-		return FALSE;
-	if (!ftstream_parser_read_uint64(pstream, &psvreid->message_id))
-		return FALSE;
-	if (!ftstream_parser_read_uint32(pstream, &psvreid->instance))
-		return FALSE;
-	return TRUE;
-}
-
 static BOOL ftstream_parser_read_binary(fxstream_parser *pstream, BINARY *pbin,
 	BOOL *pb_continue)
 {
@@ -462,17 +411,16 @@ static int ftstream_parser_read_element(fxstream_parser &stream,
 		propval.pvalue = v;
 		return ftstream_parser_read_guid(pstream, v) ? FTSTREAM_PARSER_READ_OK : FTSTREAM_PARSER_READ_FAIL;
 	}
-	case PT_SVREID: {
-		auto v = cu_alloc<SVREID>();
-		if (v == nullptr)
-			return FTSTREAM_PARSER_READ_FAIL;
-		propval.pvalue = v;
-		if (ftstream_parser_read_svreid(pstream, v, &b_continue))
-			return FTSTREAM_PARSER_READ_OK;
-		if (b_continue)
-			goto CONTINUE_WAITING;
+	case PT_SVREID:
+		/*
+		 * You cannot create these property types in MSMAPI. This
+		 * precludes them from truly existing on the client side, and
+		 * so they have never been observed of being transferred in
+		 * either direction.
+		 * PT_SVREID only seems to show up in restrictions.
+		 */
+		mlog(LV_ERR, "E-2273: Reception of PT_SVREID in fxstream is unsupported");
 		return FTSTREAM_PARSER_READ_FAIL;
-	}
 	case PT_OBJECT:
 	case PT_BINARY: {
 		auto v = cu_alloc<BINARY>();

exch/emsmdb/ftstream_producer.cpp

@@ -304,7 +304,11 @@ static BOOL ftstream_producer_write_propvalue(fxstream_producer *pstream,
 	uint16_t write_type;
 	auto propid = PROP_ID(ppropval->proptag);
 	auto proptype = PROP_TYPE(ppropval->proptag);
-	/* ignore PT_SVREID */
+	/*
+	 * The ftstream reader on the MSMAPI side does not know what to do with
+	 * these and usually throws an error (e.g. when using FXCopyMessages,
+	 * or FXSynchronizeConfigure).
+	 */
 	if (proptype == PT_SVREID)
 		return TRUE;
 	if (ppropval->proptag == PR_MESSAGE_CLASS)
@@ -385,11 +389,6 @@ static BOOL ftstream_producer_write_propvalue(fxstream_producer *pstream,
 		return ftstream_producer_write_wstring(pstream, static_cast<char *>(ppropval->pvalue));
 	case PT_CLSID:
 		return ftstream_producer_write_guid(pstream, static_cast<GUID *>(ppropval->pvalue));
-	/*
-	case PT_SVREID:
-		return ftstream_producer_write_svreid(
-					pstream, ppropval->pvalue);
-	*/
 	case PT_OBJECT:
 	case PT_BINARY:
 		return ftstream_producer_write_binary(pstream, static_cast<BINARY *>(ppropval->pvalue));

exch/emsmdb/oxctabl.cpp

@@ -59,7 +59,6 @@ static inline bool table_acceptable_type(uint16_t type)
 	case PT_UNICODE:
 	case PT_SYSTIME:
 	case PT_CLSID:
-	case PT_SVREID:
 	case PT_SRESTRICTION:
 	case PT_ACTIONS:
 	case PT_BINARY:
@@ -76,6 +75,13 @@ static inline bool table_acceptable_type(uint16_t type)
 	case PT_MV_CLSID:
 	case PT_MV_BINARY:
 		return true;
+	case PT_SVREID:
+		/*
+		 * MSMAPI rejects SetColumns with PT_SVREID tags even before
+		 * calling rop_setcolumns. So this line is never reached in
+		 * reality.
+		 */
+		return true;
 	default:
 		return false;
 	}