The branch, master has been updated
via 0137105 s4-auth: Fix some debugging and crash in error cases
via c4267ce smbd: Remove dead code
from 0886637 ctdb-recoverd: Reload remote IPs as part of takeover run
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0137105c862073f5a4422bcd424a51de33e58d37
Author: Günther Deschner <[email protected]>
Date: Thu Sep 24 20:45:04 2015 +0200
s4-auth: Fix some debugging and crash in error cases
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Nov 13 01:43:36 CET 2015 on sn-devel-104
commit c4267ce124427fb856f13b636af10ec0314d5b79
Author: Volker Lendecke <[email protected]>
Date: Thu Nov 12 21:09:35 2015 +0100
smbd: Remove dead code
94f0716fff has removed the dcelogin_atmost_once variable.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/include/smb.h | 5 -----
source3/smbd/server.c | 4 ----
source3/smbd/server_exit.c | 6 ------
source4/auth/ntlm/auth_winbind.c | 15 ++++++++++-----
4 files changed, 10 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 751b0e6..d1d7a81 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -484,11 +484,6 @@ Offset Data length.
#define SMB_SUCCESS 0 /* The request was successful. */
-#ifdef WITH_DFS
-void dfs_unlogin(void);
-extern int dcelogin_atmost_once;
-#endif
-
#ifdef NOSTRDUP
char *strdup(char *s);
#endif
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index de0bf24..72c4642 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -97,10 +97,6 @@ extern void start_fssd(struct tevent_context *ev_ctx,
extern void start_mdssd(struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx);
-#ifdef WITH_DFS
-extern int dcelogin_atmost_once;
-#endif /* WITH_DFS */
-
/*******************************************************************
What to do when smb.conf is updated.
********************************************************************/
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 7f1bbbd..bf50394 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -178,12 +178,6 @@ static void exit_server_common(enum server_exit_reason how,
serverid_deregister(messaging_server_id(msg_ctx));
}
-#ifdef WITH_DFS
- if (dcelogin_atmost_once) {
- dfs_unlogin();
- }
-#endif
-
#ifdef USE_DMAPI
/* Destroy Samba DMAPI session only if we are master smbd process */
if (am_parent) {
diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index 26d2d07..aed893d 100644
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/auth_winbind.c
@@ -193,9 +193,9 @@ static NTSTATUS winbind_check_password_wbclient(struct
auth_method_context *ctx,
params.domain_name = user_info->client.domain_name;
params.workstation_name = user_info->workstation_name;
- d_fprintf(stderr, "looking up %s@%s logging in from %s\n",
+ DEBUG(5,("looking up %s@%s logging in from %s\n",
params.account_name, params.domain_name,
- params.workstation_name);
+ params.workstation_name));
memcpy(params.password.response.challenge,
ctx->auth_ctx->challenge.data.data,
@@ -213,15 +213,20 @@ static NTSTATUS winbind_check_password_wbclient(struct
auth_method_context *ctx,
wbc_status = wbcAuthenticateUserEx(¶ms, &info, &err);
if (wbc_status == WBC_ERR_AUTH_ERROR) {
- DEBUG(1, ("error was %s (0x%08x)\nerror message was '%s'\n",
- err->nt_string, err->nt_status, err->display_string));
-
+ if (err) {
+ DEBUG(1, ("error was %s (0x%08x)\nerror message was
'%s'\n",
+ err->nt_string, err->nt_status,
err->display_string));
+ }
nt_status = NT_STATUS(err->nt_status);
wbcFreeMemory(err);
NT_STATUS_NOT_OK_RETURN(nt_status);
} else if (!WBC_ERROR_IS_OK(wbc_status)) {
DEBUG(1, ("wbcAuthenticateUserEx: failed with %u - %s\n",
wbc_status, wbcErrorString(wbc_status)));
+ if (err) {
+ DEBUG(1, ("error was %s (0x%08x)\nerror message was
'%s'\n",
+ err->nt_string, err->nt_status,
err->display_string));
+ }
return NT_STATUS_LOGON_FAILURE;
}
info3 = wbcAuthUserInfo_to_netr_SamInfo3(mem_ctx, info);
--
Samba Shared Repository
