[SCM] Samba Shared Repository - branch master updated
[email protected] (David Disseldorp)
| Newsgroups | gmane.network.samba.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch, master has been updated
via a25fb5c idmap_rid: Add the error string in a debug
via 3d875e7 idmap_autorid: Add the error string in a debug
via 462e8ce ctdb: Fix CID 1398175 Dereference after null check
via 96924f7 ctdb: Fix CID 1398178 Argument cannot be negative
via 93e8876 ctdb: Fix CID 1398179 Argument cannot be negative
via 055650e lib: Fix a comment in idmap_cache.c
via 92daaa9 lib: Fix whitespace in lmhosts.c
via b26d441 idl: Fix a comment typo
from 1e52bb9 krb5_wrap: fix smb_krb5_cc_copy_creds() for MIT krb5
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a25fb5cae26a26aa3b994824b57e34624727b2a5
Author: Volker Lendecke <[email protected]>
Date: Sun Dec 11 19:57:20 2016 +0100
idmap_rid: Add the error string in a debug
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
Autobuild-User(master): David Disseldorp <[email protected]>
Autobuild-Date(master): Tue Dec 27 18:05:13 CET 2016 on sn-devel-144
commit 3d875e7e9ee1df368532b7962dd5de12faf1c87a
Author: Volker Lendecke <[email protected]>
Date: Sun Dec 11 19:57:12 2016 +0100
idmap_autorid: Add the error string in a debug
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit 462e8cea04856eb5c82260a817f7d70770724d2e
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 27 10:50:29 2016 +0000
ctdb: Fix CID 1398175 Dereference after null check
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit 96924f75535f12ad4eb971a2b713b3ba3590ee1e
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 27 10:48:21 2016 +0000
ctdb: Fix CID 1398178 Argument cannot be negative
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit 93e8876635f56da419ae050223503cec524bfd9e
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 27 10:47:10 2016 +0000
ctdb: Fix CID 1398179 Argument cannot be negative
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit 055650ecb65f1d1d98ca97f9b938d33fe84bd28e
Author: Volker Lendecke <[email protected]>
Date: Wed Dec 21 09:48:15 2016 +0000
lib: Fix a comment in idmap_cache.c
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit 92daaa97904a713236ebe3fb5cd53601fbe1c5b7
Author: Volker Lendecke <[email protected]>
Date: Mon Dec 19 19:32:46 2016 +0100
lib: Fix whitespace in lmhosts.c
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
commit b26d441deab0fc79e0a5bae984a296ec2263b353
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 6 12:23:33 2016 +0000
idl: Fix a comment typo
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/sock_daemon.c | 2 +-
ctdb/common/sock_io.c | 1 -
ctdb/server/ctdb_takeover_helper.c | 2 +-
libcli/nbt/lmhosts.c | 8 ++++----
librpc/idl/dnsserver.idl | 2 +-
source3/lib/idmap_cache.c | 8 ++++----
source3/winbindd/idmap_autorid.c | 5 +++--
source3/winbindd/idmap_rid.c | 4 +++-
8 files changed, 17 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/sock_daemon.c b/ctdb/common/sock_daemon.c
index 0a6573c..dc5dba0 100644
--- a/ctdb/common/sock_daemon.c
+++ b/ctdb/common/sock_daemon.c
@@ -282,7 +282,7 @@ static int sock_socket_init(TALLOC_CTX *mem_ctx, const char *sockpath,
static int sock_socket_destructor(struct sock_socket *sock)
{
- if (sock->fd == -1) {
+ if (sock->fd != -1) {
close(sock->fd);
sock->fd = -1;
}
diff --git a/ctdb/common/sock_io.c b/ctdb/common/sock_io.c
index 7245d4e..b3581fc 100644
--- a/ctdb/common/sock_io.c
+++ b/ctdb/common/sock_io.c
@@ -53,7 +53,6 @@ int sock_connect(const char *sockpath)
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1) {
D_ERR("socket() failed, errno=%d\n", errno);
- close(fd);
return -1;
}
diff --git a/ctdb/server/ctdb_takeover_helper.c b/ctdb/server/ctdb_takeover_helper.c
index 847a49d..3057528 100644
--- a/ctdb/server/ctdb_takeover_helper.c
+++ b/ctdb/server/ctdb_takeover_helper.c
@@ -111,7 +111,7 @@ static struct tevent_req *get_public_ips_send(
req = tevent_req_create(mem_ctx, &state, struct get_public_ips_state);
if (req == NULL) {
- return tevent_req_post(req, ev);
+ return NULL;
}
state->pnns = pnns;
diff --git a/libcli/nbt/lmhosts.c b/libcli/nbt/lmhosts.c
index 722f6ad..f47d8b9 100644
--- a/libcli/nbt/lmhosts.c
+++ b/libcli/nbt/lmhosts.c
@@ -159,9 +159,9 @@ void endlmhosts(FILE *fp)
Resolve via "lmhosts" method.
*********************************************************/
-NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
+NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
const char *name, int name_type,
- TALLOC_CTX *mem_ctx,
+ TALLOC_CTX *mem_ctx,
struct sockaddr_storage **return_iplist,
int *return_count)
{
@@ -205,8 +205,8 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(const char *lmhosts_file,
TALLOC_FREE(lmhost_name);
continue;
}
-
- *return_iplist = talloc_realloc(ctx, (*return_iplist),
+
+ *return_iplist = talloc_realloc(ctx, (*return_iplist),
struct sockaddr_storage,
(*return_count)+1);
diff --git a/librpc/idl/dnsserver.idl b/librpc/idl/dnsserver.idl
index c7742e7..50cbfbe 100644
--- a/librpc/idl/dnsserver.idl
+++ b/librpc/idl/dnsserver.idl
@@ -1,7 +1,7 @@
#include "idl_types.h"
/*
dnsserver interface definition
- for a protocol descrition see [MS-DNSP].pdf
+ for a protocol description see [MS-DNSP].pdf
*/
import "misc.idl", "dnsp.idl";
diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index 11bda39..1e8a1eb 100644
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -274,12 +274,12 @@ bool idmap_cache_find_gid2sid(gid_t gid, struct dom_sid *sid, bool *expired)
/**
* Store a mapping in the idmap cache
* @param[in] sid the sid to map
- * @param[in] gid the gid to map
+ * @param[in] unix_id the unix_id to map
*
* If both parameters are valid values, then a positive mapping in both
* directions is stored. If "is_null_sid(sid)" is true, then this will be a
- * negative mapping of gid, we want to cache that for this gid we could not
- * find anything. Likewise if "gid==-1", then we want to cache that we did not
+ * negative mapping of xid, we want to cache that for this xid we could not
+ * find anything. Likewise if "xid==-1", then we want to cache that we did not
* find a mapping for the sid passed here.
*/
@@ -315,7 +315,7 @@ void idmap_cache_set_sid2unixid(const struct dom_sid *sid, struct unixid *unix_i
}
if (unix_id->id != -1) {
if (is_null_sid(sid)) {
- /* negative gid mapping */
+ /* negative xid mapping */
fstrcpy(value, "-");
timeout = lp_idmap_negative_cache_time();
}
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index c27c503..786f839 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -343,8 +343,9 @@ static NTSTATUS idmap_autorid_unixids_to_sids(struct idmap_domain *dom,
if ((!NT_STATUS_IS_OK(ret)) &&
(!NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {
/* some fatal error occurred, log it */
- DEBUG(3, ("Unexpected error resolving an ID "
- " (%d)\n", ids[i]->xid.id));
+ DBG_NOTICE("Unexpected error resolving an ID "
+ "(%d): %s\n", ids[i]->xid.id,
+ nt_errstr(ret));
goto failure;
}
diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c
index d68dbf7..ac53705 100644
--- a/source3/winbindd/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
@@ -143,7 +143,9 @@ static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_ma
if (( ! NT_STATUS_IS_OK(ret)) &&
( ! NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {
/* some fatal error occurred, log it */
- DEBUG(3, ("Unexpected error resolving an ID (%d)\n", ids[i]->xid.id));
+ DBG_NOTICE("Unexpected error resolving an ID "
+ "(%d): %s\n", ids[i]->xid.id,
+ nt_errstr(ret));
}
}
--
Samba Shared Repository