[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Jun 9 05:51:03 MDT 2011
The branch, master has been updated
via 5a37d32 s3-selftest Add test for smbclient --authentication-file
via 74eed8f s3-param Remove special case for global_myname(), rename to lp_netbios_name()
via 0e95311 s3-lib Add myhostname_upper()
via bb00f97 s3-selftest Add a test for 'message command'
via daf79e3 server_id: Change format to vnn:pid.task_id, pid.task_id or pid
via f348d14 s3-param Remove special case for global_scope()
via 3ccc760 s3-param Remove special case for lp_workgroup()
via acdf5b0 s3-libsmbclient Use workgroup from libsmbclient caller for domain in credentials
via 2077e0f s3-lib Use domain in credentials file for domain in credentials
via 6c3f35b s4-param add const to loadparm_init_s3 s3_fns
via 16b1c77 lib/util Bring procid_str() into lib/util as server_id_string()
via d01dbd6 s3-lib Read and write the full struct server_id (except the unique_id)
via a772797 librpc/idr Use the Samba3 notify.idl in common.
via d057116 server_id.idl: Bring server_id.idl in common
via 174893c s3-server_id change pid to hyper
via cc3b75b s3-server_id Add task_id to server_id to match Samba4
via 8d803d5 s4-cluster Use task_id instead of id2 to clarify server_id structure
via 8d4a838 s3-talloc Change TALLOC_MEMDUP() to talloc_memdup()
via 5e26e94 s3-talloc Change TALLOC_ZERO_ARRAY() to talloc_zero_array()
via ad0a07c s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
via d5e6a47 s3-talloc Change TALLOC_P() to talloc()
via 3d15137 s3-talloc Change TALLOC_ARRAY() to talloc_array()
via 73b3774 s3-talloc Change TALLOC_REALLOC_ARRAY() to talloc_realloc()
via 8459391 s3-talloc Remove unused TALLOC zeronull functions and macro definitions
from 9f02fb5 s4:rpc_server/dcesrv_samr.c - quiet enum warnings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5a37d3217a257b28d94b04d2637585e71e80d33c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 9 16:20:15 2011 +1000
s3-selftest Add test for smbclient --authentication-file
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Thu Jun 9 13:49:59 CEST 2011 on sn-devel-104
commit 74eed8f3ed5c333728350df1d23a4318e9104909
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 9 15:31:03 2011 +1000
s3-param Remove special case for global_myname(), rename to lp_netbios_name()
There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.
Andrew Bartlett
commit 0e95311c235929e07fdcfd7153b91ae795a979b9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 9 15:27:53 2011 +1000
s3-lib Add myhostname_upper()
This varient always upper cases the hostname, which is needed for the
netbios name.
Andrew Bartlett
commit bb00f97a82aea24bbf95de4dbd788d32bd34b427
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 9 15:22:19 2011 +1000
s3-selftest Add a test for 'message command'
This also provides us a way to test that the -n option to smbclient
works, as that becomes part of the filename.
Andrew Bartlett
commit daf79e33c7e8873345fb4a251f1e880fd767df19
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 9 11:18:15 2011 +1000
server_id: Change format to vnn:pid.task_id, pid.task_id or pid
This helps ensure the string cannot be ambiguous, while also ensuring
that it remains simple in the non-cluster case.
The asymmetry of reading get_my_vnn() but writing based on
NONCLUSTER_VNN is acceptable because in the non-clustered case, they
are equal, and in the clustered case we will print the full string.
Andrew Bartlett
commit f348d148b463ca61cbc48d2aadeaa099f7150425
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 16:27:06 2011 +1000
s3-param Remove special case for global_scope()
There is no reason this can't be a normal constant string in the
loadparm system. (Past reasons were that we didn't have lp_set_cmdline())
Andrew Bartlett
commit 3ccc7609476139bc6a906110a2623605f3802159
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 15:42:22 2011 +1000
s3-param Remove special case for lp_workgroup()
There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.
Andrew Bartlett
commit acdf5b0d4c188c0ca9ac17caedd1b53ae241acd6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 15:41:24 2011 +1000
s3-libsmbclient Use workgroup from libsmbclient caller for domain in credentials
This previously set the workgroup, which is a different thing, but
would have been the default if no domain was specified). This more
clearly sets the information from the credentials file into the
matching field in the credentials structure.
Andrew Bartlett
commit 2077e0f9032a84a1829012f11f968c32d78b7e0c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 15:35:02 2011 +1000
s3-lib Use domain in credentials file for domain in credentials
This previously set the workgroup, which is a different thing, but
would have been the default if no domain was specified). This more
clearly sets the information from the credentials file into the
matching field in the credentials structure.
Andrew Bartlett
commit 6c3f35bafef0c9c94b851f13de8100b35f407be0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 15:52:42 2011 +1000
s4-param add const to loadparm_init_s3 s3_fns
commit 16b1c77644217796f70a3a0bf1d95c245f9ee2d9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 14:05:55 2011 +1000
lib/util Bring procid_str() into lib/util as server_id_string()
This is needed for OpenChange, which prints Samba struct server_id
values in debug messages.
Andrew Bartlett
commit d01dbd6c3fd9ca2595d65991b56db4400a35ece0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 8 12:47:59 2011 +1000
s3-lib Read and write the full struct server_id (except the unique_id)
This is in preperation for making this code the common, only reader
and writer of this structure.
Andrew Bartlett
commit a772797a384a1142c5af95bd06c14a141dea38d7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 2 11:10:12 2011 +1000
librpc/idr Use the Samba3 notify.idl in common.
The extra fields in the structure that Samba4 does not use should not
bother it.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge at samba.org>
commit d057116cc2e454ba097d0dcb22e16108a05a4a1b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 2 10:55:20 2011 +1000
server_id.idl: Bring server_id.idl in common
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge at samba.org>
commit 174893c312f700105f8cda069cdb3b51a5aa602c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 2 10:37:31 2011 +1000
s3-server_id change pid to hyper
This matches Samba4's server_id.
Signed-off-by: Andrew Tridgell <tridge at samba.org>
commit cc3b75b807c6dd63b6dde3b449054f6640826f7c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 2 10:27:36 2011 +1000
s3-server_id Add task_id to server_id to match Samba4
This will allow this structure to be shared, and allow us to create a
common messaging system between all Samba processes. Samba4 uses the
task_id to indicate the different tasks within a single unix process.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge at samba.org>
commit 8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun May 8 18:28:17 2011 +0200
s4-cluster Use task_id instead of id2 to clarify server_id structure
This seems a clearer and more acceptable name.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge at samba.org>
commit 8d4a8389bb2df77ff8923dda8368aa2915652c1a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 12:13:26 2011 +1000
s3-talloc Change TALLOC_MEMDUP() to talloc_memdup()
Using the standard macro makes it easier to move code into common, as
TALLOC_MEMDUP isn't standard talloc.
commit 5e26e94092b56ee47e7ec7837f7cd0feb3fb0119
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:58:39 2011 +1000
s3-talloc Change TALLOC_ZERO_ARRAY() to talloc_zero_array()
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_ARRAY isn't standard talloc.
commit ad0a07c531fadd1639c5298951cfaf5cfe0cb10e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:44:43 2011 +1000
s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_P isn't standard talloc.
commit d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:38:41 2011 +1000
s3-talloc Change TALLOC_P() to talloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_P isn't standard talloc.
commit 3d15137653a7d1b593a9af2eef12f6e5b9a04c4f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:30:12 2011 +1000
s3-talloc Change TALLOC_ARRAY() to talloc_array()
Using the standard macro makes it easier to move code into common, as
TALLOC_ARRAY isn't standard talloc.
commit 73b377432c5efb8451f09f6d25d8aa1b28c239c9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:10:15 2011 +1000
s3-talloc Change TALLOC_REALLOC_ARRAY() to talloc_realloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_REALLOC_ARRAY isn't standard talloc.
Andrew Bartlett
commit 8459391e31079066745a65c5f3c07f3899afdc0c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 7 11:03:16 2011 +1000
s3-talloc Remove unused TALLOC zeronull functions and macro definitions
These have been under #if 0 for a long time now.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/shadow_copy_test.c | 2 +-
lib/addns/dnsmarshall.c | 18 +-
lib/addns/dnsrecord.c | 14 +-
lib/addns/dnssock.c | 8 +-
lib/addns/dnsutils.c | 4 +-
source3/lib/util_nscd.c => lib/util/server_id.c | 46 +++---
lib/util/util.h | 2 +
lib/util/wscript_build | 3 +-
libgpo/gpext/gpext.c | 2 +-
libgpo/gpo_fetch.c | 2 +-
libgpo/gpo_ldap.c | 6 +-
{source3/librpc => librpc}/idl/notify.idl | 2 +-
librpc/idl/server_id.idl | 33 ++++
librpc/idl/wscript_build | 3 +-
librpc/wscript_build | 15 ++-
nsswitch/pam_winbind.c | 2 +-
selftest/target/Samba3.pm | 2 +
source3/Makefile.in | 6 +-
source3/auth/auth_builtin.c | 6 +-
source3/auth/auth_domain.c | 12 +-
source3/auth/auth_netlogond.c | 10 +-
source3/auth/auth_ntlmssp.c | 2 +-
source3/auth/auth_sam.c | 4 +-
source3/auth/auth_samba4.c | 2 +-
source3/auth/auth_script.c | 2 +-
source3/auth/auth_server.c | 6 +-
source3/auth/auth_unix.c | 2 +-
source3/auth/auth_util.c | 8 +-
source3/auth/auth_wbc.c | 2 +-
source3/auth/auth_winbind.c | 2 +-
source3/auth/check_samsec.c | 2 +-
source3/auth/server_info.c | 2 +-
source3/auth/server_info_sam.c | 4 +-
source3/auth/token_util.c | 10 +-
source3/client/client.c | 35 +----
source3/client/dnsbrowse.c | 2 +-
source3/groupdb/mapping.c | 2 +-
source3/groupdb/mapping_tdb.c | 2 +-
source3/include/messages.h | 7 -
source3/include/proto.h | 17 +--
source3/include/smb_macros.h | 29 +----
source3/lib/bitmap.c | 4 +-
source3/lib/charcnv.c | 4 +-
source3/lib/ctdb_packet.c | 8 +-
source3/lib/ctdbd_conn.c | 6 +-
source3/lib/dbwrap_ctdb.c | 6 +-
source3/lib/dbwrap_file.c | 10 +-
source3/lib/dbwrap_rbt.c | 2 +-
source3/lib/dbwrap_tdb.c | 4 +-
source3/lib/eventlog/eventlog.c | 2 +-
source3/lib/events.c | 6 +-
source3/lib/g_lock.c | 12 +-
source3/lib/memcache.c | 2 +-
source3/lib/messages.c | 2 +-
source3/lib/messages_ctdbd.c | 4 +-
source3/lib/messages_local.c | 8 +-
source3/lib/netapi/cm.c | 4 +-
source3/lib/netapi/group.c | 8 +-
source3/lib/netapi/localgroup.c | 4 +-
source3/lib/netapi/netapi.c | 2 +-
source3/lib/netapi/serverinfo.c | 2 +-
source3/lib/netapi/share.c | 4 +-
source3/lib/netapi/user.c | 8 +-
source3/lib/popt_common.c | 8 +-
source3/lib/serverid.c | 3 +
source3/lib/sharesec.c | 2 +-
source3/lib/smbconf/smbconf_reg.c | 6 +-
source3/lib/smbldap.c | 8 +-
source3/lib/substitute.c | 6 +-
source3/lib/system.c | 2 +-
source3/lib/util.c | 185 ++++++-----------------
source3/lib/util_cmdline.c | 4 +-
source3/lib/util_names.c | 90 +-----------
source3/lib/util_nttoken.c | 4 +-
source3/lib/util_sock.c | 6 +-
source3/lib/util_str.c | 10 +-
source3/lib/util_tdb.c | 2 +-
source3/lib/winbind_util.c | 10 +-
source3/libads/authdata.c | 2 +-
source3/libads/dns.c | 10 +-
source3/libads/kerberos.c | 4 +-
source3/libads/kerberos_keytab.c | 14 +-
source3/libads/kerberos_util.c | 6 +-
source3/libads/kerberos_verify.c | 6 +-
source3/libads/ldap.c | 36 +++---
source3/libads/ldap_printer.c | 2 +-
source3/libads/ldap_schema.c | 6 +-
source3/libads/ldap_utils.c | 2 +-
source3/libads/sasl.c | 2 +-
source3/libgpo/gpext/registry.c | 6 +-
source3/libgpo/gpext/scripts.c | 6 +-
source3/libgpo/gpext/security.c | 2 +-
source3/libgpo/gpo_reg.c | 10 +-
source3/libnet/libnet_dssync.c | 8 +-
source3/libnet/libnet_dssync_keytab.c | 6 +-
source3/libnet/libnet_join.c | 4 +-
source3/libnet/libnet_keytab.c | 2 +-
source3/libnet/libnet_samsync.c | 6 +-
source3/libnet/libnet_samsync_ldif.c | 10 +-
source3/libnet/libnet_samsync_passdb.c | 2 +-
source3/librpc/crypto/cli_spnego.c | 2 +-
source3/librpc/crypto/gse_krb5.c | 2 +-
source3/librpc/idl/server_id.idl | 25 ---
source3/librpc/idl/wscript_build | 4 +-
source3/librpc/rpc/dcerpc_ep.c | 2 +-
source3/librpc/wscript_build | 10 --
source3/libsmb/cliconnect.c | 2 +-
source3/libsmb/clidgram.c | 8 +-
source3/libsmb/clientgen.c | 2 +-
source3/libsmb/clifile.c | 16 +-
source3/libsmb/clifsinfo.c | 2 +-
source3/libsmb/clikrb5.c | 2 +-
source3/libsmb/clilist.c | 12 +-
source3/libsmb/cliquota.c | 8 +-
source3/libsmb/clirap.c | 4 +-
source3/libsmb/clireadwrite.c | 8 +-
source3/libsmb/clitrans.c | 2 +-
source3/libsmb/dsgetdcname.c | 10 +-
source3/libsmb/libsmb_context.c | 6 +-
source3/libsmb/libsmb_path.c | 2 +-
source3/libsmb/libsmb_server.c | 2 +-
source3/libsmb/libsmb_xattr.c | 2 +-
source3/libsmb/namequery.c | 10 +-
source3/libsmb/nmblib.c | 10 +-
source3/libsmb/ntlmssp.c | 4 +-
source3/libsmb/samlogon_cache.c | 4 +-
source3/libsmb/smbsock_connect.c | 2 +-
source3/libsmb/trusts_util.c | 8 +-
source3/libsmb/unexpected.c | 8 +-
source3/locking/brlock.c | 8 +-
source3/locking/locking.c | 20 ++--
source3/locking/posix.c | 10 +-
source3/modules/onefs_streams.c | 2 +-
source3/modules/vfs_acl_common.c | 2 +-
source3/modules/vfs_acl_xattr.c | 2 +-
source3/modules/vfs_afsacl.c | 6 +-
source3/modules/vfs_aio_fork.c | 4 +-
source3/modules/vfs_cap.c | 6 +-
source3/modules/vfs_expand_msdfs.c | 2 +-
source3/modules/vfs_fileid.c | 2 +-
source3/modules/vfs_full_audit.c | 2 +-
source3/modules/vfs_notify_fam.c | 2 +-
source3/modules/vfs_preopen.c | 6 +-
source3/modules/vfs_scannedonly.c | 6 +-
source3/modules/vfs_smb_traffic_analyzer.c | 2 +-
source3/modules/vfs_streams_depot.c | 2 +-
source3/modules/vfs_streams_xattr.c | 6 +-
source3/modules/vfs_tsmsm.c | 2 +-
source3/modules/vfs_xattr_tdb.c | 6 +-
source3/nmbd/nmbd_become_dmb.c | 12 +-
source3/nmbd/nmbd_become_lmb.c | 28 ++--
source3/nmbd/nmbd_browsesync.c | 4 +-
source3/nmbd/nmbd_elections.c | 8 +-
source3/nmbd/nmbd_incomingdgrams.c | 10 +-
source3/nmbd/nmbd_incomingrequests.c | 10 +-
source3/nmbd/nmbd_logonnames.c | 8 +-
source3/nmbd/nmbd_packets.c | 16 +-
source3/nmbd/nmbd_processlogon.c | 20 ++--
source3/nmbd/nmbd_sendannounce.c | 24 ++--
source3/nmbd/nmbd_winsserver.c | 4 +-
source3/nmbd/nmbd_workgroupdb.c | 2 +-
source3/param/loadparm.c | 67 ++-------
source3/param/loadparm_ctx.c | 4 +-
source3/param/service.c | 2 +-
source3/passdb/lookup_sid.c | 14 +-
source3/passdb/machine_sid.c | 8 +-
source3/passdb/passdb.c | 10 +-
source3/passdb/pdb_get_set.c | 2 +-
source3/passdb/pdb_interface.c | 4 +-
source3/passdb/pdb_ipa.c | 6 +-
source3/passdb/pdb_ldap.c | 16 +-
source3/passdb/pdb_smbpasswd.c | 2 +-
source3/passdb/pdb_wbc_sam.c | 2 +-
source3/passdb/secrets.c | 4 +-
source3/printing/notify.c | 14 +-
source3/printing/nt_printing.c | 2 +-
source3/printing/nt_printing_ads.c | 4 +-
source3/printing/nt_printing_migrate.c | 4 +-
source3/printing/print_cups.c | 2 +-
source3/registry/reg_api.c | 4 +-
source3/registry/reg_backend_db.c | 2 +-
source3/registry/reg_objects.c | 12 +-
source3/registry/reg_perfcount.c | 24 ++--
source3/registry/reg_util_token.c | 2 +-
source3/registry/regfio.c | 20 ++--
source3/rpc_client/cli_lsarpc.c | 16 +-
source3/rpc_client/cli_netlogon.c | 24 ++--
source3/rpc_client/cli_pipe.c | 18 +-
source3/rpc_client/cli_pipe_schannel.c | 2 +-
source3/rpc_client/cli_spoolss.c | 4 +-
source3/rpc_client/cli_winreg.c | 2 +-
source3/rpc_server/dfs/srv_dfs_nt.c | 32 ++--
source3/rpc_server/dssetup/srv_dssetup_nt.c | 2 +-
source3/rpc_server/echo/srv_echo_nt.c | 4 +-
source3/rpc_server/eventlog/srv_eventlog_nt.c | 2 +-
source3/rpc_server/lsa/srv_lsa_nt.c | 48 +++---
source3/rpc_server/netlogon/srv_netlog_nt.c | 16 +-
source3/rpc_server/rpc_ncacn_np.c | 4 +-
source3/rpc_server/samr/srv_samr_nt.c | 66 ++++----
source3/rpc_server/spoolss/srv_spoolss_nt.c | 58 ++++----
source3/rpc_server/spoolss/srv_spoolss_util.c | 10 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 90 ++++++------
source3/rpc_server/svcctl/srv_svcctl_nt.c | 6 +-
source3/rpc_server/winreg/srv_winreg_nt.c | 2 +-
source3/rpc_server/wkssvc/srv_wkssvc_nt.c | 10 +-
source3/rpcclient/cmd_drsuapi.c | 2 +-
source3/rpcclient/cmd_lsarpc.c | 10 +-
source3/rpcclient/cmd_netlogon.c | 12 +-
source3/rpcclient/cmd_samr.c | 6 +-
source3/rpcclient/cmd_spoolss.c | 4 +-
source3/rpcclient/rpcclient.c | 14 +--
source3/script/tests/test_smbclient_s3.sh | 106 ++++++++++++-
source3/selftest/tests.py | 10 +-
source3/smbd/aio.c | 2 +-
source3/smbd/avahi_register.c | 2 +-
source3/smbd/conn.c | 8 +-
source3/smbd/dfree.c | 2 +-
source3/smbd/dir.c | 6 +-
source3/smbd/dmapi.c | 2 +-
source3/smbd/ipc.c | 6 +-
source3/smbd/lanman.c | 12 +-
source3/smbd/message.c | 4 +-
source3/smbd/msdfs.c | 26 ++--
source3/smbd/negprot.c | 6 +-
source3/smbd/notify.c | 6 +-
source3/smbd/notify_internal.c | 4 +-
source3/smbd/ntquotas.c | 6 +-
source3/smbd/nttrans.c | 4 +-
source3/smbd/open.c | 4 +-
source3/smbd/oplock.c | 12 +-
source3/smbd/posix_acls.c | 6 +-
source3/smbd/process.c | 20 ++--
source3/smbd/reply.c | 8 +-
source3/smbd/seal.c | 2 +-
source3/smbd/session.c | 2 +-
source3/smbd/sesssetup.c | 4 +-
source3/smbd/smb2_ioctl.c | 2 +-
source3/smbd/smb2_read.c | 2 +-
source3/smbd/srvstr.c | 2 +-
source3/smbd/trans2.c | 22 ++--
source3/smbd/vfs.c | 2 +-
source3/torture/cmd_vfs.c | 4 +-
source3/torture/masktest.c | 4 +-
source3/torture/nbench.c | 2 +-
source3/torture/torture.c | 4 +-
source3/torture/vfstest.c | 4 +-
source3/utils/eventlogadm.c | 2 +-
source3/utils/net.c | 10 +-
source3/utils/net_ads.c | 24 ++--
source3/utils/net_conf.c | 2 +-
source3/utils/net_g_lock.c | 2 +-
source3/utils/net_rpc.c | 22 ++--
source3/utils/net_rpc_join.c | 10 +-
source3/utils/net_rpc_printer.c | 2 +-
source3/utils/net_rpc_registry.c | 16 +-
source3/utils/net_rpc_rights.c | 4 +-
source3/utils/net_rpc_shell.c | 4 +-
source3/utils/net_serverid.c | 12 +-
source3/utils/net_time.c | 2 +-
source3/utils/net_usershare.c | 2 +-
source3/utils/net_util.c | 4 +-
source3/utils/netlookup.c | 4 +-
source3/utils/ntlm_auth.c | 10 +-
source3/utils/sharesec.c | 2 +-
source3/utils/smbcacls.c | 2 +-
source3/utils/smbcontrol.c | 8 +-
source3/utils/smbcquotas.c | 2 +-
source3/utils/testparm.c | 2 +-
source3/web/diagnose.c | 2 +-
source3/web/swat.c | 2 +-
source3/winbindd/idmap.c | 2 +-
source3/winbindd/idmap_ad.c | 6 +-
source3/winbindd/idmap_adex/cell_util.c | 2 +-
source3/winbindd/idmap_adex/domain_util.c | 2 +-
source3/winbindd/idmap_adex/gc_util.c | 10 +-
source3/winbindd/idmap_adex/likewise_cell.c | 2 +-
source3/winbindd/idmap_autorid.c | 4 +-
source3/winbindd/idmap_hash/idmap_hash.c | 2 +-
source3/winbindd/idmap_ldap.c | 2 +-
source3/winbindd/idmap_rid.c | 2 +-
source3/winbindd/nss_info.c | 2 +-
source3/winbindd/wb_lookupsids.c | 20 ++--
source3/winbindd/winbindd.c | 2 +-
source3/winbindd/winbindd_ads.c | 14 +-
source3/winbindd/winbindd_cache.c | 26 ++--
source3/winbindd/winbindd_ccache_access.c | 2 +-
source3/winbindd/winbindd_cm.c | 12 +-
source3/winbindd/winbindd_cred_cache.c | 4 +-
source3/winbindd/winbindd_dual.c | 2 +-
source3/winbindd/winbindd_dual_srv.c | 8 +-
source3/winbindd/winbindd_misc.c | 2 +-
source3/winbindd/winbindd_msrpc.c | 8 +-
source3/winbindd/winbindd_pam.c | 6 +-
source3/winbindd/winbindd_pam_auth_crap.c | 2 +-
source3/winbindd/winbindd_rpc.c | 22 ++--
source3/winbindd/winbindd_sids_to_xids.c | 6 +-
source3/winbindd/winbindd_util.c | 2 +-
source3/winbindd/winbindd_wins.c | 2 +-
source3/wscript_build | 2 +-
source4/cluster/cluster.c | 17 +--
source4/cluster/cluster.h | 7 +-
source4/cluster/cluster_private.h | 2 -
source4/cluster/local.c | 17 +--
source4/lib/messaging/messaging.c | 8 +-
source4/lib/messaging/messaging.h | 2 +-
source4/lib/messaging/pymessaging.c | 14 +-
source4/librpc/idl/opendb.idl | 2 +-
source4/librpc/idl/s4_notify.idl | 58 -------
source4/librpc/idl/server_id4.idl | 2 +-
source4/librpc/idl/wscript_build | 4 +-
source4/librpc/wscript_build | 15 +--
source4/ntvfs/common/notify.c | 2 +-
source4/ntvfs/ntvfs.h | 4 +-
source4/ntvfs/sysdep/sys_notify.h | 2 +-
source4/param/loadparm.c | 4 +-
source4/rpc_server/dcerpc_server.h | 2 +-
source4/smb_server/smb/receive.c | 2 +-
source4/smbd/service_stream.c | 2 +-
source4/smbd/service_stream.h | 2 +-
source4/smbd/service_task.h | 2 +-
320 files changed, 1298 insertions(+), 1588 deletions(-)
copy source3/lib/util_nscd.c => lib/util/server_id.c (53%)
rename {source3/librpc => librpc}/idl/notify.idl (98%)
create mode 100644 librpc/idl/server_id.idl
delete mode 100644 source3/librpc/idl/server_id.idl
delete mode 100644 source4/librpc/idl/s4_notify.idl
Changeset truncated at 500 lines:
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index fab7007..d4da238 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -59,7 +59,7 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fs
if (labels) {
if (num) {
- shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
+ shadow_copy_data->labels = talloc_zero_array(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
} else {
shadow_copy_data->labels = NULL;
}
diff --git a/lib/addns/dnsmarshall.c b/lib/addns/dnsmarshall.c
index 5530290..59d6470 100644
--- a/lib/addns/dnsmarshall.c
+++ b/lib/addns/dnsmarshall.c
@@ -39,7 +39,7 @@ struct dns_buffer *dns_create_buffer(TALLOC_CTX *mem_ctx)
*/
result->size = 2;
- if (!(result->data = TALLOC_ARRAY(result, uint8, result->size))) {
+ if (!(result->data = talloc_array(result, uint8, result->size))) {
TALLOC_FREE(result);
return NULL;
}
@@ -78,7 +78,7 @@ void dns_marshall_buffer(struct dns_buffer *buf, const uint8 *data,
new_size += (64 - (new_size % 64));
- if (!(new_data = TALLOC_REALLOC_ARRAY(buf, buf->data, uint8,
+ if (!(new_data = talloc_realloc(buf, buf->data, uint8,
new_size))) {
buf->error = ERROR_DNS_NO_MEMORY;
return;
@@ -223,7 +223,7 @@ static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
label->len = len;
- if (!(label->label = TALLOC_ARRAY(label, char, len+1))) {
+ if (!(label->label = talloc_array(label, char, len+1))) {
buf->error = ERROR_DNS_NO_MEMORY;
goto error;
}
@@ -329,7 +329,7 @@ static void dns_unmarshall_rr(TALLOC_CTX *mem_ctx,
if (!(ERR_DNS_IS_OK(buf->error))) return;
if (r->data_length != 0) {
- if (!(r->data = TALLOC_ARRAY(r, uint8, r->data_length))) {
+ if (!(r->data = talloc_array(r, uint8, r->data_length))) {
buf->error = ERROR_DNS_NO_MEMORY;
return;
}
@@ -390,7 +390,7 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
uint16 i;
DNS_ERROR err;
- if (!(req = TALLOC_ZERO_P(mem_ctx, struct dns_request))) {
+ if (!(req = talloc_zero(mem_ctx, struct dns_request))) {
return ERROR_DNS_NO_MEMORY;
}
@@ -406,22 +406,22 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
err = ERROR_DNS_NO_MEMORY;
if ((req->num_questions != 0) &&
- !(req->questions = TALLOC_ARRAY(req, struct dns_question *,
+ !(req->questions = talloc_array(req, struct dns_question *,
req->num_questions))) {
goto error;
}
if ((req->num_answers != 0) &&
- !(req->answers = TALLOC_ARRAY(req, struct dns_rrec *,
+ !(req->answers = talloc_array(req, struct dns_rrec *,
req->num_answers))) {
goto error;
}
if ((req->num_auths != 0) &&
- !(req->auths = TALLOC_ARRAY(req, struct dns_rrec *,
+ !(req->auths = talloc_array(req, struct dns_rrec *,
req->num_auths))) {
goto error;
}
if ((req->num_additionals != 0) &&
- !(req->additionals = TALLOC_ARRAY(req, struct dns_rrec *,
+ !(req->additionals = talloc_array(req, struct dns_rrec *,
req->num_additionals))) {
goto error;
}
diff --git a/lib/addns/dnsrecord.c b/lib/addns/dnsrecord.c
index 528fdf2..2240d08 100644
--- a/lib/addns/dnsrecord.c
+++ b/lib/addns/dnsrecord.c
@@ -31,8 +31,8 @@ DNS_ERROR dns_create_query( TALLOC_CTX *mem_ctx, const char *name,
struct dns_question *q;
DNS_ERROR err;
- if (!(req = TALLOC_ZERO_P(mem_ctx, struct dns_request)) ||
- !(req->questions = TALLOC_ARRAY(req, struct dns_question *, 1)) ||
+ if (!(req = talloc_zero(mem_ctx, struct dns_request)) ||
+ !(req->questions = talloc_array(req, struct dns_question *, 1)) ||
!(req->questions[0] = talloc(req->questions,
struct dns_question))) {
TALLOC_FREE(req);
@@ -64,8 +64,8 @@ DNS_ERROR dns_create_update( TALLOC_CTX *mem_ctx, const char *name,
struct dns_zone *z;
DNS_ERROR err;
- if (!(req = TALLOC_ZERO_P(mem_ctx, struct dns_update_request)) ||
- !(req->zones = TALLOC_ARRAY(req, struct dns_zone *, 1)) ||
+ if (!(req = talloc_zero(mem_ctx, struct dns_update_request)) ||
+ !(req->zones = talloc_array(req, struct dns_zone *, 1)) ||
!(req->zones[0] = talloc(req->zones, struct dns_zone))) {
TALLOC_FREE(req);
return ERROR_DNS_NO_MEMORY;
@@ -132,7 +132,7 @@ DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
}
ip = ((const struct sockaddr_in *)pss)->sin_addr;
- if (!(data = (uint8 *)TALLOC_MEMDUP(mem_ctx, (const void *)&ip.s_addr,
+ if (!(data = (uint8 *)talloc_memdup(mem_ctx, (const void *)&ip.s_addr,
sizeof(ip.s_addr)))) {
return ERROR_DNS_NO_MEMORY;
}
@@ -240,7 +240,7 @@ DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
if (!ERR_DNS_IS_OK(buf.error)) goto error;
if (tkey->key_length) {
- if (!(tkey->key = TALLOC_ARRAY(tkey, uint8, tkey->key_length))) {
+ if (!(tkey->key = talloc_array(tkey, uint8, tkey->key_length))) {
buf.error = ERROR_DNS_NO_MEMORY;
goto error;
}
@@ -308,7 +308,7 @@ DNS_ERROR dns_add_rrec(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
{
struct dns_rrec **new_records;
- if (!(new_records = TALLOC_REALLOC_ARRAY(mem_ctx, *records,
+ if (!(new_records = talloc_realloc(mem_ctx, *records,
struct dns_rrec *,
(*num_records)+1))) {
return ERROR_DNS_NO_MEMORY;
diff --git a/lib/addns/dnssock.c b/lib/addns/dnssock.c
index 42b4e2d..aaeb3f0 100644
--- a/lib/addns/dnssock.c
+++ b/lib/addns/dnssock.c
@@ -250,7 +250,7 @@ static DNS_ERROR dns_receive_tcp(TALLOC_CTX *mem_ctx,
DNS_ERROR err;
uint16 len;
- if (!(buf = TALLOC_ZERO_P(mem_ctx, struct dns_buffer))) {
+ if (!(buf = talloc_zero(mem_ctx, struct dns_buffer))) {
return ERROR_DNS_NO_MEMORY;
}
@@ -262,7 +262,7 @@ static DNS_ERROR dns_receive_tcp(TALLOC_CTX *mem_ctx,
buf->size = ntohs(len);
if (buf->size) {
- if (!(buf->data = TALLOC_ARRAY(buf, uint8, buf->size))) {
+ if (!(buf->data = talloc_array(buf, uint8, buf->size))) {
TALLOC_FREE(buf);
return ERROR_DNS_NO_MEMORY;
}
@@ -287,7 +287,7 @@ static DNS_ERROR dns_receive_udp(TALLOC_CTX *mem_ctx,
struct dns_buffer *buf;
ssize_t received;
- if (!(buf = TALLOC_ZERO_P(mem_ctx, struct dns_buffer))) {
+ if (!(buf = talloc_zero(mem_ctx, struct dns_buffer))) {
return ERROR_DNS_NO_MEMORY;
}
@@ -295,7 +295,7 @@ static DNS_ERROR dns_receive_udp(TALLOC_CTX *mem_ctx,
* UDP based DNS can only be 512 bytes
*/
- if (!(buf->data = TALLOC_ARRAY(buf, uint8, 512))) {
+ if (!(buf->data = talloc_array(buf, uint8, 512))) {
TALLOC_FREE(buf);
return ERROR_DNS_NO_MEMORY;
}
diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c
index 37b862c..43305a9 100644
--- a/lib/addns/dnsutils.c
+++ b/lib/addns/dnsutils.c
@@ -53,7 +53,7 @@ static DNS_ERROR LabelList( TALLOC_CTX *mem_ctx,
return ERROR_DNS_INVALID_NAME;
}
- if (!(result = TALLOC_ZERO_P(mem_ctx, struct dns_domain_label))) {
+ if (!(result = talloc_zero(mem_ctx, struct dns_domain_label))) {
return ERROR_DNS_NO_MEMORY;
}
@@ -138,7 +138,7 @@ char *dns_generate_keyname( TALLOC_CTX *mem_ctx )
/*
* uuid_unparse gives 36 bytes plus '\0'
*/
- if (!(result = TALLOC_ARRAY(mem_ctx, char, 37))) {
+ if (!(result = talloc_array(mem_ctx, char, 37))) {
return NULL;
}
diff --git a/source3/lib/util_nscd.c b/lib/util/server_id.c
similarity index 53%
copy from source3/lib/util_nscd.c
copy to lib/util/server_id.c
index 6002f14..195deea 100644
--- a/source3/lib/util_nscd.c
+++ b/lib/util/server_id.c
@@ -1,45 +1,41 @@
-/*
+/*
Unix SMB/CIFS implementation.
Samba utility functions
- Copyright (C) Guenther Deschner 2006
+ Copyright (C) Andrew Bartlett 2011
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
+#include "librpc/gen_ndr/server_id.h"
-#ifdef HAVE_LIBNSCD
-#include <libnscd.h>
-#endif
-
-static void smb_nscd_flush_cache(const char *service)
+char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id)
{
-#ifdef HAVE_NSCD_FLUSH_CACHE
- if (nscd_flush_cache(service)) {
- DEBUG(10,("failed to flush nscd cache for '%s' service: %s. "
- "Is nscd running?\n",
- service, strerror(errno)));
+ if (id->vnn == NONCLUSTER_VNN && id->task_id == 0) {
+ return talloc_asprintf(mem_ctx,
+ "%llu",
+ (unsigned long long)id->pid);
+ } else if (id->vnn == NONCLUSTER_VNN) {
+ return talloc_asprintf(mem_ctx,
+ "%llu.%u",
+ (unsigned long long)id->pid,
+ (unsigned)id->task_id);
+ } else {
+ return talloc_asprintf(mem_ctx,
+ "%u:%llu.%u",
+ (unsigned)id->vnn,
+ (unsigned long long)id->pid,
+ (unsigned)id->task_id);
}
-#endif
-}
-
-void smb_nscd_flush_user_cache(void)
-{
- smb_nscd_flush_cache("passwd");
-}
-
-void smb_nscd_flush_group_cache(void)
-{
- smb_nscd_flush_cache("group");
}
diff --git a/lib/util/util.h b/lib/util/util.h
index e89c4ac..e50cc38 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -916,5 +916,7 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name);
**/
const char *shlib_ext(void);
+struct server_id;
+char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id);
#endif /* _SAMBA_UTIL_H_ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 8ce30eb..6c4bb37 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -5,7 +5,8 @@ common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c
genrand.c fsusage.c blocking.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
- util_str.c util_str_common.c substitute.c ms_fnmatch.c'''
+ util_str.c util_str_common.c substitute.c ms_fnmatch.c
+ server_id.c'''
common_util_headers = 'debug.h'
common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET'
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index ac6c181..640aae6 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -351,7 +351,7 @@ NTSTATUS gp_ext_info_add_entry(TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct gp_extension_reg_info_entry *entry = NULL;
- entry = TALLOC_ZERO_P(mem_ctx, struct gp_extension_reg_info_entry);
+ entry = talloc_zero(mem_ctx, struct gp_extension_reg_info_entry);
NT_STATUS_HAVE_NO_MEMORY(entry);
status = GUID_from_string(ext_guid, &entry->guid);
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 8c4c508..cae11d5 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -143,7 +143,7 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_
result = cli_full_connection(&cli,
- global_myname(),
+ lp_netbios_name(),
server,
NULL, 0,
service, "A:",
diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index 6abaf29..9d984b5 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -582,7 +582,7 @@ static ADS_STATUS add_gplink_to_gpo_list(ADS_STRUCT *ads,
}
}
- new_gpo = TALLOC_ZERO_P(mem_ctx, struct GROUP_POLICY_OBJECT);
+ new_gpo = talloc_zero(mem_ctx, struct GROUP_POLICY_OBJECT);
ADS_ERROR_HAVE_NO_MEMORY(new_gpo);
status = ads_get_gpo(ads, mem_ctx, gp_link->link_names[i],
@@ -640,7 +640,7 @@ ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads,
return status;
}
- token_sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, 1);
+ token_sids = talloc_array(mem_ctx, struct dom_sid, 1);
ADS_ERROR_HAVE_NO_MEMORY(token_sids);
status = ADS_ERROR_NT(add_sid_to_array_unique(mem_ctx,
@@ -688,7 +688,7 @@ static ADS_STATUS add_local_policy_to_gpo_list(TALLOC_CTX *mem_ctx,
ADS_ERROR_HAVE_NO_MEMORY(gpo_list);
- gpo = TALLOC_ZERO_P(mem_ctx, struct GROUP_POLICY_OBJECT);
+ gpo = talloc_zero(mem_ctx, struct GROUP_POLICY_OBJECT);
ADS_ERROR_HAVE_NO_MEMORY(gpo);
gpo->name = talloc_strdup(mem_ctx, "Local Policy");
diff --git a/source3/librpc/idl/notify.idl b/librpc/idl/notify.idl
similarity index 98%
rename from source3/librpc/idl/notify.idl
rename to librpc/idl/notify.idl
index 0776ed1..8450106 100644
--- a/source3/librpc/idl/notify.idl
+++ b/librpc/idl/notify.idl
@@ -41,7 +41,7 @@ interface notify
The max_mask and max_mask_subdir at each depth is the
bitwise or of the filters and subdir filters for all entries
at that depth. This allows a depth to be quickly skipped if
- no entries will match the target filter
+ no entries will match the target filter
*/
typedef struct {
uint32 max_mask;
diff --git a/librpc/idl/server_id.idl b/librpc/idl/server_id.idl
new file mode 100644
index 0000000..414e05a
--- /dev/null
+++ b/librpc/idl/server_id.idl
@@ -0,0 +1,33 @@
+[
+ pointer_default(unique)
+]
+interface server_id
+{
+
+ /*
+ * Virtual Node Numbers are identifying a node within a cluster.
+ * Ctdbd sets this, we retrieve our vnn from it.
+ */
+
+ const int NONCLUSTER_VNN = 0xFFFFFFFF;
+
+ /* used to look like the following, note that unique_id was not
+ * marshalled at all...
+
+ struct server_id {
+ pid_t pid;
+ #ifdef CLUSTER_SUPPORT
+ uint32 vnn;
+ #endif
+ uint64_t unique_id;
+ };
+
+ */
+
+ typedef [public] struct {
+ hyper pid;
+ uint32 task_id;
+ uint32 vnn;
+ udlong unique_id;
+ } server_id;
+}
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 7e1340e..ffb7a9c 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -8,8 +8,9 @@ bld.SAMBA_PIDL_LIST('PIDL',
browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
- oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
+ oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
+ notify.idl
policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
printcap.idl''',
options='--header --ndr-parser --samba3-ndr-server --server --client --python',
diff --git a/librpc/wscript_build b/librpc/wscript_build
index d8b3fe7..a68ce47 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -175,6 +175,13 @@ bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
public_deps='ndr'
)
+bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
+ source='gen_ndr/ndr_server_id.c',
+ deps='ndr',
+ public_headers='gen_ndr/server_id.h',
+ header_path='gen_ndr'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
source='gen_ndr/ndr_trkwks.c',
public_deps='ndr'
@@ -195,6 +202,11 @@ bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
public_deps='ndr ndr-standard'
)
+bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
+ source='gen_ndr/ndr_notify.c',
+ public_deps='ndr ndr-standard NDR_SERVER_ID NDR_FILE_ID'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
source='ndr/ndr_ntlmssp.c gen_ndr/ndr_ntlmssp.c',
public_deps='ndr ndr-standard'
@@ -305,7 +317,8 @@ bld.SAMBA_LIBRARY('ndr-standard',
pc_files='ndr_standard.pc',
deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
- NDR_ECHO security NDR_DNS NDR_ATSVC NDR_SPOOLSS NDR_DSSETUP''',
+ NDR_ECHO security NDR_DNS NDR_ATSVC NDR_SPOOLSS NDR_DSSETUP
+ NDR_SERVER_ID NDR_NOTIFY''',
public_deps='ndr',
public_headers='gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/lsa.h gen_ndr/netlogon.h gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h',
header_path='gen_ndr'
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 7d5b70e..e59a6d8 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -536,7 +536,7 @@ static int _pam_winbind_init_context(pam_handle_t *pamh,
textdomain_init();
#endif
- r = TALLOC_ZERO_P(NULL, struct pwb_context);
+ r = talloc_zero(NULL, struct pwb_context);
if (!r) {
return PAM_BUF_ERR;
}
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2f65be4..595780a 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -866,6 +866,8 @@ sub provision($$$$$$$)
resolv:host file = $dns_host_file
+ message command = mv %s $shrdir/message.%m
+
# Begin extra options
$extra_options
# End extra options
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d4b59b9..a06c8c7 100644
--- a/source3/Makefile.in
--
Samba Shared Repository
More information about the samba-cvs
mailing list