Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 9d65fb4e94423ccc19bc2a7428693a90387e1b46..8a5aedfde5697d0907d931c15e10cc3e2595e626 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -464,13 +464,11 @@ struct cli_state *cli_initialise(void)
                return NULL;
        }
 
-       cli = talloc(NULL, struct cli_state);
+       cli = TALLOC_ZERO_P(NULL, struct cli_state);
        if (!cli) {
                return NULL;
        }
 
-       ZERO_STRUCTP(cli);
-
        cli->port = 0;
        cli->fd = -1;
        cli->cnum = -1;

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index c02d3d4b3be9bf5f68268c00a0c0d8e517339dc9..728fd2d45d907688dca7eeb2ec3c35e202c6dbc4 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -95,7 +95,6 @@ m4_include(ntvfs/unixuid/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
-m4_include(lib/appweb/config.m4)
 m4_include(nsswitch/config.m4)
 
 dnl Samba 4 files