X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Faliasbr.c;fp=uip%2Faliasbr.c;h=073b1b28960354082d822516a6e2432e2340887f;hp=b9b32fa1359f1c088228aa1887023f264aa801b6;hb=f61367c1118de22149e1ddff4a2c2c2437d758f0;hpb=684ec30d81e1223a282764452f4902ed4ad1c754

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index b9b32fa..073b1b2 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -39,7 +39,6 @@ static char *seekp(char *, char *, char **);
 static int addfile(struct aka *, char *);
 static int addgroup(struct aka *, char *);
 static int addmember(struct aka *, char *);
-static int addall(struct aka *);
 static char *getalias(char *);
 static void add_aka(struct aka *, char *);
 static struct aka *akalloc(char *);
@@ -115,11 +114,10 @@ aleq(char *string, char *aliasent)
 	while ((c = *string++))
 		if (*aliasent == '*')
 			return 1;
+		else if ((c | 040) != (*aliasent | 040))
+			return 0;
 		else
-			if ((c | 040) != (*aliasent | 040))
-				return 0;
-			else
-				aliasent++;
+			aliasent++;
 
 	return (*aliasent == 0 || *aliasent == '*');
 }
@@ -224,10 +222,6 @@ alias(char *file)
 			}
 			break;
 
-		case '*':  /* Everyone */
-			addall(ak);
-			break;
-
 		default:  /* list */
 			while ((cp = getalias(pp)))
 				add_aka(ak, cp);
@@ -407,28 +401,6 @@ addmember(struct aka *ak, char *grp)
 }
 
 
-static int
-addall(struct aka *ak)
-{
-	int noshell = NoShell == NULL || *NoShell == 0;
-	register struct home *hm;
-
-#ifndef DBMPWD
-	if (homehead == NULL)
-#endif /* DBMPWD */
-		init_pw();
-	if (Everyone < 0)
-		Everyone = EVERYONE;
-
-	for (hm = homehead; hm; hm = hm->h_next)
-		if (hm->h_uid > Everyone && (noshell ||
-				strcmp(hm->h_shell, NoShell)!=0))
-			add_aka(ak, hm->h_name);
-
-	return homehead != NULL;
-}
-
-
 static char *
 getalias(char *addrs)
 {