From ff98d7f9ce1213aeff3d196d8f415303974ffd77 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 19 Dec 2008 08:18:57 +1100 Subject: Fix failures setting a random password The test in extract_pw_from_buffer was incorrect: It tested if the first byte of the new password was 0 (a 1/256 chance for the random passwords), not if the password was allocated. Andrew Bartlett --- source4/libcli/auth/smbencrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index b902dddb0f..bbb363e0dd 100644 --- a/source4/libcli/auth/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c @@ -585,7 +585,7 @@ bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx, *new_pass = data_blob_talloc(mem_ctx, &in_buffer[512 - byte_len], byte_len); - if (!*new_pass->data) { + if (!new_pass->data) { return false; } -- cgit From f52fc2f90ebf314de71f7150093bd641c3989b3c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 19 Dec 2008 09:47:59 +1100 Subject: Move aggregate schema stub to it's own file This should make it easier to import just the schema entries from the WSPP docs. Andrew Bartlett --- source4/scripting/python/samba/provision.py | 2 ++ source4/setup/aggregate_schema.ldif | 3 +++ source4/setup/schema.ldif | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 source4/setup/aggregate_schema.ldif (limited to 'source4') diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index b81f618a48..3711ed7bab 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -830,6 +830,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp, message("Setting up sam.ldb AD schema") setup_add_ldif(samdb, setup_path("schema.ldif"), {"SCHEMADN": names.schemadn}) + setup_add_ldif(samdb, setup_path("aggregate_schema.ldif"), + {"SCHEMADN": names.schemadn}) message("Setting up sam.ldb configuration data") setup_add_ldif(samdb, setup_path("provision_configuration.ldif"), { diff --git a/source4/setup/aggregate_schema.ldif b/source4/setup/aggregate_schema.ldif new file mode 100644 index 0000000000..2726704719 --- /dev/null +++ b/source4/setup/aggregate_schema.ldif @@ -0,0 +1,3 @@ +dn: CN=Aggregate,${SCHEMADN} +objectClass: top +objectClass: subSchema diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif index 40ef709ac3..56eb7ce0c0 100644 --- a/source4/setup/schema.ldif +++ b/source4/setup/schema.ldif @@ -10373,6 +10373,3 @@ systemFlags: 16 defaultHidingValue: TRUE defaultObjectCategory: CN=Group-Policy-Container,${SCHEMADN} -dn: CN=Aggregate,${SCHEMADN} -objectClass: top -objectClass: subSchema -- cgit From d031472227b44d040698e6dff52dc79028fde854 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Thu, 18 Dec 2008 15:01:07 -0800 Subject: s4: Fix include path to work with tevent --- source4/ntvfs/sysdep/sys_notify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index a27386bb13..117d16d20a 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -25,7 +25,7 @@ #include "includes.h" #include "system/filesys.h" #include "ntvfs/sysdep/sys_notify.h" -#include "lib/events/events.h" +#include "../lib/tevent/tevent.h" #include "../lib/util/dlinklist.h" #include "param/param.h" -- cgit From a937a68826919ee1ed70e90c9173f07761f2f990 Mon Sep 17 00:00:00 2001 From: "Stefan (metze) Metzmacher" Date: Fri, 19 Dec 2008 10:34:47 +1100 Subject: Here's the prefixMap from w2k8. We need to move 1.3.6.1.4.1.7165.4.1 and 1.3.6.1.4.1.7165.4.2 to the end...(if we still need them, which we should avoid) metze Signed-off-by: Andrew Bartlett --- source4/setup/prefixMap.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/setup/prefixMap.txt b/source4/setup/prefixMap.txt index 8ba9b9531c..267098000b 100644 --- a/source4/setup/prefixMap.txt +++ b/source4/setup/prefixMap.txt @@ -30,5 +30,12 @@ 29:1.3.6.1.4.1.250.1 30:1.2.840.113549.1.9 31:0.9.2342.19200300.100.4 -32:1.3.6.1.4.1.7165.4.1 -33:1.3.6.1.4.1.7165.4.2 +32:1.2.840.113556.1.6.23 +33:1.2.840.113556.1.6.18.1 +34:1.2.840.113556.1.6.18.2 +35:1.2.840.113556.1.6.13.3 +36:1.2.840.113556.1.6.13.4 +37:1.3.6.1.1.1.1 +38:1.3.6.1.1.1.2 +39:1.3.6.1.4.1.7165.4.1 +40:1.3.6.1.4.1.7165.4.2 -- cgit From 43f232fcc9b3243781fa3c729f046a737be16720 Mon Sep 17 00:00:00 2001 From: Sreepathi Pai Date: Fri, 19 Dec 2008 10:35:52 +1100 Subject: Fix errors in MS-AD_Schema_Attributes_v20080618.txt - Remove spurious line breaks - Add missing attributeId from docs - Remove incorrect multiple values of systemFlags - Fix duplicate attributeId - Fix schemaIdGuid syntax Signed-off-by: Andrew Bartlett --- .../MS-AD_Schema_Attributes_v20080618.txt | 39 ++++------------------ .../ad-schema/MS-AD_Schema_Classes_v20080618.txt | 6 ++-- 2 files changed, 9 insertions(+), 36 deletions(-) (limited to 'source4') diff --git a/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt b/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt index 324a5bf3f9..743e1d0abe 100644 --- a/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt +++ b/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt @@ -1654,7 +1654,6 @@ searchFlags: 0 rangeLower: 1 rangeUpper: 512 mapiID: 35943 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Employee-Type @@ -1669,7 +1668,6 @@ searchFlags: fCOPY rangeLower: 1 rangeUpper: 256 mapiID: 35945 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Enabled @@ -1756,7 +1754,6 @@ searchFlags: 0 mapiID: 32935 systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL - systemOnly: TRUE cn: Extended-Class-Info @@ -2722,8 +2719,6 @@ mapiID: 14857 isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT -systemFlags: 0 - cn: Address-Home ldapDisplayName: homePostalAddress attributeId: 1.2.840.113556.1.2.617 @@ -2737,7 +2732,6 @@ rangeLower: 1 rangeUpper: 4096 attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1 mapiID: 14941 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: host @@ -2978,8 +2972,6 @@ mapiID: 32959 systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL -searchFlags: 0 - cn: IpHostNumber ldapDisplayName: ipHostNumber attributeId: 1.3.6.1.1.1.1.19 @@ -6280,7 +6272,7 @@ isSingleValued: TRUE systemOnly: FALSE searchFlags: 0 rangeLower: 0 -schemaIdGuid:: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2 +schemaIdGuid: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2 systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL @@ -6294,7 +6286,7 @@ systemOnly: FALSE searchFlags: 0 rangeLower: 0 rangeUpper: 65535 -schemaIdGuid:: b8c8c35e-4a19-4a95-99d0-69fe4446286f +schemaIdGuid: b8c8c35e-4a19-4a95-99d0-69fe4446286f systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL @@ -6307,7 +6299,7 @@ isSingleValued: TRUE systemOnly: FALSE searchFlags: 0 rangeLower: 0 -schemaIdGuid:: b05bda89-76af-468a-b892-1be55558ecc8 +schemaIdGuid: b05bda89-76af-468a-b892-1be55558ecc8 systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL @@ -6717,7 +6709,7 @@ omSyntax: 1 isSingleValued: TRUE systemOnly: FALSE searchFlags: 0 -schemaIdGuid:: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c +schemaIdGuid: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c systemFlags: FLAG_SCHEMA_BASE_OBJECT schemaFlagsEx: FLAG_ATTR_IS_CRITICAL @@ -7032,6 +7024,7 @@ schemaFlagsEx: FLAG_ATTR_IS_CRITICAL cn: ms-DS-Resultant-PSO ldapDisplayName: msDS-ResultantPSO +attributeId: 1.2.840.113556.1.4.2022 attributeSyntax: 2.5.5.1 omSyntax: 127 isSingleValued: TRUE @@ -7494,7 +7487,7 @@ attributeSyntax: 2.5.5.10 omSyntax: 4 isSingleValued: TRUE rangeUpper: 102400 -schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa-97186a54 +schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa97186a54 searchFlags: fRODCFilteredAttribute | fCONFIDENTIAL | fCOPY |fPRESERVEONDELETE systemFlags: FLAG_SCHEMA_BASE_OBJECT @@ -7522,7 +7515,6 @@ systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: ms-FVE-VolumeGuid ldapDisplayName: msFVE-VolumeGuid -attributeId: 1.2.840.113556.1.4.1965 attributeId: 1.2.840.113556.1.4.1998 attributeSyntax: 2.5.5.10 omSyntax: 4 @@ -8425,8 +8417,6 @@ rangeUpper: 128 isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER -systemFlags: FLAG_SCHEMA_BASE_OBJECT - cn: MSMQ-Version ldapDisplayName: mSMQVersion attributeId: 1.2.840.113556.1.4.942 @@ -12196,7 +12186,6 @@ systemOnly: TRUE searchFlags: 0 linkID: 101 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED - isSingleValued: TRUE cn: Repl-Interval @@ -12224,8 +12213,6 @@ isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_IS_OPERATIONAL |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER | FLAG_ATTR_NOT_REPLICATED schemaFlagsEx: FLAG_ATTR_IS_CRITICAL -systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER | FLAG_ATTR_NOT_REPLICATED - cn: Repl-Topology-Stay-Of-Execution ldapDisplayName: replTopologyStayOfExecution attributeId: 1.2.840.113556.1.4.677 @@ -12872,7 +12859,6 @@ searchFlags: 0 rangeLower: 1 rangeUpper: 64 mapiID: 33072 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Next-Level-Store @@ -12929,7 +12915,6 @@ searchFlags: 0 linkID: 95 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED schemaFlagsEx: FLAG_ATTR_IS_CRITICAL - isSingleValued: TRUE cn: Server-Role @@ -12942,7 +12927,6 @@ schemaIdGuid: bf967a33-0de6-11d0-a285-00aa003049e2 systemOnly: FALSE searchFlags: 0 attributeSecurityGuid: b8119fd0-04f6-4762-ab7a-4986c76b3f9a - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Server-State @@ -13235,7 +13219,6 @@ attributeSecurityGuid: 59ba2f42-79a2-11d0-9020-00c04fc2d3cf isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER schemaFlagsEx: FLAG_ATTR_IS_CRITICAL - systemOnly: TRUE cn: Signature-Algorithms @@ -13339,7 +13322,6 @@ isSingleValued: FALSE schemaIdGuid: 1be8f17c-a9ff-11d0-afe2-00c04fd930c9 systemOnly: FALSE searchFlags: 0 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Surname @@ -14442,7 +14424,6 @@ rangeUpper: 32768 attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1 mapiID: 14960 isMemberOfPartialAttributeSet: TRUE - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: User-Workstations @@ -14580,8 +14561,6 @@ isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_IS_OPERATIONAL |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER schemaFlagsEx: FLAG_ATTR_IS_CRITICAL -systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER - cn: Version-Number ldapDisplayName: versionNumber attributeId: 1.2.840.113556.1.4.141 @@ -14708,8 +14687,6 @@ isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER schemaFlagsEx: FLAG_ATTR_IS_CRITICAL -systemFlags: FLAG_SCHEMA_BASE_OBJECT - cn: Organization-Name ldapDisplayName: o attributeId: 2.5.4.10 @@ -14892,7 +14869,6 @@ mapiID: 32807 isMemberOfPartialAttributeSet: TRUE systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER schemaFlagsEx: FLAG_ATTR_IS_CRITICAL - systemOnly: FALSE cn: Object-Version @@ -14971,7 +14947,6 @@ isSingleValued: TRUE schemaIdGuid: 07383076-91df-11d1-aebc-0000f80367c1 systemOnly: FALSE searchFlags: 0 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: OMT-Indx-Guid @@ -15099,7 +15074,6 @@ isSingleValued: TRUE schemaIdGuid: 0738307b-91df-11d1-aebc-0000f80367c1 systemOnly: FALSE searchFlags: 0 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: organizationalStatus @@ -15244,7 +15218,6 @@ isSingleValued: TRUE schemaIdGuid: 0738307a-91df-11d1-aebc-0000f80367c1 systemOnly: FALSE searchFlags: 0 - systemFlags: FLAG_SCHEMA_BASE_OBJECT cn: Phone-Office-Other diff --git a/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt b/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt index cd784edfc3..e2655d57da 100644 --- a/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt +++ b/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt @@ -277,20 +277,20 @@ subClassOf: top systemMustContain: msDS-MaximumPasswordAge, msDS-MinimumPasswordAge,msDS-MinimumPasswordLength, msDS-PasswordComplexityEnabled,msDS-LockoutObservationWindow, msDS-LockoutDuration,msDS-LockoutThreshold, msDS-PasswordReversibleEncryptionEnabled,msDS-PasswordSettingsPrecedence, msDS-PasswordHistoryLength systemMayContain: msDS-PSOAppliesTo systemPossSuperiors: msDS-PasswordSettingsContainer -schemaIdGuid:: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6 +schemaIdGuid: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6 defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY) systemOnly: FALSE defaultObjectCategory: CN=ms-DS-Password-Settings,CN=Schema,CN=Configuration, systemFlags: FLAG_SCHEMA_BASE_OBJECT -cn: ms-DS-Password-Settings +cn: ms-DS-Password-Settings-Container ldapDisplayName: msDS-PasswordSettingsContainer governsId: 1.2.840.113556.1.5.256 objectClassCategory: 1 rdnAttId: cn subClassOf: top systemPossSuperiors: Container -schemaIdGuid:: 5b06b06a-4cf3-44c0-bd16-43bc10a987da +schemaIdGuid: 5b06b06a-4cf3-44c0-bd16-43bc10a987da defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY) systemOnly: FALSE defaultObjectCategory: CN=ms-DS-Password-Settings-Container,CN=Schema,CN=Configuration, -- cgit