Mercurial > 510Connectbot
diff src/ch/ethz/ssh2/packets/PacketUserauthRequestNone.java @ 308:42b15aaa7ac7 ganymed
merge
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Wed, 30 Jul 2014 14:21:50 -0700 |
parents | 071eccdff8ea |
children |
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/packets/PacketUserauthRequestNone.java Wed Jul 30 13:38:04 2014 -0700 +++ b/src/ch/ethz/ssh2/packets/PacketUserauthRequestNone.java Wed Jul 30 14:21:50 2014 -0700 @@ -28,23 +28,22 @@ public PacketUserauthRequestNone(byte payload[]) throws IOException { this.payload = payload; - TypesReader tr = new TypesReader(payload); - int packet_type = tr.readByte(); - if(packet_type != Packets.SSH_MSG_USERAUTH_REQUEST) { + if (packet_type != Packets.SSH_MSG_USERAUTH_REQUEST) { throw new PacketTypeException(packet_type); } + String userName = tr.readString(); String serviceName = tr.readString(); - String method = tr.readString(); - if(!method.equals("none")) { + if (!method.equals("none")) { throw new IOException(String.format("Unexpected method %s", method)); } - if(tr.remain() != 0) { + + if (tr.remain() != 0) { throw new PacketFormatException(String.format("Padding in %s", Packets.getMessageName(packet_type))); } }