The branch, master has been updated
via 3aecad2 winbind: dom_sid_parse_endp always initializes "endp" when
ok
via 5bded5b idmap_autorid: dom_sid_parse_endp always initializes "endp"
when ok
via a590238 lib: Make dom_sid_parse_endp init "endp" on all "ok" paths
via 61d5009 idmap_autorid: Add a {} pair in an if-statement
from a3add01 printing: Fix building with CUPS version older than 1.7
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3aecad2ffd1a3ad906ef40d77cca3530042d6a10
Author: Volker Lendecke <v...@samba.org>
Date: Thu Dec 1 16:16:14 2016 +0000
winbind: dom_sid_parse_endp always initializes "endp" when ok
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Wed Dec 7 00:11:03 CET 2016 on sn-devel-144
commit 5bded5b483efa74539e56748a4a54af02dc725e2
Author: Volker Lendecke <v...@samba.org>
Date: Thu Dec 1 16:16:14 2016 +0000
idmap_autorid: dom_sid_parse_endp always initializes "endp" when ok
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit a5902383e3886e874bd270a06673d07386149dfd
Author: Volker Lendecke <v...@samba.org>
Date: Thu Dec 1 16:15:29 2016 +0000
lib: Make dom_sid_parse_endp init "endp" on all "ok" paths
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 61d5009888dd3bf614345a249c8c1e44bca1533f
Author: Volker Lendecke <v...@samba.org>
Date: Thu Dec 1 16:11:38 2016 +0000
idmap_autorid: Add a {} pair in an if-statement
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/security/dom_sid.c | 3 ++-
source3/winbindd/idmap_autorid.c | 3 ++-
source3/winbindd/winbindd_util.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/dom_sid.c b/libcli/security/dom_sid.c
index 8b30ee6..5454c51 100644
--- a/libcli/security/dom_sid.c
+++ b/libcli/security/dom_sid.c
@@ -172,7 +172,7 @@ bool dom_sid_parse_endp(const char *sidstr,struct dom_sid
*sidout,
sidout->num_auths = 0;
if (*q != '-') {
/* Just id_auth, no subauths */
- return true;
+ goto done;
}
q++;
@@ -200,6 +200,7 @@ bool dom_sid_parse_endp(const char *sidstr,struct dom_sid
*sidout,
}
q += 1;
}
+done:
if (endp != NULL) {
*endp = q;
}
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 20cd5b7..1fd6a76 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -243,7 +243,7 @@ static NTSTATUS idmap_autorid_id_to_sid(struct
autorid_global_config *cfg,
map->status = ID_UNKNOWN;
return NT_STATUS_OK;
}
- if ((q != NULL) && (*q != '\0'))
+ if (*q != '\0') {
if (sscanf(q+1, "%"SCNu32, &domain_range_index) != 1) {
DEBUG(10, ("Domain range index not found, "
"ignoring mapping request\n"));
@@ -251,6 +251,7 @@ static NTSTATUS idmap_autorid_id_to_sid(struct
autorid_global_config *cfg,
map->status = ID_UNKNOWN;
return NT_STATUS_OK;
}
+ }
TALLOC_FREE(data.dptr);
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index a35b59e..38e4b8b 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -1651,7 +1651,7 @@ bool parse_sidlist(TALLOC_CTX *mem_ctx, const char
*sidstr,
DEBUG(1, ("Could not parse sid %s\n", p));
return false;
}
- if ((q == NULL) || (q[0] != '\n')) {
+ if (q[0] != '\n') {
DEBUG(1, ("Got invalid sidstr: %s\n", p));
return false;
}
--
Samba Shared Repository
