Merge ~awe/network-manager/+git/ubuntu:touch-vivid-ota13 into network-manager:touch-vivid

Proposed by Tony Espy
Status: Merged
Merge reported by: Tony Espy
Merged at revision: not available
Proposed branch: ~awe/network-manager/+git/ubuntu:touch-vivid-ota13
Merge into: network-manager:touch-vivid
Diff against target: 69 lines (+46/-1)
3 files modified
debian/changelog (+9/-0)
debian/patches/secret-agent-fix-get-secrets-timeout.patch (+36/-0)
debian/patches/series (+1/-1)
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code Approve
Network-manager Pending
Review via email: mp+301177@code.staging.launchpad.net

Commit message

    Add d/p/secret-agent-fix-get-secrets-timeout.patch

    Cherry pick upstream patch which restores the secret-agent
    GetSecrets DBus timeout to 2m. This was removed during the
    move from dbus-glib to gdbus, which resulted in the timeout
    being lowered to the default 25s, which is too short for a
    user to enter most lengthy passphrases (LP: #1588126).

Description of the change

This change is a cherry picked upstream patch which restores the secret-agent GetSecrets DBus timeout to 2m. This was removed during the move from dbus-glib to gdbus, which resulted in the timeout being lowered to the default 25s, which is too short for a user to enter most lengthy passphrases (LP: #1588126).

Testing this patch requires a WPA access point with a long passphrase ( 20-22+ characters in length ). Without this patch, it will be almost impossible to manually enter such a long passphrase before NM times out, and subsequently ignores the submitted passphrase.

To post a comment you must log in.
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: