X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Faliasbr.c;h=8b32826b5f9122611ae92bf0aea0c26b24d6f4e2;hp=1923867611af9cf0857578c2e65753a998ab0994;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=fce8a87e8a4a443a08a98b24eef270451a63fab8

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 1923867..8b32826 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -31,7 +31,7 @@ char *akresult(struct aka *);
 char *akvalue(char *);
 char *akerror(int);
 
-static  char *akval(struct aka *, char *);
+static char *akval(struct aka *, char *);
 static int aleq(char *, char *);
 static char *scanp(unsigned char *);
 static char *getp(char *);
@@ -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,16 +114,18 @@ 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 == '*');
 }
 
 
+/*
+** file needs to be absolute or relative to cwd
+*/
 int
 alias(char *file)
 {
@@ -134,8 +135,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;
@@ -144,22 +143,22 @@ alias(char *file)
 	while (vfgets(fp, &ap) == OK) {
 		bp = ap;
 		switch (*(pp = scanp(bp))) {
-			case '<':  /* recurse a level */
-				if (!*(cp = getp(pp + 1))) {
-					akerrst = "'<' without alias-file";
-					fclose(fp);
-					return AK_ERROR;
-				}
-				if ((i = alias(cp)) != AK_OK) {
-					fclose(fp);
-					return i;
-				}
-
-			case ':':  /* comment */
-			case ';':
-			case '#':
-			case 0:
-				continue;
+		case '<':  /* recurse a level */
+			if (!*(cp = getp(pp + 1))) {
+				akerrst = "'<' without alias-file";
+				fclose(fp);
+				return AK_ERROR;
+			}
+			if ((i = alias(cp)) != AK_OK) {
+				fclose(fp);
+				return i;
+			}
+
+		case ':':  /* comment */
+		case ';':
+		case '#':
+		case 0:
+			continue;
 		}
 
 		akerrst = bp;
@@ -172,65 +171,61 @@ alias(char *file)
 			return AK_LIMIT;
 		}
 		switch (lc) {
-			case ':':
-				ak->ak_visible = 0;
-				break;
+		case ':':
+			ak->ak_visible = 0;
+			break;
 
-			case ';':
-				ak->ak_visible = 1;
-				break;
+		case ';':
+			ak->ak_visible = 1;
+			break;
 
-			default:
-				fclose(fp);
-				return AK_ERROR;
+		default:
+			fclose(fp);
+			return AK_ERROR;
 		}
 
 		switch (*(pp = scanp(ap))) {
-			case 0:  /* EOL */
+		case 0:  /* EOL */
+			fclose(fp);
+			return AK_ERROR;
+
+		case '<':  /* read values from file */
+			if (!*(cp = getp(pp + 1))) {
 				fclose(fp);
 				return AK_ERROR;
+			}
+			if (!addfile(ak, cp)) {
+				fclose(fp);
+				return AK_NOFILE;
+			}
+			break;
 
-			case '<':  /* read values from file */
-				if (!*(cp = getp(pp + 1))) {
-					fclose(fp);
-					return AK_ERROR;
-				}
-				if (!addfile(ak, cp)) {
-					fclose(fp);
-					return AK_NOFILE;
-				}
-				break;
-
-			case '=':  /* UNIX group */
-				if (!*(cp = getp(pp + 1))) {
-					fclose(fp);
-					return AK_ERROR;
-				}
-				if (!addgroup(ak, cp)) {
-					fclose(fp);
-					return AK_NOGROUP;
-				}
-				break;
-
-			case '+':  /* UNIX group members */
-				if (!*(cp = getp(pp + 1))) {
-					fclose(fp);
-					return AK_ERROR;
-				}
-				if (!addmember(ak, cp)) {
-					fclose(fp);
-					return AK_NOGROUP;
-				}
-				break;
+		case '=':  /* UNIX group */
+			if (!*(cp = getp(pp + 1))) {
+				fclose(fp);
+				return AK_ERROR;
+			}
+			if (!addgroup(ak, cp)) {
+				fclose(fp);
+				return AK_NOGROUP;
+			}
+			break;
 
-			case '*':  /* Everyone */
-				addall(ak);
-				break;
+		case '+':  /* UNIX group members */
+			if (!*(cp = getp(pp + 1))) {
+				fclose(fp);
+				return AK_ERROR;
+			}
+			if (!addmember(ak, cp)) {
+				fclose(fp);
+				return AK_NOGROUP;
+			}
+			break;
 
-			default:  /* list */
-				while ((cp = getalias(pp)))
-					add_aka(ak, cp);
-				break;
+		default:  /* list */
+			while ((cp = getalias(pp)))
+				add_aka(ak, cp);
+			break;
 		}
 	}
 
