summaryrefslogtreecommitdiff
path: root/source3/lib/smbconf/smbconf.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-15 20:52:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-15 20:52:17 +0200
commitd0b946e328c25b8e2bdfef58e11bc3badad97f1c (patch)
treeca63d963f6db36f935aa591500db9741db4d58b8 /source3/lib/smbconf/smbconf.c
parent28fd4f6fcb101fc0274c43611a59d22072fb7891 (diff)
parentb64be89a6ddd1b9c62df98801f34f4d9116a06bf (diff)
downloadsamba-d0b946e328c25b8e2bdfef58e11bc3badad97f1c.tar.gz
samba-d0b946e328c25b8e2bdfef58e11bc3badad97f1c.tar.bz2
samba-d0b946e328c25b8e2bdfef58e11bc3badad97f1c.zip
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 3-2-nopipeindex
(This used to be commit 9028f9e065536594df901ae4aac900102f2d85f6)
Diffstat (limited to 'source3/lib/smbconf/smbconf.c')
-rw-r--r--source3/lib/smbconf/smbconf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/lib/smbconf/smbconf.c b/source3/lib/smbconf/smbconf.c
index 541b163bfb..9565540df4 100644
--- a/source3/lib/smbconf/smbconf.c
+++ b/source3/lib/smbconf/smbconf.c
@@ -183,9 +183,6 @@ WERROR smbconf_get_share_names(struct smbconf_ctx *ctx,
bool smbconf_share_exists(struct smbconf_ctx *ctx,
const char *servicename)
{
- if (servicename == NULL) {
- return false;
- }
return ctx->ops->share_exists(ctx, servicename);
}
@@ -195,7 +192,7 @@ bool smbconf_share_exists(struct smbconf_ctx *ctx,
WERROR smbconf_create_share(struct smbconf_ctx *ctx,
const char *servicename)
{
- if (smbconf_share_exists(ctx, servicename)) {
+ if ((servicename != NULL) && smbconf_share_exists(ctx, servicename)) {
return WERR_ALREADY_EXISTS;
}