diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-21 20:08:00 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-21 20:08:00 +0200 |
| commit | 69577aa34b23ea2573bcea901586719f2fe14826 (patch) | |
| tree | efa5ed9cf825dae4332b160c7f2e7f1824468f5e | |
| parent | bbfce1b43d183cdccbe6f9a189098091f9d4a251 (diff) | |
| parent | 7e5f345cfe2f553bca65deccb4b47f19f9208a5b (diff) | |
| download | samba-69577aa34b23ea2573bcea901586719f2fe14826.tar.gz samba-69577aa34b23ea2573bcea901586719f2fe14826.tar.bz2 samba-69577aa34b23ea2573bcea901586719f2fe14826.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi
| -rw-r--r-- | source3/libsmb/clientgen.c | 4 | ||||
| -rw-r--r-- | source3/samba4.m4 | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 9d65fb4e94..8a5aedfde5 100644 --- 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 c02d3d4b3b..728fd2d45d 100644 --- 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 |