Date: Thu, 11 Dec 2008 15:15:13 +0200 From: Giorgos Keramidas <keramida@ceid.upatras.gr> To: Trond =?iso-8859-1?Q?Endrest=F8l?= <Trond.Endrestol@fagskolen.gjovik.no> Cc: freebsd-hackers@freebsd.org Subject: Re: Small Change to chpass.c Message-ID: <87zlj2kg4e.fsf@kobe.laptop> In-Reply-To: <20081211080955.T60586@ramstind.fig.ol.no> ("Trond =?iso-8859-1?Q?Endrest=F8l=22's?= message of "Thu, 11 Dec 2008 08:11:20 %2B0100 (CET)") References: <f4ecc0930812101800g601d9f10jc008e83d82b54a81@mail.gmail.com> <87vdtr9q8a.fsf@kobe.laptop> <20081211080955.T60586@ramstind.fig.ol.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 11 Dec 2008 08:11:20 +0100 (CET), Trond Endrest=F8l <Trond.Endresto=
l@fagskolen.gjovik.no> wrote:
>On Thu, 11 Dec 2008 08:32+0200, Giorgos Keramidas wrote:
>> On Wed, 10 Dec 2008 18:00:25 -0800, "Sheldon Givens" <sheldon@sigsegv.ca=
> wrote:
>> > --- /usr/src/usr.bin/chpass.c 2008-12-11 01:55:27.000000000 -0800
>> > +++ /usr/src/usr.bin/chpass.c 2008-12-11 01:57:09.000000000 -0800
>> > @@ -80,10 +80,11 @@
>> > {
>> > enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW, NEWEXP } op;
>> > struct passwd lpw, *old_pw, *pw;
>> > - int ch, pfd, tfd;
>> > + int ch, pfd, tfd, itr, auth;
>> > const char *password;
>> > char *arg =3D NULL;
>> > uid_t uid;
>> > + int max_retries =3D 3;
>> > #ifdef YP
>> > struct ypclnt *ypclnt;
>> > const char *yp_domain =3D NULL, *yp_host =3D NULL;
>> > @@ -227,9 +228,16 @@
>> > }
>> >
>> > if (old_pw && !master_mode) {
>> > - password =3D getpass("Password: ");
>
> I'm sure you have noticed the trailing space in the string.
>
>> > - if (strcmp(crypt(password, old_pw->pw_passwd),
>> > - old_pw->pw_passwd) !=3D 0)
>> > + auth =3D 0;
>> > + for(itr=3D0;itr<max_retries;itr++) {
>> > + password =3D getpass("Password:");
>
> The space's missing in this string. It might be better to stay
> consistent with the original code.
Good catch. No, I didn't notice the missing space the first time I read
the diff :/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87zlj2kg4e.fsf>