3 files changed, 10 insertions, 6 deletions
diff --git a/server/responder/common/responder.h b/server/responder/common/responder.h
index 13ebf073f..f3d3293dc 100644
--- a/server/responder/common/responder.h
+++ b/server/responder/common/responder.h
@@ -49,8 +49,8 @@ struct cli_request {
 
 struct cli_protocol_version {
     uint32_t version;
-    char *date;
-    char *description;
+    const char *date;
+    const char *description;
 };
 
 struct sss_names_ctx {
diff --git a/server/responder/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index 2eb1dce04..5a779018a 100644
--- a/server/responder/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -834,6 +834,7 @@ static int nss_cmd_getpwuid(struct cli_ctx *cctx)
     int ret;
     int ncret;
 
+    ret = ENOENT;
     nctx = talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
 
     cmdctx = talloc_zero(cctx, struct nss_cmd_ctx);
@@ -1342,7 +1343,9 @@ static int fill_grent(struct sss_packet *packet,
 
     num = 0;
     mnump = 0;
+    memnum = 0;
     get_members = false;
+    skip_members = false;
     for (i = 0; i < count; i++) {
         msg = msgs[i];
 
@@ -2186,6 +2189,7 @@ static int nss_cmd_getgrgid(struct cli_ctx *cctx)
     int ret;
     int ncret;
 
+    ret = ENOENT;
     nctx = talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
 
     cmdctx = talloc_zero(cctx, struct nss_cmd_ctx);
diff --git a/server/responder/nss/nsssrv_nc.c b/server/responder/nss/nsssrv_nc.c
index d6a808dc5..1fa7d612f 100644
--- a/server/responder/nss/nsssrv_nc.c
+++ b/server/responder/nss/nsssrv_nc.c
@@ -279,7 +279,7 @@ static int delete_permanent(struct tdb_context *tdb,
                             TDB_DATA key, TDB_DATA data, void *state)
 {
     unsigned long long int timestamp;
-    bool remove = false;
+    bool remove_key = false;
     char *ep;
 
     if (strncmp((char *)key.dptr,
@@ -292,17 +292,17 @@ static int delete_permanent(struct tdb_context *tdb,
     timestamp = strtoull((const char *)data.dptr, &ep, 0);
     if (errno != 0 || *ep != '\0') {
         /* Malformed entry, remove it */
-        remove = true;
+        remove_key = true;
         goto done;
     }
 
     if (timestamp == 0) {
         /* a 0 timestamp means this is a permanent entry */
-        remove = true;
+        remove_key = true;
     }
 
 done:
-    if (remove) {
+    if (remove_key) {
         return tdb_delete(tdb, key);
     }