aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/samba36/patches/260-remove_samr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-05-01 12:17:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-05-01 12:17:52 +0000
commit14d0375301f5094ac7213550c74b35909e05f0dd (patch)
tree963a755d4f74bf16cb3cc88f8b0e7a6116cfbf74 /package/network/services/samba36/patches/260-remove_samr.patch
parent5e47b57e57d4f8a0040170284d6a77e6515a7654 (diff)
downloadupstream-14d0375301f5094ac7213550c74b35909e05f0dd.tar.gz
upstream-14d0375301f5094ac7213550c74b35909e05f0dd.tar.bz2
upstream-14d0375301f5094ac7213550c74b35909e05f0dd.zip
samba: update to version 3.6.23
This updates samba to the most recent minor version. This patch is based on a patch by Anton van Bohemen <avbohemen@ziggo.nl> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 40618
Diffstat (limited to 'package/network/services/samba36/patches/260-remove_samr.patch')
-rw-r--r--package/network/services/samba36/patches/260-remove_samr.patch19
1 files changed, 4 insertions, 15 deletions
diff --git a/package/network/services/samba36/patches/260-remove_samr.patch b/package/network/services/samba36/patches/260-remove_samr.patch
index eda6129893..7e55573056 100644
--- a/package/network/services/samba36/patches/260-remove_samr.patch
+++ b/package/network/services/samba36/patches/260-remove_samr.patch
@@ -98,7 +98,7 @@
if (!str1 || !str2 || !p) {
return False;
}
-@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
+@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
NTSTATUS status, result;
struct dcerpc_binding_handle *b;
@@ -109,7 +109,7 @@
if (!str1 || !str2 || !UserName || !p) {
return False;
}
-@@ -2733,6 +2741,10 @@ static bool api_RNetUserEnum(struct smbd
+@@ -2741,6 +2749,10 @@ static bool api_RNetUserEnum(struct smbd
struct dcerpc_binding_handle *b;
@@ -120,18 +120,7 @@
if (!str1 || !str2 || !p) {
return False;
}
-@@ -2979,6 +2991,10 @@ static bool api_SetUserPassword(struct s
- 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
+@@ -2979,6 +2991,10 @@ static bool api_SamOEMChangePassword(str
int bufsize;
struct dcerpc_binding_handle *b;
@@ -142,7 +131,7 @@
*rparam_len = 4;
*rparam = smb_realloc_limit(*rparam,*rparam_len);
if (!*rparam) {
-@@ -4265,6 +4285,10 @@ static bool api_RNetUserGetInfo(struct s
+@@ -4020,6 +4036,10 @@ static bool api_RNetUserGetInfo(struct s
union samr_UserInfo *info;
struct dcerpc_binding_handle *b = NULL;