date:20070915

Re: svn commit: samba r25166 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

2007-09-15 Thread Stefan (metze) Metzmacher

 + foreach my $x (@{$type-{ELEMENTS}}) {
 + return 1 if ($x-{POINTERS});
 + return 1 if (can_contain_deferred ($x));

Hi Jelmer,

doesn't this needs to be con_contain_deferred($x-{TYPE}),
I'm not sure so please check this.

maybe we should have a more complex test which tested unions with
structs in it where the struct contains a pointer.

metze


signature.asc
Description: OpenPGP digital signature

svn commit: samba r25176 - in branches/SAMBA_3_0_MAINT/source/client: .

2007-09-15 Thread vlendec

Author: vlendec
Date: 2007-09-15 15:31:54 + (Sat, 15 Sep 2007)
New Revision: 25176

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25176

Log:
Merge fix for bug 4028
Modified:
   branches/SAMBA_3_0_MAINT/source/client/client.c


Changeset:
Modified: branches/SAMBA_3_0_MAINT/source/client/client.c
===
--- branches/SAMBA_3_0_MAINT/source/client/client.c 2007-09-14 23:21:00 UTC 
(rev 25175)
+++ branches/SAMBA_3_0_MAINT/source/client/client.c 2007-09-15 15:31:54 UTC 
(rev 25176)
@@ -194,6 +194,10 @@
msg[l] = c;   
}
 
+   if ((total_len  0)  (strlen(msg) == 0)) {
+   break;
+   }
+
if (!cli_message_text(cli, msg, l, grp_id)) {
d_printf(SMBsendtxt failed (%s)\n,cli_errstr(cli));
return;

Re: svn commit: samba r25164 - in branches: SAMBA_3_2/source/lib/talloc SAMBA_3_2_0/source/lib/talloc SAMBA_4_0/source/lib/talloc

2007-09-15 Thread Jeremy Allison

On Sat, Sep 15, 2007 at 09:18:59AM +0200, Stefan (metze) Metzmacher wrote:
 Hi Jeremy,
 
 thanks for this patch:-)
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
  -(type *)talloc_array(const void *ctx, type, uint_t count);
  +((type *)talloc_array(const void *ctx, type, uint_t count);
 why this change?

Ohh. Typo ? Sorry.

 Could you please also update the talloc.3.xml files?

Will do once I get internet connectivity back...

svn commit: samba r25177 - in branches/SAMBA_3_2/source/nsswitch: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 18:55:04 + (Sat, 15 Sep 2007)
New Revision: 25177

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25177

Log:
if configured using --enable-socket-wrapper
allow overwritting the location of the WINBINDD_SOCKET_DIR
via an environment variable

metze
Modified:
   branches/SAMBA_3_2/source/nsswitch/wb_common.c
   branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h


Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_2/source/nsswitch/wb_common.c  2007-09-15 15:31:54 UTC 
(rev 25176)
+++ branches/SAMBA_3_2/source/nsswitch/wb_common.c  2007-09-15 18:55:04 UTC 
(rev 25177)
@@ -280,6 +280,20 @@
return -1;
 }
 
+static const char *winbindd_socket_dir(void)
+{
+#ifdef SOCKET_WRAPPER
+   const char *env_dir;
+
+   env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
+   if (env_dir) {
+   return env_dir;
+   }
+#endif
+
+   return WINBINDD_SOCKET_DIR;
+}
+
 /* Connect to winbindd socket */
 
 static int winbind_open_pipe_sock(int recursing, int need_priv)
@@ -308,7 +322,7 @@
return -1;
}
 
