diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 11:37:54 +0000 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 11:37:54 +0000 |
| commit | d24a74c5b4fb62b720a79b632021746b69de7c45 (patch) | |
| tree | fd8854673b9d72059d7f9459a82663d5a70617ce /src/charon/plugins/resolv_conf | |
| parent | 466f11bfaf56c389947b2cbee6dd4f1fb56a821e (diff) | |
| download | strongswan-d24a74c5b4fb62b720a79b632021746b69de7c45.tar.bz2 strongswan-d24a74c5b4fb62b720a79b632021746b69de7c45.tar.xz | |
merging changes from portability branch back to trunk
important change for developers: %Y replaces %D to print identities!
Diffstat (limited to 'src/charon/plugins/resolv_conf')
| -rw-r--r-- | src/charon/plugins/resolv_conf/resolv_conf_handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charon/plugins/resolv_conf/resolv_conf_handler.c b/src/charon/plugins/resolv_conf/resolv_conf_handler.c index c76222f28..1eab8f2c0 100644 --- a/src/charon/plugins/resolv_conf/resolv_conf_handler.c +++ b/src/charon/plugins/resolv_conf/resolv_conf_handler.c @@ -79,7 +79,7 @@ static bool handle(private_resolv_conf_handler_t *this, ike_sa_t *ike_sa, if (out) { addr = host_create_from_chunk(family, data, 0); - fprintf(out, "nameserver %H # by strongSwan, from %D\n", + fprintf(out, "nameserver %H # by strongSwan, from %Y\n", addr, ike_sa->get_other_id(ike_sa)); DBG1(DBG_IKE, "installing DNS server %H to %s", addr, this->file); addr->destroy(addr); @@ -140,7 +140,7 @@ static void release(private_resolv_conf_handler_t *this, ike_sa_t *ike_sa, { addr = host_create_from_chunk(family, data, 0); snprintf(matcher, sizeof(matcher), - "nameserver %H # by strongSwan, from %D\n", + "nameserver %H # by strongSwan, from %Y\n", addr, ike_sa->get_other_id(ike_sa)); /* copy all, but matching line */ |