diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-06-26 13:48:35 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-06-26 13:48:35 +0200 |
| commit | 7cb48e888df3f4a7156d39515e6573aed66acd39 (patch) | |
| tree | 9b0acad31296fbe577b8bceeb0e5a10b8bd1e125 /cmdline/apt-key | |
| parent | bf7de05c855aea1f1d30e7aafd99700601a7bc4d (diff) | |
merge previous security upload
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 6e85b7353..166508c8e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -86,6 +86,8 @@ add_keys_with_verify_against_master_keyring() { # the archive-keyring keys needs to be signed with the master key # (otherwise it does not make sense from a security POV) net_update() { + # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128)) + exit 1 if [ -z "$ARCHIVE_KEYRING_URI" ]; then echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set" |