===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- src/usr.bin/ssh/ssh-add.c	2014/06/24 01:13:21	1.110
+++ src/usr.bin/ssh/ssh-add.c	2014/06/27 18:50:39	1.111
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.110 2014/06/24 01:13:21 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.111 2014/06/27 18:50:39 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -196,14 +196,14 @@
 	close(fd);
 
 	/* At first, try empty passphrase */
-	if ((r = sshkey_parse_private_fileblob(&keyblob, filename, "",
+	if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename,
 	    &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE)
-			fatal("Cannot parse %s: %s", filename, ssh_err(r));
+		fatal("Cannot parse %s: %s", filename, ssh_err(r));
 	if (comment == NULL)
 		comment = xstrdup(filename);
 	/* try last */
 	if (private == NULL && pass != NULL) {
-		if ((r = sshkey_parse_private_fileblob(&keyblob, filename, pass,
+		if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename,
 		    &private, &comment)) != 0 &&
 		    r != SSH_ERR_KEY_WRONG_PASSPHRASE)
 			fatal("Cannot parse %s: %s", filename, ssh_err(r));
@@ -222,7 +222,7 @@
 				return -1;
 			}
 			if ((r = sshkey_parse_private_fileblob(&keyblob,
-			     filename, pass, &private, &comment)) != 0 &&
+			     pass, filename, &private, NULL)) != 0 &&
 			    r != SSH_ERR_KEY_WRONG_PASSPHRASE)
 				fatal("Cannot parse %s: %s",
 					    filename, ssh_err(r));