[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Jan 8 07:03:03 UTC 2018
The branch, master has been updated
via fe164a0 selftest: close connections after tests in samba4.ldap.secdesc.python
via babf0a7 selftest: close connections after tests in samba4.ldap.acl.python
via eae6d76 docs-xml: mention that the man pages are "part of" version x
via 5621139 doc: document wins server's smb.conf parameters
via e3cc2af tests:docs: remove explicit exceptions for parametric options
via ece75ea tests:docs: don't try to test parametric option defaults
via 080d590 packaging: add configure option to preprocess and install systemd files
via 3089a56 crypto: Update the REQUIREMENTS
via ca66efc Add substitutions %t, %j, and %J as path-safe variants of %T, %i, and %I.
via d39664f define DBGC_AUTH class
via ce2ca7f Update util.c to include DBGC_AUTH class
via 9010d54 travis-ci: Update package list to match the wiki
from 7bc329f vfs_fileid: fix a use after free
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fe164a08ddfee8efd802ed27a90f24e8afe2789a
Author: Jamie McClymont <jamiemcclymont at catalyst.net.nz>
Date: Mon Jan 8 13:56:03 2018 +1300
selftest: close connections after tests in samba4.ldap.secdesc.python
This test suite had a memory impact of around 2.2GB, from LDAP connection
handlers under the standard process model.
Signed-off-by: Jamie McClymont <jamiemcclymont at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Jan 8 08:02:15 CET 2018 on sn-devel-144
commit babf0a7bef893873af35751b7a8c081d86d2ff6b
Author: Jamie McClymont <jamiemcclymont at catalyst.net.nz>
Date: Mon Jan 8 13:24:25 2018 +1300
selftest: close connections after tests in samba4.ldap.acl.python
Over the length of a run of this suite (which runs under the standard process
model), memory usage from LDAP connection handlers reaches 4GB. This patch
reduces it to a manageable amount.
Signed-off-by: Jamie McClymont <jamiemcclymont at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit eae6d76a366fdd7cfa65a5cf804759a1889976c8
Author: Björn Jacke <bjacke at samba.org>
Date: Wed Dec 13 01:38:25 2017 +0100
docs-xml: mention that the man pages are "part of" version x
writing that they are correct for version x is not always precise. But we're
working on that also :-)
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5621139fca76d8f52d203fda9f146e942cc1b624
Author: Bjoern Jacke <bjacke at samba.org>
Date: Fri Dec 8 14:52:24 2017 +0100
doc: document wins server's smb.conf parameters
this is from the WINS server, which was released earlier as samba4wins.
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit e3cc2af011640eb1077014f820c6fb60da204d92
Author: Björn Jacke <bjacke at samba.org>
Date: Wed Dec 20 21:35:54 2017 +0100
tests:docs: remove explicit exceptions for parametric options
we don't need to list them all as special cases because we exclude parametric
options generally now from the default value test.
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit ece75ea9a6f1fd0b86593287a22993482c7b2cc5
Author: Björn Jacke <bjacke at samba.org>
Date: Wed Dec 20 21:23:24 2017 +0100
tests:docs: don't try to test parametric option defaults
we don't get the values of the parametric options.
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 080d590de1ff9f8ebc55aeffaea8d41991466549
Author: Aurelien Aptel <aaptel at suse.com>
Date: Thu Dec 14 16:47:49 2017 +0100
packaging: add configure option to preprocess and install systemd files
Turn the systemd service files under packaging into template (.in) files
with @VAR@ substitutions and add configure options to install and tweak
them.
Signed-off-by: Aurelien Aptel <aaptel at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 3089a5660dd75e1396cd29dfb202a1d4ff1b7cfe
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 3 11:23:51 2018 +0100
crypto: Update the REQUIREMENTS
Update after call with the GnuTLS maintainer to see what is supported in
GnuTLS, what is working in FIPS mode or not, and what features we require
to move to GnuTLS in future. The benefit will be FIPS certification and
more hardware accelerated crypto.
Bugs have been opened against GnuTLS to implment the missing features or
add functions to declare use of old crypto functions as non-crypto use.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit ca66efc24181ba6a7a4c13397af514b0972b4855
Author: Dr. Thomas Orgis <thomas.orgis at uni-hamburg.de>
Date: Thu Jul 27 12:54:28 2017 +0200
Add substitutions %t, %j, and %J as path-safe variants of %T, %i, and %I.
Rationale: Using the existing substitutions in construction of paths
(dynamic shares, created on client connect) results in directory names with
colons and dots in them. Those can be hard to use when accessed from a
different share, as Windows does not allow : in paths and has some ideas about
dots.
Signed-off-by: Dr. Thomas Orgis <thomas.orgis at uni-hamburg.de>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit d39664fc66dafaf5cce2b830033df52da4d81695
Author: kkplein <heupink at merit.unu.edu>
Date: Tue Dec 19 10:49:10 2017 +0100
define DBGC_AUTH class
Signed-off-by: Mourik Jan C Heupink <heupink at merit.unu.edu>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ce2ca7fa89921a4ccdac018558025a9d650b0154
Author: kkplein <heupink at merit.unu.edu>
Date: Mon Dec 18 20:14:31 2017 +0100
Update util.c to include DBGC_AUTH class
Signed-off-by: Mourik Jan C Heupink <heupink at merit.unu.edu>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9010d54d6c5c0087f3a14f56e3907461d560a7f5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jan 8 10:31:50 2018 +1300
travis-ci: Update package list to match the wiki
This in turn is based on what we use at Catalyst minus some helpful packages like editors
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 2 +-
auth/credentials/credentials_krb5.c | 3 +
auth/credentials/credentials_ntlm.c | 3 +
auth/credentials/credentials_secrets.c | 3 +
auth/gensec/external.c | 3 +
auth/gensec/gensec.c | 3 +
auth/gensec/gensec_start.c | 3 +
auth/gensec/gensec_util.c | 3 +
auth/gensec/ncalrpc.c | 3 +
auth/gensec/schannel.c | 3 +
auth/gensec/spnego.c | 3 +
auth/kerberos/gssapi_helper.c | 3 +
auth/kerberos/gssapi_pac.c | 4 ++
auth/kerberos/kerberos_pac.c | 4 ++
auth/ntlmssp/gensec_ntlmssp_server.c | 3 +
auth/ntlmssp/ntlmssp.c | 3 +
auth/ntlmssp/ntlmssp_client.c | 3 +
auth/ntlmssp/ntlmssp_server.c | 3 +
auth/ntlmssp/ntlmssp_sign.c | 3 +
auth/ntlmssp/ntlmssp_util.c | 3 +
docs-xml/manpages/dbwrap_tool.1.xml | 2 +-
docs-xml/manpages/eventlogadm.8.xml | 2 +-
docs-xml/manpages/findsmb.1.xml | 2 +-
docs-xml/manpages/libsmbclient.7.xml | 2 +-
docs-xml/manpages/lmhosts.5.xml | 2 +-
docs-xml/manpages/log2pcap.1.xml | 2 +-
docs-xml/manpages/mvxattr.1.xml | 2 +-
docs-xml/manpages/nmbd.8.xml | 2 +-
docs-xml/manpages/nmblookup.1.xml | 2 +-
docs-xml/manpages/ntlm_auth.1.xml | 2 +-
docs-xml/manpages/pam_winbind.8.xml | 2 +-
docs-xml/manpages/pam_winbind.conf.5.xml | 2 +-
docs-xml/manpages/pdbedit.8.xml | 2 +-
docs-xml/manpages/profiles.1.xml | 2 +-
docs-xml/manpages/rpcclient.1.xml | 2 +-
docs-xml/manpages/samba-regedit.8.xml | 2 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 2 +-
docs-xml/manpages/smb.conf.5.xml | 21 ++++++-
docs-xml/manpages/smbcacls.1.xml | 2 +-
docs-xml/manpages/smbclient.1.xml | 2 +-
docs-xml/manpages/smbcontrol.1.xml | 2 +-
docs-xml/manpages/smbcquotas.1.xml | 2 +-
docs-xml/manpages/smbd.8.xml | 2 +-
docs-xml/manpages/smbget.1.xml | 2 +-
docs-xml/manpages/smbgetrc.5.xml | 2 +-
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbpasswd.8.xml | 2 +-
docs-xml/manpages/smbspool.8.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 2 +-
docs-xml/manpages/smbtar.1.xml | 2 +-
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 2 +-
docs-xml/manpages/vfs_aio_fork.8.xml | 2 +-
docs-xml/manpages/vfs_aio_pthread.8.xml | 2 +-
docs-xml/manpages/vfs_audit.8.xml | 2 +-
docs-xml/manpages/vfs_btrfs.8.xml | 2 +-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_cap.8.xml | 2 +-
docs-xml/manpages/vfs_catia.8.xml | 2 +-
docs-xml/manpages/vfs_ceph.8.xml | 2 +-
docs-xml/manpages/vfs_commit.8.xml | 2 +-
docs-xml/manpages/vfs_crossrename.8.xml | 2 +-
docs-xml/manpages/vfs_default_quota.8.xml | 2 +-
docs-xml/manpages/vfs_dirsort.8.xml | 2 +-
docs-xml/manpages/vfs_extd_audit.8.xml | 2 +-
docs-xml/manpages/vfs_fake_perms.8.xml | 2 +-
docs-xml/manpages/vfs_fileid.8.xml | 2 +-
docs-xml/manpages/vfs_full_audit.8.xml | 2 +-
docs-xml/manpages/vfs_glusterfs.8.xml | 2 +-
docs-xml/manpages/vfs_gpfs.8.xml | 2 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 2 +-
docs-xml/manpages/vfs_media_harmony.8.xml | 2 +-
docs-xml/manpages/vfs_netatalk.8.xml | 2 +-
docs-xml/manpages/vfs_offline.8.xml | 2 +-
docs-xml/manpages/vfs_prealloc.8.xml | 2 +-
docs-xml/manpages/vfs_preopen.8.xml | 2 +-
docs-xml/manpages/vfs_readahead.8.xml | 2 +-
docs-xml/manpages/vfs_readonly.8.xml | 2 +-
docs-xml/manpages/vfs_recycle.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 2 +-
docs-xml/manpages/vfs_shell_snap.8.xml | 2 +-
docs-xml/manpages/vfs_snapper.8.xml | 2 +-
docs-xml/manpages/vfs_syncops.8.xml | 2 +-
docs-xml/manpages/vfs_time_audit.8.xml | 2 +-
docs-xml/manpages/vfs_tsmsm.8.xml | 2 +-
docs-xml/manpages/vfs_unityed_media.8.xml | 2 +-
docs-xml/manpages/vfs_worm.8.xml | 2 +-
docs-xml/manpages/vfs_zfsacl.8.xml | 2 +-
docs-xml/manpages/vfstest.1.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 2 +-
docs-xml/manpages/winbind_krb5_locator.7.xml | 2 +-
docs-xml/manpages/winbindd.8.xml | 2 +-
.../wins/nbtd-wins_prepend1bto1cqueries.xml | 16 +++++
.../smbdotconf/wins/nbtd-wins_randomize1clist.xml | 19 ++++++
.../wins/nbtd-wins_randomize1clist_mask.xml | 16 +++++
docs-xml/smbdotconf/wins/winsdb-localowner.xml | 12 ++++
docs-xml/smbdotconf/wins/winsdb-nosync.xml | 11 ++++
.../smbdotconf/wins/wreplsrv-periodic_interval.xml | 14 +++++
.../wins/wreplsrv-propagate_name_releases.xml | 23 +++++++
.../wins/wreplsrv-scavenging_interval.xml | 11 ++++
.../wins/wreplsrv-tombstone_extra_timeout.xml | 12 ++++
.../wins/wreplsrv-tombstone_interval.xml | 12 ++++
.../smbdotconf/wins/wreplsrv-tombstone_timeout.xml | 12 ++++
.../smbdotconf/wins/wreplsrv-verify_interval.xml | 13 ++++
lib/crypto/REQUIREMENTS | 70 +++++++++++++++-------
lib/util/time.c | 51 ++++++++++++++++
lib/util/time.h | 15 +++++
packaging/systemd/{nmb.service => nmb.service.in} | 7 ++-
.../systemd/{samba.service => samba.service.in} | 7 ++-
packaging/systemd/{smb.service => smb.service.in} | 7 ++-
.../{winbind.service => winbind.service.in} | 7 ++-
packaging/wscript | 50 ++++++++++++++++
packaging/wscript_build | 16 +++++
python/samba/tests/docs.py | 11 ++--
source3/lib/substitute.c | 32 ++++++++++
source3/torture/torture.c | 53 ++++++++++++++++
source4/dsdb/common/util.c | 4 +-
source4/dsdb/tests/python/acl.py | 32 ++++++++++
source4/dsdb/tests/python/sec_descriptor.py | 5 ++
wscript | 4 ++
wscript_build | 1 +
124 files changed, 655 insertions(+), 118 deletions(-)
create mode 100644 docs-xml/smbdotconf/wins/nbtd-wins_prepend1bto1cqueries.xml
create mode 100644 docs-xml/smbdotconf/wins/nbtd-wins_randomize1clist.xml
create mode 100644 docs-xml/smbdotconf/wins/nbtd-wins_randomize1clist_mask.xml
create mode 100644 docs-xml/smbdotconf/wins/winsdb-localowner.xml
create mode 100644 docs-xml/smbdotconf/wins/winsdb-nosync.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-periodic_interval.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-propagate_name_releases.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-scavenging_interval.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-tombstone_extra_timeout.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-tombstone_interval.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-tombstone_timeout.xml
create mode 100644 docs-xml/smbdotconf/wins/wreplsrv-verify_interval.xml
rename packaging/systemd/{nmb.service => nmb.service.in} (62%)
rename packaging/systemd/{samba.service => samba.service.in} (62%)
rename packaging/systemd/{smb.service => smb.service.in} (62%)
rename packaging/systemd/{winbind.service => winbind.service.in} (59%)
create mode 100644 packaging/wscript
create mode 100644 packaging/wscript_build
Changeset truncated at 500 lines:
diff --git a/.travis.yml b/.travis.yml
index 4c68c72..645658b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libgpgme11-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-crypto python-dev python-dnspython python-gpgme python3-crypto python3-dev python3-dnspython python3-gpgme realpath screen xsltproc zlib1g-dev
+ - sudo apt-get install --assume-yes acl attr autoconf bind9utils bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb libjansson-dev krb5-user libacl1-dev libaio-dev libarchive-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libgpgme11-dev libjson-perl libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev nettle-dev perl perl-modules pkg-config python-all-dev python-crypto python-dbg python-dev python-dnspython python3-dnspython python-gpgme python3-gpgme python-markdown python3-markdown python3-dev xsltproc zlib1g-dev
script:
- git fetch --unshallow
diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 585203a..9da1aa0 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -35,6 +35,9 @@
#include "auth/kerberos/pac_utils.h"
#include "param/param.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
static void cli_credentials_invalidate_client_gss_creds(
struct cli_credentials *cred,
enum credentials_obtained obtained);
diff --git a/auth/credentials/credentials_ntlm.c b/auth/credentials/credentials_ntlm.c
index e6859bf..eed8924 100644
--- a/auth/credentials/credentials_ntlm.c
+++ b/auth/credentials/credentials_ntlm.c
@@ -28,6 +28,9 @@
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_internal.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
_PUBLIC_ NTSTATUS cli_credentials_get_ntlm_response(struct cli_credentials *cred, TALLOC_CTX *mem_ctx,
int *flags,
DATA_BLOB challenge,
diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c
index ed148fd..beb2928 100644
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -41,6 +41,9 @@
#include "lib/util/util_tdb.h"
#include "libds/common/roles.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/**
* Fill in credentials for the machine trust account, from the secrets database.
*
diff --git a/auth/gensec/external.c b/auth/gensec/external.c
index 0158045..300ce6b 100644
--- a/auth/gensec/external.c
+++ b/auth/gensec/external.c
@@ -28,6 +28,9 @@
#include "auth/gensec/gensec_proto.h"
#include "auth/gensec/gensec_toplevel_proto.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/* SASL/EXTERNAL is essentially a no-op; it is only usable when the transport
* layer is already mutually authenticated.
*/
diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index 61bff22..e021d0c 100644
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -31,6 +31,9 @@
#include "librpc/gen_ndr/dcerpc.h"
#include "auth/common_auth.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
_PRIVATE_ NTSTATUS gensec_may_reset_crypto(struct gensec_security *gensec_security,
bool full_reset)
{
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 4276620..50f4de7 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -33,6 +33,9 @@
#include "lib/util/samba_modules.h"
#include "lib/util/base64.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/* the list of currently registered GENSEC backends */
static const struct gensec_security_ops **generic_security_ops;
static int gensec_num_backends;
diff --git a/auth/gensec/gensec_util.c b/auth/gensec/gensec_util.c
index ca5e581..20c9c2a 100644
--- a/auth/gensec/gensec_util.c
+++ b/auth/gensec/gensec_util.c
@@ -26,6 +26,9 @@
#include "auth/common_auth.h"
#include "../lib/util/asn1.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
NTSTATUS gensec_generate_session_info_pac(TALLOC_CTX *mem_ctx,
struct gensec_security *gensec_security,
struct smb_krb5_context *smb_krb5_context,
diff --git a/auth/gensec/ncalrpc.c b/auth/gensec/ncalrpc.c
index 70b3bb5..7474b6a 100644
--- a/auth/gensec/ncalrpc.c
+++ b/auth/gensec/ncalrpc.c
@@ -30,6 +30,9 @@
#include "lib/param/param.h"
#include "tsocket.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
_PUBLIC_ NTSTATUS gensec_ncalrpc_as_system_init(TALLOC_CTX *ctx);
struct gensec_ncalrpc_state {
diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c
index 8e58e73..71e9afd 100644
--- a/auth/gensec/schannel.c
+++ b/auth/gensec/schannel.c
@@ -36,6 +36,9 @@
#include "lib/crypto/crypto.h"
#include "libds/common/roles.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
struct schannel_state {
struct gensec_security *gensec;
uint64_t seq_num;
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
index 9857e78..56f9be4 100644
--- a/auth/gensec/spnego.c
+++ b/auth/gensec/spnego.c
@@ -34,6 +34,9 @@
#include "lib/util/asn1.h"
#include "lib/util/base64.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
#undef strcasecmp
_PUBLIC_ NTSTATUS gensec_spnego_init(TALLOC_CTX *ctx);
diff --git a/auth/kerberos/gssapi_helper.c b/auth/kerberos/gssapi_helper.c
index b7ffb6c..52c953c 100644
--- a/auth/kerberos/gssapi_helper.c
+++ b/auth/kerberos/gssapi_helper.c
@@ -23,6 +23,9 @@
#include "auth/kerberos/pac_utils.h"
#include "auth/kerberos/gssapi_helper.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
size_t gssapi_get_sig_size(gss_ctx_id_t gssapi_context,
const gss_OID mech,
uint32_t gss_want_flags,
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index 253976a..b695671 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -19,6 +19,10 @@
*/
#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
#ifdef HAVE_KRB5
#include "auth/kerberos/pac_utils.h"
diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c
index 7b6efdc..0ab0e9a 100644
--- a/auth/kerberos/kerberos_pac.c
+++ b/auth/kerberos/kerberos_pac.c
@@ -23,6 +23,10 @@
*/
#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
#ifdef HAVE_KRB5
#include "librpc/gen_ndr/ndr_krb5pac.h"
diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c
index 561c7cf..c0e6cff 100644
--- a/auth/ntlmssp/gensec_ntlmssp_server.c
+++ b/auth/ntlmssp/gensec_ntlmssp_server.c
@@ -37,6 +37,9 @@
#include "param/loadparm.h"
#include "libds/common/roles.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/**
* Return the credentials of a logged on user, including session keys
* etc.
diff --git a/auth/ntlmssp/ntlmssp.c b/auth/ntlmssp/ntlmssp.c
index 36e7052..37434fb 100644
--- a/auth/ntlmssp/ntlmssp.c
+++ b/auth/ntlmssp/ntlmssp.c
@@ -33,6 +33,9 @@ struct auth_session_info;
#include "auth/gensec/gensec.h"
#include "auth/gensec/gensec_internal.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/**
* Callbacks for NTLMSSP - for both client and server operating modes
*
diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c
index 5edd5f4..db2003f 100644
--- a/auth/ntlmssp/ntlmssp_client.c
+++ b/auth/ntlmssp/ntlmssp_client.c
@@ -36,6 +36,9 @@ struct auth_session_info;
#include "../auth/ntlmssp/ntlmssp_ndr.h"
#include "../nsswitch/libwbclient/wbclient.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/*********************************************************************
Client side NTLMSSP
*********************************************************************/
diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c
index 417352b..37ed2bc 100644
--- a/auth/ntlmssp/ntlmssp_server.c
+++ b/auth/ntlmssp/ntlmssp_server.c
@@ -37,6 +37,9 @@
#include "param/loadparm.h"
#include "libcli/security/session.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
/**
* Determine correct target name flags for reply, given server role
* and negotiated flags
diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
index ad0f9e9..09b7e5a 100644
--- a/auth/ntlmssp/ntlmssp_sign.c
+++ b/auth/ntlmssp/ntlmssp_sign.c
@@ -26,6 +26,9 @@
#include "../lib/crypto/crc32.h"
#include "../auth/ntlmssp/ntlmssp_private.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
#define CLI_SIGN "session key to client-to-server signing key magic constant"
#define CLI_SEAL "session key to client-to-server sealing key magic constant"
#define SRV_SIGN "session key to server-to-client signing key magic constant"
diff --git a/auth/ntlmssp/ntlmssp_util.c b/auth/ntlmssp/ntlmssp_util.c
index 9c7325a..6f3b474 100644
--- a/auth/ntlmssp/ntlmssp_util.c
+++ b/auth/ntlmssp/ntlmssp_util.c
@@ -25,6 +25,9 @@
#include "../auth/ntlmssp/ntlmssp.h"
#include "../auth/ntlmssp/ntlmssp_private.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
static void debug_ntlmssp_flags_raw(int level, uint32_t flags)
{
#define _PRINT_FLAG_LINE(v) do { \
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index 91b49bb..c2d9c30 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -169,7 +169,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/eventlogadm.8.xml b/docs-xml/manpages/eventlogadm.8.xml
index 69e90c1..f567d92 100644
--- a/docs-xml/manpages/eventlogadm.8.xml
+++ b/docs-xml/manpages/eventlogadm.8.xml
@@ -276,7 +276,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/findsmb.1.xml b/docs-xml/manpages/findsmb.1.xml
index aa8e572..63233e2 100644
--- a/docs-xml/manpages/findsmb.1.xml
+++ b/docs-xml/manpages/findsmb.1.xml
@@ -118,7 +118,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of
+ <para>This man page is part of version &doc.version; of
the Samba suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/libsmbclient.7.xml b/docs-xml/manpages/libsmbclient.7.xml
index 9c33523..8dab4d0 100644
--- a/docs-xml/manpages/libsmbclient.7.xml
+++ b/docs-xml/manpages/libsmbclient.7.xml
@@ -120,7 +120,7 @@
<title>VERSION</title>
<para>
- This man page is correct for version &doc.version; of the Samba suite.
+ This man page is part of version &doc.version; of the Samba suite.
</para>
</refsect1>
diff --git a/docs-xml/manpages/lmhosts.5.xml b/docs-xml/manpages/lmhosts.5.xml
index a332706..39bfcf8 100644
--- a/docs-xml/manpages/lmhosts.5.xml
+++ b/docs-xml/manpages/lmhosts.5.xml
@@ -93,7 +93,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml
index 2cb7ed1..fafe6de 100644
--- a/docs-xml/manpages/log2pcap.1.xml
+++ b/docs-xml/manpages/log2pcap.1.xml
@@ -103,7 +103,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/mvxattr.1.xml b/docs-xml/manpages/mvxattr.1.xml
index 977db9f..59048ce 100644
--- a/docs-xml/manpages/mvxattr.1.xml
+++ b/docs-xml/manpages/mvxattr.1.xml
@@ -83,7 +83,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index 7fe7f9f..c145e82 100644
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
@@ -258,7 +258,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of
+ <para>This man page is part of version &doc.version; of
the Samba suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index 55a4cc6..c633e07 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -190,7 +190,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of
+ <para>This man page is part of version &doc.version; of
the Samba suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml
index e84b081..4f900d5 100644
--- a/docs-xml/manpages/ntlm_auth.1.xml
+++ b/docs-xml/manpages/ntlm_auth.1.xml
@@ -450,7 +450,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba
+ <para>This man page is part of version &doc.version; of the Samba
suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
index fdda333..f57a928 100644
--- a/docs-xml/manpages/pam_winbind.8.xml
+++ b/docs-xml/manpages/pam_winbind.8.xml
@@ -253,7 +253,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of Samba.</para>
+ <para>This man page is part of version &doc.version; of Samba.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index 4ba9fe2..537007b 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -201,7 +201,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of Samba.</para>
+ <para>This man page is part of version &doc.version; of Samba.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml
index 8766bf0..1cabc0b 100644
--- a/docs-xml/manpages/pdbedit.8.xml
+++ b/docs-xml/manpages/pdbedit.8.xml
@@ -537,7 +537,7 @@ account policy value for bad lockout attempt is now 3
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of
+ <para>This man page is part of version &doc.version; of
the Samba suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/profiles.1.xml b/docs-xml/manpages/profiles.1.xml
index 151d2f2..012f843 100644
--- a/docs-xml/manpages/profiles.1.xml
+++ b/docs-xml/manpages/profiles.1.xml
@@ -72,7 +72,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba
+ <para>This man page is part of version &doc.version; of the Samba
suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index b53b46e..1e167f8 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -534,7 +534,7 @@ Comma Separated list of Files
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba
+ <para>This man page is part of version &doc.version; of the Samba
suite.</para>
</refsect1>
diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
index 8a81ee3..719b5e1 100644
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -71,7 +71,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the Samba suite.</para>
+ <para>This man page is part of version &doc.version; of the Samba suite.</para>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index df1d5a5..761c8d3 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -294,7 +294,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version &doc.version; of the
+ <para>This man page is part of version &doc.version; of the
Samba suite. </para>
--
Samba Shared Repository
More information about the samba-cvs
mailing list