fix the protobuf installation under ubuntu 16.04

cmake_targets/tools/build_helper

@@ -171,7 +171,7 @@ install_protobuf_from_source(){
     echo "Downloading protobuf"
     rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
     wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    tar -xzvf protobuf-2.6.1.tar.gz
+    tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner 
     cd protobuf-2.6.1/
     ./configure
     echo "Compiling protobuf"
@@ -208,8 +208,8 @@ check_install_usrp_uhd_driver(){
         #The new USRP repository
         $SUDO add-apt-repository ppa:ettusresearch/uhd -y
         $SUDO apt-get update
-        $SUDO apt-get -y install  python python-tk libboost-all-dev libusb-1.0-0-dev
-        $SUDO apt-get -y install libuhd-dev libuhd003 uhd-host
+        $SUDO apt-get -y --allow-unauthenticated install  python python-tk libboost-all-dev libusb-1.0-0-dev
+        $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
 }
 
 install_usrp_uhd_driver() {
@@ -224,9 +224,9 @@ check_install_bladerf_driver(){
 		$SUDO add-apt-repository -y ppa:bladerf/bladerf
 		$SUDO apt-get update
 	fi
-	$SUDO apt-get install -y bladerf libbladerf-dev
-	$SUDO apt-get install -y bladerf-firmware-fx3
-	$SUDO apt-get install -y bladerf-fpga-hostedx40	
+	$SUDO apt-get install -y--allow-unauthenticated  bladerf libbladerf-dev
+	$SUDO apt-get install -y --allow-unauthenticated bladerf-firmware-fx3
+	$SUDO apt-get install -y --allow-unauthenticated bladerf-fpga-hostedx40	
 }
 
 flash_firmware_bladerf() {

openair2/ENB_APP/enb_config.c

@@ -2391,10 +2391,11 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_x300 = 1;
             } else if (strcmp(rf_preference, "bladerf") == 0) {
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].bladerf = 1;
-	    } else if (strcmp(rf_preference, "bladerf") == 0) {
+	    } else if (strcmp(rf_preference, "lmsdr") == 0) {
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].lmssdr = 1;	      
             } else {//if (strcmp(preference, "no") == 0) 
-              enb_properties.properties[enb_properties_index]->rrh_gw_config[j].exmimo = 1;
+	      
+	      enb_properties.properties[enb_properties_index]->rrh_gw_config[j].exmimo = 1;
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_b200 = 1;
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].usrp_x300 = 1;
               enb_properties.properties[enb_properties_index]->rrh_gw_config[j].bladerf = 1;