Changeset 988 for vendor/current/lib/smbconf

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/lib/smbconf

Files:

• smbconf.c (modified) (1 diff)
• smbconf.h (modified) (4 diffs)
• wscript_build (modified) (1 diff)

vendor/current/lib/smbconf/smbconf.c

@@ -232 +232 @@
 
 /**
+ * create and set the definition for a new share (service).
+ */
+sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
+                                struct smbconf_service *service)
+{
+        sbcErr err, err2;
+        int i;
+        uint32_t num_includes = 0;
+        char **includes = NULL;
+        TALLOC_CTX *tmp_ctx = NULL;
+
+        if ((service->name != NULL) && smbconf_share_exists(ctx, service->name))
+        {
+                return SBC_ERR_FILE_EXISTS;
+        }
+
+        err = smbconf_transaction_start(ctx);
+        if (!SBC_ERROR_IS_OK(err)) {
+                return err;
+        }
+
+        tmp_ctx = talloc_stackframe();
+
+        err = smbconf_create_share(ctx, service->name);
+        if (!SBC_ERROR_IS_OK(err)) {
+                goto cancel;
+        }
+
+        for (i = 0; i < service->num_params; i++) {
+                if (strequal(service->param_names[i], "include")) {
+                        includes = talloc_realloc(tmp_ctx, includes, char *,
+                                                  num_includes+1);
+                        if (includes == NULL) {
+                                err = SBC_ERR_NOMEM;
+                                goto cancel;
+                        }
+                        includes[num_includes] = talloc_strdup(includes,
+                                                service->param_values[i]);
+                        if (includes[num_includes] == NULL) {
+                                err = SBC_ERR_NOMEM;
+                                goto cancel;
+                        }
+                        num_includes++;
+                } else {
+                        err = smbconf_set_parameter(ctx,
+                                                    service->name,
+                                                    service->param_names[i],
+                                                    service->param_values[i]);
+                        if (!SBC_ERROR_IS_OK(err)) {
+                                goto cancel;
+                        }
+                }
+        }
+
+        err = smbconf_set_includes(ctx, service->name, num_includes,
+                                   discard_const_p(const char *, includes));
+        if (!SBC_ERROR_IS_OK(err)) {
+                goto cancel;
+        }
+
+        err = smbconf_transaction_commit(ctx);
+
+        goto done;
+
+cancel:
+        err2 = smbconf_transaction_cancel(ctx);
+        if (!SBC_ERROR_IS_OK(err2)) {
+                DEBUG(5, (__location__ ": Error cancelling transaction: %s\n",
+                          sbcErrorString(err2)));
+        }
+
+done:
+        talloc_free(tmp_ctx);
+        return err;
+}
+
+/**
  * get a definition of a share (service) from configuration.
  */

vendor/current/lib/smbconf/smbconf.h

@@ -206 +206 @@
 
 /**
+ * @brief create and set the definition for a new service.
+ *
+ * @param[in] ctx       The smbconf context to use.
+ *
+ * @param[in] service   The definition for the added service.
+ *
+ * @return              SBC_ERR_OK on success, a corresponding sbcErr if an
+ *                      error occured.
+ */
+sbcErr smbconf_create_set_share(struct smbconf_ctx *ctx,
+                                struct smbconf_service *service);
+
+/**
  * @brief Get a definition of a share (service) from configuration.
  *
@@ -448 +461 @@
  * @brief Start a transaction on the configuration backend.
  *
- * This is to speed up writes to the registry based backend.
+ * Transactions are exposed in order to make it possible
+ * to create atomic compound writing commands.
  *
  * @param[in] ctx       The smbconf context to start the transaction.
@@ -460 +474 @@
  * @brief Commit a transaction on the configuration backend.
  *
- * This is to speed up writes to the registry based backend.
+ * Transactions are exposed in order to make it possible
+ * to create atomic compound writing commands.
  *
  * @param[in] ctx       The smbconf context to commit the transaction.
@@ -474 +489 @@
  * @brief Cancel a transaction on the configuration backend.
  *
+ * Transactions are exposed in order to make it possible
+ * to create atomic compound writing commands.
+ *
  * @param[in] ctx       The smbconf context to cancel the transaction.
  *

vendor/current/lib/smbconf/wscript_build

@@ -1 @@
-#!/usr/bin/env python
-
 bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
                     source='smbconf.c smbconf_txt.c smbconf_util.c',