From 22aa4d5404eab8625a86ae31b0ceddb9da10fd09 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Fri, 21 Sep 2007 17:54:32 +0000
Subject: [PATCH] * Remove some unused variables * Correct some compiler
 warnings * Hopefully stop Xpl.py generating Makefile carping

---
 src/apps/manager/manager.c   | 20 ++++----------------
 src/apps/sendmail/sendmail.c |  2 +-
 src/apps/testtool/testtool.c |  2 --
 src/libs/python/Bongo.rules  |  3 ---
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/apps/manager/manager.c b/src/apps/manager/manager.c
index 184f360..90276c8 100644
--- a/src/apps/manager/manager.c
+++ b/src/apps/manager/manager.c
@@ -28,8 +28,7 @@
 #define CRASH_WINDOW 10
 
 typedef struct {
-    const char *program;
-    const char *dn;
+    char *program;
     int priority;
     BOOL willCallback;
 } BongoAgentSpec;
@@ -420,7 +419,7 @@ Lock(BOOL force)
         exit(1);
     }
 
-    remaining = snprintf(pidstr, sizeof(pidstr), "%ld\n", pid);
+    remaining = snprintf(pidstr, sizeof(pidstr), "%ld\n", (long int)pid);
     ret = 0;
     written = 0;
     
@@ -568,20 +567,10 @@ ParseArgs(int argc, char **argv,
 static int
 StartSlapd(BOOL killExisting)
 {
-    int status = 0;
-    int err;
-    char buf[101]; // FIXME: REMOVE-MDB this was some maximum 
-    char url[101];
+    int err = 0;
 
-    char *host = "127.0.0.1";
-    int port = 0;
     pid_t pid = 0;
 
-    int sockfd = 0;
-    struct sockaddr_in serv_addr;
-    struct hostent* host_info;
-    long host_addr;
-
     /* Get rid of an existing managed-slapd processs */
     pid = ReadPid(SLAPD_LOCKFILE);
     
@@ -597,7 +586,7 @@ StartSlapd(BOOL killExisting)
                     return 1;
                 }
             } else {
-                fprintf(stderr, _("bongo-manager: managed-slapd appears to be running as pid %ld\n"), pid);
+                fprintf(stderr, _("bongo-manager: managed-slapd appears to be running as pid %ld\n"), (long int)pid);
                 fprintf(stderr, _("bongo-manager: if this is definitely the bongo slapd, you can run with -e to kill it\n"));
                 return 1;
             }
@@ -773,7 +762,6 @@ main(int argc, char **argv)
     BOOL reload;
     BOOL slapdOnly;
     BOOL killExistingSlapd;
-    char buf[CONN_BUFSIZE];
     BOOL droppedPrivs = FALSE;
     BOOL unlockFile = FALSE;
     BOOL startLdap = FALSE;
diff --git a/src/apps/sendmail/sendmail.c b/src/apps/sendmail/sendmail.c
index feef7f2..b556eaa 100644
--- a/src/apps/sendmail/sendmail.c
+++ b/src/apps/sendmail/sendmail.c
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
     }
     
     response = MemMalloc(sizeof(char) * 1000);
-    if (! NMAPAuthenticate(nmap, response, 1000)) {
+    if (! NMAPAuthenticateToQueue(nmap, response, 1000)) {
         FatalError(1, "cannot authenticate with NMAP.");
     }
     MemFree(response);
diff --git a/src/apps/testtool/testtool.c b/src/apps/testtool/testtool.c
index 471fd71..0307fe2 100644
--- a/src/apps/testtool/testtool.c
+++ b/src/apps/testtool/testtool.c
@@ -61,7 +61,6 @@ int
 main(int argc, char *argv[]) {
 	int next_arg = 0;
 	int command = 0;
-	int startup = 0;
 
 	if (!MemoryManagerOpen("bongo-testtool")) {
 		XplConsolePrintf(_("ERROR: Failed to initialize memory manager\n"));
@@ -70,7 +69,6 @@ main(int argc, char *argv[]) {
 	
 	// parse options
 	while (++next_arg < argc && argv[next_arg][0] == '-') {
-		char *arg = argv[next_arg];
 		printf(_("Unrecognized option: %s\n"), argv[next_arg]);
 	}
 
diff --git a/src/libs/python/Bongo.rules b/src/libs/python/Bongo.rules
index 7d6b87e..51c3031 100644
--- a/src/libs/python/Bongo.rules
+++ b/src/libs/python/Bongo.rules
@@ -151,9 +151,6 @@ CLEANFILES +=						\
 	src/libs/python/bongo/nmap/*.pyc			\
 	src/libs/python/bongoy/store/*.pyc
 
-src/libs/python/bongo/Xpl.py: $(top_builddir)/config.status $(srcdir)/src/libs/python/bongo/Xpl.py.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
 src/libs/python/bongo-python-wrapper: $(top_builddir)/config.status $(srcdir)/src/libs/python/bongo-python-wrapper.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@