Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9377d89e74368edf0cece6030f0c7b77e263118f..141d76bd3d381a15fefa2ec5138f8892781b11b3 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -47,6 +47,7 @@ o   Jeremy Allison <jra@samba.org>
     * Backport the semantics of when to delete alternate data streams on a file
       truncate.
     * Fix printf warnings.
+    * Fix warnings on Solaris.
 
 
 o   Michael Adam <obnox@samba.org>
@@ -78,6 +79,7 @@ o   Bjoern Jacke <bj@sernet.de>
     * Add configure check for Tru64 sub-second timestamp resolution.
     * Add Tru64 sub-second resolution timestamp support.
     * Enable IPv6 support for NetBSD and FreeBSD.
+    * Use correct BSD evironment variable.
 
 
 o   Guenter Kukkukk <linux@kukkukk.com>

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index a73660958055f72559c2edcb32a8ff44cd0ca95c..d05115b892d3d7aa207ad9df8dce7e53471ed9e5 100644 (file)
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -650,7 +650,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) {
@@ -1079,6 +1081,14 @@ int main(int argc, char ** argv)
                }
                mountpoint = argv[2];
        } else {
+               if ((strcmp (argv[1], "--version") == 0) ||
+                   ((strcmp (argv[1], "-V") == 0))) {
+                       printf ("mount.cifs version: %s.%s%s\n",
+                       MOUNT_CIFS_VERSION_MAJOR,
+                       MOUNT_CIFS_VERSION_MINOR,
+                       MOUNT_CIFS_VENDOR_SUFFIX);
+                       exit (0);
+               }
                mount_cifs_usage();
                exit(EX_USAGE);
        }

diff --git a/source/include/includes.h b/source/include/includes.h
index d95b8215fb578806f1b2dd6e8558088acce7993a..7b24b729e33568dab157170eaa3b6b4e260f7a11 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -207,12 +207,12 @@ typedef int ber_int_t;
 #undef HAVE_LDAP
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
 #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
 #endif
 
 #if HAVE_COM_ERR_H

diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index 8c642b1794cd6354a86016c8be1300253c2c9bfa..869aeb6a032336512c101f528e61f07041cc95c5 100644 (file)
--- a/source/include/libsmbclient.h
+++ b/source/include/libsmbclient.h
@@ -2677,11 +2677,11 @@ smbc_version(void);
  */
 
 void
-smbc_set_credentials(char *workgroup,
-                     char *user,
-                     char *password,
+smbc_set_credentials(const char *workgroup,
+                     const char *user,
+                     const char *password,
                      smbc_bool use_kerberos,
-                     char *signing_state);
+                     const char *signing_state);
 
 /*
  * Wrapper around smbc_set_credentials.

diff --git a/source/lib/fault.c b/source/lib/fault.c
index 1bd7d038c9edf99a6ea08d0fc138e73c86993ea3..4a949320f06088fee8cec5d72eab376eeb6235f3 100644 (file)
--- a/source/lib/fault.c
+++ b/source/lib/fault.c
@@ -157,7 +157,6 @@ void dump_core_setup(const char *progname)
                return;
        }
 
-       SAFE_FREE(corepath);
        SAFE_FREE(logbase);
 
 #ifdef HAVE_GETRLIMIT

diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index 2eaeaf7608423d05ca0d244d582d48913086f76f..9f6e7e9864ee50f28d3733eca25cbff1ad86709c 100644 (file)
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -81,12 +81,12 @@
 #include <krb5.h>
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
 #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
 #endif
 
 #if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)

diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c
index 90f18ac537090031ef982ca55be911752da08a88..ec163114126556a24f7be26c4f35909c7c648be4 100644 (file)
--- a/source/libsmb/libsmb_context.c
+++ b/source/libsmb/libsmb_context.c
@@ -630,11 +630,11 @@ smbc_version(void)
  * Set the credentials so DFS will work when following referrals.
  */
 void
-smbc_set_credentials(char *workgroup,
-                     char *user,
-                     char *password,
+smbc_set_credentials(const char *workgroup,
+                     const char *user,
+                     const char *password,
                      smbc_bool use_kerberos,
-                     char *signing_state)
+                     const char *signing_state)
 {
         
         set_cmdline_auth_info_username(user);
@@ -675,18 +675,8 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
                signing_state = "force";
        }
 
-       /* Using CONST_DISCARD here is ugly, but
-        * we know that smbc_set_credentials() doesn't
-        * actually modify the strings, and should have
-        * been const from the start. We're constrained
-        * by the ABI here.
-        */
-
-       smbc_set_credentials(CONST_DISCARD(char *,workgroup),
-                            CONST_DISCARD(char *,user),
-                            CONST_DISCARD(char *,password),
-                            use_kerberos,
-                            CONST_DISCARD(char *,signing_state));
+       smbc_set_credentials(workgroup, user, password,
+                             use_kerberos, signing_state);
 
        if (smbc_getOptionFallbackAfterKerberos(context)) {
                cli_cm_set_fallback_after_kerberos();