9 files changed, 20 insertions, 28 deletions
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index 7d4dd2b5ab..1227b2a052 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -193,8 +193,7 @@ static NTSTATUS unixids_to_sids(struct idmap_domain *dom,
 		if (!hashed_domains[h_domain].sid)
 			continue;
 
-		sid_copy(ids[i]->sid, hashed_domains[h_domain].sid);
-		sid_append_rid(ids[i]->sid, h_rid);
+		sid_compose(ids[i]->sid, hashed_domains[h_domain].sid, h_rid);
 		ids[i]->status = ID_MAPPED;
 	}
 
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 189b088809..8bfe751a8b 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -97,8 +97,7 @@ static int convert_fn(struct db_record *rec, void *private_data)
 
 	rid = atoi(p);
 
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
+	sid_compose(&sid, &domain->sid, rid);
 
 	sid_to_fstring(keystr, &sid);
 	key2 = string_term_tdb_data(keystr);
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index d15fb86d86..f647a3ffaf 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -880,8 +880,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 		goto done;
 	}
 
-	sid_copy(&primary_group, &domain->sid);
-	sid_append_rid(&primary_group, primary_group_rid);
+	sid_compose(&primary_group, &domain->sid, primary_group_rid);
 
 	count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids);
 
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 68972dd18d..b7b5e6d7ed 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2986,8 +2986,7 @@ void wcache_invalidate_samlogon(struct winbindd_domain *domain,
                 return;
         }
 
-	sid_copy(&sid, info3->base.domain_sid);
-	sid_append_rid(&sid, info3->base.rid);
+	sid_compose(&sid, info3->base.domain_sid, info3->base.rid);
 
 	/* Clear U/SID cache entry */
 	fstr_sprintf(key_str, "U/%s", sid_to_fstring(sid_string, &sid));
diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 921110a0be..2f71aaae52 100644
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -116,7 +116,7 @@ static NTSTATUS do_ntlm_auth_with_hashes(const char *username,
 		data_blob_free(&reply);
 		goto done;
 	}
-	*auth_msg = reply;
+	*auth_msg = data_blob(reply.data, reply.length);
 	status = NT_STATUS_OK;
 
 done:
diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index e63e73221e..df09bbe1bd 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -523,11 +523,10 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 				   "user krb5 ccache %s with %s\n", ccname,
 				   error_message(ret)));
 			return krb5_to_nt_status(ret);
-		} else {
-			DEBUG(10, ("add_ccache_to_list: successfully destroyed "
-				   "krb5 ccache %s for user %s\n", ccname,
-				   username));
 		}
+		DEBUG(10, ("add_ccache_to_list: successfully destroyed "
+			   "krb5 ccache %s for user %s\n", ccname,
+			   username));
 	}
 #endif
 
@@ -545,11 +544,11 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 		/* FIXME: in this case we still might want to have a krb5 cred
 		 * event handler created - gd
 		 * Add ticket refresh handler here */
-		
+
 		if (!lp_winbind_refresh_tickets() || renew_until <= 0) {
 			return NT_STATUS_OK;
 		}
-		
+
 		if (!entry->event) {
 			if (postponed_request) {
 				t = timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0);
@@ -586,7 +585,7 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 
 			DEBUG(10,("add_ccache_to_list: added krb5_ticket handler\n"));
 		}
-		 
+
 		return NT_STATUS_OK;
 	}
 
diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c
index 98a16ee937..46c7a06f7c 100644
--- a/source3/winbindd/winbindd_creds.c
+++ b/source3/winbindd/winbindd_creds.c
@@ -4,17 +4,17 @@
    Winbind daemon - cached credentials funcions
 
    Copyright (C) Guenther Deschner 2005
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -66,10 +66,8 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain,
 
 	if (info3 != NULL) {
 
-		DOM_SID sid;
-		sid_copy(&sid, info3->base.domain_sid);
-		sid_append_rid(&sid, info3->base.rid);
-		sid_copy(&cred_sid, &sid);
+		sid_compose(&cred_sid, info3->base.domain_sid,
+			    info3->base.rid);
 		info3->base.user_flags |= NETLOGON_CACHED_ACCOUNT;
 
 	} else if (user_sid != NULL) {
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 357b6463d5..4658231a5c 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -195,8 +195,8 @@ static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
 		DOM_SID user_sid;
 		fstring sidstr;
 
-		sid_copy(&user_sid, info3->base.domain_sid);
-		sid_append_rid(&user_sid, info3->base.rid);
+		sid_compose(&user_sid, info3->base.domain_sid,
+			    info3->base.rid);
 		sid_to_fstring(sidstr, &user_sid);
 		afsname = talloc_string_sub(mem_ctx, afsname,
 					    "%s", sidstr);
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 2146953639..87494db2bb 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -612,9 +612,8 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 		return NT_STATUS_NO_MEMORY;
 
 	for (i=0;i<(*num_groups);i++) {
-		sid_copy(&((*user_grpsids)[i]), &domain->sid);
-		sid_append_rid(&((*user_grpsids)[i]),
-				rid_array->rids[i].rid);
+		sid_compose(&((*user_grpsids)[i]), &domain->sid,
+			    rid_array->rids[i].rid);
 	}
 
 	return NT_STATUS_OK;