summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/includes.h28
-rw-r--r--source3/lib/util_seaccess.c3
-rw-r--r--source3/passdb/secrets.c2
-rw-r--r--source3/rpc_parse/parse_spoolss.c2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c3
-rw-r--r--source3/smbd/vfs.c4
6 files changed, 23 insertions, 19 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4a760b86f5..4b4d741648 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -671,6 +671,20 @@ typedef struct smb_wpasswd {
#define UNI_XDIGIT 0x8
#define UNI_SPACE 0x10
+#ifdef HAVE_NSS_H
+#include <nss.h>
+#else
+
+/* Minimal needed to compile.. */
+
+enum nss_status {
+ NSS_STATUS_SUCCESS,
+ NSS_STATUS_NOTFOUND,
+ NSS_STATUS_UNAVAIL
+};
+
+#endif
+
/***** automatically generated prototypes *****/
#include "proto.h"
@@ -935,19 +949,5 @@ extern int DEBUGLEVEL;
#define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */
-#ifdef HAVE_NSS_H
-#include <nss.h>
-#else
-
-/* Minimal needed to compile.. */
-
-enum nss_status {
- NSS_STATUS_SUCCESS,
- NSS_STATUS_NOTFOUND,
- NSS_STATUS_UNAVAIL
-};
-
-#endif
-
#endif /* _INCLUDES_H */
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index 128cbffc0c..4dbeb36ae6 100644
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -210,7 +210,8 @@ BOOL se_access_check(SEC_DESC *sd, uid_t uid, gid_t gid, int ngroups,
{
DOM_SID user_sid, group_sid;
DOM_SID **group_sids = NULL;
- int i, j, ngroup_sids = 0;
+ int i, j;
+ uint ngroup_sids = 0;
SEC_ACL *acl;
uint8 check_ace_type;
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 4093a653d2..0e98d60f4a 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -101,7 +101,7 @@ BOOL secrets_fetch_domain_sid(char *domain, DOM_SID *sid)
{
DOM_SID *dyn_sid;
fstring key;
- int size;
+ size_t size;
slprintf(key, sizeof(key), "%s/%s", SECRETS_DOMAIN_SID, domain);
dyn_sid = (DOM_SID *)secrets_fetch(key, &size);
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index ec8f9901f5..470e25e032 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1957,7 +1957,7 @@ BOOL new_smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int
********************************************************************/
BOOL new_smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth)
{
- int pipo=0;
+ uint pipo=0;
prs_struct *ps=&(buffer->prs);
prs_debug(ps, depth, desc, "new_smb_io_job_info_2");
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 0be371df11..dd3a5dd733 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2941,7 +2941,8 @@ uint32 _spoolss_writeprinter( const POLICY_HND *handle,
return ERROR_INVALID_HANDLE;
}
- (*buffer_written) = print_job_write(Printer->jobid, buffer, buffer_size);
+ (*buffer_written) = print_job_write(Printer->jobid, (char *)buffer,
+ buffer_size);
return 0x0;
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 9a1af18b3d..7c34817351 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -83,6 +83,7 @@ int vfs_init_default(connection_struct *conn)
/****************************************************************************
initialise custom vfs hooks
****************************************************************************/
+
#ifdef HAVE_LIBDL
BOOL vfs_init_custom(connection_struct *conn)
{
@@ -105,7 +106,8 @@ BOOL vfs_init_custom(connection_struct *conn)
/* Get handle on vfs_init() symbol */
- fptr = dlsym(handle, "vfs_init");
+ fptr = (struct vfs_ops *(*)(struct vfs_options *))
+ dlsym(handle, "vfs_init");
if (fptr == NULL) {
DEBUG(0, ("No vfs_init() symbol found in %s\n",