Changeset 105 for trunk/src


Ignore:
Timestamp:
May 15, 2007, 10:56:55 PM (18 years ago)
Author:
rainer
Message:

Fixes for tickets #64, #65, #66 (null checksum encoding, acl double print, UseACLCheck/UseSELinuxCheck bug).

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_hash.c

    r93 r105  
    6161#include "sh_forward.h"
    6262#endif
     63
     64
     65#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
     66
    6367
    6468#undef  FIL__
     
    35683572            SH_FREE(esc);
    35693573        }
    3570       printf(_(" %s"), tmp);
    35713574      SH_FREE(tmp);
    35723575    }
  • trunk/src/sh_tiger0.c

    r102 r105  
    5454
    5555typedef unsigned char sh_byte;
     56
     57#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
    5658
    5759#undef  FIL__
  • trunk/src/sh_unix.c

    r102 r105  
    139139#endif
    140140
     141#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
    141142
    142143#undef  FIL__
     
    30403041#endif
    30413042
    3042   out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
    3043 
    3044   if (out)
    3045     {
    3046       if (collect) {
    3047         tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
    3048         SH_FREE(collect);
    3049       }
    3050       else {
    3051         tmp = sh_util_strconcat(_("selinux:"), out, NULL);
    3052       }
    3053       SH_FREE(out);
    3054       collect = tmp;
     3043  if (sh_unix_check_selinux == S_TRUE)
     3044    {
     3045      out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
     3046
     3047      if (out)
     3048        {
     3049          if (collect) {
     3050            tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
     3051            SH_FREE(collect);
     3052          }
     3053          else {
     3054            tmp = sh_util_strconcat(_("selinux:"), out, NULL);
     3055          }
     3056          SH_FREE(out);
     3057          collect = tmp;
     3058        }
    30553059    }
    30563060
     
    33213325#endif
    33223326
    3323 #if defined(USE_XATTR)
     3327#if defined(USE_XATTR) && defined(USE_ACL)
     3328  if (sh_unix_check_selinux == S_TRUE || sh_unix_check_acl == S_TRUE)
     3329    theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);
     3330#elif defined(USE_XATTR)
    33243331  if (sh_unix_check_selinux == S_TRUE)
    33253332    theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);
Note: See TracChangeset for help on using the changeset viewer.