[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Tue Jan 14 20:03:03 MST 2014
The branch, master has been updated
via 497a8dd smbd: Avoid duplicate debug header lines
via 666948c s3: set native os according to Windows and NBT_ANNOUNCE_VERSION defines
via 4701e19 smbcontrol: fix NUM_CHILDREN message deregister
from 2c2f175 Revert "pam_winbind: fix segfault in pam_sm_authenticate()"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 497a8dddc4901c9df1c30d0251b5706ff11ca6bd
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 10 13:02:59 2014 +0100
smbd: Avoid duplicate debug header lines
This is what gets created in log.smbd: DEBUGLVL generates an empty
header line, CHECK_DEBUGLVL avoids this.
[2014/01/10 12:58:24.971658, 10, pid=2329, effective(1001, 1001), real(0, 0)] ../source3/smbd/smbXsrv_open.c:696(smbXsrv_open_global_store)
[2014/01/10 12:58:24.971690, 10, pid=2329, effective(1001, 1001), real(0, 0)] ../source3/smbd/smbXsrv_open.c:698(smbXsrv_open_global_store)
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Jan 15 04:02:58 CET 2014 on sn-devel-104
commit 666948c776948a8147501d2ba590bcd05e78458d
Author: Björn Jacke <bj at sernet.de>
Date: Tue Jan 7 15:57:50 2014 +0100
s3: set native os according to Windows and NBT_ANNOUNCE_VERSION defines
When the native os in sessionsetup is "Unix" then broken Konica Minolta
printers refuse to talk to those CIFS servers. Other CIFS servers also announce
themselves with native os Windows. Let's do the same to improve
interoperability with broken devices like those printers from Konica Minolta.
Thanks to Daniel Hoffmann for finding and reporting this Konika printer
brokenness.
https://bugzilla.samba.org/show_bug.cgi?id=10168
Signed-off-by: Bjoern Jacke <bj at sernet.de>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 4701e198957a6391f136824b844dc47a8191fb13
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Jan 14 14:45:06 2014 -0800
smbcontrol: fix NUM_CHILDREN message deregister
smbcontrol registers for MSG_SMB_NUM_CHILDREN response messages before
sending a MSG_SMB_TELL_NUM_CHILDREN request.
The same MSG_SMB_NUM_CHILDREN response message should be deregistered.
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Christof Schmit <cs at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/sesssetup.c | 6 +++++-
source3/smbd/smbXsrv_open.c | 14 +++++++-------
source3/utils/smbcontrol.c | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 4728759..02cb445 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -46,10 +46,14 @@ static int push_signature(uint8 **outbuf)
{
char *lanman;
int result, tmp;
+ fstring native_os;
result = 0;
- tmp = message_push_string(outbuf, "Unix", STR_TERMINATE);
+ fstr_sprintf(native_os, "Windows %d.%d", SAMBA_MAJOR_NBT_ANNOUNCE_VERSION,
+ SAMBA_MINOR_NBT_ANNOUNCE_VERSION);
+
+ tmp = message_push_string(outbuf, native_os, STR_TERMINATE);
if (tmp == -1) return -1;
result += tmp;
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 25dc6f7..3566dc2 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -600,7 +600,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
}
DEBUG(10,("smbXsrv_open_global_verify_record\n"));
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
}
@@ -626,7 +626,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
"key '%s' server_id %s does not exist.\n",
hex_encode_talloc(frame, key.dptr, key.dsize),
server_id_str(frame, &global->server_id)));
- if (DEBUGLVL(2)) {
+ if (CHECK_DEBUGLVL(2)) {
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
}
TALLOC_FREE(frame);
@@ -692,7 +692,7 @@ static NTSTATUS smbXsrv_open_global_store(struct smbXsrv_open_global0 *global)
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
DEBUG(10,("smbXsrv_open_global_store: key '%s' stored\n",
hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
@@ -859,7 +859,7 @@ NTSTATUS smbXsrv_open_create(struct smbXsrv_connection *conn,
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -930,7 +930,7 @@ NTSTATUS smbXsrv_open_update(struct smbXsrv_open *op)
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -1008,7 +1008,7 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
error = status;
}
- if (NT_STATUS_IS_OK(status) && DEBUGLVL(10)) {
+ if (NT_STATUS_IS_OK(status) && CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
@@ -1270,7 +1270,7 @@ NTSTATUS smb2srv_open_recreate(struct smbXsrv_connection *conn,
return status;
}
- if (DEBUGLVL(10)) {
+ if (CHECK_DEBUGLVL(10)) {
struct smbXsrv_openB open_blob;
ZERO_STRUCT(open_blob);
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 579aa10..7299bc4 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -963,7 +963,7 @@ static bool do_num_children(struct tevent_context *ev_ctx,
if (num_replies == 0)
printf("No replies received\n");
- messaging_deregister(msg_ctx, MSG_SMB_TELL_NUM_CHILDREN, NULL);
+ messaging_deregister(msg_ctx, MSG_SMB_NUM_CHILDREN, NULL);
return num_replies;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list