Merge pull request #1287 from ploubser/maint_fix_system_account_check

ripienaar · web-flow · commit e5087cb254bc · 2025-03-10T12:41:09.000+01:00
(maint) Check if system account is not nil before using it
diff --git a/cli/auth_account_command.go b/cli/auth_account_command.go
@@ -773,7 +773,7 @@ func (c *authAccountCommand) lsAction(_ *fisk.ParseContext) error {
 		system := ""
 		js := ""
 		sa, err := operator.SystemAccount()
-		if err == nil && acct.Subject() == sa.Subject() {
+		if err == nil && sa != nil && acct.Subject() == sa.Subject() {
 			system = "true"
 		}
 		if acct.Limits().JetStream().IsJetStreamEnabled() {

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ func (c authAccountCommand) lsAction(_ fisk.ParseContext) error {`
`773`	`773`	`system := ""`
`774`	`774`	`js := ""`
`775`	`775`	`sa, err := operator.SystemAccount()`
`776`		`- if err == nil && acct.Subject() == sa.Subject() {`
	`776`	`+ if err == nil && sa != nil && acct.Subject() == sa.Subject() {`
`777`	`777`	`system = "true"`
`778`	`778`	`}`
`779`	`779`	`if acct.Limits().JetStream().IsJetStreamEnabled() {`