Remove single-debian-patch

diff --cc debian/.git-dpm
index 1ea907a,0000000..e28df73
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- cee86495bad5c1f6d019cfc73c47fb86562dc0b2
- cee86495bad5c1f6d019cfc73c47fb86562dc0b2
 +# see git-dpm(1) from git-dpm package
++f159988592bd2db0f7ef6662a9117af6b82b23ff
++f159988592bd2db0f7ef6662a9117af6b82b23ff
 +bbf497cdf42f068cae597f3a38e2d2400470119b
 +bbf497cdf42f068cae597f3a38e2d2400470119b
 +moonshot-trust-router_1.4.1.orig.tar.gz
 +a8c6fb6b6f9cfd2bcec95a9433723147d24a48ba
 +371621

diff --cc debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch
index 0000000,0000000..56c5df2
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0002-Add-default-aaa-server-to-config-printout-remove-red.patch
@@@ -1,0 -1,0 +1,36 @@@
++From a7cab74a12d0c5064c02c99b22039d24b75283df Mon Sep 17 00:00:00 2001
++From: Margaret Wasserman <mrw@painless-security.com>
++Date: Tue, 4 Nov 2014 15:30:28 -0500
++Subject: Add default aaa server to config printout, remove redundant log
++ mesage.
++
++---
++ common/tr_config.c | 2 +-
++ tid/tidc.c         | 1 -
++ 2 files changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/common/tr_config.c b/common/tr_config.c
++index 352c894..66eda35 100644
++--- a/common/tr_config.c
+++++ b/common/tr_config.c
++@@ -570,7 +570,7 @@ static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg)
++                                                &rc))) {
++      return rc;
++       }
++-      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured.\n");
+++      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s.\n", ds->hostname->buf);
++       ds->next = trc->default_servers;
++       trc->default_servers = ds;
++     }
++diff --git a/tid/tidc.c b/tid/tidc.c
++index 103d354..649706c 100644
++--- a/tid/tidc.c
+++++ b/tid/tidc.c
++@@ -74,7 +74,6 @@ int tidc_open_connection (TIDC_INSTANCE *tidc,
++   else 
++     use_port = port;
++ 
++-  fprintf(stderr, "tidc_open_connection: Opening GSS connection to %s:%u.", server, use_port);  
++   err = gsscon_connect(server, use_port, "trustidentity", &conn, gssctx);
++ 
++   if (!err)

diff --cc debian/patches/0003-Remove-period-from-default-configuration-message.patch
index 0000000,0000000..a179c06
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0003-Remove-period-from-default-configuration-message.patch
@@@ -1,0 -1,0 +1,22 @@@
++From f159988592bd2db0f7ef6662a9117af6b82b23ff Mon Sep 17 00:00:00 2001
++From: Margaret Wasserman <mrw@painless-security.com>
++Date: Tue, 4 Nov 2014 15:35:09 -0500
++Subject: Remove period from default configuration message.
++
++---
++ common/tr_config.c | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/common/tr_config.c b/common/tr_config.c
++index 66eda35..ccc8a9d 100644
++--- a/common/tr_config.c
+++++ b/common/tr_config.c
++@@ -570,7 +570,7 @@ static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg)
++                                                &rc))) {
++      return rc;
++       }
++-      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s.\n", ds->hostname->buf);
+++      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s\n", ds->hostname->buf);
++       ds->next = trc->default_servers;
++       trc->default_servers = ds;
++     }

diff --cc debian/patches/series
index 4b6ad01,0000000..d5fa349
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
 +gitignore
++0002-Add-default-aaa-server-to-config-printout-remove-red.patch
++0003-Remove-period-from-default-configuration-message.patch