[PATCH] fix another d_type problem on xfs

[PATCH] fix another d_type problem on xfs

[qiaonuohan]

Function get_server_mok_fingerprints is supposed to find mok on server.
Because of d_type problem on xfs, existing mok will be ignored.

Signed-off-by: qiaonuohan <qiaonuohan@cn.fujitsu.com>
---
 stap-serverd.cxx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/stap-serverd.cxx b/stap-serverd.cxx
index 917c52a..cedc017 100644
--- a/stap-serverd.cxx
+++ b/stap-serverd.cxx
@@ -473,7 +473,19 @@ get_server_mok_fingerprints(vector<string> &mok_fingerprints, bool verbose,
     {
       // We're only interested in directories (of key files).
       if (direntp->d_type != DT_DIR)
-	continue;
+        {
+          if (direntp->d_type == DT_UNKNOWN)
+            {
+              // If the filesystem doesn't support d_type, we'll have to
+              // call stat().
+              struct stat tmpstat;
+              stat((mok_path + "/" + direntp->d_name).c_str (), &tmpstat);
+              if (!S_ISDIR(tmpstat.st_mode))
+                continue;
+            }
+          else
+            continue;
+        }
 
       // We've got a directory. If the directory name isn't in the right
       // format for a MOK fingerprint, skip it.
-- 
1.8.3.1

Re: [PATCH] fix another d_type problem on xfs

[qiaonuohan]

Hello David,

This is an another d_type problem, please check.

On 04/07/2015 03:29 PM, qiaonuohan wrote:
> Function get_server_mok_fingerprints is supposed to find mok on server.
> Because of d_type problem on xfs, existing mok will be ignored.
>
> Signed-off-by: qiaonuohan <qiaonuohan@cn.fujitsu.com>
> ---
>   stap-serverd.cxx | 14 +++++++++++++-
>   1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/stap-serverd.cxx b/stap-serverd.cxx
> index 917c52a..cedc017 100644
> --- a/stap-serverd.cxx
> +++ b/stap-serverd.cxx
> @@ -473,7 +473,19 @@ get_server_mok_fingerprints(vector<string> &mok_fingerprints, bool verbose,
>       {
>         // We're only interested in directories (of key files).
>         if (direntp->d_type != DT_DIR)
> -	continue;
> +        {
> +          if (direntp->d_type == DT_UNKNOWN)
> +            {
> +              // If the filesystem doesn't support d_type, we'll have to
> +              // call stat().
> +              struct stat tmpstat;
> +              stat((mok_path + "/" + direntp->d_name).c_str (), &tmpstat);
> +              if (!S_ISDIR(tmpstat.st_mode))
> +                continue;
> +            }
> +          else
> +            continue;
> +        }
>
>         // We've got a directory. If the directory name isn't in the right
>         // format for a MOK fingerprint, skip it.
>


-- 
Regards
Qiao Nuohan

Re: [PATCH] fix another d_type problem on xfs

[David Smith]

On 04/07/2015 02:30 AM, qiaonuohan wrote:
> Hello David,
> 
> This is an another d_type problem, please check.

The patch looks fine. I've checked both of them in.

Thanks for the fixes.

-- 
David Smith
dsmith@redhat.com
Red Hat
http://www.redhat.com
256.217.0141 (direct)
256.837.0057 (fax)