Browse Source

PASS command may be optional if the server answers 230 after issuing USER

Ludovic Fauvet 12 years ago
parent
commit
7a3697af8c
1 changed files with 10 additions and 4 deletions
  1. 10 4
      ftp.go

+ 10 - 4
ftp.go

@@ -80,14 +80,20 @@ func Connect(addr string) (*ServerConn, error) {
 // "anonymous"/"anonymous" is a common user/password scheme for FTP servers
 // that allows anonymous read-only accounts.
 func (c *ServerConn) Login(user, password string) error {
-	_, _, err := c.cmd(StatusUserOK, "USER %s", user)
+	code, message, err := c.cmd(-1, "USER %s", user)
 	if err != nil {
 		return err
 	}
 
-	_, _, err = c.cmd(StatusLoggedIn, "PASS %s", password)
-	if err != nil {
-		return err
+	switch code {
+	case StatusLoggedIn:
+	case StatusUserOK:
+		_, _, err = c.cmd(StatusLoggedIn, "PASS %s", password)
+		if err != nil {
+			return err
+		}
+	default:
+		return errors.New(message)
 	}
 
 	// Switch to binary mode