r5738: fix my build breakage; fix a few compiler warnings

diff --git a/source/libsmb/libsmb_cache.c b/source/libsmb/libsmb_cache.c
index dabf5a527d5040523a43546e79e545c04294dabe..71399f14db8edbe500edabcd4fa67cc83344f218 100644 (file)
--- a/source/libsmb/libsmb_cache.c
+++ b/source/libsmb/libsmb_cache.c
@@ -143,7 +143,7 @@ static SMBCSRV * smbc_get_cached_server(SMBCCTX * context, const char * server,
                          * a connection to the server (other than the
                          * attribute server connection) is cool.
                          */
-                        if (context->options.one_share_per_server) {
+                        if (context->internal->options.one_share_per_server) {
                                 /*
                                  * The currently connected share name
                                  * doesn't match the requested share, so

diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index bc15fe7d5087e2e1d602d58b14367a52ae431f77..c876720cfab5bb90bdf3a8e4d92bea070ce1dcf9 100644 (file)
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -4370,9 +4370,7 @@ int smbc_getxattr_ctx(SMBCCTX *context,
                 /* Yup. */
                 ret = cacl_get(context, ctx, srv,
                                ipc_srv == NULL ? NULL : &ipc_srv->cli, 
-                               &pol,
-                               (char *) path, (char *) name,
-                               (const char *) value, size);
+                               &pol, path, name, (const char *) value, size);
                 if (ret < 0 && errno == 0) {
                         errno = smbc_errno(context, &srv->cli);
                 }