samba36: remove SAMR support and save a bit more space

SVN-Revision: 30491

diff --git a/net/samba36/patches/130-remove_services.patch b/net/samba36/patches/130-remove_services.patch
index 5b873a3e985d5ca2e7d8b76f3c6e6ca3fc1f4b1d..706048c16b185e026fceec1c32a296ec2313a711 100644 (file)
--- a/net/samba36/patches/130-remove_services.patch
+++ b/net/samba36/patches/130-remove_services.patch
@@ -82,3 +82,17 @@
  #ifdef PRINTER_SUPPORT
                rpc_spoolss_shutdown();
  #endif
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -635,9 +635,11 @@ static struct cmd_set *rpcclient_command
+       shutdown_commands,
+       test_commands,
+       wkssvc_commands,
++#ifdef EXTRA_SERVICES
+       ntsvcs_commands,
+       drsuapi_commands,
+       eventlog_commands,
++#endif
+       winreg_commands,
+       NULL
+ };

diff --git a/net/samba36/patches/140-no_winreg_support.patch b/net/samba36/patches/140-no_winreg_support.patch
index 0751c84a3e51af65268507d287982cfbb784aa55..3726bc28329ed3f9142a0b50b4230cb9c70ae389 100644 (file)
--- a/net/samba36/patches/140-no_winreg_support.patch
+++ b/net/samba36/patches/140-no_winreg_support.patch
@@ -132,3 +132,15 @@
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -640,7 +640,9 @@ static struct cmd_set *rpcclient_command
+       drsuapi_commands,
+       eventlog_commands,
+ #endif
++#ifdef WINREG_SUPPORT
+       winreg_commands,
++#endif
+       NULL
+ };
+ 

diff --git a/net/samba36/patches/150-no_dfs_api.patch b/net/samba36/patches/150-no_dfs_api.patch
index 7b69087437d210262f75623b13b6c05bd17972a9..00db75821d5412eb72be5aab61f23c59a30ac267 100644 (file)
--- a/net/samba36/patches/150-no_dfs_api.patch
+++ b/net/samba36/patches/150-no_dfs_api.patch
@@ -57,3 +57,15 @@
                rpc_initshutdown_shutdown();
  #ifdef EXTRA_SERVICES
                rpc_eventlog_shutdown();
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -629,7 +629,9 @@ static struct cmd_set *rpcclient_command
+ #endif
+       netlogon_commands,
+       srvsvc_commands,
++#ifdef DFS_SUPPORT
+       dfs_commands,
++#endif
+       echo_commands,
+       epmapper_commands,
+       shutdown_commands,

diff --git a/net/samba36/patches/160-add_missing_ifdef.patch b/net/samba36/patches/160-add_missing_ifdef.patch
index 4aab79a48c487bc33b157b44ee92e4aae5eb1ae2..c2d9cd28241cdf2327fc09f9e1dd76f17c22aff1 100644 (file)
--- a/net/samba36/patches/160-add_missing_ifdef.patch
+++ b/net/samba36/patches/160-add_missing_ifdef.patch
@@ -12,3 +12,15 @@
        if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
                return false;
        }
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -632,7 +632,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef DFS_SUPPORT
+       dfs_commands,
+ #endif
++#ifdef DEVELOPER
+       echo_commands,
++#endif
+       epmapper_commands,
+       shutdown_commands,
+       test_commands,

diff --git a/net/samba36/patches/170-no_wkssvc_support.patch b/net/samba36/patches/170-no_wkssvc_support.patch
index 40dd9fb48f293203a7c6c7961d974e9f0f8f836c..557357598589feb717da95253f876cc2ba4de21d 100644 (file)
--- a/net/samba36/patches/170-no_wkssvc_support.patch
+++ b/net/samba36/patches/170-no_wkssvc_support.patch
@@ -59,13 +59,13 @@
                return false;
 --- a/source3/rpcclient/rpcclient.c
 +++ b/source3/rpcclient/rpcclient.c
-@@ -634,7 +634,9 @@ static struct cmd_set *rpcclient_command
+@@ -638,7 +638,9 @@ static struct cmd_set *rpcclient_command
        epmapper_commands,
        shutdown_commands,
        test_commands,
 +#ifdef WKSSVC_SUPPORT
        wkssvc_commands,
 +#endif
+ #ifdef EXTRA_SERVICES
        ntsvcs_commands,
        drsuapi_commands,
-       eventlog_commands,

diff --git a/net/samba36/patches/180-no_domain_logon.patch b/net/samba36/patches/180-no_domain_logon.patch
index 6345658dae2423d3871aa8b7ae28ab19d5c6d774..aa249628e2902cbe6872e95e926517368b5c4ba2 100644 (file)
--- a/net/samba36/patches/180-no_domain_logon.patch
+++ b/net/samba36/patches/180-no_domain_logon.patch
@@ -85,3 +85,15 @@
        in_addr_to_sockaddr_storage(&ss, p->ip);
        pss = iface_ip((struct sockaddr *)&ss);
        if (!pss) {
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -627,7 +627,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef PRINTER_SUPPORT
+       spoolss_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+       netlogon_commands,
++#endif
+       srvsvc_commands,
+ #ifdef DFS_SUPPORT
+       dfs_commands,

diff --git a/net/samba36/patches/190-no_srvsvc.patch b/net/samba36/patches/190-no_srvsvc.patch
index 91cb20bacad4c7e9ac9ddb1f089acd66a6e74f97..e9aefe13192257fea92f94e5a4f92a42a4732914 100644 (file)
--- a/net/samba36/patches/190-no_srvsvc.patch
+++ b/net/samba36/patches/190-no_srvsvc.patch
@@ -58,3 +58,15 @@
  
        lsarpc_cb.init         = lsarpc_init_cb;
        lsarpc_cb.shutdown     = NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -630,7 +630,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef NETLOGON_SUPPORT
+       netlogon_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+       srvsvc_commands,
++#endif
+ #ifdef DFS_SUPPORT
+       dfs_commands,
+ #endif