Use WERR_FILE_EXISTS which is the equivalent of WERR_ALREADY_EXISTS

previously present in Samba 3.

diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 1a9b4e07f94bd0b818a4ceb8fba151e50138fb99..77a438048fd790c83f74f7496107c6a890ac8322 100644 (file)
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -172,7 +172,7 @@ WERROR smbconf_create_share(struct smbconf_ctx *ctx,
                            const char *servicename)
 {
        if ((servicename != NULL) && smbconf_share_exists(ctx, servicename)) {
-               return WERR_ALREADY_EXISTS;
+               return WERR_FILE_EXISTS;
        }
 
        return ctx->ops->create_share(ctx, servicename);

diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 033f800e2a364e745ac66a7d3c55b83ea6f78feb..1aa345da3c668dcdb6da5d8b9d735172802faa26 100644 (file)
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -208,7 +208,7 @@ static WERROR smbconf_reg_create_service_key(TALLOC_CTX *mem_ctx,
                             REG_KEY_WRITE, newkey, &action);
        if (W_ERROR_IS_OK(werr) && (action != REG_CREATED_NEW_KEY)) {
                DEBUG(10, ("Key '%s' already exists.\n", subkeyname));
-               werr = WERR_ALREADY_EXISTS;
+               werr = WERR_FILE_EXISTS;
        }
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(5, ("Error creating key %s: %s\n",

diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index d14733a534aecc66e7c0a02cb2123794ad767c29..0cccae1e6afb4a35e7d3db0a667a69be9eb84fd5 100644 (file)
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -42,7 +42,7 @@ werror_code_struct dos_errs[] =
        { "WERR_INSUFFICIENT_BUFFER", WERR_INSUFFICIENT_BUFFER },
        { "WERR_SEM_TIMEOUT", WERR_SEM_TIMEOUT },
        { "WERR_NO_SUCH_SHARE", WERR_NO_SUCH_SHARE },
-       { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS },
+       { "WERR_FILE_EXISTS", WERR_FILE_EXISTS },
        { "WERR_INVALID_PARAM", WERR_INVALID_PARAM },
        { "WERR_NOT_SUPPORTED", WERR_NOT_SUPPORTED },
        { "WERR_BAD_PASSWORD", WERR_BAD_PASSWORD },

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index af9246c49f240cb2d6810ed6cf5595a63f1fc358..b0200de20a71bc9f74be365bb0ac7f2ee915fa28 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8490,7 +8490,7 @@ WERROR _spoolss_addform( pipes_struct *p, SPOOL_Q_ADDFORM *q_u, SPOOL_R_ADDFORM
        /* can't add if builtin */
 
        if (get_a_builtin_ntform(&form->name,&tmpForm)) {
-               status = WERR_ALREADY_EXISTS;
+               status = WERR_FILE_EXISTS;
                goto done;
        }
 

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index b99c77c9b86d92603ca9c58904525b6432150231..9d9e9af59b0391eea5a5757de6b4cc90901f2e09 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1781,7 +1781,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
 
        /* Share already exists. */
        if (snum >= 0) {
-               return WERR_ALREADY_EXISTS;
+               return WERR_FILE_EXISTS;
        }
 
        /* We can only add disk shares. */

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 94feeafa691148b96aaca9fa3b5b6c4f335c5173..531bbfe43caed4a9fbe2bc401c9e8fb304614a80 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -3126,7 +3126,7 @@ static NTSTATUS rpc_share_migrate_shares_internals(struct net_context *c,
                                                      &parm_error,
                                                      &result);
 
-                if (W_ERROR_V(result) == W_ERROR_V(WERR_ALREADY_EXISTS)) {
+                if (W_ERROR_V(result) == W_ERROR_V(WERR_FILE_EXISTS)) {
                        printf("           [%s] does already exist\n",
                                info502.name);
                        continue;