The branch, master has been updated
via 30bdb68c9ebe281d8c512f8b737141d76a7c7d68 (commit)
via e94e7f82798db59849cb1dc6a99b414adc11594e (commit)
via dcc4081f75f0d0c51878385477f7738f49a761dd (commit)
via 8df6af213a0ca9a70e30c630970b5e2d2debe821 (commit)
via bd64688c6aca6512efd0bd7d95000579beea3119 (commit)
via 32e03f9fa55a4c897ade55b9b2e3740facfdcfd1 (commit)
from 5c75b65ca15f7c71babd835a45b252fed6534acf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 30bdb68c9ebe281d8c512f8b737141d76a7c7d68
Merge: e94e7f82798db59849cb1dc6a99b414adc11594e
5c75b65ca15f7c71babd835a45b252fed6534acf
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 23:26:32 2008 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit e94e7f82798db59849cb1dc6a99b414adc11594e
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 23:24:12 2008 +0100
s4: Fix make clean to remove gen_ndr objects.
commit dcc4081f75f0d0c51878385477f7738f49a761dd
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 23:22:57 2008 +0100
Fix more compiler warnings.
commit 8df6af213a0ca9a70e30c630970b5e2d2debe821
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 23:02:54 2008 +0100
Use 32-bit smbpid in interface as required by SMB2, in line with
1bdd08227e7d046305705050f21f0f1b6dd6994a.
commit bd64688c6aca6512efd0bd7d95000579beea3119
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 22:57:11 2008 +0100
Fix more compiler warnings in various places.
commit 32e03f9fa55a4c897ade55b9b2e3740facfdcfd1
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Dec 23 22:57:00 2008 +0100
Install tevent_internal.h, as Samba 4 needs it.
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/tevent.mk | 2 +
lib/tevent/tevent_internal.h | 2 +-
libcli/nbt/pynbt.c | 4 +-
source4/Makefile | 2 +-
source4/cluster/ctdb/brlock_ctdb.c | 6 ++--
source4/dsdb/samdb/ldb_modules/kludge_acl.c | 8 ++--
source4/dsdb/samdb/ldb_modules/partition.c | 8 ++--
source4/dsdb/schema/schema_description.c | 12 ++++----
source4/dsdb/schema/schema_query.c | 38 ++++++++++++------------
source4/lib/events/tevent_s4.c | 4 +-
source4/lib/ldb/modules/operational.c | 8 +----
source4/lib/tls/tls.c | 20 ++++++------
source4/libcli/security/security_descriptor.c | 1 -
source4/ntvfs/common/brlock.c | 4 +-
source4/ntvfs/common/brlock.h | 6 ++--
source4/ntvfs/ipc/ipc_rap.c | 2 -
source4/ntvfs/posix/pvfs_resolve.c | 6 ++--
source4/torture/libnet/libnet_rpc.c | 26 ++++++++--------
source4/torture/raw/lookuprate.c | 2 +-
source4/torture/raw/tconrate.c | 1 -
source4/torture/rpc/netlogon.c | 1 -
source4/torture/rpc/samr.c | 2 +-
source4/torture/rpc/schannel.c | 10 +++---
source4/utils/ad2oLschema.c | 4 +-
source4/web_server/wsgi.c | 4 --
source4/winbind/wb_init_domain.c | 1 -
26 files changed, 86 insertions(+), 98 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index 2e4d5a9..6538362 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -21,6 +21,8 @@ installdirs::
installheaders:: installdirs
cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
+ cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
+ cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir)
installlibs:: installdirs
cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 0d0755f..9606fad 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -103,7 +103,7 @@ struct ev_debug_ops {
int ev_set_debug(struct event_context *ev,
void (*debug)(void *context, enum ev_debug_level level,
- const char *fmt, va_list ap),
+ const char *fmt, va_list ap)
PRINTF_ATTRIBUTE(3,0),
void *context);
int ev_set_debug_stderr(struct event_context *ev);
void ev_debug(struct event_context *ev, enum ev_debug_level level, const char
*fmt, ...);
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 6750ad7..1d8924e 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -90,7 +90,7 @@ static bool PyObject_AsDestinationTuple(PyObject *obj, const
char **dest_addr, u
return false;
}
-static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *socket,
struct nbt_name *name)
+static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket
*name_socket, struct nbt_name *name)
{
if (PyTuple_Check(obj)) {
if (PyTuple_Size(obj) == 2) {
@@ -121,7 +121,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct
nbt_name_socket *socket, st
return false;
}
-static PyObject *PyObject_FromNBTName(struct nbt_name_socket *socket, struct
smb_iconv_convenience *ic,
+static PyObject *PyObject_FromNBTName(struct nbt_name_socket *name_socket,
struct smb_iconv_convenience *ic,
struct nbt_name *name)
{
if (name->scope) {
diff --git a/source4/Makefile b/source4/Makefile
index 442a62e..fff2dbf 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -144,7 +144,7 @@ include $(srcdir)/static_deps.mk
endif
clean::
- @find ../lib ../libcli -name '*.o' -o -name '*.ho' | xargs rm -f
+ @find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name
'*.ho' | xargs rm -f
DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
$(srcdir)/version.h
diff --git a/source4/cluster/ctdb/brlock_ctdb.c
b/source4/cluster/ctdb/brlock_ctdb.c
index 01d6090..1cc6beb 100644
--- a/source4/cluster/ctdb/brlock_ctdb.c
+++ b/source4/cluster/ctdb/brlock_ctdb.c
@@ -378,7 +378,7 @@ reply:
*/
static NTSTATUS brl_ctdb_lock(struct brl_context *brl,
struct brl_handle *brlh,
- uint16_t smbpid,
+ uint32_t smbpid,
uint64_t start, uint64_t size,
enum brl_type lock_type,
void *notify_ptr)
@@ -609,7 +609,7 @@ found:
*/
static NTSTATUS brl_ctdb_unlock(struct brl_context *brl,
struct brl_handle *brlh,
- uint16_t smbpid,
+ uint32_t smbpid,
uint64_t start, uint64_t size)
{
struct ctdb_call call;
@@ -782,7 +782,7 @@ static int brl_ctdb_locktest_func(struct ctdb_call_info
*call)
*/
static NTSTATUS brl_ctdb_locktest(struct brl_context *brl,
struct brl_handle *brlh,
- uint16_t smbpid,
+ uint32_t smbpid,
uint64_t start, uint64_t size,
enum brl_type lock_type)
{
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 275e9b5..bb95c7e 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -93,7 +93,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context
*ldb, struct ldb_mess
struct ldb_message_element *allowedAttributes;
const struct dsdb_schema *schema = dsdb_get_schema(ldb);
TALLOC_CTX *mem_ctx;
- char **objectclass_list, **attr_list;
+ const char **objectclass_list, **attr_list;
int i, ret;
/* If we don't have a schema yet, we can't do anything... */
@@ -118,7 +118,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context
*ldb, struct ldb_mess
we alter the element array in ldb_msg_add_empty() */
oc_el = ldb_msg_find_element(msg, "objectClass");
- objectclass_list = talloc_array(mem_ctx, char *, oc_el->num_values + 1);
+ objectclass_list = talloc_array(mem_ctx, const char *,
oc_el->num_values + 1);
if (!objectclass_list) {
ldb_oom(ldb);
talloc_free(mem_ctx);
@@ -126,11 +126,11 @@ static int kludge_acl_allowedAttributes(struct
ldb_context *ldb, struct ldb_mess
}
for (i=0; oc_el && i < oc_el->num_values; i++) {
- objectclass_list[i] = (char *)oc_el->values[i].data;
+ objectclass_list[i] = (const char *)oc_el->values[i].data;
}
objectclass_list[i] = NULL;
- attr_list = dsdb_full_attribute_list(mem_ctx, schema, (const char
**)objectclass_list, DSDB_SCHEMA_ALL);
+ attr_list = dsdb_full_attribute_list(mem_ctx, schema, objectclass_list,
DSDB_SCHEMA_ALL);
if (!attr_list) {
ldb_asprintf_errstring(ldb, "kludge_acl: Failed to get list of
attributes create %s attribute", attrName);
talloc_free(mem_ctx);
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c
b/source4/dsdb/samdb/ldb_modules/partition.c
index 0d2ce64..0000c87 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -1065,11 +1065,11 @@ static int partition_extended(struct ldb_module
*module, struct ldb_request *req
static int partition_sort_compare(const void *v1, const void *v2)
{
- struct dsdb_control_current_partition *p1;
- struct dsdb_control_current_partition *p2;
+ const struct dsdb_control_current_partition *p1;
+ const struct dsdb_control_current_partition *p2;
- p1 = *((struct dsdb_control_current_partition **)v1);
- p2 = *((struct dsdb_control_current_partition **)v2);
+ p1 = *((struct dsdb_control_current_partition * const*)v1);
+ p2 = *((struct dsdb_control_current_partition * const*)v2);
return ldb_dn_compare(p1->dn, p2->dn);
}
diff --git a/source4/dsdb/schema/schema_description.c
b/source4/dsdb/schema/schema_description.c
index 5474eb5..d616f3b 100644
--- a/source4/dsdb/schema/schema_description.c
+++ b/source4/dsdb/schema/schema_description.c
@@ -215,8 +215,8 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
const char **auxillary_classes,
const char *subClassOf,
int objectClassCategory,
- char **must,
- char **may,
+ const char **must,
+ const char **may,
const char *schemaHexGUID)
{
char *schema_entry = talloc_asprintf(mem_ctx,
@@ -343,10 +343,10 @@ char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx,
const struct dsdb_clas
{
int i;
char *schema_description;
- char **aux_class_list = NULL;
- char **attrs;
- char **must_attr_list = NULL;
- char **may_attr_list = NULL;
+ const char **aux_class_list = NULL;
+ const char **attrs;
+ const char **must_attr_list = NULL;
+ const char **may_attr_list = NULL;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
const struct dsdb_class *aux_class;
if (!tmp_ctx) {
diff --git a/source4/dsdb/schema/schema_query.c
b/source4/dsdb/schema/schema_query.c
index ca26ffd..f848fee 100644
--- a/source4/dsdb/schema/schema_query.c
+++ b/source4/dsdb/schema/schema_query.c
@@ -212,18 +212,18 @@ WERROR dsdb_linked_attribute_lDAPDisplayName_list(const
struct dsdb_schema *sche
return WERR_OK;
}
-char **merge_attr_list(TALLOC_CTX *mem_ctx,
- char **attrs, const char **new_attrs)
+const char **merge_attr_list(TALLOC_CTX *mem_ctx,
+ const char **attrs, const char * const*new_attrs)
{
- char **ret_attrs;
+ const char **ret_attrs;
int i;
- size_t new_len, orig_len = str_list_length((const char **)attrs);
+ size_t new_len, orig_len = str_list_length(attrs);
if (!new_attrs) {
return attrs;
}
ret_attrs = talloc_realloc(mem_ctx,
- attrs, char *, orig_len +
str_list_length(new_attrs) + 1);
+ attrs, const char *, orig_len +
str_list_length(new_attrs) + 1);
if (ret_attrs) {
for (i=0; i < str_list_length(new_attrs); i++) {
ret_attrs[orig_len + i] = new_attrs[i];
@@ -241,9 +241,9 @@ char **merge_attr_list(TALLOC_CTX *mem_ctx,
considering subclasses, auxillary classes etc)
*/
-char **dsdb_attribute_list(TALLOC_CTX *mem_ctx, const struct dsdb_class
*class, enum dsdb_attr_list_query query)
+const char **dsdb_attribute_list(TALLOC_CTX *mem_ctx, const struct dsdb_class
*class, enum dsdb_attr_list_query query)
{
- char **attr_list = NULL;
+ const char **attr_list = NULL;
switch (query) {
case DSDB_SCHEMA_ALL_MAY:
attr_list = merge_attr_list(mem_ctx, attr_list,
class->mayContain);
@@ -281,7 +281,7 @@ char **dsdb_attribute_list(TALLOC_CTX *mem_ctx, const
struct dsdb_class *class,
return attr_list;
}
-static char **dsdb_full_attribute_list_internal(TALLOC_CTX *mem_ctx,
+static const char **dsdb_full_attribute_list_internal(TALLOC_CTX *mem_ctx,
const struct dsdb_schema
*schema,
const char **class_list,
enum dsdb_attr_list_query query)
@@ -289,39 +289,39 @@ static char
**dsdb_full_attribute_list_internal(TALLOC_CTX *mem_ctx,
int i;
const struct dsdb_class *class;
- char **attr_list = NULL;
- char **this_class_list;
- char **recursive_list;
+ const char **attr_list = NULL;
+ const char **this_class_list;
+ const char **recursive_list;
for (i=0; class_list && class_list[i]; i++) {
class = dsdb_class_by_lDAPDisplayName(schema, class_list[i]);
this_class_list = dsdb_attribute_list(mem_ctx, class, query);
- attr_list = merge_attr_list(mem_ctx, attr_list, (const char
**)this_class_list);
+ attr_list = merge_attr_list(mem_ctx, attr_list,
this_class_list);
recursive_list = dsdb_full_attribute_list_internal(mem_ctx,
schema,
class->systemAuxiliaryClass,
query);
- attr_list = merge_attr_list(mem_ctx, attr_list, (const char
**)recursive_list);
+ attr_list = merge_attr_list(mem_ctx, attr_list, recursive_list);
recursive_list = dsdb_full_attribute_list_internal(mem_ctx,
schema,
class->auxiliaryClass,
query);
- attr_list = merge_attr_list(mem_ctx, attr_list, (const char
**)recursive_list);
+ attr_list = merge_attr_list(mem_ctx, attr_list, recursive_list);
}
return attr_list;
}
-char **dsdb_full_attribute_list(TALLOC_CTX *mem_ctx,
+const char **dsdb_full_attribute_list(TALLOC_CTX *mem_ctx,
const struct dsdb_schema *schema,
const char **class_list,
enum dsdb_attr_list_query query)
{
- char **attr_list = dsdb_full_attribute_list_internal(mem_ctx, schema,
class_list, query);
- size_t new_len = str_list_length((const char **)attr_list);
+ const char **attr_list = dsdb_full_attribute_list_internal(mem_ctx,
schema, class_list, query);
+ size_t new_len = str_list_length(attr_list);
/* Remove duplicates */
if (new_len > 1) {
@@ -331,8 +331,8 @@ char **dsdb_full_attribute_list(TALLOC_CTX *mem_ctx,
(comparison_fn_t)strcasecmp);
for (i=1 ; i < new_len; i++) {
- char **val1 = &attr_list[i-1];
- char **val2 = &attr_list[i];
+ const char **val1 = &attr_list[i-1];
+ const char **val2 = &attr_list[i];
if (ldb_attr_cmp(*val1, *val2) == 0) {
memmove(val1, val2, (new_len - i) * sizeof(
*attr_list));
new_len--;
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c
index 80267fd..e711e43 100644
--- a/source4/lib/events/tevent_s4.c
+++ b/source4/lib/events/tevent_s4.c
@@ -17,8 +17,8 @@
*/
#include "includes.h"
-#include "tevent.h"
-#include "tevent_internal.h"
+#include <tevent.h>
+#include <tevent_internal.h>
/*
this is used to catch debug messages from events
diff --git a/source4/lib/ldb/modules/operational.c
b/source4/lib/ldb/modules/operational.c
index 345441b..4193f91 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -268,16 +268,12 @@ static int operational_search(struct ldb_module *module,
struct ldb_request *req
}
}
- /* use new set of attrs if any */
- if (search_attrs == NULL) {
- search_attrs = req->op.search.attrs;
- }
-
ret = ldb_build_search_req_ex(&down_req, module->ldb, ac,
req->op.search.base,
req->op.search.scope,
req->op.search.tree,
- (const char * const *)search_attrs,
+ /* use new set of attrs if any */
+
search_attrs?req->op.search.attrs:search_attrs,
req->controls,
ac, operational_callback,
req);
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 24e4632..d16df25 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -454,7 +454,7 @@ init_failed:
setup for a new connection
*/
struct socket_context *tls_init_server(struct tls_params *params,
- struct socket_context *socket,
+ struct socket_context *socket_ctx,
struct fd_event *fde,
const char *plain_chars)
{
@@ -463,9 +463,9 @@ struct socket_context *tls_init_server(struct tls_params
*params,
struct socket_context *new_sock;
NTSTATUS nt_status;
- nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock,
+ nt_status = socket_create_with_ops(socket_ctx, &tls_socket_ops,
&new_sock,
SOCKET_TYPE_STREAM,
- socket->flags | SOCKET_FLAG_ENCRYPT);
+ socket_ctx->flags |
SOCKET_FLAG_ENCRYPT);
if (!NT_STATUS_IS_OK(nt_status)) {
return NULL;
}
@@ -475,13 +475,13 @@ struct socket_context *tls_init_server(struct tls_params
*params,
return NULL;
}
- tls->socket = socket;
+ tls->socket = socket_ctx;
tls->fde = fde;
if (talloc_reference(tls, fde) == NULL) {
talloc_free(new_sock);
return NULL;
}
- if (talloc_reference(tls, socket) == NULL) {
+ if (talloc_reference(tls, socket_ctx) == NULL) {
talloc_free(new_sock);
return NULL;
}
@@ -534,7 +534,7 @@ failed:
/*
setup for a new client connection
*/
-struct socket_context *tls_init_client(struct socket_context *socket,
+struct socket_context *tls_init_client(struct socket_context *socket_ctx,
struct fd_event *fde,
const char *ca_path)
{
@@ -545,9 +545,9 @@ struct socket_context *tls_init_client(struct
socket_context *socket,
struct socket_context *new_sock;
NTSTATUS nt_status;
- nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock,
+ nt_status = socket_create_with_ops(socket_ctx, &tls_socket_ops,
&new_sock,
SOCKET_TYPE_STREAM,
- socket->flags | SOCKET_FLAG_ENCRYPT);
+ socket_ctx->flags |
SOCKET_FLAG_ENCRYPT);
if (!NT_STATUS_IS_OK(nt_status)) {
return NULL;
}
@@ -555,12 +555,12 @@ struct socket_context *tls_init_client(struct
socket_context *socket,
tls = talloc(new_sock, struct tls_context);
if (tls == NULL) return NULL;
- tls->socket = socket;
+ tls->socket = socket_ctx;
tls->fde = fde;
if (talloc_reference(tls, fde) == NULL) {
return NULL;
}
- if (talloc_reference(tls, socket) == NULL) {
+ if (talloc_reference(tls, socket_ctx) == NULL) {
return NULL;
}
new_sock->private_data = tls;
diff --git a/source4/libcli/security/security_descriptor.c
b/source4/libcli/security/security_descriptor.c
index 2bce8e8..8e9c7eb 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -53,7 +53,6 @@ static struct security_acl *security_acl_dup(TALLOC_CTX
*mem_ctx,
const struct security_acl *oacl)
{
struct security_acl *nacl;
- int i;
nacl = talloc (mem_ctx, struct security_acl);
if (nacl == NULL) {
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 21670bb..a5bc5c1 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -71,7 +71,7 @@ struct brl_handle *brl_create_handle(TALLOC_CTX *mem_ctx,
struct ntvfs_handle *n
*/
NTSTATUS brl_lock(struct brl_context *brl,
struct brl_handle *brlh,
- uint16_t smbpid,
+ uint32_t smbpid,
uint64_t start, uint64_t size,
enum brl_type lock_type,
void *notify_ptr)
@@ -85,7 +85,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
*/
NTSTATUS brl_unlock(struct brl_context *brl,
struct brl_handle *brlh,
- uint16_t smbpid,
+ uint32_t smbpid,
uint64_t start, uint64_t size)
{
return ops->brl_unlock(brl, brlh, smbpid, start, size);
diff --git a/source4/ntvfs/common/brlock.h b/source4/ntvfs/common/brlock.h
index aff30d1..75f142b 100644
--- a/source4/ntvfs/common/brlock.h
+++ b/source4/ntvfs/common/brlock.h
@@ -28,20 +28,20 @@ struct brlock_ops {
struct brl_handle *(*brl_create_handle)(TALLOC_CTX *, struct
ntvfs_handle *, DATA_BLOB *);
NTSTATUS (*brl_lock)(struct brl_context *,
struct brl_handle *,
- uint16_t ,
+ uint32_t ,
uint64_t , uint64_t ,
enum brl_type ,
void *);
NTSTATUS (*brl_unlock)(struct brl_context *,
struct brl_handle *,
- uint16_t ,
+ uint32_t ,
uint64_t , uint64_t );
NTSTATUS (*brl_remove_pending)(struct brl_context *,
struct brl_handle *,
void *);
NTSTATUS (*brl_locktest)(struct brl_context *,
struct brl_handle *,
- uint16_t ,
+ uint32_t ,
uint64_t , uint64_t ,
enum brl_type );
NTSTATUS (*brl_close)(struct brl_context *,
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 4969f1a..07a8b6d 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -53,8 +53,6 @@
} while (0)
-#define NERR_Success 0
-#define NERR_badpass 86
#define NERR_notsupported 50
struct rap_string_heap {
diff --git a/source4/ntvfs/posix/pvfs_resolve.c
b/source4/ntvfs/posix/pvfs_resolve.c
index f08de72..43547c2 100644
--- a/source4/ntvfs/posix/pvfs_resolve.c
+++ b/source4/ntvfs/posix/pvfs_resolve.c
@@ -190,16 +190,16 @@ static NTSTATUS parse_stream_name(struct
smb_iconv_convenience *ic,
struct pvfs_filename *name,
const char *s)
{
- char *p;
+ char *p, *stream_name;
if (s[1] == '\0') {
return NT_STATUS_OBJECT_NAME_INVALID;
}
- name->stream_name = talloc_strdup(name, s+1);
+ name->stream_name = stream_name = talloc_strdup(name, s+1);
if (name->stream_name == NULL) {
return NT_STATUS_NO_MEMORY;
}
- p = name->stream_name;
+ p = stream_name;
while (*p) {
--
Samba Shared Repository
