The branch, v3-3-test has been updated
via 60649a74cdf2594bc89c301025f86d23caba91c2 (commit)
via 14e022b95140441850f7ef4bded8ee82deae2d6f (commit)
from 14caf928ebcc3e7beff507eb77961e6642e1713a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 60649a74cdf2594bc89c301025f86d23caba91c2
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Mon Aug 25 11:36:56 2008 +0200
auth: Fix build warning.
Guenther
(cherry picked from commit 4661ef625a6522d6f859b83e3e3702f01d0b952f)
commit 14e022b95140441850f7ef4bded8ee82deae2d6f
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Aug 22 00:20:46 2008 +0200
rpc_server: make it a little more obvious what flags we send to a client.
Guenther
(cherry picked from commit f3791e03ab09cadb1f54e32e67f4dfb3cf42e708)
-----------------------------------------------------------------------
Summary of changes:
source/auth/pampass.c | 5 +++--
source/rpc_server/srv_netlog_nt.c | 11 ++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 58921bd..9345eed 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -63,6 +63,7 @@ typedef int (*smb_pam_conv_fn)(int, const struct pam_message
**, struct pam_resp
* Macros to help make life easy
*/
#define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
/*******************************************************************
PAM error handler.
@@ -327,7 +328,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(100,("smb_pam_passchange_conv:
PAM_PROMPT_ECHO_ON: We actualy sent: %s\n", current_reply));
#endif
reply[replies].resp_retcode =
PAM_SUCCESS;
- reply[replies].resp =
COPY_STRING(current_reply);
+ reply[replies].resp =
COPY_FSTRING(current_reply);
found = True;
break;
}
@@ -355,7 +356,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(10,("smb_pam_passchange_conv:
PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
pwd_sub(current_reply,
udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
reply[replies].resp_retcode =
PAM_SUCCESS;
- reply[replies].resp =
COPY_STRING(current_reply);
+ reply[replies].resp =
COPY_FSTRING(current_reply);
#ifdef DEBUG_PASSWORD
DEBUG(100,("smb_pam_passchange_conv:
PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
#endif
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index 7ece482..4e211cf 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -521,7 +521,16 @@ NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
return NT_STATUS_ACCESS_DENIED;
}
- srv_flgs = 0x000001ff;
+ /* 0x000001ff */
+ srv_flgs = NETLOGON_NEG_ACCOUNT_LOCKOUT |
+ NETLOGON_NEG_PERSISTENT_SAMREPL |
+ NETLOGON_NEG_ARCFOUR |
+ NETLOGON_NEG_PROMOTION_COUNT |
+ NETLOGON_NEG_CHANGELOG_BDC |
+ NETLOGON_NEG_FULL_SYNC_REPL |
+ NETLOGON_NEG_MULTIPLE_SIDS |
+ NETLOGON_NEG_REDO |
+ NETLOGON_NEG_PASSWORD_CHANGE_REFUSAL;
if (lp_server_schannel() != false) {
srv_flgs |= NETLOGON_NEG_SCHANNEL;
--
Samba Shared Repository
