diff options
| author | des <des@FreeBSD.org> | 2002-04-17 00:18:15 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-04-17 00:18:15 +0000 |
| commit | e914cc2fa2f90ac19ef0dd05e8468a1d5980ad36 (patch) | |
| tree | 38bbb767237b37f452bd7a6e77e809ffa5bd53d5 /lib/libutil/pw_util.c | |
| parent | f84972208cc476569de7ab6888d63b17606722c1 (diff) | |
| download | FreeBSD-src-e914cc2fa2f90ac19ef0dd05e8468a1d5980ad36.zip FreeBSD-src-e914cc2fa2f90ac19ef0dd05e8468a1d5980ad36.tar.gz | |
Make mppath and masterpasswd pointers instead of arrays, and initialize
them to point at static strings that contain the default paths. This
makes 'vipw -d' work again (I broke it in rev 1.21; apologies for taking
so long to fix it.)
Spotted by: Olivier Houchard <doginou@cognet.ci0.org>
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'lib/libutil/pw_util.c')
| -rw-r--r-- | lib/libutil/pw_util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index c5327cc..1c163d2 100644 --- a/lib/libutil/pw_util.c +++ b/lib/libutil/pw_util.c @@ -67,8 +67,10 @@ extern char *tempname; static pid_t editpid = -1; static int lockfd; static char _default_editor[] = _PATH_VI; -char mppath[] = _PATH_PWD; -char masterpasswd[] = _PATH_MASTERPASSWD; +static char _default_mppath[] = _PATH_PWD; +static char _default_masterpasswd[] = _PATH_MASTERPASSWD; +char *mppath = _default_mppath; +char *masterpasswd = _default_masterpasswd; void pw_cont(int); |
