diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2006-01-30 16:25:14 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2006-01-30 16:25:14 +0000 |
| commit | e1ed2e8e9ccc8b906a570df83d133951a6dcab60 (patch) | |
| tree | e4e6a62fd70cf73e699a1307436be6b16e7de805 /mail/qmail | |
| parent | Add support for getopt_long and fix getopt(). (diff) | |
- Revert last commit and back to use alias user, that is the default.
- Fix mkaliasdir accordingly
Notes
Notes:
svn path=/head/; revision=154836
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/files/mkaliasdir | 4 | ||||
| -rw-r--r-- | mail/qmail/files/pkg-install.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mail/qmail/files/mkaliasdir b/mail/qmail/files/mkaliasdir index bc56f2fecfcd..b380d47d29fd 100644 --- a/mail/qmail/files/mkaliasdir +++ b/mail/qmail/files/mkaliasdir @@ -19,9 +19,9 @@ do Getopts('vf:'); $verbose = 0 unless ($verbose = $opt_v); $aliases = $ALIASES unless ($aliases = $opt_f); -if (($aliasdir = (getpwnam("qalias"))[7]) eq "") +if (($aliasdir = (getpwnam("alias"))[7]) eq "") { - die "User qalias does not exist, bailing!\n"; + die "User alias does not exist, bailing!\n"; } if (($qmaildir = (getpwnam("qmaild"))[7]) eq "") diff --git a/mail/qmail/files/pkg-install.in b/mail/qmail/files/pkg-install.in index ad5782086507..bae0f277a8cd 100644 --- a/mail/qmail/files/pkg-install.in +++ b/mail/qmail/files/pkg-install.in @@ -32,7 +32,7 @@ switch ($argv[2]) case "PRE-INSTALL": set groups = (qmail qnofiles); set gids = (82 81); - set users = (qalias qmaild qmaill qmailp qmailq qmailr qmails); + set users = (alias qmaild qmaill qmailp qmailq qmailr qmails); set users_g = (qnofiles qnofiles qnofiles qnofiles qmail qmail qmail); set uids = (81 82 83 84 85 86 87); @@ -64,7 +64,7 @@ case "PRE-INSTALL": pw usershow $user >& /dev/null; if ($status) then - if ($user == "qalias") then + if ($user == "alias") then set home = ${PKG_PREFIX}/alias; else set home = ${PKG_PREFIX}; |