[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  0c73322 s3:wscript_build - fix TDB dependency for source3/lib/util.c
       via  ed405df examples/testsmbc.c - substitute deprecated function "bzero" with "memset"
       via  b2ff4b0 examples/testsmbc.c - quiet implicit cast warnings on OpenSolaris
       via  a191852 examples/testsmbc.c - remove unused function "print_list_fn"
       via  2522712 examples/testsmbc.c - remove unused variables
      from  e673afa s3-vfstest: Return an error code if cmd failed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0c733221cf122d1bf304d74904b1329b2a6b7fb5
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Feb 20 10:27:45 2012 +0100

    s3:wscript_build - fix TDB dependency for source3/lib/util.c
    
    https://bugzilla.samba.org/show_bug.cgi?id=8708
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Thu Feb 23 01:43:04 CET 2012 on sn-devel-104

commit ed405df823b9238baf49e3f9b84146eef6ce64ec
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Feb 20 09:27:13 2012 +0100

    examples/testsmbc.c - substitute deprecated function "bzero" with "memset"
    
    Here we do not make any use of libreplace and hence it would be overkill
    to include the right headers for Solaris.
    
    This fixes bug: https://bugzilla.samba.org/show_bug.cgi?id=8767
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

commit b2ff4b06d65f26eed913eb472a6660e7e26f8389
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Feb 20 09:23:30 2012 +0100

    examples/testsmbc.c - quiet implicit cast warnings on OpenSolaris
    
    https://bugzilla.samba.org/show_bug.cgi?id=8767
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

commit a19185249a69597c870cd1e366128400c5ebeeb9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Feb 20 09:18:42 2012 +0100

    examples/testsmbc.c - remove unused function "print_list_fn"
    
    It does not get referenced from anywhere.
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

commit 25227129943420558476799a71a0e27647cf8d86
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Feb 20 09:37:39 2012 +0100

    examples/testsmbc.c - remove unused variables
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 examples/libsmbclient/testsmbc.c |   26 +++++---------------------
 source3/wscript_build            |    4 +---
 2 files changed, 6 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/testsmbc.c b/examples/libsmbclient/testsmbc.c
index de42428..1f98c3a 100644
--- a/examples/libsmbclient/testsmbc.c
+++ b/examples/libsmbclient/testsmbc.c
@@ -29,25 +29,9 @@
 #include "libsmbclient.h"
 #include "get_auth_data_fn.h"
 
-int global_id = 0;
-
-void print_list_fn(struct print_job_info *pji)
-{
-
-  fprintf(stdout, "Print job: ID: %u, Prio: %u, Size: %lu, User: %s, Name: %s\n",
-	  pji->id,
-          pji->priority,
-          (unsigned long) pji->size,
-          pji->user,
-          pji->name);
-
-  global_id = pji->id;
-
-}
-
 int main(int argc, char *argv[])
 {
-  int err, fd, dh1, dh2, dh3, dsize, dirc;
+  int err, fd, dh1, dsize, dirc;
   const char *file = "smb://samba/public/testfile.txt";
   const char *file2 = "smb://samba/public/testfile2.txt";
   char buff[256];
@@ -74,7 +58,7 @@ int main(int argc, char *argv[])
 
     }
 
-    fprintf(stdout, "Directory handles: %u, %u, %u\n", dh1, dh2, dh3);
+    fprintf(stdout, "Directory handle: %u\n", dh1);
 
     /* Now, list those directories, but in funny ways ... */
 
@@ -130,7 +114,7 @@ int main(int argc, char *argv[])
 
   /* Now, write some date to the file ... */
 
-  bzero(buff, sizeof(buff));
+  memset(buff, '\0', sizeof(buff));
   strcpy(buff, "Some test data for the moment ...");
 
   err = smbc_write(fd, buff, sizeof(buff));
@@ -256,10 +240,10 @@ int main(int argc, char *argv[])
   }
 
   fprintf(stdout, "Stat'ed file:   %s. Size = %d, mode = %04X\n", file2, 
-	  (int)st2.st_size, st2.st_mode);
+	  (int)st2.st_size, (unsigned int)st2.st_mode);
   fprintf(stdout, "    time: %s\n", ctime(&st2.st_atime));
   fprintf(stdout, "Earlier stat:   %s, Size = %d, mode = %04X\n", file, 
-	  (int)st1.st_size, st1.st_mode);
+	  (int)st1.st_size, (unsigned int)st1.st_mode);
   fprintf(stdout, "    time: %s\n", ctime(&st1.st_atime));
 
   /* Now, make a directory ... */
diff --git a/source3/wscript_build b/source3/wscript_build
index 67b686b..b24090e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -811,7 +811,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source=LIB_UTIL_SRC,
-                   deps='ndr security NDR_SECURITY samba-util',
+                   deps='ndr security NDR_SECURITY samba-util UTIL_TDB',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('samba3core',
@@ -821,8 +821,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         LIBTSOCKET
                         NDR_MESSAGING
                         LIBASYNC_REQ
-                        tdb-wrap3
-                        UTIL_TDB
                         UTIL_PW
                         SAMBA_VERSION
                         PTHREADPOOL


-- 
Samba Shared Repository