From f9fb9436ae7a6556d3636f732889bae136a81390 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Oct 2008 15:37:39 +0200
Subject: Use WERR_FILE_EXISTS which is the equivalent of WERR_ALREADY_EXISTS
 previously present in Samba 3.

---
 source3/lib/smbconf/smbconf.c       | 2 +-
 source3/lib/smbconf/smbconf_reg.c   | 2 +-
 source3/libsmb/doserr.c             | 2 +-
 source3/rpc_server/srv_spoolss_nt.c | 2 +-
 source3/rpc_server/srv_srvsvc_nt.c  | 2 +-
 source3/utils/net_rpc.c             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 1a9b4e07f9..77a438048f 100644
--- 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 033f800e2a..1aa345da3c 100644
--- 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 d14733a534..0cccae1e6a 100644
--- 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 af9246c49f..b0200de20a 100644
--- 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 b99c77c9b8..9d9e9af59b 100644
--- 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 94feeafa69..531bbfe43c 100644
--- 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;
-- 
cgit