summaryrefslogtreecommitdiff
path: root/source3/lib/smbconf/smbconf.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-23 18:04:16 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-23 18:04:16 +0200
commitd70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch)
tree92ee7a3f33ea51f34a33fee094eaed651215a3d3 /source3/lib/smbconf/smbconf.c
parent2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff)
parentd805c714bb79a709716ec0373670283bfcd23c3c (diff)
downloadsamba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz
samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.bz2
samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip
Merge branch 'master' of git://git.samba.org/samba
Conflicts: lib/util/asn1_proto.h
Diffstat (limited to 'source3/lib/smbconf/smbconf.c')
-rw-r--r--source3/lib/smbconf/smbconf.c2
1 files changed, 1 insertions, 1 deletions
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);