diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-07 08:49:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-07 08:49:32 +0000 |
| commit | 6082fe3b24929770fbe8eb41b04c3430b1baae23 (patch) | |
| tree | 1cd4798c1803416e1da3834b9ed3a3c9f34924a3 /packet-afp.c | |
| parent | 202ee2ce257beca4a7a1e9d3c90148f680360696 (diff) | |
From Didier Gautheron:
Unix Privilege defined as bit 14 for directories seems to be an
error in AFP3.0.pdf.
AFP3.1.pdf and AFP3.0 traffic capture use bit 15 for files and
directories.
svn path=/trunk/; revision=7801
Diffstat (limited to 'packet-afp.c')
| -rw-r--r-- | packet-afp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packet-afp.c b/packet-afp.c index 9cb5ee6814..587bd539e2 100644 --- a/packet-afp.c +++ b/packet-afp.c @@ -2,7 +2,7 @@ * Routines for afp packet dissection * Copyright 2002, Didier Gautheron <dgautheron@magic.fr> * - * $Id: packet-afp.c,v 1.30 2003/05/15 05:53:43 guy Exp $ + * $Id: packet-afp.c,v 1.31 2003/06/07 08:49:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -653,7 +653,10 @@ static const value_string map_id_type_vals[] = { #define kFPGroupIDBit (1 << 11) #define kFPAccessRightsBit (1 << 12) #define kFPUTF8NameBit (1 << 13) -#define kFPUnixPrivsBit (1 << 14) + +/* FIXME AFP3.0 bit 14, AFP3.1 bit 15 */ + +#define kFPUnixPrivsBit (1 << 15) /* directory Access Rights parameter AFP3.0.pdf @@ -732,7 +735,6 @@ kFPUTF8NameBit (bit 13) #define kFPLaunchLimitBit (1 << 12) #define kFPExtRsrcForkLenBit (1 << 14) -#define kFPUnixPrivsBit_file (1 << 15) /* :( */ /* file attribute AFP3.0.pdf @@ -1224,7 +1226,7 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, offset += 8; } - if ((bitmap & kFPUnixPrivsBit_file)) { + if ((bitmap & kFPUnixPrivsBit)) { /* * XXX - the AFP 3.0 spec says this is "Four bytes", but * also says the privileges are "stored in an FPUnixPrivs @@ -3890,7 +3892,7 @@ proto_register_afp(void) { &hf_afp_file_bitmap_UnixPrivs, { "UNIX privileges", "afp.file_bitmap.unix_privs", - FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit_file, + FT_BOOLEAN, 16, NULL, kFPUnixPrivsBit, "Return UNIX privileges if file", HFILL }}, /* ---------- */ |