summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/auth_server.c2
-rw-r--r--source3/lib/iconv.c2
-rw-r--r--source3/lib/sendfile.c3
-rw-r--r--source3/lib/util_sock.c4
-rw-r--r--source3/nsswitch/libwbclient/wbc_sid.c2
-rw-r--r--source3/smbd/utmp.c3
-rw-r--r--source3/winbindd/winbindd_pam.c36
7 files changed, 23 insertions, 29 deletions
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 31d1d37fbf..696b42621e 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -37,7 +37,7 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
const char *p;
char *pserver = NULL;
bool connected_ok = False;
- struct named_mutex *mutex;
+ struct named_mutex *mutex = NULL;
if (!(cli = cli_initialise()))
return NULL;
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 6575dba5a9..3ceb637b8e 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -136,7 +136,7 @@ static size_t sys_iconv(void *cd,
char **outbuf, size_t *outbytesleft)
{
size_t ret = iconv((iconv_t)cd,
- (char **)inbuf, inbytesleft,
+ (void *)inbuf, inbytesleft,
outbuf, outbytesleft);
if (ret == (size_t)-1) {
int saved_errno = errno;
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c
index 20b2371273..d1b178577c 100644
--- a/source3/lib/sendfile.c
+++ b/source3/lib/sendfile.c
@@ -383,7 +383,8 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
hdtrl.iov_base = NULL;
hdtrl.iov_len = 0;
} else {
- hdtrl.iov_base += nwritten;
+ hdtrl.iov_base =
+ (caddr_t)hdtrl.iov_base + nwritten;
hdtrl.iov_len -= nwritten;
nwritten = 0;
}
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 822ff26331..7356b3ec35 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -43,9 +43,9 @@ bool is_ipaddress_v4(const char *str)
bool is_ipaddress(const char *str)
{
+#if defined(HAVE_IPV6)
int ret = -1;
-#if defined(HAVE_IPV6)
if (strchr_m(str, ':')) {
char addr[INET6_ADDRSTRLEN];
struct in6_addr dest6;
@@ -212,9 +212,9 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
const char *str,
int flags)
{
- char addr[INET6_ADDRSTRLEN];
struct addrinfo *res = NULL;
#if defined(HAVE_IPV6)
+ char addr[INET6_ADDRSTRLEN];
unsigned int scope_id = 0;
if (strchr_m(str, ':')) {
diff --git a/source3/nsswitch/libwbclient/wbc_sid.c b/source3/nsswitch/libwbclient/wbc_sid.c
index 475c9947e0..09bfc3e840 100644
--- a/source3/nsswitch/libwbclient/wbc_sid.c
+++ b/source3/nsswitch/libwbclient/wbc_sid.c
@@ -242,7 +242,7 @@ wbcErr wbcLookupSid(const struct wbcDomainSid *sid,
char *sid_string = NULL;
char *domain = NULL;
char *name = NULL;
- enum wbcSidType name_type;
+ enum wbcSidType name_type = WBC_SID_NAME_USE_NONE;
if (!sid) {
wbc_status = WBC_ERR_INVALID_PARAM;
diff --git a/source3/smbd/utmp.c b/source3/smbd/utmp.c
index de6d707eaf..af947ef462 100644
--- a/source3/smbd/utmp.c
+++ b/source3/smbd/utmp.c
@@ -189,7 +189,7 @@ static const char *wt_pathname =
# endif
/* BSD-like systems might want "lastlog" support. */
-/* *** Not yet implemented */
+#if 0 /* *** Not yet implemented */
#ifndef HAVE_PUTUTLINE /* see "pututline_my()" */
static const char *ll_pathname =
# if defined (_PATH_LASTLOG) /* what other names (if any?) */
@@ -198,6 +198,7 @@ static const char *ll_pathname =
"" ;
# endif /* _PATH_LASTLOG */
#endif /* HAVE_PUTUTLINE */
+#endif
/*
* Get name of {u,w}tmp{,x} file.
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index c26f552d31..0f9f1e1621 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1179,6 +1179,18 @@ done:
return result;
}
+typedef NTSTATUS (*netlogon_fn_t)(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ uint32 logon_parameters,
+ const char *server,
+ const char *username,
+ const char *domain,
+ const char *workstation,
+ const uint8 chal[8],
+ DATA_BLOB lm_response,
+ DATA_BLOB nt_response,
+ struct netr_SamInfo3 **info3);
+
NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
struct winbindd_cli_state *state,
struct netr_SamInfo3 **info3)
@@ -1285,17 +1297,7 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
/* check authentication loop */
do {
- NTSTATUS (*logon_fn)(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32 logon_parameters,
- const char *server,
- const char *username,
- const char *ldomain,
- const char *workstation,
- const uint8 lchal[8],
- DATA_BLOB lm_response,
- DATA_BLOB nt_response,
- struct netr_SamInfo3 **linfo3);
+ netlogon_fn_t logon_fn;
ZERO_STRUCTP(my_info3);
retry = False;
@@ -1863,17 +1865,7 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
}
do {
- NTSTATUS (*logon_fn)(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- uint32 logon_parameters,
- const char *server,
- const char *username,
- const char *ldomain,
- const char *lworkstation,
- const uint8 lchal[8],
- DATA_BLOB lm_response,
- DATA_BLOB nt_response,
- struct netr_SamInfo3 **linfo3);
+ netlogon_fn_t logon_fn;
retry = False;