-   if ((winbindd_fd = winbind_named_pipe_sock(WINBINDD_SOCKET_DIR)) == -1) 
{
+   if ((winbindd_fd = winbind_named_pipe_sock(winbindd_socket_dir())) == 
-1) {
return -1;
}
 

Modified: branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h
===
--- branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h
2007-09-15 15:31:54 UTC (rev 25176)
+++ branches/SAMBA_3_2/source/nsswitch/winbind_struct_protocol.h
2007-09-15 18:55:04 UTC (rev 25177)
@@ -27,6 +27,13 @@
 #define WINBINDD_SOCKET_DIR  /tmp/.winbindd  /* Name of PF_UNIX dir */
 #endif
 
+/*
+ * when compiled with socket_wrapper support
+ * the location of the WINBINDD_SOCKET_DIR
+ * can be overwritten via an environment variable
+ */
+#define WINBINDD_SOCKET_DIR_ENVVAR WINBINDD_SOCKET_DIR
+
 #define WINBINDD_PRIV_SOCKET_SUBDIR winbindd_privileged /* name of 
subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  WINBINDD_DOMAIN /* Environment variables */
 #define WINBINDD_DONT_ENV_NO_WINBINDD

svn commit: samba r25179 - in branches/SAMBA_3_2/source: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 19:14:49 + (Sat, 15 Sep 2007)
New Revision: 25179

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25179

Log:
fix libunwind detection on x86 based hosts
we need -lunwind-x86 not -lunwind-i686

metze
Modified:
   branches/SAMBA_3_2/source/configure.in


Changeset:
Modified: branches/SAMBA_3_2/source/configure.in
===
--- branches/SAMBA_3_2/source/configure.in  2007-09-15 19:04:36 UTC (rev 
25178)
+++ branches/SAMBA_3_2/source/configure.in  2007-09-15 19:14:49 UTC (rev 
25179)
@@ -702,6 +702,10 @@
 AC_MSG_CHECKING(uname -p)
 AC_MSG_RESULT(${UNAME_P})
 
+UNAME_I=`(uname -i) 2/dev/null` || UNAME_I=unknown
+AC_MSG_CHECKING(uname -i)
+AC_MSG_RESULT(${UNAME_I})
+
 dnl Add #include for broken IRIX header files
   case $host_os in
*irix6*)
@@ -1401,15 +1405,33 @@
 # any of them.
 AC_MSG_CHECKING([for libunwind])
 save_LIBS=$LIBS
-if test x$UNAME_P = xunknown ; then
-# This probably won't link without the platform-specific libunwind.
-LIBS=$LIBS -lunwind
-else
-# Add the platform-specific libunwind module. uname -p seems the most
-# plausible option and works for ia64, where libunwind is most useful.
-LIBS=$LIBS -lunwind -lunwind-$UNAME_P
+
+UNWIND_ARCH=unknown
+if test x$UNAME_I != xunknown; then
+   UNWIND_ARCH=$UNAME_I
+elif test x$UNAME_M != xunknown; then
+   UNWIND_ARCH=$UNAME_M
+elif test x$UNAME_P != xunknown; then
+   UNWIND_ARCH=$UNAME_P
 fi
 
