Changeset 745 for trunk/server/lib/smbconf/smbconf_private.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/smbconf/smbconf_private.h (modified) (2 diffs)

trunk/server/lib/smbconf/smbconf_private.h

@@ -28 +28 @@
 
 struct smbconf_ops {
-        WERROR (*init)(struct smbconf_ctx *ctx, const char *path);
+        sbcErr (*init)(struct smbconf_ctx *ctx, const char *path);
         int (*shutdown)(struct smbconf_ctx *ctx);
         bool (*requires_messaging)(struct smbconf_ctx *ctx);
         bool (*is_writeable)(struct smbconf_ctx *ctx);
-        WERROR (*open_conf)(struct smbconf_ctx *ctx);
+        sbcErr (*open_conf)(struct smbconf_ctx *ctx);
         int (*close_conf)(struct smbconf_ctx *ctx);
         void (*get_csn)(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
                         const char *service, const char *param);
-        WERROR (*drop)(struct smbconf_ctx *ctx);
-        WERROR (*get_share_names)(struct smbconf_ctx *ctx,
+        sbcErr (*drop)(struct smbconf_ctx *ctx);
+        sbcErr (*get_share_names)(struct smbconf_ctx *ctx,
                                   TALLOC_CTX *mem_ctx,
                                   uint32_t *num_shares,
                                   char ***share_names);
         bool (*share_exists)(struct smbconf_ctx *ctx, const char *service);
-        WERROR (*create_share)(struct smbconf_ctx *ctx, const char *service);
-        WERROR (*get_share)(struct smbconf_ctx *ctx,
+        sbcErr (*create_share)(struct smbconf_ctx *ctx, const char *service);
+        sbcErr (*get_share)(struct smbconf_ctx *ctx,
                             TALLOC_CTX *mem_ctx,
                             const char *servicename,
                             struct smbconf_service **service);
-        WERROR (*delete_share)(struct smbconf_ctx *ctx,
+        sbcErr (*delete_share)(struct smbconf_ctx *ctx,
                                     const char *servicename);
-        WERROR (*set_parameter)(struct smbconf_ctx *ctx,
+        sbcErr (*set_parameter)(struct smbconf_ctx *ctx,
                                 const char *service,
                                 const char *param,
                                 const char *valstr);
-        WERROR (*get_parameter)(struct smbconf_ctx *ctx,
+        sbcErr (*get_parameter)(struct smbconf_ctx *ctx,
                                 TALLOC_CTX *mem_ctx,
                                 const char *service,
                                 const char *param,
                                 char **valstr);
-        WERROR (*delete_parameter)(struct smbconf_ctx *ctx,
+        sbcErr (*delete_parameter)(struct smbconf_ctx *ctx,
                                    const char *service, const char *param);
-        WERROR (*get_includes)(struct smbconf_ctx *ctx,
+        sbcErr (*get_includes)(struct smbconf_ctx *ctx,
                                TALLOC_CTX *mem_ctx,
                                const char *service,
                                uint32_t *num_includes, char ***includes);
-        WERROR (*set_includes)(struct smbconf_ctx *ctx,
+        sbcErr (*set_includes)(struct smbconf_ctx *ctx,
                                const char *service,
                                uint32_t num_includes, const char **includes);
-        WERROR (*delete_includes)(struct smbconf_ctx *ctx,
+        sbcErr (*delete_includes)(struct smbconf_ctx *ctx,
                                   const char *service);
-        WERROR (*transaction_start)(struct smbconf_ctx *ctx);
-        WERROR (*transaction_commit)(struct smbconf_ctx *ctx);
-        WERROR (*transaction_cancel)(struct smbconf_ctx *ctx);
+        sbcErr (*transaction_start)(struct smbconf_ctx *ctx);
+        sbcErr (*transaction_commit)(struct smbconf_ctx *ctx);
+        sbcErr (*transaction_cancel)(struct smbconf_ctx *ctx);
 };
 
@@ -80 +80 @@
 };
 
-WERROR smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
+sbcErr smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
                              const char *path, struct smbconf_ops *ops);
 
-WERROR smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
+sbcErr smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
                                    char ***array,
                                    uint32_t count,