The branch, master has been updated
via 263c7c2 s3: Use the correct enum values
via a5c0446 nsswitch: Remove a pointless if-clause
via bd6ff4d libcli: Remove a pointless check
from fe3274d provision: Start splitting out provision result reporting
from actual provisioning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 263c7c28e3cc28a91577631cc6e8f1a96426868c
Author: Volker Lendecke <v...@samba.org>
Date: Sat Feb 25 21:27:28 2012 +0100
s3: Use the correct enum values
wbcIdType and id_type have the same values, but different names
Autobuild-User: Volker Lendecke <v...@samba.org>
Autobuild-Date: Sat Feb 25 23:46:36 CET 2012 on sn-devel-104
commit a5c044644f7387cb0859f823f91d735e94594b7a
Author: Volker Lendecke <v...@samba.org>
Date: Sat Feb 25 21:20:21 2012 +0100
nsswitch: Remove a pointless if-clause
gr->num_gr_mem is a uint32, so it can never be < 0
commit bd6ff4dbab68b34b7903ebbde470b970e45dcdb7
Author: Volker Lendecke <v...@samba.org>
Date: Sat Feb 25 21:17:40 2012 +0100
libcli: Remove a pointless check
"n" is size_t, so it is always >=0.
-----------------------------------------------------------------------
Summary of changes:
libcli/auth/msrpc_parse.c | 4 +---
nsswitch/winbind_nss_linux.c | 2 +-
source3/winbindd/winbindd_sids_to_xids.c | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
index 8b64e98..d499d9e 100644
--- a/libcli/auth/msrpc_parse.c
+++ b/libcli/auth/msrpc_parse.c
@@ -177,9 +177,7 @@ NTSTATUS msrpc_gen(TALLOC_CTX *mem_ctx,
n = pointers[i].length;
SSVAL(blob->data, data_ofs, n); data_ofs += 2;
- if (n >= 0) {
- memcpy(blob->data+data_ofs, pointers[i].data,
n);
- }
+ memcpy(blob->data+data_ofs, pointers[i].data, n);
data_ofs += n;
break;
case 'd':
diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c
index 7b16752..8d66a74 100644
--- a/nsswitch/winbind_nss_linux.c
+++ b/nsswitch/winbind_nss_linux.c
@@ -322,7 +322,7 @@ static NSS_STATUS fill_grent(struct group *result, struct
winbindd_gr *gr,
/* Group membership */
- if ((gr->num_gr_mem < 0) || !gr_mem) {
+ if (!gr_mem) {
gr->num_gr_mem = 0;
}
diff --git a/source3/winbindd/winbindd_sids_to_xids.c
b/source3/winbindd/winbindd_sids_to_xids.c
index b416e3a..0ed6c89 100644
--- a/source3/winbindd/winbindd_sids_to_xids.c
+++ b/source3/winbindd/winbindd_sids_to_xids.c
@@ -189,15 +189,15 @@ static void winbindd_sids_to_xids_lookupsids_done(struct
tevent_req *subreq)
switch (n->sid_type) {
case SID_NAME_USER:
case SID_NAME_COMPUTER:
- t->type = WBC_ID_TYPE_UID;
+ t->type = ID_TYPE_UID;
break;
case SID_NAME_DOM_GRP:
case SID_NAME_ALIAS:
case SID_NAME_WKN_GRP:
- t->type = WBC_ID_TYPE_GID;
+ t->type = ID_TYPE_GID;
break;
default:
- t->type = WBC_ID_TYPE_NOT_SPECIFIED;
+ t->type = ID_TYPE_NOT_SPECIFIED;
break;
};
t->domain_index = n->sid_index;
--
Samba Shared Repository
