From e8a7526b06acf4af322fdab593c8bafbd9f4a103 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 7 Apr 2009 12:11:48 -0400
Subject: Clean up warnings in SSSD

---
 server/responder/nss/nsssrv_cmd.c  | 16 ++++++++--------
 server/responder/pam/pamsrv_cmd.c  |  4 ++--
 server/responder/pam/pamsrv_util.c |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'server/responder')

diff --git a/server/responder/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index d090b9d18..367df36f5 100644
--- a/server/responder/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -192,7 +192,7 @@ static int fill_pwent(struct sss_packet *packet,
         rp += 2*sizeof(uint32_t);
 
         if (add_domain) {
-            ret = snprintf(&body[rp], s1, namefmt, name, domain);
+            ret = snprintf((char *)&body[rp], s1, namefmt, name, domain);
             if (ret >= s1) {
                 /* need more space, got creative with the print format ? */
                 t = ret - s1 + 1;
@@ -206,7 +206,7 @@ static int fill_pwent(struct sss_packet *packet,
                 sss_packet_get_body(packet, &body, &blen);
 
                 /* retry */
-                ret = snprintf(&body[rp], s1, namefmt, name, domain);
+                ret = snprintf((char *)&body[rp], s1, namefmt, name, domain);
             }
 
             if (ret != s1-1) {
@@ -1375,7 +1375,7 @@ static int fill_grent(struct sss_packet *packet,
 
             /*  8-X: sequence of strings (name, passwd, mem..) */
             if (add_domain) {
-                ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                 if (ret >= name_len) {
                     /* need more space, got creative with the print format ? */
                     t = ret - name_len + 1;
@@ -1389,7 +1389,7 @@ static int fill_grent(struct sss_packet *packet,
                     sss_packet_get_body(packet, &body, &blen);
 
                     /* retry */
-                    ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                    ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                 }
 
                 if (ret != name_len-1) {
@@ -1441,7 +1441,7 @@ static int fill_grent(struct sss_packet *packet,
                     rp = blen - rsize;
 
                     if (add_domain) {
-                        ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                        ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                         if (ret >= name_len) {
                             /* need more space, got creative with the print format ? */
                             t = ret - name_len + 1;
@@ -1455,7 +1455,7 @@ static int fill_grent(struct sss_packet *packet,
                             sss_packet_get_body(packet, &body, &blen);
 
                             /* retry */
-                            ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                            ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                         }
 
                         if (ret != name_len-1) {
@@ -1531,7 +1531,7 @@ static int fill_grent(struct sss_packet *packet,
             rp = blen - rsize;
 
             if (add_domain) {
-                ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                 if (ret >= name_len) {
                     /* need more space, got creative with the print format ? */
                     t = ret - name_len + 1;
@@ -1545,7 +1545,7 @@ static int fill_grent(struct sss_packet *packet,
                     sss_packet_get_body(packet, &body, &blen);
 
                     /* retry */
-                    ret = snprintf(&body[rp], name_len, namefmt, name, domain);
+                    ret = snprintf((char *)&body[rp], name_len, namefmt, name, domain);
                 }
 
                 if (ret != name_len-1) {
diff --git a/server/responder/pam/pamsrv_cmd.c b/server/responder/pam/pamsrv_cmd.c
index 8f74e96f6..22a2b85de 100644
--- a/server/responder/pam/pamsrv_cmd.c
+++ b/server/responder/pam/pamsrv_cmd.c
@@ -3,6 +3,7 @@
 
 #include "util/util.h"
 #include "confdb/confdb.h"
+#include "responder/common/responder_packet.h"
 #include "responder/pam/pam_LOCAL_domain.h"
 #include "responder/pam/pamsrv.h"
 
@@ -22,7 +23,7 @@ static int pam_parse_in_data(struct sss_names_ctx *snctx,
     for (start = end; end < last; end++) if (body[end] == '\0') break;
     if (body[end++] != '\0') return EINVAL;
 
-    ret = sss_parse_name(pd, snctx, &body[start], &pd->domain, &pd->user);
+    ret = sss_parse_name(pd, snctx, (char *)&body[start], &pd->domain, &pd->user);
     if (ret != EOK) return ret;
 
     for (start = end; end < last; end++) if (body[end] == '\0') break;
@@ -100,7 +101,6 @@ static void pam_reply_delay(struct tevent_context *ev, struct tevent_timer *te,
 static void pam_reply(struct pam_data *pd)
 {
     struct cli_ctx *cctx;
-    struct sss_cmd_ctx *rctx;
     uint8_t *body;
     size_t blen;
     int ret;
diff --git a/server/responder/pam/pamsrv_util.c b/server/responder/pam/pamsrv_util.c
index 1d0ab103a..ab9b733e5 100644
--- a/server/responder/pam/pamsrv_util.c
+++ b/server/responder/pam/pamsrv_util.c
@@ -114,7 +114,6 @@ bool dp_pack_pam_response(DBusMessage *msg, struct pam_data *pd)
 
 bool dp_unpack_pam_response(DBusMessage *msg, struct pam_data *pd, DBusError *dbus_error)
 {
-    int ret;
     DBusMessageIter iter;
     DBusMessageIter sub_iter;
     int type;
-- 
cgit