110 Commits

Author SHA1 Message Date
Felix Fietkau
a8cf4fe00a hostapd: enable WPS2 support on hostapd-full.config
Enable CONFIG_WPS2 for hostapd. This is required to support
options like Virtual Push Button in WPS.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38337 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-08 11:09:44 +00:00
Felix Fietkau
66614d7572 hostapd: fix hostapd RSN preauthentication PMKSA caching
In 2009 OpenWrt's hostapd config added an "auth_cache" boolean
to be used to address a reported issue #12129 [0] on a forum [1].
The reported issue on the ticket is different that the one
described on the forum. The commit was r33359. This change broke
proper RSN preauthentication [2] [3] [4] expectations on hostapd's
configuration for WPA2 and this in turn disabled PMKSA caching and
Opportunistic Key Caching. This change:

  * Leaves the "auth_cache" to be used only for WPA networks for those
    looking to use this as a workaround to a reported issue but annotates
    a warning over its usage.

  * Separate "auth_cache" from WPA2 RSN preauthentication, leaving
    WPA2 RSN preauthentication to enabled only with "rsn_preauth" with
    the expected and recommended settings.

  * Adds a new WPA2 RSN preauthentication "rsn_preauth_testing" to
    be used when evaluating funcionality for WPA2 RSN preauthentication
    with the expected and recommended settings with the only difference
    so far with what should be enabled by default to disable Opportunistic
    Key Caching.

Disabling the PMKSA cache should mean the STA could not roam off and back
onto the AP that had PMKSA caching disabled and would require a full
authentication cycle. This fixes this for WPA2 networks with
RSN preauthentication enabled.

This change should be applied to AA as well as trunk.

  TL DR;

The issue described on the forum has to do with failure of a STA
being able to try to authenticate again with the AP if it failed
its first try. This may have been an issue with hostapd in 2009
but as per some tests I cannot reproduce this today on a WPA2
network.

The issue described on the ticket alludes to a security issue with the
design of using a Radius server to authenticate to an AP. The issue
vaguely alludes to the circumstances of zapping a user, deleting their
authentication credentials to log in to the network, and that if
RSN preauthentication is enabled with PMKSA caching that the user
that was zapped would still be able to authenticate.

Lets treat these as separate issues.

I cannot reproduce the first issue reported on the forums of not
being able to authenticate anymore on a WPA2 network.

The issue reported on the ticket modified WPA2 RSN preauthentication
by adding two fields to the hostapd configuration if auth_cache
was enabled:

  * disable_pmksa_caching=1
  * okc=0

The first one disables PMKSA authentication cache.
The second one disables Opportunistic Key Caching.

The issue reported on the ticket was fixed by implementing a workaround
in hostapd's configuration. Disabling PMKSA caching breaks proper use
of WPA2 RSN pre authentication. The usage of disable_pmksa_caching=1
prevents hostapd from adding PMKSA entries into its cache when a successful
802.1x authentication occurs. In practice RSN preauthentication would
trigger a STA to perform authentication with other APs on the same SSID,
it would then have its own supplicant PMKSA cache held. If a STA roams
between one AP to another no new authenitcation would need to be performed
as the new AP would already have authenticated the STA. The purpose of the
PMKSA cache on the AP side would be for the AP to use the same PMKID for
a STA when the STA roams off onto another BSSID and later comes back to it.

Disabling Opportunistic Key Caching could help the reported issue
as well but its not the correct place to address this. Opportunistic
Key Caching enables an AP with different interfaces to share the
PMKSA cache. Its a technical enhancement and disabling it would
be useful to let a testing suite properly test for RSN preauthentication
given that otherwise Opportunistic Key Caching would enable an
interface being tested to derive its own derive the PMKSA entry.
In production though okc=1 should be enabled to help with RSN
preauthentication.

The real fix for this particular issue outside of the scope of hostapd's
configuration and it should not be dealt with as a workaround to
its configuration and breaking expected RSN preauthentication and
technical optimizations. Revert this change and enable users to pick
and choose to enable or disable disable_pmksa_caching and okc expecting them
to instead have read clearly more what these do.

As for the core issure ported, the correct place to fix this is to
enable a sort of messaging between the RADIUS server and its peers
so that if caching for authentication is enabled that cache can be
cleared upon user credential updates. Updating a user password
(not just zapping a user) is another possible issue that would need
to be resolved here. Another part of the solution might be to reduce
the cache timing to account for any systematic limitations (RADIUS
server not able to ask peers to clear cache might be
one).

