X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fgroups.go;h=d003bddeed1c9e5efdf24db2db57b788dc252b3f;hb=7c4e5d64e25acec7209a54a15836b4481c450416;hp=5af3be09990115740b0ed7f4e9c941b185b87477;hpb=4473e968425319e6beae558643bb047a6b01c17a;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/groups.go b/cmd/safcm/config/groups.go
index 5af3be0..d003bdd 100644
--- a/cmd/safcm/config/groups.go
+++ b/cmd/safcm/config/groups.go
@@ -60,7 +60,9 @@ func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
 				"%s conflict with pre-defined group %q",
 				errPrefix, name)
 		}
-		if hosts.Map[name] != nil {
+		if hosts.Map[name] != nil ||
+			hosts.Map[strings.TrimSuffix(name,
+				GroupRemoveSuffix)] != nil {
 			return nil, fmt.Errorf(
 				"%s conflict with existing host",
 				errPrefix)
@@ -95,7 +97,7 @@ func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
 			if hosts.Map[x] != nil || groups[x] != nil {
 				continue
 			}
-			return nil, fmt.Errorf("%s group %q not found",
+			return nil, fmt.Errorf("%s member %q not found",
 				errPrefix, x)
 		}
 	}