[SSSD] [PATCHES] Fix warnings

Lukas Slebodnik lslebodn at redhat.com
Thu Jul 18 11:09:11 UTC 2013


ehlo,

I tested some patches with old distro and I spotted warnings.
    -- uninitialized variable (gcc 4.4.7)
    -- macro AM_PROG_AR not found in library (automake 1.11.1)

I checked them and all warnings should be harmless, but anyway we don't like
warnings.

Two patches are attached.

LS
-------------- next part --------------
>From cb2d561c97564f61c8a7f2517d226a4f99f90f52 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 18 Jul 2013 11:44:24 +0200
Subject: [PATCH 1/2] Fix warnings: uninitialized variable

---
 Makefile.am                             | 4 ++--
 contrib/sssd.spec.in                    | 1 +
 src/providers/krb5/krb5_child.c         | 3 +--
 src/providers/krb5/krb5_child_handler.c | 4 ++--
 src/sss_client/ssh/sss_ssh_client.c     | 2 +-
 src/util/usertools.c                    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 515843420834bbbd0e5b4c86c114294c89afa752..35ab8550ad86f471434384bcd2010089796ef77c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1990,7 +1990,7 @@ rpms: rpmbrprep
 if GIT_CHECKOUT
 prerelease-rpms:
 	cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
-	sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
+	sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`.`git symbolic-ref --short HEAD | sed -e 's/[-/~]/_/g' `\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
 	$(MAKE) rpms
 	mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
 endif
@@ -2005,7 +2005,7 @@ srpm: rpmbrprep
 if GIT_CHECKOUT
 prerelease-srpm:
 	cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
-	sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
+	sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`.`git symbolic-ref --short HEAD | sed -e 's/[-/~]/_/g' `\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
 	$(MAKE) srpm
 	mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
 endif
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index da68d9dc760bfd656580a64117bc5849abedc1b5..911c9fe10e71004226ac27358cde1fef64dae221 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -381,6 +381,7 @@ do
     find . -name $i -exec rm -f {} \;
 done
 
+unset $(env | egrep -o "GIT\w+")
 autoreconf -ivf
 
 %configure \
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index a7999b7edb3e8c1fb1885459e16aa079bce39992..450752ec6f514362877c14b8ebc4256fb87aa4fe 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -1814,8 +1814,7 @@ static krb5_error_code check_fast_ccache(TALLOC_CTX *mem_ctx,
     tmp_ctx = talloc_new(NULL);
     if (tmp_ctx == NULL) {
         DEBUG(1, ("talloc_new failed.\n"));
-        kerr = ENOMEM;
-        goto done;
+        return ENOMEM;
     }
 
     ccname = talloc_asprintf(tmp_ctx, "FILE:%s/fast_ccache_%s", DB_PATH, realm);
diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c
index 1da7e4f422d68510b50df5415017e4118fac57fd..1bfecc4607df2212959b00a1b2ab3ea7025b87a7 100644
--- a/src/providers/krb5/krb5_child_handler.c
+++ b/src/providers/krb5/krb5_child_handler.c
@@ -486,7 +486,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len,
     errno_t ret;
     bool skip;
     char *ccname = NULL;
-    size_t ccname_len;
+    size_t ccname_len = 0;
     int32_t msg_status;
     int32_t msg_type;
     int32_t msg_len;
@@ -496,7 +496,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len,
     uint32_t *msg_subtype;
     struct krb5_child_response *res;
     const char *upn = NULL;
-    size_t upn_len;
+    size_t upn_len = 0;
     bool otp = false;
 
     if ((size_t) len < sizeof(int32_t)) {
diff --git a/src/sss_client/ssh/sss_ssh_client.c b/src/sss_client/ssh/sss_ssh_client.c
index 5312dba2be32aa0cc8813dedfc4189edeff7085c..245a0205685abfa553f6264942e97b3d556262bb 100644
--- a/src/sss_client/ssh/sss_ssh_client.c
+++ b/src/sss_client/ssh/sss_ssh_client.c
@@ -106,7 +106,7 @@ sss_ssh_get_ent(TALLOC_CTX *mem_ctx,
     errno_t ret;
     uint32_t flags;
     uint32_t name_len;
-    uint32_t alias_len;
+    uint32_t alias_len = 0;
     uint32_t domain_len;
     size_t req_len;
     uint8_t *req = NULL;
diff --git a/src/util/usertools.c b/src/util/usertools.c
index dc863ce82d21a857cc6a28bb963e0e729c38b583..8d5a5ca079779979c032830a7384bb1391cf0951 100644
--- a/src/util/usertools.c
+++ b/src/util/usertools.c
@@ -394,7 +394,7 @@ int sss_parse_name_for_domains(TALLOC_CTX *memctx,
                                const char *default_domain,
                                const char *orig, char **domain, char **name)
 {
-    struct sss_domain_info *dom, *match;
+    struct sss_domain_info *dom, *match = NULL;
     char *rdomain, *rname;
     char *dmatch, *nmatch;
     char *candidate_name = NULL;
-- 
1.8.3.1

-------------- next part --------------
>From 07b88897baacf5bf5f4096bbd70b56efe473a20b Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 18 Jul 2013 11:46:26 +0200
Subject: [PATCH 2/2] Fix autotols warnings: macro xyz not found in library

---
 configure.ac | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b34ae3f4c98bd88e8f94550d4c3bdbab510602d7..b9b72e3d7cd3adf1bd127e6ae9546a460ee0055e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,7 @@ AC_CONFIG_AUX_DIR([build])
 
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
 AM_PROG_CC_C_O
-m4_pattern_allow([AM_PROG_AR])
-AM_PROG_AR
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_DISABLE_STATIC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -33,8 +32,7 @@ AC_DEFINE([PRERELEASE_VERSION], "PRERELEASE_VERSION_NUMBER",
 
 AM_CONDITIONAL([GIT_CHECKOUT], [git log -1 &>/dev/null])
 
-m4_pattern_allow([AM_SILENT_RULES])
-AM_SILENT_RULES
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
 
-- 
1.8.3.1



More information about the sssd-devel mailing list