upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the correct file pointer when reading the group id map file. The old

Browse source 
code tried to read the group id map from the user id file, and thus would
never actually allow a umapfs to be mounted.  (!)
This commit is contained in:
Garrett Wollman 1995-06-13 17:42:07 +00:00
parent 3589d0dfc6
commit f73b709a01
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sbin/mount_umap/mount_umap.c
View file

@ -190,7 +190,7 @@ main(argc, argv)
errx(1, "%s does not belong to root%s", gmapfile, not);
#endif /* MAPSECURITY */
if ((fscanf(fp, "%d\n", &gnentries)) != 1)
if ((fscanf(gfp, "%d\n", &gnentries)) != 1)
errx(1, "nentries not found%s", gmapfile, not);
if (gnentries > MAPFILEENTRIES)
errx(1,
@ -200,11 +200,11 @@ main(argc, argv)
#endif
for (count = 0; count < gnentries; ++count)
if ((fscanf(fp, "%lu %lu\n",
if ((fscanf(gfp, "%lu %lu\n",
&(gmapdata[count][0]), &(gmapdata[count][1]))) != 2) {
if (ferror(fp))
if (ferror(gfp))
err(1, "%s%s", gmapfile, not);
if (feof(fp))
if (feof(gfp))
errx(1, "%s: unexpected end-of-file%s",
gmapfile, not);
errx(1, "%s: illegal format (line %d)%s",
@ -226,8 +226,11 @@ main(argc, argv)
endvfsent(); /* flush cache */
vfc = getvfsbyname("umap");
}
if (!vfc) {
errx(1, "umap filesystem not available");
}
if (mount(vfc ? vfc->vfc_index : MOUNT_UMAP, argv[1], mntflags, &args))
if (mount(vfc->vfc_index, argv[1], mntflags, &args))
err(1, NULL);
exit(0);
}

13
sbin/mount_umapfs/mount_umapfs.c
View file

@ -190,7 +190,7 @@ main(argc, argv)
errx(1, "%s does not belong to root%s", gmapfile, not);
#endif /* MAPSECURITY */
if ((fscanf(fp, "%d\n", &gnentries)) != 1)
if ((fscanf(gfp, "%d\n", &gnentries)) != 1)
errx(1, "nentries not found%s", gmapfile, not);
if (gnentries > MAPFILEENTRIES)
errx(1,
@ -200,11 +200,11 @@ main(argc, argv)
#endif
for (count = 0; count < gnentries; ++count)
if ((fscanf(fp, "%lu %lu\n",
if ((fscanf(gfp, "%lu %lu\n",
&(gmapdata[count][0]), &(gmapdata[count][1]))) != 2) {
if (ferror(fp))
if (ferror(gfp))
err(1, "%s%s", gmapfile, not);
if (feof(fp))
if (feof(gfp))
errx(1, "%s: unexpected end-of-file%s",
gmapfile, not);
errx(1, "%s: illegal format (line %d)%s",
@ -226,8 +226,11 @@ main(argc, argv)
endvfsent(); /* flush cache */
vfc = getvfsbyname("umap");
}
if (!vfc) {
errx(1, "umap filesystem not available");
}
if (mount(vfc ? vfc->vfc_index : MOUNT_UMAP, argv[1], mntflags, &args))
if (mount(vfc->vfc_index, argv[1], mntflags, &args))
err(1, NULL);
exit(0);
}