From f9eaa746eb0566ac48ca27c7c6bc9aa42e8ef80f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 17 Apr 2002 00:18:15 +0000 Subject: [PATCH] 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 Sponsored by: DARPA, NAI Labs --- lib/libutil/pw_util.c | 6 ++++-- usr.sbin/vipw/pw_util.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index c5327ccfbf8b..1c163d2d57ed 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); diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c index c5327ccfbf8b..1c163d2d57ed 100644 --- a/usr.sbin/vipw/pw_util.c +++ b/usr.sbin/vipw/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);