[0] https://dev.openwrt.org/changeset/33359
[1] https://forum.openwrt.org/viewtopic.php?id=19596
[2] http://wireless.kernel.org/en/users/Documentation/hostapd#IEEE_802.11i.2FRSN.2FWPA2_pre-authentication
[3] http://wireless.kernel.org/en/users/Documentation/wpa_supplicant#RSN_preauthentication
[4] http://wiki.openwrt.org/doc/recipes/rsn_preauthentication

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38336 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-08 11:09:40 +00:00
Felix Fietkau
6ff7614c07 hostapd: Add WPS unconfigured & WPS pin method support
Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38335 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-08 11:09:36 +00:00
Felix Fietkau
21108bc210 hostapd: Add eap_reauth_period config option
This adds the eap_reauth_period to be used for modifying
the RADIUS server reauthentication authentication period,
a parameter that gets passed directly to the hostapd
configuration file.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38334 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-08 11:09:27 +00:00
Luka Perkov
337f454532 [package] openvpn: switch to new procd init script style
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38331 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-07 21:28:14 +00:00
Felix Fietkau
b8672f84cb uhttpd: add a config option for using ustream-polarssl, and use it by default
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38250 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-29 11:26:09 +00:00
Felix Fietkau
3a931a5b0c uhttpd: fix appending https ports to cmdline
Otherwise it is started only on non-secure ports.

Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38171 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 07:44:48 +00:00
Luka Perkov
cebf051302 [package] fix various init scripts
Changes include:

