]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: add a comment so I don't make this mistake again
authordjm@openbsd.org <djm@openbsd.org>
Wed, 5 Jan 2022 21:54:37 +0000 (21:54 +0000)
committerDamien Miller <djm@mindrot.org>
Thu, 6 Jan 2022 22:10:42 +0000 (09:10 +1100)
OpenBSD-Commit-ID: 69c7f2362f9de913bb29b6318580c5a1b52c921e

ssh-keygen.c

index 6dd825936629f9545d6831add62a5e8860260c8f..05901cb025e61f7287ac2c73eeae6e1d16630192 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.446 2022/01/05 21:50:00 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.447 2022/01/05 21:54:37 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3523,6 +3523,7 @@ main(int argc, char **argv)
                        return sig_match_principals(identity_file, cert_key_id,
                            opts, nopts);
                } else if (strncmp(sign_op, "sign", 4) == 0) {
+                       /* NB. cert_principals is actually namespace, via -n */
                        if (cert_principals == NULL ||
                            *cert_principals == '\0') {
                                error("Too few arguments for sign: "
@@ -3545,10 +3546,11 @@ main(int argc, char **argv)
                        return sig_verify(ca_key_path, cert_principals,
                            NULL, NULL, NULL, opts, nopts);
                } else if (strncmp(sign_op, "verify", 6) == 0) {
+                       /* NB. cert_principals is actually namespace, via -n */
                        if (cert_principals == NULL ||
                            *cert_principals == '\0') {
                                error("Too few arguments for verify: "
-                                   "missing principal");
+                                   "missing namespace");
                                exit(1);
                        }
                        if (ca_key_path == NULL) {
@@ -3563,7 +3565,7 @@ main(int argc, char **argv)
                        }
                        if (cert_key_id == NULL) {
                                error("Too few arguments for verify: "
-                                   "missing principal ID");
+                                   "missing principal identity");
                                exit(1);
                        }
                        return sig_verify(ca_key_path, cert_principals,