Changeset 745 for trunk/server/source3/lib/smbconf/smbconf_init.c

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)
• source3/lib/smbconf/smbconf_init.c (modified) (7 diffs)

trunk/server/source3/lib/smbconf/smbconf_init.c

@@ -22 +22 @@
 #include "lib/smbconf/smbconf_txt.h"
 #include "lib/smbconf/smbconf_reg.h"
+
 
 /**
@@ -34 +35 @@
  * -  "txt" or "file"
  */
-WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
+ smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
                     const char *source)
 {
-        WERROR werr;
+        err;
         char *backend = NULL;
         char *path = NULL;
@@ -44 +45 @@
 
         if (conf_ctx == NULL) {
-                werr = WERR_INVALID_PARAM;
+                ERR_INVALID_PARAM;
                 goto done;
         }
 
         if ((source == NULL) || (*source == '\0')) {
-                werr = WERR_INVALID_PARAM;
+                ERR_INVALID_PARAM;
                 goto done;
         }
@@ -55 +56 @@
         backend = talloc_strdup(tmp_ctx, source);
         if (backend == NULL) {
-                werr = WERR_NOMEM;
+                ERR_NOMEM;
                 goto done;
         }
@@ -69 +70 @@
 
         if (strequal(backend, "registry") || strequal(backend, "reg")) {
-                werr = smbconf_init_reg(mem_ctx, conf_ctx, path);
+                err = smbconf_init_reg(mem_ctx, conf_ctx, path);
         } else if (strequal(backend, "file") || strequal(backend, "txt")) {
-                werr = smbconf_init_txt(mem_ctx, conf_ctx, path);
+                err = smbconf_init_txt(mem_ctx, conf_ctx, path);
         } else if (sep == NULL) {
                 /*
@@ -78 +79 @@
                  * string as a path argument.
                  */
-                werr = smbconf_init_txt(mem_ctx, conf_ctx, backend);
+                err = smbconf_init_txt(mem_ctx, conf_ctx, backend);
         } else {
                 /*
@@ -87 +88 @@
                  * 'include = /path/to/file.%T'
                  */
-                werr = smbconf_init_txt(mem_ctx, conf_ctx, source);
+                err = smbconf_init_txt(mem_ctx, conf_ctx, source);
         }
 
 done:
         talloc_free(tmp_ctx);
-        return werr;
+        return err;
 }