From 8fb181ea93edb44ddce4d49872a2443ca6e0a9a7 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Mar 28 2011 19:55:01 +0000
Subject: - switch up defaults for system-vs-session


---

diff --git a/src/env-session.c b/src/env-session.c
index 2fac18e..c631849 100644
--- a/src/env-session.c
+++ b/src/env-session.c
@@ -16,13 +16,21 @@
  */
 
 #include "config.h"
+
 #include <sys/types.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include <dbus/dbus.h>
+
 #include "env.h"
+#include "tdbus.h"
 
 static char *
 cm_env_homedir(const char *subdir)
@@ -92,3 +100,15 @@ cm_env_whoami(void)
 {
 	return "certmonger-session";
 }
+
+enum cm_tdbus_type
+cm_env_default_bus(void)
+{
+	return cm_tdbus_session;
+}
+
+dbus_bool_t
+cm_env_default_fork(void)
+{
+	return FALSE;
+}
diff --git a/src/env-system.c b/src/env-system.c
index 06bb746..80fef35 100644
--- a/src/env-system.c
+++ b/src/env-system.c
@@ -16,8 +16,16 @@
  */
 
 #include "config.h"
+
 #include <stdlib.h>
+
+#include <talloc.h>
+#include <tevent.h>
+
+#include <dbus/dbus.h>
+
 #include "env.h"
+#include "tdbus.h"
 
 char *
 cm_env_config_dir(void)
@@ -57,3 +65,15 @@ cm_env_whoami(void)
 {
 	return "certmonger";
 }
+
+enum cm_tdbus_type
+cm_env_default_bus(void)
+{
+	return cm_tdbus_system;
+}
+
+dbus_bool_t
+cm_env_default_fork(void)
+{
+	return TRUE;
+}
diff --git a/src/env.h b/src/env.h
index 1d97cf8..46114f2 100644
--- a/src/env.h
+++ b/src/env.h
@@ -18,9 +18,15 @@
 #ifndef cmenv_h
 #define cmenv_h
 
+#include <dbus/dbus.h>
+
+#include "tdbus.h"
+
 char *cm_env_config_dir(void);
 char *cm_env_request_dir(void);
 char *cm_env_ca_dir(void);
 char *cm_env_whoami(void);
+enum cm_tdbus_type cm_env_default_bus(void);
+dbus_bool_t cm_env_default_fork(void);
 
 #endif
diff --git a/src/main.c b/src/main.c
index a88972e..3347d17 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,7 @@
 #include <dbus/dbus.h>
 
 #include "cm.h"
+#include "env.h"
 #include "log.h"
 #include "tdbus.h"
 
@@ -50,12 +51,15 @@ main(int argc, char **argv)
 {
 	struct tevent_context *ec;
 	struct cm_context *ctx;
-	enum cm_tdbus_type bus = CM_DBUS_DEFAULT_BUS;
+	enum cm_tdbus_type bus;
 	int i, c, dlevel = 0, pfd = -1;
 	pid_t pid;
 	FILE *pfp;
 	const char *pidfile = NULL;
-	dbus_bool_t dofork = TRUE;
+	dbus_bool_t dofork;
+	
+	bus = cm_env_default_bus();
+	dofork = cm_env_default_fork();
 
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, MYLOCALEDIR);
diff --git a/src/submit-d.c b/src/submit-d.c
index 2c2c824..235b836 100644
--- a/src/submit-d.c
+++ b/src/submit-d.c
@@ -388,7 +388,7 @@ int
 main(int argc, char **argv)
 {
 	void *ctx;
-	int c, i, j, pflag, submit, check, retrieve, id, try_xml;
+	int c, i, j, submit, check, retrieve, id, try_xml;
 	const char *method, *ca, *cgi, *file, *profile, *result;
 	const char *name, *email, *tele;
 	char *params, *uri, **var, **vars, *p, *request;
@@ -417,7 +417,6 @@ main(int argc, char **argv)
 				  "/xml/header/certPrettyPrint",
 				  NULL};
 	struct cm_submit_h_context *hctx;
-	pflag = 0;
 	submit = 0;
 	try_xml = 0;
 	check = 0;