jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-26 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: update to samba-3.6.23

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-03-12 16:27:11 +01:00
parent 357873e1e6
commit 1f32acedb8
2 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/network/samba/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="samba" PKG_NAME="samba"
PKG_VERSION="3.6.22" PKG_VERSION="3.6.23"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

119
packages/network/samba/patches/samba-260-remove_samr.patch
View File

@ -1,22 +1,7 @@
--- a/source3/rpc_server/rpc_handles.c diff -Naur samba-3.6.23/source3/librpc/rpc/rpc_common.c samba-3.6.23.patch/source3/librpc/rpc/rpc_common.c
+++ b/source3/rpc_server/rpc_handles.c --- samba-3.6.23/source3/librpc/rpc/rpc_common.c 2014-03-12 16:10:57.120989895 +0100
@@ -59,8 +59,11 @@ struct handle_list { +++ samba-3.6.23.patch/source3/librpc/rpc/rpc_common.c 2014-03-12 16:11:48.361046356 +0100
@@ -100,9 +100,11 @@
static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
{
- return (ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id)
- || ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
+ return
+#ifdef SAMR_SUPPORT
+ ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
+#endif
+ ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
}
size_t num_pipe_handles(struct pipes_struct *p)
--- a/source3/librpc/rpc/rpc_common.c
+++ b/source3/librpc/rpc/rpc_common.c
@@ -100,9 +100,11 @@ static bool initialize_interfaces(void)
return false; return false;
} }
#endif #endif
@ -28,9 +13,23 @@
#ifdef NETLOGON_SUPPORT #ifdef NETLOGON_SUPPORT
if (!smb_register_ndr_interface(&ndr_table_netlogon)) { if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
return false; return false;
--- a/source3/rpc_server/rpc_ep_setup.c diff -Naur samba-3.6.23/source3/rpcclient/rpcclient.c samba-3.6.23.patch/source3/rpcclient/rpcclient.c
+++ b/source3/rpc_server/rpc_ep_setup.c --- samba-3.6.23/source3/rpcclient/rpcclient.c 2014-03-12 16:10:57.121989948 +0100
@@ -557,6 +557,7 @@ static bool lsarpc_init_cb(void *ptr) +++ samba-3.6.23.patch/source3/rpcclient/rpcclient.c 2014-03-12 16:11:48.362046792 +0100
@@ -623,7 +623,9 @@
rpcclient_commands,
lsarpc_commands,
ds_commands,
+#ifdef SAMR_SUPPORT
samr_commands,
+#endif
#ifdef PRINTER_SUPPORT
spoolss_commands,
#endif
diff -Naur samba-3.6.23/source3/rpc_server/rpc_ep_setup.c samba-3.6.23.patch/source3/rpc_server/rpc_ep_setup.c
--- samba-3.6.23/source3/rpc_server/rpc_ep_setup.c 2014-03-12 16:10:57.120989895 +0100
+++ samba-3.6.23.patch/source3/rpc_server/rpc_ep_setup.c 2014-03-12 16:11:48.361046356 +0100
@@ -557,6 +557,7 @@
return true; return true;
} }
@ -38,7 +37,7 @@
static bool samr_init_cb(void *ptr) static bool samr_init_cb(void *ptr)
{ {
struct dcesrv_ep_context *ep_ctx = struct dcesrv_ep_context *ep_ctx =
@@ -605,6 +606,7 @@ static bool samr_init_cb(void *ptr) @@ -605,6 +606,7 @@
return true; return true;
} }
@ -46,7 +45,7 @@
#ifdef NETLOGON_SUPPORT #ifdef NETLOGON_SUPPORT
static bool netlogon_init_cb(void *ptr) static bool netlogon_init_cb(void *ptr)
@@ -1111,12 +1113,14 @@ bool dcesrv_ep_setup(struct tevent_conte @@ -1111,12 +1113,14 @@
return false; return false;
} }
@ -61,33 +60,27 @@
#ifdef NETLOGON_SUPPORT #ifdef NETLOGON_SUPPORT
netlogon_cb.init = netlogon_init_cb; netlogon_cb.init = netlogon_init_cb;
--- a/source3/smbd/server_exit.c diff -Naur samba-3.6.23/source3/rpc_server/rpc_handles.c samba-3.6.23.patch/source3/rpc_server/rpc_handles.c
+++ b/source3/smbd/server_exit.c --- samba-3.6.23/source3/rpc_server/rpc_handles.c 2014-03-11 11:17:34.000000000 +0100
@@ -160,7 +160,9 @@ static void exit_server_common(enum serv +++ samba-3.6.23.patch/source3/rpc_server/rpc_handles.c 2014-03-12 16:11:48.361046356 +0100
#ifdef NETLOGON_SUPPORT @@ -59,8 +59,11 @@
rpc_netlogon_shutdown();
#endif static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
{
- return (ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id)
- || ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
+ return
+#ifdef SAMR_SUPPORT +#ifdef SAMR_SUPPORT
rpc_samr_shutdown(); + ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
+#endif +#endif
rpc_lsarpc_shutdown(); + ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
} }
--- a/source3/rpcclient/rpcclient.c size_t num_pipe_handles(struct pipes_struct *p)
+++ b/source3/rpcclient/rpcclient.c diff -Naur samba-3.6.23/source3/smbd/lanman.c samba-3.6.23.patch/source3/smbd/lanman.c
@@ -623,7 +623,9 @@ static struct cmd_set *rpcclient_command --- samba-3.6.23/source3/smbd/lanman.c 2014-03-12 16:10:30.535984713 +0100
rpcclient_commands, +++ samba-3.6.23.patch/source3/smbd/lanman.c 2014-03-12 16:11:48.362046792 +0100
lsarpc_commands, @@ -2353,6 +2353,10 @@
ds_commands,
+#ifdef SAMR_SUPPORT
samr_commands,
+#endif
#ifdef PRINTER_SUPPORT
spoolss_commands,
#endif
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -2353,6 +2353,10 @@ static bool api_RNetGroupEnum(struct smb
NTSTATUS status, result; NTSTATUS status, result;
struct dcerpc_binding_handle *b; struct dcerpc_binding_handle *b;
@ -98,7 +91,7 @@
if (!str1 || !str2 || !p) { if (!str1 || !str2 || !p) {
return False; return False;
} }
@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct @@ -2541,6 +2545,10 @@
NTSTATUS status, result; NTSTATUS status, result;
struct dcerpc_binding_handle *b; struct dcerpc_binding_handle *b;
@ -109,7 +102,7 @@
if (!str1 || !str2 || !UserName || !p) { if (!str1 || !str2 || !UserName || !p) {
return False; return False;
} }
@@ -2733,6 +2741,10 @@ static bool api_RNetUserEnum(struct smbd @@ -2741,6 +2749,10 @@
struct dcerpc_binding_handle *b; struct dcerpc_binding_handle *b;
@ -120,18 +113,7 @@
if (!str1 || !str2 || !p) { if (!str1 || !str2 || !p) {
return False; return False;
} }
@@ -2979,6 +2991,10 @@ static bool api_SetUserPassword(struct s @@ -2979,6 +2991,10 @@
int min_pwd_length;
struct dcerpc_binding_handle *b = NULL;
+#ifndef SAMR_SUPPORT
+ return False;
+#endif
+
/* Skip 2 strings. */
p = skip_string(param,tpscnt,np);
p = skip_string(param,tpscnt,p);
@@ -3224,6 +3240,10 @@ static bool api_SamOEMChangePassword(str
int bufsize; int bufsize;
struct dcerpc_binding_handle *b; struct dcerpc_binding_handle *b;
@ -142,7 +124,7 @@
*rparam_len = 4; *rparam_len = 4;
*rparam = smb_realloc_limit(*rparam,*rparam_len); *rparam = smb_realloc_limit(*rparam,*rparam_len);
if (!*rparam) { if (!*rparam) {
@@ -4265,6 +4285,10 @@ static bool api_RNetUserGetInfo(struct s @@ -4020,6 +4036,10 @@
union samr_UserInfo *info; union samr_UserInfo *info;
struct dcerpc_binding_handle *b = NULL; struct dcerpc_binding_handle *b = NULL;
@ -153,3 +135,16 @@
if (!str1 || !str2 || !UserName || !p) { if (!str1 || !str2 || !UserName || !p) {
return False; return False;
} }
diff -Naur samba-3.6.23/source3/smbd/server_exit.c samba-3.6.23.patch/source3/smbd/server_exit.c
--- samba-3.6.23/source3/smbd/server_exit.c 2014-03-12 16:10:57.120989895 +0100
+++ samba-3.6.23.patch/source3/smbd/server_exit.c 2014-03-12 16:11:48.361046356 +0100
@@ -159,7 +159,9 @@
#ifdef NETLOGON_SUPPORT
rpc_netlogon_shutdown();
#endif
+#ifdef SAMR_SUPPORT
rpc_samr_shutdown();
+#endif
rpc_lsarpc_shutdown();
}