[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-259-g218ce0e
Jelmer Vernooij
jelmer at samba.org
Mon Mar 9 21:20:03 GMT 2009
The branch, master has been updated
via 218ce0e80532b0dbc595e72502d9596a35acdffd (commit)
via 3b181564c552ed3bc464534714148556deeeca2c (commit)
via 0d2de5380d13d544c382e3626e3b84fbea4b70a7 (commit)
via f992416e23c9baf0e20848ff3c12fcafe1d492aa (commit)
from c666aef471174ca5d95afcc48924325e7caded14 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 218ce0e80532b0dbc595e72502d9596a35acdffd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 9 21:49:44 2009 +0100
Fix prototype mismatch.
commit 3b181564c552ed3bc464534714148556deeeca2c
Merge: 0d2de5380d13d544c382e3626e3b84fbea4b70a7 c666aef471174ca5d95afcc48924325e7caded14
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 9 21:42:13 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit 0d2de5380d13d544c382e3626e3b84fbea4b70a7
Author: Björn Jacke <bj at sernet.de>
Date: Mon Mar 9 17:28:42 2009 +0100
use LIB_PATH_VAR in selftest.sh if we have it
if we have LIB_PATH_VAR we should use it, otherwise we'll unobtrusively
complain about not having it and use the most likely LD_LIBRARY_PATH.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit f992416e23c9baf0e20848ff3c12fcafe1d492aa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 8 06:57:52 2009 +0100
Revert accidental reintroduction of void ** bug.
-----------------------------------------------------------------------
Summary of changes:
lib/util/charset/charcnv.c | 6 ++++--
lib/util/charset/charset.h | 6 +++---
lib/util/charset/util_unistr.c | 2 +-
source3/include/proto.h | 3 ---
source3/lib/charcnv.c | 2 +-
source3/script/tests/selftest.sh | 13 +++++++------
6 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 258730e..94d47a9 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -169,9 +169,10 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic,
_PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx,
smb_iconv_t cd,
void const *src, size_t srclen,
- void **dest)
+ void *dst)
{
size_t i_len, o_len, destlen;
+ void **dest = (void **)dst;
size_t retval;
const char *inbuf = (const char *)src;
char *outbuf, *ob;
@@ -314,9 +315,10 @@ _PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
struct smb_iconv_convenience *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
- void **dest, size_t *converted_size,
+ void *dst, size_t *converted_size,
bool allow_badcharcnv)
{
+ void **dest = (void **)dst;
smb_iconv_t descriptor;
ssize_t ret;
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 655bae7..37c5aca 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -136,7 +136,7 @@ ssize_t pull_string(char *dest, const void *src, size_t dest_len, size_t src_len
bool convert_string_talloc(TALLOC_CTX *ctx,
charset_t from, charset_t to,
void const *src, size_t srclen,
- void **dest, size_t *converted_size,
+ void *dest, size_t *converted_size,
bool allow_badcharcnv);
size_t convert_string(charset_t from, charset_t to,
@@ -146,7 +146,7 @@ size_t convert_string(charset_t from, charset_t to,
ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
smb_iconv_t cd,
void const *src, size_t srclen,
- void **dest);
+ void *dest);
extern struct smb_iconv_convenience *global_iconv_convenience;
@@ -176,7 +176,7 @@ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
struct smb_iconv_convenience *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
- void **dest, size_t *converted_size, bool allow_badcharcnv);
+ void *dest, size_t *converted_size, bool allow_badcharcnv);
/* iconv */
smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode);
int smb_iconv_close(smb_iconv_t cd);
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index ec88e78..ea2bfea 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -978,7 +978,7 @@ _PUBLIC_ size_t convert_string(charset_t from, charset_t to,
_PUBLIC_ bool convert_string_talloc(TALLOC_CTX *ctx,
charset_t from, charset_t to,
void const *src, size_t srclen,
- void **dest, size_t *converted_size,
+ void *dest, size_t *converted_size,
bool allow_badcharcnv)
{
return convert_string_talloc_convenience(ctx, get_iconv_convenience(),
diff --git a/source3/include/proto.h b/source3/include/proto.h
index b6ddacc..a1cafb6 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -347,9 +347,6 @@ size_t convert_string(charset_t from, charset_t to,
bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
void const *src, size_t srclen, void *dst,
size_t *converted_size, bool allow_bad_conv);
-bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
- void const *src, size_t srclen, void **dst,
- size_t *converted_size, bool allow_bad_conv);
size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen);
char *strdup_upper(const char *s);
char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s);
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 81cb9a5..c3b3451 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -763,7 +763,7 @@ bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to,
* converted.
*/
bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
- void const *src, size_t srclen, void **dst,
+ void const *src, size_t srclen, void *dst,
size_t *converted_size, bool allow_bad_conv)
{
void **dest = (void **)dst;
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 9462184..a430d01 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -104,13 +104,14 @@ SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
export SAMBA4SHAREDDIR
export SMBTORTURE4
-if test x"$LD_LIBRARY_PATH" != x""; then
- LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
-else
- LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR"
+if [ -z "$LIB_PATH_VAR" ] ; then
+ echo "Warning: LIB_PATH_VAR not set. Using best guess LD_LIBRARY_PATH." >&2
+ LIB_PATH_VAR=LD_LIBRARY_PATH
+ export LIB_PATH_VAR
fi
-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
+
+eval $LIB_PATH_VAR=$BINDIR:$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR
+export $LIB_PATH_VAR
##
## verify that we were built with --enable-socket-wrapper
--
Samba Shared Repository
More information about the samba-cvs
mailing list