X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Faliasbr.c;h=b9b32fa1359f1c088228aa1887023f264aa801b6;hb=a0f6183a0f52f9c0f48ce42b4f10592ceec2b014;hp=07c5e035c8d050e06d8874496958eb3277b1dffe;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 07c5e03..b9b32fa 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -125,6 +125,9 @@ aleq(char *string, char *aliasent)
 }
 
 
+/*
+** file needs to be absolute or relative to cwd
+*/
 int
 alias(char *file)
 {
@@ -134,8 +137,6 @@ alias(char *file)
 	register struct aka *ak = NULL;
 	register FILE *fp;
 
-	if (*file!='/' && (strncmp(file, "./", 2) && strncmp(file, "../", 3)))
-		file = etcpath(file);
 	if ((fp = fopen(file, "r")) == NULL) {
 		akerrst = file;
 		return AK_NOFILE;
@@ -359,7 +360,7 @@ addgroup(struct aka *ak, char *grp)
 		struct passwd *pw;
 #endif /* DBMPWD */
 		for (hm = homehead; hm; hm = hm->h_next)
-			if (!strcmp(hm->h_name, gp)) {
+			if (strcmp(hm->h_name, gp)==0) {
 				add_aka(ak, hm->h_name);
 				break;
 			}
@@ -420,8 +421,8 @@ addall(struct aka *ak)
 		Everyone = EVERYONE;
 
 	for (hm = homehead; hm; hm = hm->h_next)
-		if (hm->h_uid > Everyone
-				&& (noshell || strcmp(hm->h_shell, NoShell)))
+		if (hm->h_uid > Everyone && (noshell ||
+				strcmp(hm->h_shell, NoShell)!=0))
 			add_aka(ak, hm->h_name);
 
 	return homehead != NULL;
@@ -466,7 +467,7 @@ add_aka(struct aka *ak, char *pp)
 	register struct adr *ad, *ld;
 
 	for (ad = ak->ak_addr, ld = NULL; ad; ld = ad, ad = ad->ad_next)
-		if (!strcmp(pp, ad->ad_text))
+		if (strcmp(pp, ad->ad_text)==0)
 			return;
 
 	ad = (struct adr *) mh_xmalloc(sizeof(*ad));