Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.3] Remove nostat option #542

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions doc/manual/man/man5/AppleVolumes.default.5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -920,15 +920,6 @@
</listitem>
</varlistentry>

<varlistentry>
<term>nostat</term>

<listitem>
<para>Don't stat volume path when enumerating volumes list,
useful for automounting.</para>
</listitem>
</varlistentry>

<varlistentry>
<term>prodos</term>

Expand Down
Empty file added etc/afpd/.dirstamp
Empty file.
4 changes: 1 addition & 3 deletions etc/afpd/volume.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,6 @@ static void volset(struct vol_option *options, struct vol_option *save,
options[VOLOPT_FLAGS].i_value |= AFPVOL_LIMITSIZE;
else if (strcasecmp(p, "nofileid") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_NOFILEID;
else if (strcasecmp(p, "nostat") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_NOSTAT;
else if (strcasecmp(p, "upriv") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_UNIX_PRIV;
else if (strcasecmp(p, "nodev") == 0)
Expand Down Expand Up @@ -1938,7 +1936,7 @@ int afp_getsrvrparms(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf

data = rbuf + 5;
for ( vcnt = 0, volume = Volumes; volume && vcnt < 255; volume = volume->v_next ) {
if (!(volume->v_flags & AFPVOL_NOSTAT)) {
if (!(volume->v_flags)) {
struct maccess ma;

if ( stat( volume->v_path, &st ) < 0 ) {
Expand Down
2 changes: 2 additions & 0 deletions include/atalk/volume.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,10 @@ struct vol {
#define AFPVOL_DROPBOX (1 << 14) /* dropkludge dropbox support */
#endif
#define AFPVOL_NOFILEID (1 << 15) /* don't advertise createid resolveid and deleteid calls */
#if 0
#define AFPVOL_NOSTAT (1 << 16) /* advertise the volume even if we can't stat() it
* maybe because it will be mounted later in preexec */
#endif
#define AFPVOL_UNIX_PRIV (1 << 17) /* support unix privileges */
#define AFPVOL_NODEV (1 << 18) /* always use 0 for device number in cnid calls
* help if device number is notconsistent across reboot
Expand Down
2 changes: 2 additions & 0 deletions libatalk/util/volinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ static const vol_opt_name_t vol_opt_names[] = {
{AFPVOL_DROPBOX, "DROPBOX"}, /* dropkludge dropbox support */
#endif
{AFPVOL_NOFILEID, "NOFILEID"}, /* don't advertise createid resolveid and deleteid calls */
#if 0
{AFPVOL_NOSTAT, "NOSTAT"}, /* advertise the volume even if we can't stat() it
* maybe because it will be mounted later in preexec */
#endif
{AFPVOL_UNIX_PRIV, "UNIXPRIV"}, /* support unix privileges */
{AFPVOL_NODEV, "NODEV"}, /* always use 0 for device number in cnid calls */
{AFPVOL_CASEINSEN, "CASEINSENSITIVE"}, /* volume is case insensitive */
Expand Down