The branch, master has been updated
via cb51e8d s4/heimdal/lib/krb5/pac.c: typo
via 511c747 s4/heimdal/lib/gssapi/mech/gss_compare_name.c: typo
via ad9c1aa s4/client/cifsdd.c: typo
via 34ae5c5 s4/auth/ntlm/auth_unix.c: add parens
via 085b687 s3/utils/regedit.c: typo
via f28014d docs: update vfs_fruit manpage
via 3e88ccd testparm: vfs_fruit checks
from 5741e84 smbd: Avoid an "else"
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cb51e8d5cbcee144301bdfa3f51608610c2ddebd
Author: Aurelien Aptel <[email protected]>
Date: Wed Mar 9 11:35:24 2016 +0100
s4/heimdal/lib/krb5/pac.c: typo
Signed-off-by: Aurelien Aptel <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Thu Mar 10 03:33:46 CET 2016 on sn-devel-144
commit 511c747745b8adf60d03dc4af02a80f4d55e830d
Author: Aurelien Aptel <[email protected]>
Date: Wed Mar 9 17:46:54 2016 +0100
s4/heimdal/lib/gssapi/mech/gss_compare_name.c: typo
make memcmp() compare the name1 and name2 value instead of comparing
name1 with itself.
Signed-off-by: Aurelien Aptel <[email protected]>
Reviewed-by: Ira Cooper <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit ad9c1aa867d8d5e478f4511a710736da397d5c50
Author: Aurelien Aptel <[email protected]>
Date: Wed Mar 9 11:37:44 2016 +0100
s4/client/cifsdd.c: typo
Signed-off-by: Aurelien Aptel <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
commit 34ae5c508302383909128b589d6fab6199b32f52
Author: Aurelien Aptel <[email protected]>
Date: Wed Mar 9 11:43:16 2016 +0100
s4/auth/ntlm/auth_unix.c: add parens
operator | has lower precedence than ?:
so add parens to have the expected result.
Signed-off-by: Aurelien Aptel <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
commit 085b687768a1f10689ec371d4b9e771bfd3f4a07
Author: Aurelien Aptel <[email protected]>
Date: Wed Mar 9 15:25:26 2016 +0100
s3/utils/regedit.c: typo
loop should exit on any case of Q.
Signed-off-by: Aurelien Aptel <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
commit f28014d81083e61537ea796f0dd9efa24154f5f6
Author: Ralph Boehme <[email protected]>
Date: Wed Mar 9 14:01:05 2016 +0100
docs: update vfs_fruit manpage
Add documentation that ea support = yes is required and explain why all
shares for OS X clients should use fruit if one uses it.
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 3e88ccdd73847c70c76c07eec6334bd15b5c4180
Author: Ralph Boehme <[email protected]>
Date: Wed Mar 9 13:53:09 2016 +0100
testparm: vfs_fruit checks
- vfs_fruit requires "ea support = yes"
- OS X clients negotiate AAPL on the first tcon, so mixing shares with
and without fruit will globally disable AAPL if the first tcon is
without fruit
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_fruit.8.xml | 9 ++++++++
source3/utils/regedit.c | 2 +-
source3/utils/testparm.c | 24 ++++++++++++++++++++++
source4/auth/ntlm/auth_unix.c | 2 +-
source4/client/cifsdd.c | 2 +-
source4/heimdal/lib/gssapi/mech/gss_compare_name.c | 2 +-
source4/heimdal/lib/krb5/pac.c | 2 +-
7 files changed, 38 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_fruit.8.xml
b/docs-xml/manpages/vfs_fruit.8.xml
index 2ac5db7..36d137e 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -45,6 +45,14 @@
<command>vfs_streams_xattr</command> which must be loaded
together with <command>vfs_fruit</command>.</para>
+ <para>vfs_fruit requires "ea support = yes".</para>
+
+ <para>Be careful when mixing shares with and without
+ vfs_fruit. OS X clients negotiate SMB2 AAPL protocol
+ extensions on the first tcon, so mixing shares with and
+ without fruit will globally disable AAPL if the first tcon is
+ without fruit.</para>
+
<para>Having shares with ADS support enabled for OS X client
is worthwhile because it resembles the behaviour of Apple's
own SMB server implementation and it avoids certain severe
@@ -234,6 +242,7 @@
<programlisting>
<smbconfsection name="[share]"/>
+ <smbconfoption name="ea support">yes</smbconfoption>
<smbconfoption name="vfs objects">catia fruit
streams_xattr</smbconfoption>
<smbconfoption name="fruit:resource">file</smbconfoption>
<smbconfoption name="fruit:metadata">netatalk</smbconfoption>
diff --git a/source3/utils/regedit.c b/source3/utils/regedit.c
index 21437f4..9db63b9 100644
--- a/source3/utils/regedit.c
+++ b/source3/utils/regedit.c
@@ -748,7 +748,7 @@ static void display_window(TALLOC_CTX *mem_ctx, struct
registry_context *ctx)
handle_main_input(regedit, key);
update_panels();
doupdate();
- } while (key != 'q' || key == 'Q');
+ } while (key != 'q' && key != 'Q');
endwin();
}
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 5912d18..e1d66ce 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -345,7 +345,11 @@ static void do_per_share_checks(int s)
{
const char **deny_list = lp_hosts_deny(s);
const char **allow_list = lp_hosts_allow(s);
+ const char **vfs_objects = NULL;
int i;
+ static bool uses_fruit;
+ static bool doesnt_use_fruit;
+ static bool fruit_mix_warned;
if(deny_list) {
for (i=0; deny_list[i]; i++) {
@@ -426,6 +430,26 @@ static void do_per_share_checks(int s)
"parameter is ignored when using CUPS libraries.\n\n",
lp_servicename(talloc_tos(), s));
}
+
+ vfs_objects = lp_vfs_objects(s);
+ if (vfs_objects && str_list_check(vfs_objects, "fruit")) {
+ uses_fruit = true;
+ if (!lp_ea_support(s) && !lp_ea_support(-1)) {
+ fprintf(stderr,
+ "ERROR: Service \"%s\" uses vfs_fruit, but "
+ "that requires \"ea support = yes\".\n\n",
+ lp_servicename(talloc_tos(), s));
+ }
+ } else {
+ doesnt_use_fruit = true;
+ }
+
+ if (uses_fruit && doesnt_use_fruit && !fruit_mix_warned) {
+ fruit_mix_warned = true;
+ fprintf(stderr,
+ "WARNING: some services use vfs_fruit, others don't.
Mounting them "
+ "in conjunction on OS X clients results in undefined
behaviour.\n\n");
+ }
}
int main(int argc, const char *argv[])
diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c
index 2b0512a..46e82f4 100644
--- a/source4/auth/ntlm/auth_unix.c
+++ b/source4/auth/ntlm/auth_unix.c
@@ -329,7 +329,7 @@ static NTSTATUS smb_pam_auth(pam_handle_t *pamh, bool
allow_null_passwords, cons
DEBUG(4,("smb_pam_auth: PAM: Authenticate User: %s\n", user));
- pam_error = pam_authenticate(pamh, PAM_SILENT | allow_null_passwords ?
0 : PAM_DISALLOW_NULL_AUTHTOK);
+ pam_error = pam_authenticate(pamh, PAM_SILENT | (allow_null_passwords ?
0 : PAM_DISALLOW_NULL_AUTHTOK));
switch( pam_error ){
case PAM_AUTH_ERR:
DEBUG(2, ("smb_pam_auth: PAM: Authentication Error for
user %s\n", user));
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 48ffe18..980948a 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -606,7 +606,7 @@ int main(int argc, const char ** argv)
gensec_init();
dump_args();
- if (check_arg_numeric("ibs") == 0 || check_arg_numeric("ibs") == 0) {
+ if (check_arg_numeric("ibs") == 0 || check_arg_numeric("obs") == 0) {
fprintf(stderr, "%s: block sizes must be greater that zero\n",
PROGNAME);
exit(SYNTAX_EXIT_CODE);
diff --git a/source4/heimdal/lib/gssapi/mech/gss_compare_name.c
b/source4/heimdal/lib/gssapi/mech/gss_compare_name.c
index 70b4b1c..30543ef 100644
--- a/source4/heimdal/lib/gssapi/mech/gss_compare_name.c
+++ b/source4/heimdal/lib/gssapi/mech/gss_compare_name.c
@@ -47,7 +47,7 @@ gss_compare_name(OM_uint32 *minor_status,
if (!gss_oid_equal(&name1->gn_type, &name2->gn_type)) {
*name_equal = 0;
} else if (name1->gn_value.length != name2->gn_value.length ||
- memcmp(name1->gn_value.value, name1->gn_value.value,
+ memcmp(name1->gn_value.value, name2->gn_value.value,
name1->gn_value.length)) {
*name_equal = 0;
}
diff --git a/source4/heimdal/lib/krb5/pac.c b/source4/heimdal/lib/krb5/pac.c
index 7c8ba50..19663d2 100644
--- a/source4/heimdal/lib/krb5/pac.c
+++ b/source4/heimdal/lib/krb5/pac.c
@@ -764,7 +764,7 @@ build_logon_name(krb5_context context,
s2_len = (ucs2_len + 1) * 2;
s2 = malloc(s2_len);
- if (ucs2 == NULL) {
+ if (s2 == NULL) {
free(ucs2);
return krb5_enomem(context);
}
--
Samba Shared Repository
