From 5a2bff3f7afd5561c5f6e003690a42542cbfcfa1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 15 Mar 2012 17:29:00 +0100 Subject: Update patches. --- samba4-libpdb-soversion.patch | 8 ++-- samba4-samr-lsa-session_key.patch | 92 +++++++++++++++++++-------------------- samba4-waf_target.patch | 37 ++++++++-------- 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/samba4-libpdb-soversion.patch b/samba4-libpdb-soversion.patch index f83a073..0fffef3 100644 --- a/samba4-libpdb-soversion.patch +++ b/samba4-libpdb-soversion.patch @@ -1,11 +1,11 @@ source3/wscript_build | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -Index: samba-4.0.0/source3/wscript_build +Index: samba-4.0.0alpha18/source3/wscript_build =================================================================== ---- samba-4.0.0.orig/source3/wscript_build -+++ samba-4.0.0/source3/wscript_build -@@ -731,6 +731,7 @@ bld.SAMBA3_LIBRARY('pdb', +--- samba-4.0.0alpha18.orig/source3/wscript_build ++++ samba-4.0.0alpha18/source3/wscript_build +@@ -730,6 +730,7 @@ bld.SAMBA3_LIBRARY('pdb', include/passdb.h passdb/machine_sid.h passdb/lookup_sid.h''', diff --git a/samba4-samr-lsa-session_key.patch b/samba4-samr-lsa-session_key.patch index 297f680..4a71f10 100644 --- a/samba4-samr-lsa-session_key.patch +++ b/samba4-samr-lsa-session_key.patch @@ -24,11 +24,11 @@ CommitDate: Fri Mar 9 13:58:43 2012 +0100 source3/rpc_server/samr/srv_samr_nt.c | 37 +++++----- 5 files changed, 120 insertions(+), 79 deletions(-) -diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c -index 21a8642..4f6ebfa 100644 ---- a/source3/auth/auth_util.c -+++ b/source3/auth/auth_util.c -@@ -1618,3 +1618,31 @@ NTSTATUS do_map_to_guest_server_info(NTSTATUS status, +Index: samba-4.0.0alpha18/source3/auth/auth_util.c +=================================================================== +--- samba-4.0.0alpha18.orig/source3/auth/auth_util.c ++++ samba-4.0.0alpha18/source3/auth/auth_util.c +@@ -1596,3 +1596,31 @@ NTSTATUS do_map_to_guest_server_info(NTS return status; } @@ -60,11 +60,11 @@ index 21a8642..4f6ebfa 100644 + } + return NT_STATUS_OK; +} -diff --git a/source3/auth/proto.h b/source3/auth/proto.h -index 01e2934..44ae909 100644 ---- a/source3/auth/proto.h -+++ b/source3/auth/proto.h -@@ -248,6 +248,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx, +Index: samba-4.0.0alpha18/source3/auth/proto.h +=================================================================== +--- samba-4.0.0alpha18.orig/source3/auth/proto.h ++++ samba-4.0.0alpha18/source3/auth/proto.h +@@ -220,6 +220,7 @@ NTSTATUS make_server_info_wbcAuthUserInf struct auth_serversupplied_info **server_info); void free_user_info(struct auth_usersupplied_info **user_info); bool is_trusted_domain(const char* dom_name); @@ -72,11 +72,11 @@ index 01e2934..44ae909 100644 /* The following definitions come from auth/user_info.c */ -diff --git a/source3/include/auth.h b/source3/include/auth.h -index 7f2c3e5..693a0df 100644 ---- a/source3/include/auth.h -+++ b/source3/include/auth.h -@@ -128,6 +128,12 @@ struct auth_init_function_entry { +Index: samba-4.0.0alpha18/source3/include/auth.h +=================================================================== +--- samba-4.0.0alpha18.orig/source3/include/auth.h ++++ samba-4.0.0alpha18/source3/include/auth.h +@@ -134,6 +134,12 @@ struct auth_init_function_entry { extern const struct gensec_security_ops gensec_ntlmssp3_server_ops; @@ -89,11 +89,11 @@ index 7f2c3e5..693a0df 100644 /* Changed from 1 -> 2 to add the logon_parameters field. */ /* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */ #define AUTH_INTERFACE_VERSION 3 -diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c -index 0a5cda5..48bdfdb 100644 ---- a/source3/rpc_server/lsa/srv_lsa_nt.c -+++ b/source3/rpc_server/lsa/srv_lsa_nt.c -@@ -287,7 +287,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, +Index: samba-4.0.0alpha18/source3/rpc_server/lsa/srv_lsa_nt.c +=================================================================== +--- samba-4.0.0alpha18.orig/source3/rpc_server/lsa/srv_lsa_nt.c ++++ samba-4.0.0alpha18/source3/rpc_server/lsa/srv_lsa_nt.c +@@ -287,7 +287,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_C return NT_STATUS_NO_MEMORY; } @@ -102,7 +102,7 @@ index 0a5cda5..48bdfdb 100644 if (!lookup_name(mem_ctx, full_name, flags, &domain, NULL, &sid, &type)) { -@@ -300,12 +300,12 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, +@@ -300,12 +300,12 @@ static NTSTATUS lookup_lsa_sids(TALLOC_C case SID_NAME_DOMAIN: case SID_NAME_ALIAS: case SID_NAME_WKN_GRP: @@ -117,7 +117,7 @@ index 0a5cda5..48bdfdb 100644 type = SID_NAME_UNKNOWN; break; } -@@ -1309,10 +1309,7 @@ NTSTATUS _lsa_LookupNames3(struct pipes_struct *p, +@@ -1309,10 +1309,7 @@ NTSTATUS _lsa_LookupNames3(struct pipes_ DEBUG(5,("_lsa_LookupNames3: truncating name lookup list to %d\n", num_entries)); } @@ -129,7 +129,7 @@ index 0a5cda5..48bdfdb 100644 domains = talloc_zero(p->mem_ctx, struct lsa_RefDomainList); if (!domains) { -@@ -1660,6 +1657,46 @@ NTSTATUS _lsa_OpenTrustedDomainByName(struct pipes_struct *p, +@@ -1660,6 +1657,46 @@ NTSTATUS _lsa_OpenTrustedDomainByName(st r->out.trustdom_handle); } @@ -176,7 +176,7 @@ index 0a5cda5..48bdfdb 100644 /*************************************************************************** _lsa_CreateTrustedDomainEx2 ***************************************************************************/ -@@ -1674,7 +1711,6 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, +@@ -1674,7 +1711,6 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(str size_t sd_size; struct pdb_trusted_domain td; struct trustDomainPasswords auth_struct; @@ -184,7 +184,7 @@ index 0a5cda5..48bdfdb 100644 DATA_BLOB auth_blob; if (!IS_DC) { -@@ -1738,27 +1774,18 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, +@@ -1738,27 +1774,18 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(str auth_blob.length = r->in.auth_info_internal->auth_blob.size; auth_blob.data = r->in.auth_info_internal->auth_blob.data; @@ -218,7 +218,7 @@ index 0a5cda5..48bdfdb 100644 return NT_STATUS_UNSUCCESSFUL; } } else { -@@ -2244,6 +2271,7 @@ NTSTATUS _lsa_SetSecret(struct pipes_struct *p, +@@ -2244,6 +2271,7 @@ NTSTATUS _lsa_SetSecret(struct pipes_str DATA_BLOB cleartext_blob_old = data_blob_null; DATA_BLOB *cleartext_blob_new_p = NULL; DATA_BLOB *cleartext_blob_old_p = NULL; @@ -226,7 +226,7 @@ index 0a5cda5..48bdfdb 100644 if (!find_policy_by_hnd(p, r->in.sec_handle, (void **)(void *)&info)) { return NT_STATUS_INVALID_HANDLE; -@@ -2257,12 +2285,17 @@ NTSTATUS _lsa_SetSecret(struct pipes_struct *p, +@@ -2257,12 +2285,17 @@ NTSTATUS _lsa_SetSecret(struct pipes_str return NT_STATUS_ACCESS_DENIED; } @@ -245,7 +245,7 @@ index 0a5cda5..48bdfdb 100644 &cleartext_blob_new); if (!NT_STATUS_IS_OK(status)) { return status; -@@ -2276,7 +2309,7 @@ NTSTATUS _lsa_SetSecret(struct pipes_struct *p, +@@ -2276,7 +2309,7 @@ NTSTATUS _lsa_SetSecret(struct pipes_str r->in.old_val->length); status = sess_decrypt_blob(p->mem_ctx, &blob_old, @@ -254,7 +254,7 @@ index 0a5cda5..48bdfdb 100644 &cleartext_blob_old); if (!NT_STATUS_IS_OK(status)) { return status; -@@ -2310,6 +2343,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_struct *p, +@@ -2310,6 +2343,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_s struct lsa_info *info = NULL; DATA_BLOB blob_new, blob_old; DATA_BLOB blob_new_crypt, blob_old_crypt; @@ -262,7 +262,7 @@ index 0a5cda5..48bdfdb 100644 NTTIME nttime_new, nttime_old; NTSTATUS status; -@@ -2333,6 +2367,11 @@ NTSTATUS _lsa_QuerySecret(struct pipes_struct *p, +@@ -2333,6 +2367,11 @@ NTSTATUS _lsa_QuerySecret(struct pipes_s return status; } @@ -274,7 +274,7 @@ index 0a5cda5..48bdfdb 100644 if (r->in.new_val) { if (blob_new.length) { if (!r->out.new_val->buf) { -@@ -2343,7 +2382,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_struct *p, +@@ -2343,7 +2382,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_s } blob_new_crypt = sess_encrypt_blob(p->mem_ctx, &blob_new, @@ -283,7 +283,7 @@ index 0a5cda5..48bdfdb 100644 if (!blob_new_crypt.length) { return NT_STATUS_NO_MEMORY; } -@@ -2364,7 +2403,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_struct *p, +@@ -2364,7 +2403,7 @@ NTSTATUS _lsa_QuerySecret(struct pipes_s } blob_old_crypt = sess_encrypt_blob(p->mem_ctx, &blob_old, @@ -292,10 +292,11 @@ index 0a5cda5..48bdfdb 100644 if (!blob_old_crypt.length) { return NT_STATUS_NO_MEMORY; } -@@ -3468,40 +3507,6 @@ static NTSTATUS info_ex_2_pdb_trusted_domain( +@@ -3467,40 +3506,6 @@ static NTSTATUS info_ex_2_pdb_trusted_do + return NT_STATUS_OK; } - +- -static NTSTATUS get_trustdom_auth_blob(struct pipes_struct *p, - TALLOC_CTX *mem_ctx, DATA_BLOB *auth_blob, - struct trustDomainPasswords *auth_struct) @@ -329,15 +330,14 @@ index 0a5cda5..48bdfdb 100644 - - return NT_STATUS_OK; -} -- + static NTSTATUS setInfoTrustedDomain_base(struct pipes_struct *p, TALLOC_CTX *mem_ctx, - struct lsa_info *policy, -diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c -index ebe6e45..77888ea 100644 ---- a/source3/rpc_server/samr/srv_samr_nt.c -+++ b/source3/rpc_server/samr/srv_samr_nt.c -@@ -5036,6 +5036,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +Index: samba-4.0.0alpha18/source3/rpc_server/samr/srv_samr_nt.c +=================================================================== +--- samba-4.0.0alpha18.orig/source3/rpc_server/samr/srv_samr_nt.c ++++ samba-4.0.0alpha18/source3/rpc_server/samr/srv_samr_nt.c +@@ -5036,6 +5036,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ uint32_t fields = 0; bool ret; char *rhost; @@ -345,7 +345,7 @@ index ebe6e45..77888ea 100644 DEBUG(5,("_samr_SetUserInfo: %d\n", __LINE__)); -@@ -5193,10 +5194,14 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +@@ -5193,10 +5194,14 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ break; case 18: @@ -361,7 +361,7 @@ index ebe6e45..77888ea 100644 pwd); break; -@@ -5206,18 +5211,20 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +@@ -5206,18 +5211,20 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ break; case 21: @@ -387,7 +387,7 @@ index ebe6e45..77888ea 100644 dump_data(100, info->info23.password.data, 516); -@@ -5228,12 +5235,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +@@ -5228,12 +5235,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ break; case 24: @@ -402,7 +402,7 @@ index ebe6e45..77888ea 100644 dump_data(100, info->info24.password.data, 516); -@@ -5243,12 +5248,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +@@ -5243,12 +5248,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ break; case 25: @@ -417,7 +417,7 @@ index ebe6e45..77888ea 100644 dump_data(100, info->info25.password.data, 532); -@@ -5258,12 +5261,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p, +@@ -5258,12 +5261,10 @@ NTSTATUS _samr_SetUserInfo(struct pipes_ break; case 26: diff --git a/samba4-waf_target.patch b/samba4-waf_target.patch index 3690d20..b9d076c 100644 --- a/samba4-waf_target.patch +++ b/samba4-waf_target.patch @@ -1,28 +1,29 @@ -commit 7c7d54e0d18e1a840abdcc54be31b0dee998bd3f +commit b6880efe1ad8fbc3fe24919ae84edf46d31bd984 Author: Andreas Schneider AuthorDate: Thu Mar 15 17:04:00 2012 +0100 Commit: Andreas Schneider -CommitDate: Thu Mar 15 17:04:00 2012 +0100 +CommitDate: Thu Mar 15 17:08:58 2012 +0100 waf: Add autoconf --target support. - + This is needed on some platforms so that you can set it and it is not - automagicaly transformed into --targets. + automagically transformed into --targets. The --target option is + normally set by the RPM %configure macro. --- buildtools/wafsamba/wscript | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index 094f9cc..49d2107 100755 ---- a/buildtools/wafsamba/wscript -+++ b/buildtools/wafsamba/wscript -@@ -156,6 +156,9 @@ def set_options(opt): - opt.add_option('--host', - help=SUPPRESS_HELP, - action='store', dest='AUTOCONF_HOST', default='') -+ opt.add_option('--target', -+ help=SUPPRESS_HELP, -+ action='store', dest='AUTOCONF_TARGET', default='') - opt.add_option('--program-prefix', - help=SUPPRESS_HELP, - action='store', dest='AUTOCONF_PROGRAM_PREFIX', default='') \ No newline at end of file +Index: samba-4.0.0alpha18/buildtools/wafsamba/wscript +=================================================================== +--- samba-4.0.0alpha18.orig/buildtools/wafsamba/wscript ++++ samba-4.0.0alpha18/buildtools/wafsamba/wscript +@@ -156,6 +156,9 @@ def set_options(opt): + opt.add_option('--host', + help=SUPPRESS_HELP, + action='store', dest='AUTOCONF_HOST', default='') ++ opt.add_option('--target', ++ help=SUPPRESS_HELP, ++ action='store', dest='AUTOCONF_TARGET', default='') + opt.add_option('--program-prefix', + help=SUPPRESS_HELP, + action='store', dest='AUTOCONF_PROGRAM_PREFIX', default='') -- cgit