The branch, master has been updated
via abe7648609949847c15089cb5096176eba8a6dfa (commit)
via 53196955d47293ebf5956ddbdbbbc131e7116a78 (commit)
from 1b09e36f0bc1942a5156715db21aed1ad403800e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit abe7648609949847c15089cb5096176eba8a6dfa
Author: Günther Deschner <g...@samba.org>
Date: Mon Aug 17 16:49:24 2009 +0200
netlogon: document some more MSVC flags.
Some of these were observed during password changing
from win7 using a samba 3.4 PDC.
Guenther
commit 53196955d47293ebf5956ddbdbbbc131e7116a78
Author: Günther Deschner <g...@samba.org>
Date: Wed Aug 12 14:59:44 2009 +0200
s3-spoolss: remove another duplicate copy of print_architecture_table.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_netlogon.c | 13 +++++++++++++
librpc/gen_ndr/netlogon.h | 13 +++++++++++++
librpc/idl/netlogon.idl | 15 ++++++++++++++-
source3/rpc_server/srv_spoolss_nt.c | 35 ++++++++++++-----------------------
4 files changed, 52 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c
index 30c8d9d..18969ec 100644
--- a/librpc/gen_ndr/ndr_netlogon.c
+++ b/librpc/gen_ndr/ndr_netlogon.c
@@ -296,9 +296,22 @@ _PUBLIC_ void ndr_print_netr_LogonParameterControl(struct
ndr_print *ndr, const
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_CLEARTEXT_PASSWORD_ALLOWED", MSV1_0_CLEARTEXT_PASSWORD_ALLOWED, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_UPDATE_LOGON_STATISTICS", MSV1_0_UPDATE_LOGON_STATISTICS, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_RETURN_USER_PARAMETERS", MSV1_0_RETURN_USER_PARAMETERS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_DONT_TRY_GUEST_ACCOUNT", MSV1_0_DONT_TRY_GUEST_ACCOUNT, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT", MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_RETURN_PASSWORD_EXPIRY", MSV1_0_RETURN_PASSWORD_EXPIRY, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_USE_CLIENT_CHALLENGE", MSV1_0_USE_CLIENT_CHALLENGE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_TRY_GUEST_ACCOUNT_ONLY", MSV1_0_TRY_GUEST_ACCOUNT_ONLY, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_RETURN_PROFILE_PATH", MSV1_0_RETURN_PROFILE_PATH, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY", MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY, r);
ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT",
MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_DISABLE_PERSONAL_FALLBACK", MSV1_0_DISABLE_PERSONAL_FALLBACK, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_ALLOW_FORCE_GUEST", MSV1_0_ALLOW_FORCE_GUEST, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED", MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY", MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_ALLOW_MSVCHAPV2",
MSV1_0_ALLOW_MSVCHAPV2, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "MSV1_0_S4U2SELF",
MSV1_0_S4U2SELF, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_CHECK_LOGONHOURS_FOR_S4U", MSV1_0_CHECK_LOGONHOURS_FOR_S4U, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t),
"MSV1_0_SUBAUTHENTICATION_DLL_EX", MSV1_0_SUBAUTHENTICATION_DLL_EX, r);
ndr->depth--;
}
diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h
index 6f62107..28307ff 100644
--- a/librpc/gen_ndr/netlogon.h
+++ b/librpc/gen_ndr/netlogon.h
@@ -53,9 +53,22 @@ struct netr_AcctLockStr {
#define MSV1_0_CLEARTEXT_PASSWORD_ALLOWED ( 0x00000002 )
#define MSV1_0_UPDATE_LOGON_STATISTICS ( 0x00000004 )
#define MSV1_0_RETURN_USER_PARAMETERS ( 0x00000008 )
+#define MSV1_0_DONT_TRY_GUEST_ACCOUNT ( 0x00000010 )
#define MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT ( 0x00000020 )
+#define MSV1_0_RETURN_PASSWORD_EXPIRY ( 0x00000040 )
+#define MSV1_0_USE_CLIENT_CHALLENGE ( 0x00000080 )
+#define MSV1_0_TRY_GUEST_ACCOUNT_ONLY ( 0x00000100 )
#define MSV1_0_RETURN_PROFILE_PATH ( 0x00000200 )
+#define MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY ( 0x00000400 )
#define MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT ( 0x00000800 )
+#define MSV1_0_DISABLE_PERSONAL_FALLBACK ( 0x00001000 )
+#define MSV1_0_ALLOW_FORCE_GUEST ( 0x00002000 )
+#define MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED ( 0x00004000 )
+#define MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY ( 0x00008000 )
+#define MSV1_0_ALLOW_MSVCHAPV2 ( 0x00010000 )
+#define MSV1_0_S4U2SELF ( 0x00020000 )
+#define MSV1_0_CHECK_LOGONHOURS_FOR_S4U ( 0x00040000 )
+#define MSV1_0_SUBAUTHENTICATION_DLL_EX ( 0x00100000 )
struct netr_IdentityInfo {
struct lsa_String domain_name;
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 1b3ef45..c34059a 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -108,9 +108,22 @@ interface netlogon
MSV1_0_CLEARTEXT_PASSWORD_ALLOWED = 0x00000002,
MSV1_0_UPDATE_LOGON_STATISTICS = 0x00000004,
MSV1_0_RETURN_USER_PARAMETERS = 0x00000008,
+ MSV1_0_DONT_TRY_GUEST_ACCOUNT = 0x00000010,
MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT = 0x00000020,
+ MSV1_0_RETURN_PASSWORD_EXPIRY = 0x00000040,
+ MSV1_0_USE_CLIENT_CHALLENGE = 0x00000080,
+ MSV1_0_TRY_GUEST_ACCOUNT_ONLY = 0x00000100,
MSV1_0_RETURN_PROFILE_PATH = 0x00000200,
- MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT = 0x00000800
+ MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY = 0x00000400,
+ MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT = 0x00000800,
+ MSV1_0_DISABLE_PERSONAL_FALLBACK = 0x00001000,
+ MSV1_0_ALLOW_FORCE_GUEST = 0x00002000,
+ MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED = 0x00004000,
+ MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY = 0x00008000,
+ MSV1_0_ALLOW_MSVCHAPV2 = 0x00010000,
+ MSV1_0_S4U2SELF = 0x00020000,
+ MSV1_0_CHECK_LOGONHOURS_FOR_S4U = 0x00040000,
+ MSV1_0_SUBAUTHENTICATION_DLL_EX = 0x00100000
} netr_LogonParameterControl;
typedef struct {
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index e535f26..cd14b5e 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2057,20 +2057,21 @@ WERROR _spoolss_DeletePrinter(pipes_struct *p,
* long architecture string
******************************************************************/
+static const struct print_architecture_table_node archi_table[]= {
+
+ {"Windows 4.0", SPL_ARCH_WIN40, 0 },
+ {"Windows NT x86", SPL_ARCH_W32X86, 2 },
+ {"Windows NT R4000", SPL_ARCH_W32MIPS, 2 },
+ {"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 },
+ {"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 },
+ {"Windows IA64", SPL_ARCH_IA64, 3 },
+ {"Windows x64", SPL_ARCH_X64, 3 },
+ {NULL, "", -1 }
+};
+
static int get_version_id(const char *arch)
{
int i;
- struct print_architecture_table_node archi_table[]= {
-
- {"Windows 4.0", "WIN40", 0 },
- {"Windows NT x86", "W32X86", 2 },
- {"Windows NT R4000", "W32MIPS", 2 },
- {"Windows NT Alpha_AXP", "W32ALPHA", 2 },
- {"Windows NT PowerPC", "W32PPC", 2 },
- {"Windows IA64", "IA64", 3 },
- {"Windows x64", "x64", 3 },
- {NULL, "", -1 }
- };
for (i=0; archi_table[i].long_archi != NULL; i++)
{
@@ -6714,18 +6715,6 @@ WERROR _spoolss_SetJob(pipes_struct *p,
return errcode;
}
-static const struct print_architecture_table_node archi_table[]= {
-
- {"Windows 4.0", SPL_ARCH_WIN40, 0 },
- {"Windows NT x86", SPL_ARCH_W32X86, 2 },
- {"Windows NT R4000", SPL_ARCH_W32MIPS, 2 },
- {"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 },
- {"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 },
- {"Windows IA64", SPL_ARCH_IA64, 3 },
- {"Windows x64", SPL_ARCH_X64, 3 },
- {NULL, "", -1 }
-};
-
/****************************************************************************
Enumerates all printer drivers by level and architecture.
****************************************************************************/
--
Samba Shared Repository
