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

Rename a static variable, so it will not shadowed by a local variable.

Browse Source 
Now comments will be ignored, rather than put junk in the password database.

Broken in:	rev. 1.21
This commit is contained in:
Dmitrij Tejblum 1998-09-29 20:01:21 +00:00
parent 9048a9edbd
commit 5081946172
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=39777
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pwd_mkdb/pwd_mkdb.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";
#endif
static const char rcsid[] =
"$Id: pwd_mkdb.c,v 1.25 1998/04/19 07:15:34 phk Exp $";
"$Id: pwd_mkdb.c,v 1.26 1998/06/09 20:19:59 ache Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -81,7 +81,7 @@ static struct passwd pwd; /* password structure */
static char *pname; /* password file name */
static char prefix[MAXPATHLEN];
static int Cflag; /* flag for comments */
static int is_comment; /* flag for comments */
static char line[LINE_MAX];
void cleanup __P((void));
@ -283,11 +283,11 @@ main(argc, argv)
sdata.data = (u_char *)sbuf;
key.data = (u_char *)tbuf;
for (cnt = 1; scan(fp, &pwd); ++cnt) {
if (!Cflag &&
if (!is_comment &&
(pwd.pw_name[0] == '+' || pwd.pw_name[0] == '-'))
yp_enabled = 1;
#define COMPACT(e) t = e; while ((*p++ = *t++));
if (!Cflag &&
if (!is_comment &&
(!username || (strcmp(username, pwd.pw_name) == 0))) {
/* Create insecure data. */
p = buf;
@ -386,7 +386,7 @@ main(argc, argv)
}
}
/* Create original format password file entry */
if (Cflag && makeold){ /* copy comments */
if (is_comment && makeold){ /* copy comments */
if (fprintf(oldfp, "%s\n", line) < 0)
error("write old");
} else if (makeold) {
@ -484,10 +484,10 @@ scan(fp, pw)
if (*p != ' ' && *p != '\t')
break;
if (*p == '#' || *p == '\0') {
Cflag = 1;
is_comment = 1;
return(1);
} else
Cflag = 0;
is_comment = 0;
#endif
if (!pw_scan(line, pw)) {