@@ -245,25 +240,29 @@ akerror(int i)
 	static char buffer[BUFSIZ];
 
 	switch (i) {
-		case AK_NOFILE:
-			snprintf(buffer, sizeof(buffer), "unable to read '%s'", akerrst);
-			break;
-
-		case AK_ERROR:
-			snprintf(buffer, sizeof(buffer), "error in line '%s'", akerrst);
-			break;
-
-		case AK_LIMIT:
-			snprintf(buffer, sizeof(buffer), "out of memory while on '%s'", akerrst);
-			break;
-
-		case AK_NOGROUP:
-			snprintf(buffer, sizeof(buffer), "no such group as '%s'", akerrst);
-			break;
-
-		default:
-			snprintf(buffer, sizeof(buffer), "unknown error (%d)", i);
-			break;
+	case AK_NOFILE:
+		snprintf(buffer, sizeof(buffer), "unable to read '%s'",
+				akerrst);
+		break;
+
+	case AK_ERROR:
+		snprintf(buffer, sizeof(buffer), "error in line '%s'",
+				akerrst);
+		break;
+
+	case AK_LIMIT:
+		snprintf(buffer, sizeof(buffer), "out of memory while on '%s'",
+				akerrst);
+		break;
+
+	case AK_NOGROUP:
+		snprintf(buffer, sizeof(buffer), "no such group as '%s'",
+				akerrst);
+		break;
+
+	default:
+		snprintf(buffer, sizeof(buffer), "unknown error (%d)", i);
+		break;
 	}
 
 	return buffer;
@@ -282,7 +281,7 @@ scanp(unsigned char *p)
 static char *
 getp(char *p)
 {
-	register unsigned char  *cp = scanp(p);
+	register unsigned char *cp = scanp(p);
 
 	p = cp;
 	while (!isspace(*cp) && *cp)
@@ -344,28 +343,19 @@ addgroup(struct aka *ak, char *grp)
 		return 0;
 	}
 
-#ifndef DBMPWD
-	if (homehead == NULL)
-		init_pw();
-#endif /* DBMPWD */
-
 	while ((gp = *gr->gr_mem++))
-#ifdef DBMPWD
 	{
 		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;
 			}
-#ifdef DBMPWD
 		if ((pw = getpwnam(gp))) {
-				hmalloc(pw);
-				add_aka(ak, gp);
+			hmalloc(pw);
+			add_aka(ak, gp);
 		}
 	}
-#endif /* DBMPWD */
 
 	return 1;
 }
@@ -389,10 +379,7 @@ addmember(struct aka *ak, char *grp)
 		return 0;
 	}
 
-#ifndef DBMPWD
-	if (homehead == NULL)
-#endif /* DBMPWD */
-		init_pw();
+	init_pw();
 
 	for (hm = homehead; hm; hm = hm->h_next)
 		if (hm->h_gid == gid)
@@ -402,28 +389,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)))
-			add_aka(ak, hm->h_name);
-
-	return homehead != NULL;
-}
-
-
 static char *
 getalias(char *addrs)
 {
@@ -462,12 +427,12 @@ 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));
 	ad->ad_text = getcpy(pp);
-	ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
+	ad->ad_local = strchr(pp, '@') == NULL;
 	ad->ad_next = NULL;
 	if (ak->ak_addr)
 		ld->ad_next = ad;
@@ -479,28 +444,21 @@ add_aka(struct aka *ak, char *pp)
 void
 init_pw(void)
 {
-	register struct passwd  *pw;
-#ifdef DBMPWD
-	static int init;
+	register struct passwd *pw;
+	static int init = 0;
 
 	if (!init) {
-		/* if the list has yet to be initialized */
-		/* zap the list, and rebuild from scratch */
-		homehead=NULL;
-		hometail=NULL;
-		init++;
-#endif /* DBMPWD */
-
+		/* read the passwd database and build a list */
 		setpwent();
-
-		while ((pw = getpwent()))
-			if (!hmalloc(pw))
+		while ((pw = getpwent())) {
+			if (!hmalloc(pw)) {
 				break;
-
+			}
+		}
 		endpwent();
-#ifdef DBMPWD
+
+		init++;  /* now we're initialized */
 	}
-#endif /* DBMPWD */
 }
 
 
@@ -539,10 +497,11 @@ hmalloc(struct passwd *pw)
 	p->h_shell = getcpy(pw->pw_shell);
 	p->h_ngrps = 0;
 	p->h_next = NULL;
-	if (hometail != NULL)
-		hometail->h_next = p;
-	if (homehead == NULL)
+	/* append to end */
+	if (!homehead)
 		homehead = p;
+	if (hometail)
+		hometail->h_next = p;
 	hometail = p;
 
 	return p;
@@ -553,27 +512,20 @@ struct home *
 seek_home(char *name)
 {
 	register struct home *hp;
-#ifdef DBMPWD
 	struct passwd *pw;
 	char lname[32];
 	unsigned char *c;
 	char *c1;
-#else  /* DBMPWD */
-
-	if (homehead == NULL)
-		init_pw();
-#endif /* DBMPWD */
 
 	for (hp = homehead; hp; hp = hp->h_next)
 		if (!mh_strcasecmp(name, hp->h_name))
 			return hp;
 
-#ifdef DBMPWD
 	/*
 	** The only place where there might be problems.
 	** This assumes that ALL usernames are kept in lowercase.
 	*/
-	for (c = name, c1 = lname; *c && (c1 - lname < sizeof(lname) - 1);
+	for (c = name, c1 = lname; *c && (c1 - lname < (int)sizeof(lname) - 1);
 			c++, c1++) {
 		if (isalpha(*c) && isupper(*c))
 			*c1 = tolower(*c);
@@ -583,7 +535,6 @@ seek_home(char *name)
 	*c1 = '\0';
 	if ((pw = getpwnam(lname)))
 		return(hmalloc(pw));
-#endif /* DBMPWD */
 
 	return NULL;
 }