diff options
-rw-r--r-- | lib/libutil/pw_util.c | 10 | ||||
-rw-r--r-- | usr.sbin/vipw/pw_util.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index 2c082e4..c5327cc 100644 --- a/lib/libutil/pw_util.c +++ b/lib/libutil/pw_util.c @@ -244,21 +244,13 @@ pw_prompt(void) void pw_error(const char *name, int error, int eval) { -#ifdef YP - extern int _use_yp; -#endif /* YP */ if (error) { if (name != NULL) warn("%s", name); else warn(NULL); } -#ifdef YP - if (_use_yp) - warnx("NIS information unchanged"); - else -#endif /* YP */ - warnx("%s: unchanged", masterpasswd); + warnx("password information unchanged"); (void)unlink(tempname); exit(eval); } diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c index 2c082e4..c5327cc 100644 --- a/usr.sbin/vipw/pw_util.c +++ b/usr.sbin/vipw/pw_util.c @@ -244,21 +244,13 @@ pw_prompt(void) void pw_error(const char *name, int error, int eval) { -#ifdef YP - extern int _use_yp; -#endif /* YP */ if (error) { if (name != NULL) warn("%s", name); else warn(NULL); } -#ifdef YP - if (_use_yp) - warnx("NIS information unchanged"); - else -#endif /* YP */ - warnx("%s: unchanged", masterpasswd); + warnx("password information unchanged"); (void)unlink(tempname); exit(eval); } |