diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-02-28 00:22:47 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-02-28 00:22:47 +0000 |
| commit | d670e0b9fbf1569b78c7b526053c8f68bae130c3 (patch) | |
| tree | 28bbd6f22cf59652f0a32ec670c83c5f12c960a9 /contrib/sendmail/praliases/praliases.c | |
| parent | e4882e48c06ee9963c8275992cd9767a29e01c05 (diff) | |
| download | FreeBSD-src-d670e0b9fbf1569b78c7b526053c8f68bae130c3.zip FreeBSD-src-d670e0b9fbf1569b78c7b526053c8f68bae130c3.tar.gz | |
Repair 8.11.3 merge conflicts
Diffstat (limited to 'contrib/sendmail/praliases/praliases.c')
| -rw-r--r-- | contrib/sendmail/praliases/praliases.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index 3f706da..b4d4414 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ #ifndef lint static char copyright[] = -"@(#) Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.\n\ +"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\ All rights reserved.\n\ Copyright (c) 1983 Eric P. Allman. All rights reserved.\n\ Copyright (c) 1988, 1993\n\ @@ -21,7 +21,7 @@ static char copyright[] = #endif /* ! lint */ #ifndef lint -static char id[] = "@(#)$Id: praliases.c,v 8.59.4.15 2000/10/24 00:42:59 geir Exp $"; +static char id[] = "@(#)$Id: praliases.c,v 8.59.4.18 2001/01/22 19:00:18 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -274,6 +274,21 @@ praliases(filename, argc, argv) db_name++; } + /* Skip non-file based DB types */ + if (db_type != NULL && *db_type != '\0') + { + if (db_type != SMDB_TYPE_DEFAULT && + strcmp(db_type, "hash") != 0 && + strcmp(db_type, "btree") != 0 && + strcmp(db_type, "dbm") != 0) + { + fprintf(stderr, + "praliases: Skipping non-file based alias type %s\n", + db_type); + return; + } + } + if (*db_name == '\0' || (db_type != NULL && *db_type == '\0')) { if (colon != NULL) |