* removing unused variables
* replacing spaces with tabs where appropriate
* more consistency with variable declarations

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38142 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-23 21:58:36 +00:00
John Crispin
d330d9fac4 procd: convert various packages to procd style init.d scripts
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38023 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-17 21:45:30 +00:00
Felix Fietkau
e2a5d64c3e hostapd: adjust the md5sum for the uploaded source tarball (fixes #14155)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37990 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-14 20:07:35 +00:00
Jo-Philipp Wich
546a43923a uhttpd: udpat to git head
- fixes buffer corruption with JSON-RPC list calls
	- change JSON-RPC protocol to include the session ID into the call
	  attributes instead of passing it via the URL
	- forcibly pass effective session ID as "ubus_rpc_session" attribute
	  to called procedures
	- change ubus acl checking to conform with new ubus session namespace

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37962 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-13 13:24:45 +00:00
Vasilis Tsiligiannis
482f6fb9db lldpd: Add libbsd dependency when using eglibc
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37837 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-25 18:47:08 +00:00
Felix Fietkau
a1fe46a80c hostapd: fix typo in version number
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37742 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-08 20:45:15 +00:00
Felix Fietkau
fbf4f2e570 hostapd: fix ubus reconnect handling
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37741 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-08 20:45:12 +00:00
Felix Fietkau
b6e54cd812 hostapd: add a build variant for wpa_supplicant with p2p (aka Wi-Fi Direct) support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37739 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-08 16:24:50 +00:00
Felix Fietkau
58b0b6c534 hostapd: update to latest version (20130707)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37738 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-08 16:04:19 +00:00
Felix Fietkau
388917caf9 hostapd: Settings for DAE/CoA server
hostapd supports "Dynamic Authorization Extensions", making it possible
to forcibly disconnect a user by sending it a RADIUS "Disconnect-Request"
packet.

I've added three new variables to enable setting of the
"radius_das_client" and "radius_das_port" variables in the hostapd
configuration, which enable these extensions.

* dae_client - IP of the client that can send disconnect requests
* dae_secret - shared secret for DAE packets

These are combined into the "radius_das_client" option in hostapd.conf
To enable the server, both dae_client and dae_secret must be set.

* dae_port - optional, default value is 3799 as specified in RFC 5176

Signed-off-by: Martijn van de Streek <martijn@vandestreek.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37734 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-06 18:55:30 +00:00
Felix Fietkau
485af0c163 hostapd: Fix WDS/WEP usage
WEP in WDS is currently broken in hostapd. Add a patch
to fix the issue.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37733 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-06 17:59:12 +00:00
Felix Fietkau
2905bd034c hostapd: Refresh patches
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37731 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-06 17:59:05 +00:00
Felix Fietkau
5e0ba1f79b hostapd: Add an option to disable beaconing
Add a patch for hostapd that introduces a config option
"start_disabled" which can be used to bring up an AP
interface with beaconing disabled. This is useful in
a Repeater-AP setup where the Repeater AP has to start
beaconing only after the WDS link has been established.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37730 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-06 17:59:02 +00:00
Felix Fietkau
5cd74c5c9b uhttpd: update to the latest version, fixes a crash on early cgi/lua process termination
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37628 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-31 22:07:09 +00:00
Felix Fietkau
ac4dea772d openvpn: update to 2.3.2
this patches updates openvpn to v2.3.2
and adds a PKG_MD5SUM to the Makefile

This release fixes a memory access violation when cipher none is used
on ar71xx - at least with my config

Signed-off-by: Peter Wagner <tripolar@gmx.at>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37560 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 12:35:22 +00:00
Felix Fietkau
6a732cad77 uhttpd: update to latest version, fixes issues with POST and keep-alive (#13940)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37556 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 10:03:07 +00:00
Felix Fietkau
6fe49b24d1 authsae: add myself as a maintainer
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37555 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 10:03:03 +00:00
Felix Fietkau
2b073b7b73 authsae: adapt uci scripts to use authsae
This patch modifies the uci scripts to be able to
start meshd-nl80211 for encrypted mesh networks,
therefor a new script (authsae.sh) is inserted.

Signed-off-by: Emanuel Taube <emanuel.taube@gmail.com>
[etienne.champetier@free.fr: just update mac80211.sh path]
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37554 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 10:02:59 +00:00
Felix Fietkau
a22105f7ce authsae 80211s authentication daemon
This patch adds authsae open80211s authentication daemon (http://open80211s.org)
It's a rework of Peter Naulls patch (http://patchwork.openwrt.org/patch/1350/)
I've excluded the sample conf file as it's useless when used with mac80211.sh (Emanuel Taube patch)
It now link against libnl-tiny instead of libnl (patch merged in authsae git)
Authsae is 58 Ko (OPENSSL_WITH_EC option adds 35Ko to libopenssl)

Signed-off-by: Peter Naulls <peter@chocky.org>
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37553 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-26 10:02:55 +00:00
Felix Fietkau
e66785dcf8 ead: fix compile errors with recent kernels
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37482 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-20 12:56:07 +00:00
John Crispin
9af7d06947 dropbear: register a config.change trigger
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-11 17:00:40 +00:00
Jo-Philipp Wich
990e4f90d6 lldpd: upgrade to 0.7.5
lldpd 0.7.1 has several alignment issues that trip a system configured
to fault on misaligned accesses.  Version 0.7.5 fixes that along with a
few other minor issues.

Signed-off-by: John Szakmeister <john@szakmeister.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37168 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-04 16:57:03 +00:00
Jo-Philipp Wich
17a7b9cb50 hostapd: truncate default mac file before adding entries to it (#13797)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37114 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-01 10:52:35 +00:00
Felix Fietkau
378caa3427 hostapd: fix multi-ssid and AP+STA, clean up code
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37111 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-30 21:01:13 +00:00
Felix Fietkau
5cdd493473 hostapd: update to latest git version
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37110 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-30 20:27:38 +00:00
John Crispin
eed5ffcc11 hostapd: fix superflous coma
this cause the wps trigegr to be copied to the wrong place

https://dev.openwrt.org/ticket/13753

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37031 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-24 16:44:18 +00:00
John Crispin
eaa7932386 hostapd: remove old button hotplug script
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36991 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-21 16:53:07 +00:00
Jo-Philipp Wich
49f5201b52 hostapd: correctly handle macfile uci option
Make hostapd.sh correctly handle the macfile uci option.

Such option specifies the macfile name to pass into the
hostapd configuration file. Moreover, if a maclist option
has been specified, copy the macfile before appending new
entries.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36944 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-17 11:59:29 +00:00
Jo-Philipp Wich
bf4c0b1b8a dnsmasq: use host-record instead of address
Using "--address" for individual host A records is broken, use "--host-record" instead.
The following patch changes dnsmasq.init to build individual host records using "--host-record" instead of "--address".

Signed-off-by: Adam Gensler <openwrt at gnslr.us>

[jow: shorter description, simplified shell script code]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36943 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-17 11:55:30 +00:00
Jo-Philipp Wich
f5a4945636 uhttpd: expose missing options to uci
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36932 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-13 11:55:12 +00:00
Steven Barth
5882e71509 ppp: correctly handle address when reloading
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36904 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-10 10:42:34 +00:00
Felix Fietkau
93ac2d0351 uhttpd: update to latest version, fixes CGI related crashes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36817 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-01 21:43:06 +00:00
Felix Fietkau
1d886ef03c uhttpd: update again to fix a ubus plugin crash bug
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36770 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-30 13:16:38 +00:00
Felix Fietkau
25681e5dbd uhttpd: update to latest version, fixes script timeout for ubus requests
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36767 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-30 10:44:20 +00:00
Felix Fietkau
4ffd43dbc7 uhttpd: update to latest version, fixes #13564, #13560, improves error handling as pointed out in #13537
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36696 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-23 10:50:42 +00:00
Steven Barth
b846672f60 dnsmasq: add directory for external hosts-files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36655 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-17 14:44:12 +00:00
Felix Fietkau
8ca26bf040 uhttpd: update to latest version, fixes index page processing order
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36644 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-16 11:38:19 +00:00
Felix Fietkau
e252bdb152 uhttpd: update to latest version, fixes a SSL connection memory leak
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36636 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-14 17:43:00 +00:00
Steven Barth
47fcfd999d add uci support for "proxy-dnssec" in dnsmasq
This patch simply adds support for the "--proxy-dnssec" command in dnsmasq into the init file so it can be used with /etc/config/dhcp.

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36570 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-07 07:19:51 +00:00
Jo-Philipp Wich
7f8b27f0e5 ipset-dns: support simultaneously populating IPv4 and IPv6 sets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36554 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-06 10:01:45 +00:00
Jo-Philipp Wich
280eac850b Add ipset-dns - a tiny DNS proxy service which puts resolved ip addresses into a specified ipset
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36552 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-06 08:44:54 +00:00
Felix Fietkau
a1caa0f493 hostapd: enable 802.11r for the -full variant (#13250)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36533 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-03 10:39:57 +00:00
Steven Barth
b97eb9b08e dnsmasq: update to 2.66
Thanks to Christoph König for patches.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36412 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-24 05:55:39 +00:00