weekend work. user / group database API.

- split sam_passwd and smb_passwd into separate higher-order function tables

- renamed struct smb_passwd's "smb_user" to "unix_user".  added "nt_user"
plus user_rid, and added a "wrap" function in both sam_passwd and smb_passwd
password databases to fill in the blank entries that are not obtained
from whatever password database API instance is being used.

NOTE: whenever a struct smb_passwd or struct sam_passwd is used, it MUST
be initialised with pwdb_sam_init() or pwd_smb_init(), see chgpasswd.c
for the only example outside of the password database APIs i could find.

- added query_useraliases code to rpcclient.

- dealt with some nasty interdependencies involving non-smbd programs
and the password database API.  this is still not satisfactorily
resolved completelely, but it's the best i can do for now.

- #ifdef'd out some password database options so that people don't
mistakenly set them unless they recompile to _use_ those options.

lots of debugging done, it's still not finished.  the unix/NT uid/gid
and user-rid/group-rid issues are better, but not perfect.  the "BUILTIN"
domain is still missing: users cannot be added to "BUILTIN" groups yet,
as we only have an "alias" db API and a "group" db API but not "builtin-alias"
db API...
(This used to be commit 5d5d7e4de7d1514ab87b07ede629de8aa00519a1)

1 files changed, 25 insertions, 9 deletions

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index da13e1033b..af459d1fd6 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -1645,6 +1645,30 @@ void samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_str
 	prs_uint32("status", ps, depth, &(r_u->status));
 }
 
+
+/*******************************************************************
+makes a SAMR_Q_QUERY_USERALIASES structure.
+********************************************************************/
+void make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
+				POLICY_HND *hnd,
+				DOM_SID *sid)
+{
+	if (q_u == NULL || hnd == NULL) return;
+
+	DEBUG(5,("make_samr_q_query_useraliases\n"));
+
+	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+
+	q_u->num_sids1 = 1;
+	q_u->ptr = 0;
+	q_u->num_sids2 = 1;
+
+	{
+		q_u->ptr_sid[0] = 1;
+		make_dom_sid2(&q_u->sid[0], sid);
+	}
+}
+
 /*******************************************************************
 reads or writes a SAMR_Q_QUERY_USERALIASES structure.
 ********************************************************************/
@@ -1695,7 +1719,6 @@ makes a SAMR_R_QUERY_USERALIASES structure.
 void make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
 		uint32 num_rids, uint32 *rid, uint32 status)
 {
-	int i;
 	if (r_u == NULL) return;
 
 	DEBUG(5,("make_samr_r_query_useraliases\n"));
@@ -1706,12 +1729,7 @@ void make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
 		r_u->ptr = 1;
 		r_u->num_entries2 = num_rids;
 
-		SMB_ASSERT_ARRAY(r_u->rid, num_rids);
-
-		for (i = 0; i < num_rids; i++)
-		{
-			r_u->rid[i] = rid[i];
-		}
+		r_u->rid = rid;
 	}
 	else
 	{
@@ -1743,8 +1761,6 @@ void samr_io_r_query_useraliases(char *desc,  SAMR_R_QUERY_USERALIASES *r_u, prs
 
 	if (r_u->num_entries != 0)
 	{
-		SMB_ASSERT_ARRAY(r_u->rid, r_u->num_entries2);
-
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
 			slprintf(tmp, sizeof(tmp)-1, "rid[%02d]", i);