d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small NIS tweak: frob pw_error() a little so that it can say either

Browse Source 
'NIS information unchanged' or '/etc/master.passwd unchanged'
depending on which was is being modified (conditional on -DYP).

This is to save me the trouble of writing a whole other error
routine (nis_error()?) for the upcoming changes to passwd and
chpass.
This commit is contained in:
Bill Paul 1995-08-13 16:05:06 +00:00
parent 1cf4903ecd
commit d877befa37
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libutil/pw_util.c
View File

@ -211,9 +211,16 @@ pw_error(name, err, eval)
char *name; char *name;
int err, eval; int err, eval;
{ {
#ifdef YP
extern int _use_yp;
#endif /* YP */
if (err) if (err)
warn(name); warn(name);
#ifdef YP
if (_use_yp)
warnx("NIS information unchanged");
else
#endif /* YP */
warnx("%s: unchanged", _PATH_MASTERPASSWD); warnx("%s: unchanged", _PATH_MASTERPASSWD);
(void)unlink(tempname); (void)unlink(tempname);
exit(eval); exit(eval);

9
usr.sbin/vipw/pw_util.c
View File

@ -211,9 +211,16 @@ pw_error(name, err, eval)
char *name; char *name;
int err, eval; int err, eval;
{ {
#ifdef YP
extern int _use_yp;
#endif /* YP */
if (err) if (err)
warn(name); warn(name);
#ifdef YP
if (_use_yp)
warnx("NIS information unchanged");
else
#endif /* YP */
warnx("%s: unchanged", _PATH_MASTERPASSWD); warnx("%s: unchanged", _PATH_MASTERPASSWD);
(void)unlink(tempname); (void)unlink(tempname);
exit(eval); exit(eval);