v4.27-9666-betav4.27-9666-beta

3 files changed, 12 insertions, 12 deletions

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 2be48125..575205f2 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -138,7 +138,7 @@
 #define	CEDAR_VER					427

 

 // Build Number

-#define	CEDAR_BUILD					9665

+#define	CEDAR_BUILD					9666

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -153,16 +153,16 @@
 

 // Specify the location to build

 #ifndef	BUILD_PLACE

-#define	BUILD_PLACE			"pc33"

+#define	BUILD_PLACE			"pc34"

 #endif	// BUILD_PLACE

 

 // Specifies the build date

 #define	BUILD_DATE_Y		2018

 #define	BUILD_DATE_M		4

 #define	BUILD_DATE_D		21

-#define	BUILD_DATE_HO		0

-#define	BUILD_DATE_MI		54

-#define	BUILD_DATE_SE		23

+#define	BUILD_DATE_HO		14

+#define	BUILD_DATE_MI		23

+#define	BUILD_DATE_SE		36

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c
index 3af48a45..a86c4ea9 100644
--- a/src/Cedar/Client.c
+++ b/src/Cedar/Client.c
@@ -431,7 +431,7 @@ void CiChangeAllVLanMacAddress(CLIENT *c)
 			RPC_CLIENT_ENUM_VLAN_ITEM *e = t.Items[i];

 			UCHAR mac[6];

 

-			if (StrToMac(mac, e->MacAddress) && mac[1] == 0xAC)

+			if (StrToMac(mac, e->MacAddress) && ((mac[0] == 0x00 && mac[1] == 0xAC) || (mac[0] = 0x5E)))

 			{

 				char *name = e->DeviceName;

 				RPC_CLIENT_SET_VLAN s;

diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c
index e28a7733..749de6ef 100644
--- a/src/Cedar/Virtual.c
+++ b/src/Cedar/Virtual.c
@@ -10306,12 +10306,12 @@ void GenMacAddress(UCHAR *mac)
 	Hash(hash, b->Buf, b->Size, true);

 

 	// Generate a MAC address

-	mac[0] = 0x00;

-	mac[1] = 0xAC;		// AC hurray

-	mac[2] = hash[0];

-	mac[3] = hash[1];

-	mac[4] = hash[2];

-	mac[5] = hash[3];

+	mac[0] = 0x5E;

+	mac[1] = hash[0];

+	mac[2] = hash[1];

+	mac[3] = hash[2];

+	mac[4] = hash[3];

+	mac[5] = hash[4];

 

 	FreeBuf(b);

 }