+case $UNWIND_ARCH in
+   unknown)
+   # This probably won't link without
+   # the platform-specific libunwind.
+   LIBS=$LIBS -lunwind
+   ;;
+   i386|i586|i686)
+   # Add the platform-specific libunwind module.
+   LIBS=$LIBS -lunwind -lunwind-x86
+   ;;
+   *)
+   # Add the platform-specific libunwind module.
+   # based on uname -i, uname -m or uname -p
+   LIBS=$LIBS -lunwind -lunwind-$UNWIND_ARCH
+   ;;
+esac
+
 AC_TRY_LINK(
 [
 #ifdef HAVE_LIBUNWIND_H

svn commit: samba r25180 - in branches/SAMBA_3_2_0/source: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 19:15:29 + (Sat, 15 Sep 2007)
New Revision: 25180

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25180

Log:
fix libunwind detection on x86 based hosts
we need -lunwind-x86 not -lunwind-i686

metze
Modified:
   branches/SAMBA_3_2_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_2_0/source/configure.in
===
--- branches/SAMBA_3_2_0/source/configure.in2007-09-15 19:14:49 UTC (rev 
25179)
+++ branches/SAMBA_3_2_0/source/configure.in2007-09-15 19:15:29 UTC (rev 
25180)
@@ -634,6 +634,10 @@
 AC_MSG_CHECKING(uname -p)
 AC_MSG_RESULT(${UNAME_P})
 
+UNAME_I=`(uname -i) 2/dev/null` || UNAME_I=unknown
+AC_MSG_CHECKING(uname -i)
+AC_MSG_RESULT(${UNAME_I})
+
 dnl Add #include for broken IRIX header files
   case $host_os in
*irix6*)
@@ -1323,15 +1327,33 @@
 # any of them.
 AC_MSG_CHECKING([for libunwind])
 save_LIBS=$LIBS
-if test x$UNAME_P = xunknown ; then
-# This probably won't link without the platform-specific libunwind.
-LIBS=$LIBS -lunwind
-else
-# Add the platform-specific libunwind module. uname -p seems the most
-# plausible option and works for ia64, where libunwind is most useful.
-LIBS=$LIBS -lunwind -lunwind-$UNAME_P
+
+UNWIND_ARCH=unknown
+if test x$UNAME_I != xunknown; then
+   UNWIND_ARCH=$UNAME_I
+elif test x$UNAME_M != xunknown; then
+   UNWIND_ARCH=$UNAME_M
+elif test x$UNAME_P != xunknown; then
+   UNWIND_ARCH=$UNAME_P
 fi
 
+case $UNWIND_ARCH in
+   unknown)
+   # This probably won't link without
+   # the platform-specific libunwind.
+   LIBS=$LIBS -lunwind
+   ;;
+   i386|i586|i686)
+   # Add the platform-specific libunwind module.
+   LIBS=$LIBS -lunwind -lunwind-x86
+   ;;
+   *)
+   # Add the platform-specific libunwind module.
+   # based on uname -i, uname -m or uname -p
+   LIBS=$LIBS -lunwind -lunwind-$UNWIND_ARCH
+   ;;
+esac
+
 AC_TRY_LINK(
 [
 #ifdef HAVE_LIBUNWIND_H

svn commit: samba r25178 - in branches/SAMBA_3_2_0/source/nsswitch: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 19:04:36 + (Sat, 15 Sep 2007)
New Revision: 25178

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25178

Log:
if configured using --enable-socket-wrapper
allow overwritting the location of the WINBINDD_SOCKET_DIR
via an environment variable

metze
Modified:
   branches/SAMBA_3_2_0/source/nsswitch/wb_common.c
   branches/SAMBA_3_2_0/source/nsswitch/winbind_struct_protocol.h


Changeset:
Modified: branches/SAMBA_3_2_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/wb_common.c2007-09-15 18:55:04 UTC 
(rev 25177)
+++ branches/SAMBA_3_2_0/source/nsswitch/wb_common.c2007-09-15 19:04:36 UTC 
(rev 25178)
@@ -280,6 +280,20 @@
return -1;
 }
 
+static const char *winbindd_socket_dir(void)
+{
+#ifdef SOCKET_WRAPPER
+   const char *env_dir;
+
+   env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
+   if (env_dir) {
+   return env_dir;
+   }
+#endif
+
+   return WINBINDD_SOCKET_DIR;
+}
+
 /* Connect to winbindd socket */
 
 static int winbind_open_pipe_sock(int recursing, int need_priv)
@@ -308,7 +322,7 @@
return -1;
}
 
