Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel

diff --git a/source3/auth/auth_wbc.c b/source3/auth/auth_wbc.c
index b0af9ffb1d25ee93f0f76bf0325d43877dd3518c..580c8b550d94a6a944bdeaefa62c484fce477d65 100644 (file)
--- a/source3/auth/auth_wbc.c
+++ b/source3/auth/auth_wbc.c
@@ -74,7 +74,7 @@ static NTSTATUS check_wbc_security(const struct auth_context *auth_context,
                         user_info->internal_username));
                params.level = WBC_AUTH_USER_LEVEL_PLAIN;
 
-               params.password.plaintext = user_info->plaintext_password.data;
+               params.password.plaintext = (char *)user_info->plaintext_password.data;
        } else {
                DEBUG(3,("Checking encrypted password for %s.\n",
                         user_info->internal_username));

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index ae8a7fd18619a823fa419a2e8574178d0f34ba46..8623d3c04b537d3022f23b62e2da3aaca40f29ef 100644 (file)
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -649,7 +649,9 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                } else if (strncmp(data, "exec", 4) == 0) {
                        *filesys_flags &= ~MS_NOEXEC;
                } else if (strncmp(data, "guest", 5) == 0) {
-                       got_password=1;
+                       user_name = (char *)calloc(1, 1);
+                       got_user = 1;
+                       got_password = 1;
                } else if (strncmp(data, "ro", 2) == 0) {
                        *filesys_flags |= MS_RDONLY;
                } else if (strncmp(data, "rw", 2) == 0) {

diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index b8097b6455ed339c1532446f15d5388066a32104..a1bfa6e121e19659605d2a53fbf1d696374ac478 100644 (file)
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -890,7 +890,7 @@ onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                  uint32 security_info_sent, SEC_DESC *psd)
 {
        struct ifs_security_descriptor sd = {};
-       int fd;
+       int fd = -1;
        bool fopened = false;
        NTSTATUS status;
 

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 1927e9977fdefa62262249201ea2142e03f704ed..ffdf92f78444a100315be4579b8f4a8e607ceb62 100644 (file)
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -157,6 +157,13 @@ mkinclude $1
 "
 ])
 
+dnl
+dnl SMB_EXT_LIB() just specifies the details of the library.
+dnl Note: the library isn't enabled by default.
+dnl You need to enable it with SMB_ENABLE(name) if configure
+dnl find it should be used. E.g. it should not be enabled
+dnl if the library is present, but the header file is missing.
+dnl
 dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
 AC_DEFUN([SMB_EXT_LIB],
 [

diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index 50a3c8addaddb2678160655395f8b11e5f7c5c38..a48777fab1ea897ced5559d127e8417a5239e26c 100644 (file)
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -170,6 +170,12 @@ SMB_ENABLE(OPENPTY,YES)
 
 SMB_EXT_LIB(OPENPTY,[${OPENPTY_LIBS}],[${OPENPTY_CFLAGS}],[${OPENPTY_CPPFLAGS}],[${OPENPTY_LDFLAGS}])
 
+AC_CHECK_LIB_EXT(intl, INTL_LIBS, gettext)
+
+SMB_ENABLE(INTL,YES)
+
+SMB_EXT_LIB(INTL, $INTL_LIBS)
+
 smb_save_LIBS=$LIBS
 RESOLV_LIBS=""
 LIBS=""