Merge branch 'master' of git://git.samba.org/samba

Conflicts:
	lib/util/asn1_proto.h

3 files changed, 2 insertions, 132 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);
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/lib/talloc_stack.c b/source3/lib/talloc_stack.c
deleted file mode 100644
index 2722fb9676..0000000000
--- a/source3/lib/talloc_stack.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Implement a stack of talloc contexts
-   Copyright (C) Volker Lendecke 2007
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/*
- * Implement a stack of talloc frames.
- *
- * When a new talloc stackframe is allocated with talloc_stackframe(), then
- * the TALLOC_CTX returned with talloc_tos() is reset to that new
- * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse
- * happens: The previous talloc_tos() is restored.
- *
- * This API is designed to be robust in the sense that if someone forgets to
- * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and
- * resets the talloc_tos().
- *
- * This robustness feature means that we can't rely on a linked list with
- * talloc destructors because in a hierarchy of talloc destructors the parent
- * destructor is called before its children destructors. The child destructor
- * called after the parent would set the talloc_tos() to the wrong value.
- */
-
-#include "includes.h"
-
-static int talloc_stacksize;
-static int talloc_stack_arraysize;
-static TALLOC_CTX **talloc_stack;
-
-static int talloc_pop(TALLOC_CTX *frame)
-{
-	int i;
-
-	for (i=talloc_stacksize-1; i>0; i--) {
-		if (frame == talloc_stack[i]) {
-			break;
-		}
-		talloc_free(talloc_stack[i]);
-	}
-
-	talloc_stacksize = i;
-	return 0;
-}
-
-/*
- * Create a new talloc stack frame.
- *
- * When free'd, it frees all stack frames that were created after this one and
- * not explicitly freed.
- */
-
-static TALLOC_CTX *talloc_stackframe_internal(size_t poolsize)
-{
-	TALLOC_CTX **tmp, *top, *parent;
-
-	if (talloc_stack_arraysize < talloc_stacksize + 1) {
-		tmp = TALLOC_REALLOC_ARRAY(NULL, talloc_stack, TALLOC_CTX *,
-					   talloc_stacksize + 1);
-		if (tmp == NULL) {
-			goto fail;
-		}
-		talloc_stack = tmp;
-		talloc_stack_arraysize = talloc_stacksize + 1;
-        }
-
-	if (talloc_stacksize == 0) {
-		parent = talloc_stack;
-	}
-	else {
-		parent = talloc_stack[talloc_stacksize-1];
-	}
-
-	if (poolsize) {
-		top = talloc_pool(parent, poolsize);
-	} else {
-		top = talloc_new(parent);
-	}
-
-	if (top == NULL) {
-		goto fail;
-	}
-
-	talloc_set_destructor(top, talloc_pop);
-
-	talloc_stack[talloc_stacksize++] = top;
-	return top;
-
- fail:
-	smb_panic("talloc_stackframe failed");
-	return NULL;
-}
-
-TALLOC_CTX *talloc_stackframe(void)
-{
-	return talloc_stackframe_internal(0);
-}
-
-TALLOC_CTX *talloc_stackframe_pool(size_t poolsize)
-{
-	return talloc_stackframe_internal(poolsize);
-}
-
-/*
- * Get us the current top of the talloc stack.
- */
-
-TALLOC_CTX *talloc_tos(void)
-{
-	if (talloc_stacksize == 0) {
-		talloc_stackframe();
-		DEBUG(0, ("no talloc stackframe around, leaking memory\n"));
-	}
-
-	return talloc_stack[talloc_stacksize-1];
-}