hostpad update

gistfile1.txt

[root@dragonfly /usr/src] # git status
# On branch hostapd-wpa_supplicant-update
nothing to commit, working directory clean
[root@dragonfly /usr/src] # git diff master hostapd-wpa_supplicant-update
diff --git a/contrib/hostapd/src/crypto/md5.c b/contrib/hostapd/src/crypto/md5.c
index e13ce7d..a7db7aa 100644
--- a/contrib/hostapd/src/crypto/md5.c
+++ b/contrib/hostapd/src/crypto/md5.c
@@ -287,7 +287,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (u32 *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     os_memcpy(digest, ctx->buf, 16);
-    os_memset(ctx, 0, sizeof(*ctx));   /* In case it's sensitive */
+    os_memset(ctx, 0, sizeof(ctx));    /* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
diff --git a/contrib/hostapd/src/drivers/driver_ralink.c b/contrib/hostapd/src/drivers/driver_ralink.c
index e14e70b..e9313cb 100644
--- a/contrib/hostapd/src/drivers/driver_ralink.c
+++ b/contrib/hostapd/src/drivers/driver_ralink.c
@@ -232,7 +232,7 @@ static int wpa_driver_ralink_set_ssid(struct wpa_driver_ralink_data *drv,
        buf = os_zalloc(sizeof(NDIS_802_11_SSID));
        if (buf == NULL)
                return -1;
-       os_memset(buf, 0, sizeof(*buf));
+       os_memset(buf, 0, sizeof(buf));
        buf->SsidLength = ssid_len;
        os_memcpy(buf->Ssid, ssid, ssid_len);
        os_memset(&iwr, 0, sizeof(iwr));
diff --git a/contrib/hostapd/src/utils/os_unix.c b/contrib/hostapd/src/utils/os_unix.c
index ea46094..bc2fc40 100644
--- a/contrib/hostapd/src/utils/os_unix.c
+++ b/contrib/hostapd/src/utils/os_unix.c
@@ -228,7 +228,7 @@ int os_setenv(const char *name, const char *value, int overwrite)
 int os_unsetenv(const char *name)
 {
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || \
-    defined(__OpenBSD__) || defined(__DragonFly__)
+    defined(__OpenBSD__)
        unsetenv(name);
        return 0;
 #else
[root@dragonfly /usr/src] # git diff hostapd-wpa_supplicant-update vendor/HOSTAPD contrib/hostapd
[root@dragonfly /usr/src] # git merge vendor/HOSTAPD 
CONFLICT (rename/delete): contrib/hostapd/src/utils/state_machine.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/state_machine.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/os_unix.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/os_unix.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/os_none.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/os_none.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/os_internal.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/os_internal.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/os.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/os.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/ip_addr.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/ip_addr.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/includes.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/includes.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/eloop_win.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/eloop_win.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/eloop_none.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/eloop_none.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/eloop.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/eloop.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/eloop.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/eloop.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/common.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/common.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/utils/build_config.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/utils/build_config.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius_server.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius_server.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius_server.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius_server.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius_client.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius_client.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius_client.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius_client.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/radius/radius.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/radius/radius.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/l2_packet/l2_packet.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/l2_packet/l2_packet.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/hlr_auc_gw/milenage.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/hlr_auc_gw/milenage.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/hlr_auc_gw/milenage.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/hlr_auc_gw/milenage.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/hlr_auc_gw/hlr_auc_gw.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/hlr_auc_gw/hlr_auc_gw.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_ttls.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_ttls.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_tls.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_tls.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_sim_db.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_sim_db.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_sim_db.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_sim_db.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_sim.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_sim.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_sake.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_sake.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_psk.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_psk.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_pax.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_pax.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_mschapv2.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_mschapv2.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_methods.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_methods.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_methods.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_methods.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_md5.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_md5.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_identity.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_identity.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_i.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_i.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_gtc.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_gtc.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_gpsk.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_gpsk.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap_aka.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap_aka.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_server/eap.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_server/eap.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_ttls.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_ttls.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_sim_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_sim_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_sim_common.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_sim_common.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_sake_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_sake_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_sake_common.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_sake_common.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_psk_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_psk_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_psk_common.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_psk_common.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_pax_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_pax_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_gpsk_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_gpsk_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_gpsk_common.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_gpsk_common.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/eap_defs.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/eap_defs.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/chap.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/chap.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/eap_common/chap.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/eap_common/chap.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/tls_openssl.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/tls_openssl.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/tls_none.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/tls_none.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/tls_gnutls.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/tls_gnutls.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/tls.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/tls.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/sha256.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/sha256.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/sha1.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/sha1.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/sha1.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/sha1.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/rc4.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/rc4.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/rc4.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/rc4.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/ms_funcs.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/ms_funcs.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/ms_funcs.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/ms_funcs.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/des.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/des.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/crypto_openssl.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/crypto_openssl.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/crypto.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/crypto.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/aes_wrap.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/aes_wrap.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/crypto/aes.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/crypto/aes.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/wpa_ctrl.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/wpa_ctrl.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/wpa_ctrl.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/wpa_ctrl.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/wireless_copy.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/wireless_copy.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/version.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/version.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/eapol_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/eapol_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/src/common/defs.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/src/common/defs.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/vlan_init.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/vlan_init.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/sta_info.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/sta_info.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/sta_info.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/sta_info.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/preauth.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/preauth.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/pmksa_cache.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/pmksa_cache.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/pmksa_cache.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/pmksa_cache.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/mlme.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/mlme.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ieee802_1x.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ieee802_1x.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ieee802_1x.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ieee802_1x.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ieee802_11_auth.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ieee802_11_auth.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ieee802_11.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ieee802_11.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/iapp.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/iapp.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/hw_features.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/hw_features.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/hostapd_cli.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/hostapd_cli.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/hostapd.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/hostapd.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/hostapd.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/hostapd.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/hostap_common.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/hostap_common.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/eapol_sm.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/eapol_sm.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/eapol_sm.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/eapol_sm.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/driver_wired.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/driver_wired.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/driver_hostap.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/driver_hostap.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/driver.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/driver.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ctrl_iface.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ctrl_iface.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ctrl_iface.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ctrl_iface.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/config.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/config.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/beacon.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/beacon.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ap_list.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ap_list.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ap_list.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ap_list.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/ap.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/ap.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/accounting.h deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/accounting.h left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/accounting.c deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/accounting.c left in tree.
CONFLICT (rename/delete): contrib/hostapd/hostapd/README deleted in HEAD and renamed in vendor/HOSTAPD. Version vendor/HOSTAPD of contrib/hostapd/hostapd/README left in tree.
warning: inexact rename detection was skipped due to too many files.
Automatic merge failed; fix conflicts and then commit the result.
!1! [root@dragonfly /usr/src] #