Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sh_hash.c
r93 r105 61 61 #include "sh_forward.h" 62 62 #endif 63 64 65 #define SH_KEY_NULL _("000000000000000000000000000000000000000000000000") 66 63 67 64 68 #undef FIL__ … … 3568 3572 SH_FREE(esc); 3569 3573 } 3570 printf(_(" %s"), tmp);3571 3574 SH_FREE(tmp); 3572 3575 } -
trunk/src/sh_tiger0.c
r102 r105 54 54 55 55 typedef unsigned char sh_byte; 56 57 #define SH_KEY_NULL _("000000000000000000000000000000000000000000000000") 56 58 57 59 #undef FIL__ -
trunk/src/sh_unix.c
r102 r105 139 139 #endif 140 140 141 #define SH_KEY_NULL _("000000000000000000000000000000000000000000000000") 141 142 142 143 #undef FIL__ … … 3040 3041 #endif 3041 3042 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 } 3055 3059 } 3056 3060 … … 3321 3325 #endif 3322 3326 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) 3324 3331 if (sh_unix_check_selinux == S_TRUE) 3325 3332 theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);
Note:
See TracChangeset
for help on using the changeset viewer.