Re: [Ltp-commits] [Git] ltp updated.

[Garrett C. <yan...@gm...>]

On Sat, Jul 3, 2010 at 7:05 AM, Subrata <ris...@li...> wrote:
> The branch, master, has been updated
>       via  13adcb0c4496e75bdcdbc02410b46b9fbc6120a8 (commit)
>      from  04b500a71b8a410adf5b92978c9d93d659912c20 (commit)
>
>
> - Log -----------------------------------------------------------------
> commit 13adcb0c4496e75bdcdbc02410b46b9fbc6120a8
> Author: Subrata Modak <sub...@su...>
> Date:   Fri Jul 2 22:47:57 2010 +0530
>
>    ima_measure doesn't build correctly.  It needs config.h to determine whether openssl headers are present, and verbose needs to be global. Broken by commit ef77253961f909f87e82e6d2b620e87af33e9665.
>    Signed-off-by:  Stephen D. Smalley <sd...@ty...>,
>    Acked-by: Garrett Cooper <yan...@gm...>,
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  .../security/integrity/ima/src/ima_measure.c       |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/testcases/kernel/security/integrity/ima/src/ima_measure.c b/testcases/kernel/security/integrity/ima/src/ima_measure.c
> index dd6b1d0..0484c04 100644
> --- a/testcases/kernel/security/integrity/ima/src/ima_measure.c
> +++ b/testcases/kernel/security/integrity/ima/src/ima_measure.c
> @@ -22,7 +22,7 @@
>  #include <fcntl.h>
>  #include <string.h>
>  #include <unistd.h>
> -//#include "config.h"
> +#include "config.h"
>  #include "test.h"
>  #if HAVE_OPENSSL_SHA_H
>  #include <openssl/sha.h>
> @@ -33,6 +33,8 @@
>  char *TCID = "ima_measure";
>  int TST_TOTAL = 1;
>
> +static int verbose;
> +
>  #define print_info(format, arg...) \
>        if (verbose) \
>                printf(format, ##arg)
> @@ -135,9 +137,8 @@ main(int argc, char *argv[])
>        FILE *fp;
>        struct event template;
>        u_int8_t pcr[SHA_DIGEST_LENGTH];
> -       int i, count = 0, len;
> +       int i, count = 0;
>
> -       int verbose = 0;
>        int validate = 0;
>        int verify = 0;

    I actually committed this (and another bugfix in the test scripts)
to next, because it allows us to test things out before a release, as
things migrate pu -> next -> master. Is everything being committed to
master now?
Thanks,
-Garrett