From 71f7e8b4214ab566af2917bdddecfc90ccef20ff Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu, 16 Feb 2012 23:26:01 +0200
Subject: [PATCH] fix-format-string.diff: Fix build errors, thanks Krzysztof
 Klimonda!

---
 debian/changelog                      |  1 +
 debian/patches/fix-string-format.diff | 85 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 87 insertions(+)
 create mode 100644 debian/patches/fix-string-format.diff

diff --git a/debian/changelog b/debian/changelog
index 060a7bd4b..5cf91316a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,5 +23,6 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low
   * control: Add python-libipa-hbac to build-depends.
   * control: Add ${shlibs:Depends} to python-freeipa depends.
   * rules: Strip the executable bit from translation files.
+  * fix-format-string.diff: Fix build errors, thanks Krzysztof Klimonda!
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400
diff --git a/debian/patches/fix-string-format.diff b/debian/patches/fix-string-format.diff
new file mode 100644
index 000000000..0dd4eb7e3
--- /dev/null
+++ b/debian/patches/fix-string-format.diff
@@ -0,0 +1,85 @@
+From 93f421284081d88bbe224b48c65fbcd3deaa7b36 Mon Sep 17 00:00:00 2001
+From: Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>
+Date: Sun, 12 Feb 2012 18:21:38 +0100
+Subject: [PATCH] Fix -Wformat-security warnings
+
+---
+ .../ipa-enrollment/ipa_enrollment.c                |    6 +++---
+ .../ipa-pwd-extop/ipa_pwd_extop.c                  |    8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
+index 78fb359..cb8bb84 100644
+--- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
++++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
+@@ -317,7 +317,7 @@ free_and_return:
+ 
+     if (krbLastPwdChange) slapi_ch_free_string(&krbLastPwdChange);
+ 
+-    LOG(errMesg ? errMesg : "success\n");
++    LOG("%s", errMesg ? errMesg : "success\n");
+     slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
+ 
+     free(principal);
+@@ -344,7 +344,7 @@ ipaenrollment_extop(Slapi_PBlock *pb)
+     if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid ) != 0) {
+         errMesg = "Could not get OID and value from request.\n";
+         rc = LDAP_OPERATIONS_ERROR;
+-        LOG(errMesg);
++        LOG("%s", errMesg);
+         goto free_and_return;
+     }
+ 
+@@ -357,7 +357,7 @@ ipaenrollment_extop(Slapi_PBlock *pb)
+     rc = LDAP_OPERATIONS_ERROR;
+ 
+ free_and_return:
+-    LOG(errMesg);
++    LOG("%s", errMesg);
+     slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
+ 
+     return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+index 61e0df1..d526b47 100644
+--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
++++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+@@ -500,7 +500,7 @@ free_and_return:
+ 	if (targetEntry) slapi_entry_free(targetEntry);
+ 	if (ber) ber_free(ber, 1);
+ 
+-	LOG(errMesg ? errMesg : "success");
++	LOG("%s", errMesg ? errMesg : "success");
+ 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
+ 
+ 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+@@ -1079,7 +1079,7 @@ free_and_return:
+ 
+         if (rc == LDAP_SUCCESS)
+             errMesg = NULL;
+-	LOG(errMesg ? errMesg : "success");
++	LOG("%s", errMesg ? errMesg : "success");
+ 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
+ 
+ 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+@@ -1106,7 +1106,7 @@ static int ipapwd_extop(Slapi_PBlock *pb)
+ 	if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid) != 0) {
+ 		errMesg = "Could not get OID value from request.\n";
+ 		rc = LDAP_OPERATIONS_ERROR;
+-		LOG(errMesg);
++		LOG("%s", errMesg);
+ 		goto free_and_return;
+ 	} else {
+ 	        LOG("Received extended operation request with OID %s\n", oid);
+@@ -1129,7 +1129,7 @@ static int ipapwd_extop(Slapi_PBlock *pb)
+ free_and_return:
+ 	if (krbcfg) free_ipapwd_krbcfg(&krbcfg);
+ 
+-	LOG(errMesg);
++	LOG("%s", errMesg);
+ 	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
+ 
+ 	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+-- 
+1.7.9
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 1c80328c5..36c7fb7f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ include-stdint.patch
 no-arrows.patch
 no-testcert.patch
 prefix.patch
+fix-string-format.diff