6 files changed, 18 insertions, 14 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d617fe1f0b..34eaeb2d79 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -163,6 +163,8 @@ static void terminate(bool is_parent)
 
 	trustdom_cache_shutdown();
 
+	gencache_stabilize();
+
 #if 0
 	if (interactive) {
 		TALLOC_CTX *mem_ctx = talloc_init("end_description");
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 0f40419a0e..08afb46674 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -210,7 +210,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 		gid_t primary_gid = (gid_t)-1;
 
 		if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
-		    ads_atype_map(atype) != SID_NAME_USER) {
+		    ds_atype_map(atype) != SID_NAME_USER) {
 			DEBUG(1,("Not a user account? atype=0x%x\n", atype));
 			continue;
 		}
@@ -608,7 +608,7 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain,
 		goto done;
 	}
 
-	if (!(escaped_dn = escape_ldap_string_alloc(user_dn))) {
+	if (!(escaped_dn = escape_ldap_string(talloc_tos(), user_dn))) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -620,12 +620,12 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain,
 		GROUP_TYPE_SECURITY_ENABLED);
 	if (!ldap_exp) {
 		DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
-		SAFE_FREE(escaped_dn);
+		TALLOC_FREE(escaped_dn);
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
 
-	SAFE_FREE(escaped_dn);
+	TALLOC_FREE(escaped_dn);
 
 	rc = ads_search_retry(ads, &res, ldap_exp, group_attrs);
 	
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 92f0d60817..ab07c9767d 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -179,10 +179,6 @@ int wb_child_request_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 	if (tevent_req_is_unix_error(req, err)) {
 		return -1;
 	}
-	if (state->response->result != WINBINDD_OK) {
-		*err = EIO; /* EIO doesn't fit, but what would be better? */
-		return -1;
-	}
 	*presponse = talloc_move(mem_ctx, &state->response);
 	return 0;
 }
diff --git a/source3/winbindd/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c
index b18f0ff595..9a43c6d6a2 100644
--- a/source3/winbindd/winbindd_passdb.c
+++ b/source3/winbindd/winbindd_passdb.c
@@ -332,29 +332,29 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (!pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
+	if (!pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
 				    &account_policy_temp)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 	p->min_password_length = account_policy_temp;
 
-	if (!pdb_get_account_policy(AP_PASSWORD_HISTORY,
+	if (!pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY,
 				    &account_policy_temp)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 	p->password_history_length = account_policy_temp;
 
-	if (!pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+	if (!pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 				    &p->password_properties)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
-	if (!pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &account_policy_temp)) {
+	if (!pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &account_policy_temp)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 	u_expire = account_policy_temp;
 
-	if (!pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &account_policy_temp)) {
+	if (!pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &account_policy_temp)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 	u_min_age = account_policy_temp;
diff --git a/source3/winbindd/winbindd_sid.c b/source3/winbindd/winbindd_sid.c
index c091cd7f53..f8cf7db920 100644
--- a/source3/winbindd/winbindd_sid.c
+++ b/source3/winbindd/winbindd_sid.c
@@ -93,6 +93,11 @@ void winbindd_lookupname(struct winbindd_cli_state *state)
 		*p = 0;
 		name_domain = state->request->data.name.name;
 		name_user = p+1;
+	} else if ((p = strchr(state->request->data.name.name, '@')) != NULL) {
+		/* upn */
+		name_domain = p + 1;
+		*p = 0;
+		name_user = state->request->data.name.name;
 	} else {
 		name_domain = state->request->data.name.dom_name;
 		name_user = state->request->data.name.name;
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 283eee09af..44ae814ae9 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -996,7 +996,8 @@ bool parse_domain_user(const char *domuser, fstring domain, fstring user)
 		if ( assume_domain(lp_workgroup())) {
 			fstrcpy(domain, lp_workgroup());
 		} else if ((p = strchr(domuser, '@')) != NULL) {
-			fstrcpy(domain, "");
+			fstrcpy(domain, p + 1);
+			user[PTR_DIFF(p, domuser)] = 0;
 		} else {
 			return False;
 		}