summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_srvsvc_nt.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/rpc_server/srv_srvsvc_nt.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/rpc_server/srv_srvsvc_nt.c')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c2
1 files changed, 1 insertions, 1 deletions
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. */