-   if ((winbindd_fd = winbind_named_pipe_sock(WINBINDD_SOCKET_DIR)) == -1) 
{
+   if ((winbindd_fd = winbind_named_pipe_sock(winbindd_socket_dir())) == 
-1) {
return -1;
}
 

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbind_struct_protocol.h
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbind_struct_protocol.h  
2007-09-15 18:55:04 UTC (rev 25177)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbind_struct_protocol.h  
2007-09-15 19:04:36 UTC (rev 25178)
@@ -27,6 +27,13 @@
 #define WINBINDD_SOCKET_DIR  /tmp/.winbindd  /* Name of PF_UNIX dir */
 #endif
 
+/*
+ * when compiled with socket_wrapper support
+ * the location of the WINBINDD_SOCKET_DIR
+ * can be overwritten via an environment variable
+ */
+#define WINBINDD_SOCKET_DIR_ENVVAR WINBINDD_SOCKET_DIR
+
 #define WINBINDD_PRIV_SOCKET_SUBDIR winbindd_privileged /* name of 
subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  WINBINDD_DOMAIN /* Environment variables */
 #define WINBINDD_DONT_ENV_NO_WINBINDD

svn commit: samba r25181 - in branches/SAMBA_4_0/source: auth nsswitch

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 20:09:29 + (Sat, 15 Sep 2007)
New Revision: 25181

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25181

Log:
sync winbind client code with samba3

NOTE: wbinfo.c isn't fully merged here

metze
Modified:
   branches/SAMBA_4_0/source/auth/auth_winbind.c
   branches/SAMBA_4_0/source/nsswitch/wb_common.c
   branches/SAMBA_4_0/source/nsswitch/wbinfo.c
   branches/SAMBA_4_0/source/nsswitch/winbind_client.h
   branches/SAMBA_4_0/source/nsswitch/winbind_nss.h
   branches/SAMBA_4_0/source/nsswitch/winbind_nss_config.h
   branches/SAMBA_4_0/source/nsswitch/winbind_nss_irix.h
   branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.c
   branches/SAMBA_4_0/source/nsswitch/winbind_nss_solaris.h
   branches/SAMBA_4_0/source/nsswitch/winbind_struct_protocol.h


Changeset:
Sorry, the patch is too large (2145 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25181

svn commit: samba r25184 - in branches: SAMBA_3_2/source/lib SAMBA_3_2/source/smbd SAMBA_3_2_0/source/lib SAMBA_3_2_0/source/smbd

2007-09-15 Thread vlendec

Author: vlendec
Date: 2007-09-15 20:24:35 + (Sat, 15 Sep 2007)
New Revision: 25184

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25184

Log:
Fix some C++ warnings and an uninitialized variable

Modified:
   branches/SAMBA_3_2/source/lib/charcnv.c
   branches/SAMBA_3_2/source/lib/util_str.c
   branches/SAMBA_3_2/source/smbd/msdfs.c
   branches/SAMBA_3_2/source/smbd/nttrans.c
   branches/SAMBA_3_2/source/smbd/trans2.c
   branches/SAMBA_3_2_0/source/lib/charcnv.c
   branches/SAMBA_3_2_0/source/lib/util_str.c
   branches/SAMBA_3_2_0/source/smbd/msdfs.c
   branches/SAMBA_3_2_0/source/smbd/nttrans.c
   branches/SAMBA_3_2_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_2/source/lib/charcnv.c
===
--- branches/SAMBA_3_2/source/lib/charcnv.c 2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2/source/lib/charcnv.c 2007-09-15 20:24:35 UTC (rev 
25184)
@@ -1493,7 +1493,7 @@
/* Have we got space to append the '\0' ? */
if (size = dest_len) {
/* No, realloc. */
-   dest = TALLOC_REALLOC(ctx, dest,
+   dest = TALLOC_REALLOC_ARRAY(ctx, dest, char,
dest_len+1);
if (!dest) {
/* talloc fail. */

Modified: branches/SAMBA_3_2/source/lib/util_str.c
===
--- branches/SAMBA_3_2/source/lib/util_str.c2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2/source/lib/util_str.c2007-09-15 20:24:35 UTC (rev 
25184)
@@ -995,7 +995,7 @@
/* We know a token can't be larger
 * than the entire list. */
 
-   tok = SMB_MALLOC(bufsize+1);
+   tok = SMB_MALLOC_ARRAY(char, bufsize+1);
if (!tok) {
return False;
}

Modified: branches/SAMBA_3_2/source/smbd/msdfs.c
===
--- branches/SAMBA_3_2/source/smbd/msdfs.c  2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2/source/smbd/msdfs.c  2007-09-15 20:24:35 UTC (rev 
25184)
@@ -1549,7 +1549,7 @@
 {
struct junction_map *jn = NULL;
int i=0;
-   size_t jn_count;
+   size_t jn_count = 0;
int sharecount = 0;
 
*p_num_jn = 0;

Modified: branches/SAMBA_3_2/source/smbd/nttrans.c
===
--- branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-15 20:24:35 UTC (rev 
25184)
@@ -634,7 +634,7 @@
 */
 
dir_name_len = strlen(dir_fsp-fsp_name);
-   fname = TALLOC_SIZE(ctx, dir_name_len+2);
+   fname = TALLOC_ARRAY(ctx, char, dir_name_len+2);
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);
@@ -1392,7 +1392,7 @@
 */
 
dir_name_len = strlen(dir_fsp-fsp_name);
-   fname = TALLOC_SIZE(ctx, dir_name_len+2);
+   fname = TALLOC_ARRAY(ctx, char, dir_name_len+2);
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);

Modified: branches/SAMBA_3_2/source/smbd/trans2.c
===
--- branches/SAMBA_3_2/source/smbd/trans2.c 2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2/source/smbd/trans2.c 2007-09-15 20:24:35 UTC (rev 
25184)
@@ -4209,7 +4209,7 @@
 
case SMB_QUERY_FILE_UNIX_LINK:
{
-   char *buffer = TALLOC_SIZE(ctx, 1024);
+   char *buffer = TALLOC_ARRAY(ctx, char, 1024);
 
if (!buffer) {
reply_nterror(req, NT_STATUS_NO_MEMORY);

Modified: branches/SAMBA_3_2_0/source/lib/charcnv.c
===
--- branches/SAMBA_3_2_0/source/lib/charcnv.c   2007-09-15 20:14:17 UTC (rev 
25183)
+++ branches/SAMBA_3_2_0/source/lib/charcnv.c   2007-09-15 20:24:35 UTC (rev 
25184)
@@ -1493,7 +1493,7 @@
/* Have we got space to append the '\0' ? */
if (size = dest_len) {
/* No, realloc. */
-   dest = TALLOC_REALLOC(ctx, dest,
+   dest = TALLOC_REALLOC_ARRAY(ctx, dest, char,
dest_len+1);
if (!dest) {
/* talloc fail. */

Modified: branches/SAMBA_3_2_0/source/lib/util_str.c

svn commit: samba r25182 - in branches/SAMBA_4_0/source/selftest/output: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 20:11:28 + (Sat, 15 Sep 2007)
New Revision: 25182

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25182

Log:
don't hide the envlog in plain mode

metze
Modified:
   branches/SAMBA_4_0/source/selftest/output/plain.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm
===
--- branches/SAMBA_4_0/source/selftest/output/plain.pm  2007-09-15 20:09:29 UTC 
(rev 25181)
+++ branches/SAMBA_4_0/source/selftest/output/plain.pm  2007-09-15 20:11:28 UTC 
(rev 25182)
@@ -61,6 +61,8 @@
my ($self, $state, $expected_ret, $ret, $envlog) = @_;
my $out = ;
 
+   $self-output_msg($state, ENVLOG: $envlog\n) if ($envlog ne );
+
if ($ret != $expected_ret) {
$self-output_msg($state, ERROR: $ret\n);
}

svn commit: samba r25183 - in branches/SAMBA_4_0/source/selftest/env: .

2007-09-15 Thread metze

Author: metze
Date: 2007-09-15 20:14:17 + (Sat, 15 Sep 2007)
New Revision: 25183

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25183

Log:
return LOCKDIR too

metze
Modified:
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm2007-09-15 20:11:28 UTC 
(rev 25182)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm2007-09-15 20:14:17 UTC 
(rev 25183)
@@ -446,6 +446,7 @@
LDAPDIR = $ldapdir,
WINBINDD_SOCKET_DIR = $winbindd_socket_dir,
NCALRPCDIR = $ncalrpcdir,
+   LOCKDIR = $lockdir,
CONFIGURATION = $configuration,
SOCKET_WRAPPER_DEFAULT_IFACE = $swiface
};

svn commit: samba r25185 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

2007-09-15 Thread jelmer

Author: jelmer
Date: 2007-09-15 23:03:34 + (Sat, 15 Sep 2007)
New Revision: 25185

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25185

Log:
Check that can_contain_deferred returns true if one of the members of a type 
can contain deferred data.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2007-09-15 
20:24:35 UTC (rev 25184)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2007-09-15 
23:03:34 UTC (rev 25185)
@@ -289,15 +289,13 @@
 
return 1 if ($type-{TYPE} eq DECLARE); # assume the worst
 
-   if ($type-{TYPE} eq TYPEDEF) {
-   return can_contain_deferred($type-{DATA});
-   } 
+   return can_contain_deferred($type-{DATA}) if ($type-{TYPE} eq 
TYPEDEF);
 
return 0 unless defined($type-{ELEMENTS});
 
-   foreach my $x (@{$type-{ELEMENTS}}) {
-   return 1 if ($x-{POINTERS});
-   return 1 if (can_contain_deferred ($x));
+   foreach (@{$type-{ELEMENTS}}) {
+   return 1 if ($_-{POINTERS});
+   return 1 if (can_contain_deferred ($_-{TYPE}));
}

return 0;

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-09-15 20:24:35 UTC (rev 
25184)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-09-15 23:03:34 UTC (rev 
25185)
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use Test::More tests = 33;
+use Test::More tests = 34;
 use FindBin qw($RealBin);
 use lib $RealBin;
 use Util;
@@ -266,3 +266,5 @@
 ok(not can_contain_deferred({ TYPE = TYPEDEF,
DATA = { TYPE = STRUCT, 
ELEMENTS = [ { TYPE = uint32 } ]}}));
+ok(can_contain_deferred({ TYPE = STRUCT, 
+   ELEMENTS = [ { TYPE = someunknowntype } ]}));

Re: svn commit: samba r25166 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

2007-09-15 Thread Jelmer Vernooij

Hi Stefan,

Am Samstag, den 15.09.2007, 09:24 +0200 schrieb Stefan (metze)
Metzmacher:
  +   foreach my $x (@{$type-{ELEMENTS}}) {
  +   return 1 if ($x-{POINTERS});
  +   return 1 if (can_contain_deferred ($x));
 doesn't this needs to be con_contain_deferred($x-{TYPE}),
 I'm not sure so please check this.
 
 maybe we should have a more complex test which tested unions with
 structs in it where the struct contains a pointer.
I've added another simple test - I think all code paths in
can_contain_deferred() are tested now.

Cheers,

Jelmer
-- 
Jelmer Vernooij [EMAIL PROTECTED] - http://samba.org/~jelmer/
Jabber: [EMAIL PROTECTED]

Build status as of Sun Sep 16 00:00:02 2007

2007-09-15 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-09-15 
00:02:03.0 +
+++ /home/build/master/cache/broken_results.txt 2007-09-16 00:01:53.0 
+
@@ -1,4 +1,4 @@
-Build status as of Sat Sep 15 00:00:02 2007
+Build status as of Sun Sep 16 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -8,17 +8,17 @@
 ctdb 0  0  0 
 distcc   2  0  0 
 ldb  30 5  0 
-libreplace   29 8  0 
+libreplace   30 8  0 
 lorikeet-heimdal 26 15 0 
-pidl 17 4  0 
+pidl 18 4  0 
 ppp  11 8  0 
 python   0  0  0 
-rsync31 13 0 
+rsync31 12 0 
 samba-docs   0  0  0 
 samba-gtk3  3  0 
-samba4   28 25 3 
-samba_3_232 18 0 
-smb-build28 27 0 
+samba4   28 22 2 
+samba_3_232 21 0 
+smb-build29 28 0 
 talloc   31 1  0 
-tdb  30 3  0 
+tdb  31 3  0

Re: svn commit: samba r25166 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

svn commit: samba r25176 - in branches/SAMBA_3_0_MAINT/source/client: .

Re: svn commit: samba r25164 - in branches: SAMBA_3_2/source/lib/talloc SAMBA_3_2_0/source/lib/talloc SAMBA_4_0/source/lib/talloc

svn commit: samba r25177 - in branches/SAMBA_3_2/source/nsswitch: .

svn commit: samba r25179 - in branches/SAMBA_3_2/source: .

svn commit: samba r25180 - in branches/SAMBA_3_2_0/source: .

svn commit: samba r25178 - in branches/SAMBA_3_2_0/source/nsswitch: .

svn commit: samba r25181 - in branches/SAMBA_4_0/source: auth nsswitch

svn commit: samba r25184 - in branches: SAMBA_3_2/source/lib SAMBA_3_2/source/smbd SAMBA_3_2_0/source/lib SAMBA_3_2_0/source/smbd

svn commit: samba r25182 - in branches/SAMBA_4_0/source/selftest/output: .

svn commit: samba r25183 - in branches/SAMBA_4_0/source/selftest/env: .

svn commit: samba r25185 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

Re: svn commit: samba r25166 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/tests

Build status as of Sun Sep 16 00:00:02 2007

14 matches

Site Navigation

Mail list logo

Footer information