[SSSD] [PATCH] SYSDB: Use ldb_msg_add_string for simple string additions

Jakub Hrozek jhrozek at redhat.com
Mon Aug 6 10:44:10 UTC 2012


Simo did the same change in the subdomains sysdb module. The attached
patch performs the changes in other sysdb modules, too.
-------------- next part --------------
>From cbef5ecd54711b3a4fabaf008e7d1c5f9ac33a5b Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Fri, 3 Aug 2012 15:28:32 +0200
Subject: [PATCH] SYSDB: Use ldb_msg_add_string for simple string additions

---
 src/db/sysdb.c          |  8 ++++----
 src/db/sysdb_ops.c      | 12 ++++++------
 src/db/sysdb_services.c |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 3ef8444cd061d111f9f7359ae9b22a53e77fa87c..2790d28fe183d6e800350bf8ee8867447f024433 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -827,7 +827,7 @@ errno_t sysdb_domain_create(struct sysdb_ctx *sysdb, const char *domain_name)
         ret = ENOMEM;
         goto done;
     }
-    ret = ldb_msg_add_fmt(msg, "cn", "%s", domain_name);
+    ret = ldb_msg_add_string(msg, "cn", domain_name);
     if (ret != LDB_SUCCESS) {
         ret = EIO;
         goto done;
@@ -857,7 +857,7 @@ errno_t sysdb_domain_create(struct sysdb_ctx *sysdb, const char *domain_name)
         ret = ENOMEM;
         goto done;
     }
-    ret = ldb_msg_add_fmt(msg, "cn", "Users");
+    ret = ldb_msg_add_string(msg, "cn", "Users");
     if (ret != LDB_SUCCESS) {
         ret = EIO;
         goto done;
@@ -887,7 +887,7 @@ errno_t sysdb_domain_create(struct sysdb_ctx *sysdb, const char *domain_name)
         ret = ENOMEM;
         goto done;
     }
-    ret = ldb_msg_add_fmt(msg, "cn", "Groups");
+    ret = ldb_msg_add_string(msg, "cn", "Groups");
     if (ret != LDB_SUCCESS) {
         ret = EIO;
         goto done;
@@ -1549,7 +1549,7 @@ errno_t sysdb_set_bool(struct sysdb_ctx *sysdb,
         }
     }
 
-    lret = ldb_msg_add_fmt(msg, attr_name, "%s", value ? "TRUE" : "FALSE");
+    lret = ldb_msg_add_string(msg, attr_name, value ? "TRUE" : "FALSE");
     if (lret != LDB_SUCCESS) {
         ret = sysdb_error_to_errno(lret);
         goto done;
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 6c1fc49b46728809048d3cba8d03d4635af0ebc0..e790ce2d3c7ec44ce526365d67e0fd73c69aa351 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -1050,7 +1050,7 @@ int sysdb_add_user(struct sysdb_ctx *sysdb,
             ERROR_OUT(ret, ENOMEM, done);
         }
 
-        ret = ldb_msg_add_fmt(msg, SYSDB_MEMBER, "%s", userdn);
+        ret = ldb_msg_add_string(msg, SYSDB_MEMBER, userdn);
         if (ret != LDB_SUCCESS) {
             ERROR_OUT(ret, EINVAL, done);
         }
@@ -1059,14 +1059,14 @@ int sysdb_add_user(struct sysdb_ctx *sysdb,
         if (ret != LDB_SUCCESS) {
             ERROR_OUT(ret, ENOMEM, done);
         }
-        ret = ldb_msg_add_fmt(msg, SYSDB_GHOST, "%s", name);
+        ret = ldb_msg_add_string(msg, SYSDB_GHOST, name);
         if (ret != LDB_SUCCESS) {
             ERROR_OUT(ret, EINVAL, done);
         }
         /* Delete aliases from the ghost attribute as well */
         for (j = 0; j < alias_el->num_values; j++) {
-            ret = ldb_msg_add_fmt(msg, SYSDB_GHOST, "%s",
-                                  (char *)alias_el->values[j].data);
+            ret = ldb_msg_add_string(msg, SYSDB_GHOST,
+                                     (char *) alias_el->values[j].data);
             if (ret != LDB_SUCCESS) {
                 ERROR_OUT(ret, EINVAL, done);
             }
@@ -1344,7 +1344,7 @@ int sysdb_mod_group_member(struct sysdb_ctx *sysdb,
         ERROR_OUT(ret, EINVAL, fail);
     }
 
-    ret = ldb_msg_add_fmt(msg, SYSDB_MEMBER, "%s", dn);
+    ret = ldb_msg_add_string(msg, SYSDB_MEMBER, dn);
     if (ret != LDB_SUCCESS) {
         ERROR_OUT(ret, EINVAL, fail);
     }
@@ -2350,7 +2350,7 @@ int sysdb_delete_user(struct sysdb_ctx *sysdb,
             if (ret != LDB_SUCCESS) {
                 ERROR_OUT(ret, ENOMEM, fail);
             }
-            ret = ldb_msg_add_fmt(msg, SYSDB_GHOST, "%s", name);
+            ret = ldb_msg_add_string(msg, SYSDB_GHOST, name);
             if (ret != LDB_SUCCESS) {
                 ERROR_OUT(ret, EINVAL, fail);
             }
diff --git a/src/db/sysdb_services.c b/src/db/sysdb_services.c
index d443fcd80f0219efbf1ef24bdd0a252eaa93441a..9a5e57a02b86b30a1b5e14d6de41740dba4332e7 100644
--- a/src/db/sysdb_services.c
+++ b/src/db/sysdb_services.c
@@ -574,7 +574,7 @@ sysdb_svc_update(struct sysdb_ctx *sysdb,
         }
 
         for (i = 0; aliases[i]; i++) {
-            lret = ldb_msg_add_fmt(msg, SYSDB_NAME_ALIAS, "%s", aliases[i]);
+            lret = ldb_msg_add_string(msg, SYSDB_NAME_ALIAS, aliases[i]);
             if (lret != LDB_SUCCESS) {
                 ret = EINVAL;
                 goto done;
@@ -590,7 +590,7 @@ sysdb_svc_update(struct sysdb_ctx *sysdb,
     }
 
     for (i = 0; protocols[i]; i++) {
-        lret = ldb_msg_add_fmt(msg, SYSDB_SVC_PROTO, "%s", protocols[i]);
+        lret = ldb_msg_add_string(msg, SYSDB_SVC_PROTO, protocols[i]);
         if (lret != LDB_SUCCESS) {
             ret = EINVAL;
             goto done;
-- 
1.7.11.2



More information about the sssd-devel mailing list