/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2291
2291
                                ["secret"]))
2292
2292
            except PGPError:
2293
2293
                # If decryption fails, we use secret from new settings
 
2294
                logger.debug("Failed to decrypt {0} old secret"
 
2295
                             .format(client_name))
2294
2296
                tcp_server.clients[client_name].secret = (
2295
2297
                    client_settings[client_name]["secret"])
2296
2298