Hmmm. I thought I'd added these files to CVS head.....

Jeremy.
(This used to be commit d573700a9218bce8efd21f0be70afec6b460f8b9)

3 files changed, 3673 insertions, 0 deletions

diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
new file mode 100644
index 0000000000..9b3ac1bb54
--- /dev/null
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -0,0 +1,350 @@
+/* 
+ *  Unix SMB/Netbios implementation.
+ *  Version 1.9.
+ *  RPC Pipe client / server routines for Dfs
+ *  Copyright (C) Andrew Tridgell              1992-1997,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
+ *  Copyright (C) Shirish Kalele               2000.
+ *  Copyright (C) Jeremy Allison				2001.
+ *  
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* This is the implementation of the dfs pipe. */
+
+#include "includes.h"
+#include "nterr.h"
+
+extern int DEBUGLEVEL;
+extern pstring global_myname;
+
+#ifdef WITH_MSDFS
+
+#define MAX_MSDFS_JUNCTIONS 256
+
+uint32 _dfs_exist(pipes_struct *p, DFS_Q_DFS_EXIST *q_u, DFS_R_DFS_EXIST *r_u)
+{
+	if(lp_host_msdfs()) 
+		return 1;
+	else
+		return 0;
+}
+
+uint32 _dfs_add(pipes_struct *p, DFS_Q_DFS_ADD* q_u, DFS_R_DFS_ADD *r_u)
+{
+  struct junction_map jn;
+  struct referral* old_referral_list = NULL;
+  BOOL exists = False;
+
+  pstring dfspath, servername, sharename;
+  pstring altpath;
+
+  unistr2_to_ascii(dfspath, &q_u->DfsEntryPath, sizeof(dfspath)-1);
+  unistr2_to_ascii(servername, &q_u->ServerName, sizeof(servername)-1);
+  unistr2_to_ascii(sharename, &q_u->ShareName, sizeof(sharename)-1);
+
+  DEBUG(5,("init_reply_dfs_add: Request to add %s -> %s\\%s.\n",
+	   dfspath, servername, sharename));
+
+  pstrcpy(altpath, servername);
+  pstrcat(altpath, "\\");
+  pstrcat(altpath, sharename);
+
+  if(!create_junction(dfspath, &jn))
+    return NERR_DfsNoSuchServer;
+
+  if(get_referred_path(&jn))
+    {
+      exists = True;
+      jn.referral_count += 1;
+      old_referral_list = jn.referral_list;
+    }
+  else
+    jn.referral_count = 1;
+
+  jn.referral_list = (struct referral*) talloc(p->mem_ctx, jn.referral_count 
+					       * sizeof(struct referral));
+
+  if(jn.referral_list == NULL)
+    {
+      DEBUG(0,("init_reply_dfs_add: talloc failed for referral list!\n"));
+      return NERR_DfsInternalError;
+    }
+
+  if(old_referral_list)
+    {
+      memcpy(jn.referral_list, old_referral_list, 
+	     sizeof(struct referral)*jn.referral_count-1);
+      free(old_referral_list);
+    }
+  
+  jn.referral_list[jn.referral_count-1].proximity = 0;
+  jn.referral_list[jn.referral_count-1].ttl = REFERRAL_TTL;
+
+  pstrcpy(jn.referral_list[jn.referral_count-1].alternate_path, altpath);
+  
+  if(!create_msdfs_link(&jn, exists))
+    return NERR_DfsCantCreateJunctionPoint;
+
+  return NT_STATUS_NOPROBLEMO;
+}
+
+uint32 _dfs_remove(pipes_struct *p, DFS_Q_DFS_REMOVE *q_u, DFS_R_DFS_REMOVE *r_u)
+{
+  struct junction_map jn;
+  BOOL found = False;
+
+  pstring dfspath, servername, sharename;
+  pstring altpath;
+
+  unistr2_to_ascii(dfspath, &q_u->DfsEntryPath, sizeof(dfspath)-1);
+  if(q_u->ptr_ServerName)
+    unistr2_to_ascii(servername, &q_u->ServerName, sizeof(servername)-1);
+
+  if(q_u->ptr_ShareName)
+    unistr2_to_ascii(sharename, &q_u->ShareName, sizeof(sharename)-1);
+
+  if(q_u->ptr_ServerName && q_u->ptr_ShareName)
+    {
+      pstrcpy(altpath, servername);
+      pstrcat(altpath, "\\");
+      pstrcat(altpath, sharename);
+    }
+
+  DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",
+	   dfspath, servername, sharename));
+
+  if(!create_junction(dfspath, &jn))
+    return NERR_DfsNoSuchServer;
+
+  if(!get_referred_path(&jn))
+    return NERR_DfsNoSuchVolume;
+
+  /* if no server-share pair given, remove the msdfs link completely */
+  if(!q_u->ptr_ServerName && !q_u->ptr_ShareName)
+    {
+      if(!remove_msdfs_link(&jn))
+	return NERR_DfsNoSuchVolume;
+    }
+  else
+    {
+      int i=0;
+      /* compare each referral in the list with the one to remove */
+      for(i=0;i<jn.referral_count;i++)
+	{
+	  pstring refpath;
+	  pstrcpy(refpath,jn.referral_list[i].alternate_path);
+	  trim_string(refpath, "\\", "\\");
+	  if(strequal(refpath, altpath))
+	    {
+	      *(jn.referral_list[i].alternate_path)='\0';
+	      found = True;
+	    }
+	}
+      if(!found)
+	return NERR_DfsNoSuchShare;
+      
+      /* Only one referral, remove it */
+      if(jn.referral_count == 1)
+	{
+	  if(!remove_msdfs_link(&jn))
+	    return NERR_DfsNoSuchVolume;
+	}
+      else
+	{
+	  if(!create_msdfs_link(&jn, True))
+	    return NERR_DfsCantCreateJunctionPoint;
+	}
+    }
+
+  return NT_STATUS_NOPROBLEMO;
+}
+
+static BOOL init_reply_dfs_info_1(struct junction_map* j, DFS_INFO_1* dfs1, int num_j)
+{
+  int i=0;
+  for(i=0;i<num_j;i++) 
+    {
+      pstring str;
+      dfs1[i].ptr_entrypath = 1;
+      slprintf(str, sizeof(pstring)-1, "\\\\%s\\%s\\%s", global_myname, 
+	       j[i].service_name, j[i].volume_name);
+      DEBUG(5,("init_reply_dfs_info_1: %d) initing entrypath: %s\n",i,str));
+      init_unistr2(&dfs1[i].entrypath,str,strlen(str)+1);
+    }
+  return True;
+}
+
+static BOOL init_reply_dfs_info_2(struct junction_map* j, DFS_INFO_2* dfs2, int num_j)
+{
+  int i=0;
+  for(i=0;i<num_j;i++)
+    {
+      pstring str;
+      dfs2[i].ptr_entrypath = 1;
+      slprintf(str, sizeof(pstring)-1, "\\\\%s\\%s\\%s", global_myname,
+	       j[i].service_name, j[i].volume_name);
+      init_unistr2(&dfs2[i].entrypath, str, strlen(str)+1);
+      dfs2[i].ptr_comment = 0;
+      dfs2[i].state = 1; /* set up state of dfs junction as OK */
+      dfs2[i].num_storages = j[i].referral_count;
+    }
+  return True;
+}
+
+static BOOL init_reply_dfs_info_3(TALLOC_CTX *ctx, struct junction_map* j, DFS_INFO_3* dfs3, int num_j)
+{
+  int i=0,ii=0;
+  for(i=0;i<num_j;i++)
+    {
+      pstring str;
+      dfs3[i].ptr_entrypath = 1;
+      slprintf(str, sizeof(pstring)-1, "\\\\%s\\%s\\%s", global_myname,
+	       j[i].service_name, j[i].volume_name);
+      init_unistr2(&dfs3[i].entrypath, str, strlen(str)+1);
+      dfs3[i].ptr_comment = 1;
+      init_unistr2(&dfs3[i].comment, "", 1); 
+      dfs3[i].state = 1;
+      dfs3[i].num_storages = dfs3[i].num_storage_infos = j[i].referral_count;
+      dfs3[i].ptr_storages = 1;
+     
+      /* also enumerate the storages */
+      dfs3[i].storages = (DFS_STORAGE_INFO*) talloc(ctx, j[i].referral_count * 
+						    sizeof(DFS_STORAGE_INFO));
+      if (!dfs3[i].storages)
+        return False;
+
+      memset(dfs3[i].storages, '\0', j[i].referral_count * sizeof(DFS_STORAGE_INFO));
+
+      for(ii=0;ii<j[i].referral_count;ii++)
+	{
+	  char* p; 
+	  pstring path;
+	  DFS_STORAGE_INFO* stor = &(dfs3[i].storages[ii]);
+	  struct referral* ref = &(j[i].referral_list[ii]);
+	  
+	  pstrcpy(path, ref->alternate_path);
+	  trim_string(path,"\\","");
+	  p = strrchr(path,'\\');
+	  if(p==NULL)
+	    {
+	      DEBUG(4,("init_reply_dfs_info_3: invalid path: no \\ found in %s\n",path));
+	      continue;
+	    }
+	  *p = '\0';
+	  DEBUG(5,("storage %d: %s.%s\n",ii,path,p+1));
+	  stor->state = 2; /* set all storages as ONLINE */
+	  init_unistr2(&stor->servername, path, strlen(path)+1);
+	  init_unistr2(&stor->sharename,  p+1, strlen(p+1)+1);
+	  stor->ptr_servername = stor->ptr_sharename = 1;
+	}
+    }
+  return True;
+}
+
+static uint32 init_reply_dfs_ctr(TALLOC_CTX *ctx, uint32 level, DFS_INFO_CTR* ctr, 
+			       struct junction_map* jn, int num_jn)
+{
+  /* do the levels */
+  switch(level)
+    {
+    case 1:
+      {
+	DFS_INFO_1* dfs1;
+	dfs1 = (DFS_INFO_1*) talloc(ctx, num_jn * sizeof(DFS_INFO_1));
+	if (!dfs1)
+		return NT_STATUS_NO_MEMORY;
+	init_reply_dfs_info_1(jn, dfs1, num_jn);
+	ctr->dfs.info1 = dfs1;
+	break;
+      }
+    case 2:
+      {
+	DFS_INFO_2* dfs2;
+	dfs2 = (DFS_INFO_2*) talloc(ctx, num_jn * sizeof(DFS_INFO_2));
+	if (!dfs2)
+		return NT_STATUS_NO_MEMORY;
+	init_reply_dfs_info_2(jn, dfs2, num_jn);
+	ctr->dfs.info2 = dfs2;
+	break;
+      }
+    case 3:
+      {
+	DFS_INFO_3* dfs3;
+	dfs3 = (DFS_INFO_3*) talloc(ctx, num_jn * sizeof(DFS_INFO_3));
+	if (!dfs3)
+		return NT_STATUS_NO_MEMORY;
+	init_reply_dfs_info_3(ctx, jn, dfs3, num_jn);
+	ctr->dfs.info3 = dfs3;
+      }
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+    }
+  return NT_STATUS_NOPROBLEMO;
+}
+      
+uint32 _dfs_enum(pipes_struct *p, DFS_Q_DFS_ENUM *q_u, DFS_R_DFS_ENUM *r_u)
+{
+  uint32 level = q_u->level;
+  struct junction_map jn[MAX_MSDFS_JUNCTIONS];
+  int num_jn = 0;
+
+  num_jn = enum_msdfs_links(jn);
+  
+  DEBUG(5,("make_reply_dfs_enum: %d junctions found in Dfs, doing level %d\n", num_jn, level));
+
+  r_u->ptr_buffer = level;
+  r_u->level = r_u->level2 = level;
+  r_u->ptr_num_entries = r_u->ptr_num_entries2 = 1;
+  r_u->num_entries = r_u->num_entries2 = num_jn;
+  r_u->reshnd.ptr_hnd = 1;
+  r_u->reshnd.handle = num_jn;
+  
+  r_u->ctr = (DFS_INFO_CTR*)talloc(p->mem_ctx, sizeof(DFS_INFO_CTR));
+  if (!r_u->ctr)
+    return NT_STATUS_NO_MEMORY;
+  ZERO_STRUCTP(r_u->ctr);
+  r_u->ctr->switch_value = level;
+  r_u->ctr->num_entries = num_jn;
+  r_u->ctr->ptr_dfs_ctr = 1;
+  
+  r_u->status = init_reply_dfs_ctr(p->mem_ctx, level, r_u->ctr, jn, num_jn);
+
+  return r_u->status;
+}
+      
+uint32 _dfs_get_info(pipes_struct *p, DFS_Q_DFS_GET_INFO *q_u, DFS_R_DFS_GET_INFO *r_u)
+{
+  UNISTR2* uni_path = &q_u->uni_path;
+  uint32 level = q_u->level;
+  pstring path;
+  struct junction_map jn;
+
+  unistr2_to_ascii(path, uni_path, sizeof(path)-1);
+  if(!create_junction(path, &jn))
+     return NERR_DfsNoSuchServer;
+  
+  if(!get_referred_path(&jn))
+    return NERR_DfsNoSuchVolume;
+
+  r_u->level = level;
+  r_u->ptr_ctr = 1;
+  r_u->status = init_reply_dfs_ctr(p->mem_ctx, level, &r_u->ctr, &jn, 1);
+  
+  return r_u->status;
+}
+#else
+	void dfs_dummy1(void) {;} /* So some compilers don't complain. */
+#endif
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
new file mode 100644
index 0000000000..bd04b40c4d
--- /dev/null
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -0,0 +1,2457 @@
+/*
+ *  Unix SMB/Netbios implementation.
+ *  Version 1.9.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-1997,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
+ *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Hewlett-Packard Company           1999.
+ *  Copyright (C) Jeremy Allison                    2001.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * This is the implementation of the SAMR code.
+ */
+
+#include "includes.h"
+
+extern int DEBUGLEVEL;
+
+extern fstring global_myworkgroup;
+extern pstring global_myname;
+extern DOM_SID global_sam_sid;
+
+extern rid_name domain_group_rids[];
+extern rid_name domain_alias_rids[];
+extern rid_name builtin_alias_rids[];
+
+/*******************************************************************
+  This next function should be replaced with something that
+  dynamically returns the correct user info..... JRA.
+ ********************************************************************/
+
+static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
+                                int *total_entries, int *num_entries,
+                                int max_num_entries, uint16 acb_mask)
+{
+    void *vp = NULL;
+    struct sam_passwd *pwd = NULL;
+
+    (*num_entries) = 0;
+    (*total_entries) = 0;
+
+    if (pw_buf == NULL)
+        return False;
+
+    vp = startsmbpwent(False);
+    if (!vp) {
+        DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
+        return False;
+    }
+
+    while (((pwd = getsam21pwent(vp)) != NULL) && (*num_entries) < max_num_entries) {
+        int user_name_len;
+
+        if (start_idx > 0) {
+            /* skip the requested number of entries.
+               not very efficient, but hey...
+             */
+            start_idx--;
+            continue;
+        }
+
+        user_name_len = strlen(pwd->smb_name)+1;
+        init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pwd->smb_name, user_name_len);
+        init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
+        pw_buf[(*num_entries)].user_rid = pwd->user_rid;
+        memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+
+        /* Now check if the NT compatible password is available. */
+        if (pwd->smb_nt_passwd != NULL) {
+            memcpy( pw_buf[(*num_entries)].nt_pwd , pwd->smb_nt_passwd, 16);
+        }
+
+        pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
+
+        DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x",
+                  (*num_entries), pwd->smb_name, pwd->user_rid, pwd->acct_ctrl));
+
+        if (acb_mask == 0 || (pwd->acct_ctrl & acb_mask)) {
+            DEBUG(5,(" acb_mask %x accepts\n", acb_mask));
+            (*num_entries)++;
+        }
+        else
+            DEBUG(5,(" acb_mask %x rejects\n", acb_mask));
+
+        (*total_entries)++;
+    }
+
+    endsmbpwent(vp);
+
+    return (*num_entries) > 0;
+}
+
+static BOOL jf_get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
+                                int *total_entries, int *num_entries,
+                                int max_num_entries, uint16 acb_mask)
+{
+	void *vp = NULL;
+	struct sam_passwd *pwd = NULL;
+
+	*num_entries = 0;
+	*total_entries = 0;
+
+	if (pw_buf == NULL)
+		return False;
+
+	vp = startsmbpwent(False);
+	if (!vp) {
+		DEBUG(0, ("get_sampwd_entries: Unable to open SMB password database.\n"));
+		return False;
+	}
+
+	while (((pwd = getsam21pwent(vp)) != NULL) && (*num_entries) < max_num_entries) {
+		int user_name_len;
+		int full_name_len;
+
+		if (acb_mask != 0 && !(pwd->acct_ctrl & acb_mask))
+			continue;
+
+		if (start_idx > 0) {
+			/* skip the requested number of entries.
+			   not very efficient, but hey...
+			*/
+			start_idx--;
+			continue;
+		}
+
+		ZERO_STRUCTP(&pw_buf[(*num_entries)]);
+
+		user_name_len = strlen(pwd->smb_name);
+		init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pwd->smb_name, user_name_len);
+		init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
+
+		full_name_len = strlen(pwd->full_name);
+		init_unistr2(&pw_buf[(*num_entries)].uni_full_name, pwd->full_name, full_name_len);
+		init_uni_hdr(&pw_buf[(*num_entries)].hdr_full_name, full_name_len);
+
+		pw_buf[(*num_entries)].user_rid = pwd->user_rid;
+		memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+
+		/* Now check if the NT compatible password is available. */
+		if (pwd->smb_nt_passwd != NULL) {
+			memcpy( pw_buf[(*num_entries)].nt_pwd , pwd->smb_nt_passwd, 16);
+		}
+
+		pw_buf[(*num_entries)].acb_info = (uint16)pwd->acct_ctrl;
+
+		DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x\n", (*num_entries), pwd->smb_name, pwd->user_rid, pwd->acct_ctrl));
+		(*num_entries)++;
+	}
+
+	endsmbpwent(vp);
+
+	*total_entries = *num_entries;
+	return True;
+}
+
+/*******************************************************************
+ This function uses the username map file and tries to map a UNIX
+ user name to an DOS name.  (Sort of the reverse of the
+ map_username() function.)  Since more than one DOS name can map
+ to the UNIX name, to reverse the mapping you have to specify
+ which corresponding DOS name you want; that's where the name_idx
+ parameter comes in.  Returns the string requested or NULL if it
+ fails or can't complete the request for any reason.  This doesn't
+ handle group names (starting with '@') or names starting with
+ '+' or '&'.  If they are encountered, they are skipped.
+********************************************************************/
+
+static char *unmap_unixname(char *unix_user_name, int name_idx)
+{
+	char *mapfile = lp_username_map();
+	char **lines;
+	static pstring tok;
+	int i;
+
+	if (!*unix_user_name) return NULL;
+	if (!*mapfile) return NULL;
+
+	lines = file_lines_load(mapfile, NULL,False);
+	if (!lines) {
+		DEBUG(0,("unmap_unixname: can't open username map %s\n", mapfile));
+		return NULL;
+	}
+
+	DEBUG(5,("unmap_unixname: scanning username map %s, index: %d\n", mapfile, name_idx));
+
+	for (i=0; lines[i]; i++) {
+		char *unixname = lines[i];
+		char *dosname = strchr(unixname,'=');
+
+		if (!dosname)
+			continue;
+
+		*dosname++ = 0;
+
+		while (isspace(*unixname))
+			unixname++;
+		if ('!' == *unixname) {
+			unixname++;
+			while (*unixname && isspace(*unixname))
+				unixname++;
+		}
+    
+		if (!*unixname || strchr("#;",*unixname))
+			continue;
+
+		if (strncmp(unixname, unix_user_name, strlen(unix_user_name)))
+			continue;
+
+		/* We have matched the UNIX user name */
+
+		while(next_token(&dosname, tok, LIST_SEP, sizeof(tok))) {
+			if (!strchr("@&+", *tok)) {
+				name_idx--;
+				if (name_idx < 0 ) {
+					break;
+				}
+			}
+		}
+
+		if (name_idx >= 0) {
+			DEBUG(0,("unmap_unixname: index too high - not that many DOS names\n"));
+			file_lines_free(lines);
+			return NULL;
+		} else {
+			file_lines_free(lines);
+			return tok;
+		}
+	}
+
+	DEBUG(0,("unmap_unixname: Couldn't find the UNIX user name\n"));
+	file_lines_free(lines);
+	return NULL;
+}
+
+/*******************************************************************
+ This function sets up a list of users taken from the list of
+ users that UNIX knows about, as well as all the user names that
+ Samba maps to a valid UNIX user name.  (This should work with
+ /etc/passwd or NIS.)
+********************************************************************/
+
+static BOOL get_passwd_entries(SAM_USER_INFO_21 *pw_buf,
+				int start_idx,
+				int *total_entries, int *num_entries,
+				int max_num_entries,
+				uint16 acb_mask)
+{
+	static struct passwd *pwd = NULL;
+	static uint32 pw_rid;
+	static BOOL orig_done = False;
+	static int current_idx = 0;
+	static int mapped_idx = 0;
+	char *sep;
+
+	DEBUG(5, ("get_passwd_entries: retrieving a list of UNIX users\n"));
+
+	(*num_entries) = 0;
+	(*total_entries) = 0;
+
+	/* Skip all this stuff if we're in appliance mode */
+
+	if (lp_hide_local_users()) goto done;
+
+	if (pw_buf == NULL) return False;
+
+	if (current_idx == 0) {
+		sys_setpwent();
+	}
+
+	/* These two cases are inefficient, but should be called very rarely */
+	/* they are the cases where the starting index isn't picking up      */
+	/* where we left off last time.  It is efficient when it starts over */
+	/* at zero though.                                                   */
+	if (start_idx > current_idx) {
+		/* We aren't far enough; advance to start_idx */
+		while (current_idx <= start_idx) {
+			char *unmap_name;
+
+			if(!orig_done) {
+				if ((pwd = sys_getpwent()) == NULL) break;
+				current_idx++;
+				orig_done = True;
+			}
+
+			while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
+			        (current_idx < start_idx)) {
+				current_idx++;
+				mapped_idx++;
+			}
+
+			if (unmap_name == NULL) {
+				orig_done = False;
+				mapped_idx = 0;
+			}
+		}
+	} else if (start_idx < current_idx) {
+		/* We are already too far; start over and advance to start_idx */
+		sys_endpwent();
+		sys_setpwent();
+		current_idx = 0;
+		mapped_idx = 0;
+		orig_done = False;
+		while (current_idx < start_idx) {
+			char *unmap_name;
+
+			if(!orig_done) {
+				if ((pwd = sys_getpwent()) == NULL) break;
+				current_idx++;
+				orig_done = True;
+			}
+
+			while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
+			        (current_idx < start_idx)) {
+				current_idx++;
+				mapped_idx++;
+			}
+
+			if (unmap_name == NULL) {
+				orig_done = False;
+				mapped_idx = 0;
+			}
+		}
+	}
+
+	sep = lp_winbind_separator();
+
+	/* now current_idx == start_idx */
+	while ((*num_entries) < max_num_entries) {
+		int user_name_len;
+		char *unmap_name;
+
+		/* This does the original UNIX user itself */
+		if(!orig_done) {
+			if ((pwd = sys_getpwent()) == NULL) break;
+
+			/* Don't enumerate winbind users as they are not local */
+
+			if (strchr(pwd->pw_name, *sep) != NULL) {
+				continue;
+			}
+
+			user_name_len = strlen(pwd->pw_name);
+			
+			/* skip the trust account stored in the /etc/passwd file */
+			if (pwd->pw_name[user_name_len-1]=='$')
+				continue;
+			
+			pw_rid = pdb_uid_to_user_rid(pwd->pw_uid);
+			ZERO_STRUCTP(&pw_buf[(*num_entries)]);
+			init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pwd->pw_name, user_name_len);
+			init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
+			pw_buf[(*num_entries)].user_rid = pw_rid;
+			memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+
+			pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
+
+			DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+
+			(*num_entries)++;
+			(*total_entries)++;
+			current_idx++;
+			orig_done = True;
+		}
+
+		/* This does all the user names that map to the UNIX user */
+		while (((unmap_name = unmap_unixname(pwd->pw_name, mapped_idx)) != NULL) && 
+		        (*num_entries < max_num_entries)) {
+			user_name_len = strlen(unmap_name);
+			ZERO_STRUCTP(&pw_buf[(*num_entries)]);
+			init_unistr2(&pw_buf[(*num_entries)].uni_user_name, unmap_name, user_name_len);
+			init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
+			pw_buf[(*num_entries)].user_rid = pw_rid;
+			memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
+
+			pw_buf[(*num_entries)].acb_info = ACB_NORMAL;
+
+			DEBUG(5, ("get_passwd_entries: entry idx %d user %s, rid 0x%x\n", (*num_entries), pwd->pw_name, pw_rid));
+
+			(*num_entries)++;
+			(*total_entries)++;
+			current_idx++;
+			mapped_idx++;
+		}
+
+		if (unmap_name == NULL) {
+			/* done with 'aliases', go on to next UNIX user */
+			orig_done = False;
+			mapped_idx = 0;
+		}
+	}
+
+	if (pwd == NULL) {
+		/* totally done, reset everything */
+		sys_endpwent();
+		current_idx = 0;
+		mapped_idx = 0;
+	}
+
+done:
+	return (*num_entries) > 0;
+}
+
+/*******************************************************************
+ _samr_close_hnd
+ ********************************************************************/
+
+uint32 _samr_close_hnd(pipes_struct *p, SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HND *r_u)
+{
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* close the policy handle */
+	if (!close_lsa_policy_hnd(&q_u->pol))
+		return NT_STATUS_OBJECT_NAME_INVALID;
+
+	DEBUG(5,("samr_reply_close_hnd: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_open_domain
+ ********************************************************************/
+
+uint32 _samr_open_domain(pipes_struct *p, SAMR_Q_OPEN_DOMAIN *q_u, SAMR_R_OPEN_DOMAIN *r_u)
+{
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* find the connection policy handle. */
+	if (find_lsa_policy_by_hnd(&q_u->pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* get a (unique) handle.  open a policy on it. */
+	if (!open_lsa_policy_hnd(&r_u->domain_pol))
+		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+	/* associate the domain SID with the (unique) handle. */
+	if (!set_lsa_policy_samr_sid(&r_u->domain_pol, &q_u->dom_sid.sid)) {
+		close_lsa_policy_hnd(&r_u->domain_pol);
+		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+	}
+
+	DEBUG(5,("samr_open_domain: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ _samr_get_usrdom_pwinfo
+ ********************************************************************/
+
+uint32 _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, SAMR_R_GET_USRDOM_PWINFO *r_u)
+{
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* find the policy handle.  open a policy on it. */
+	if (find_lsa_policy_by_hnd(&q_u->user_pol) == -1) {
+		return NT_STATUS_INVALID_HANDLE;
+	}
+
+	/* find the user's rid */
+	if (get_lsa_policy_samr_rid(&q_u->user_pol) == 0xffffffff) {
+		return NT_STATUS_OBJECT_TYPE_MISMATCH;
+	}
+
+	init_samr_r_get_usrdom_pwinfo(r_u, NT_STATUS_NOPROBLEMO);
+
+	DEBUG(5,("_samr_get_usrdom_pwinfo: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_make_usr_obj_sd
+ ********************************************************************/
+
+static uint32 samr_make_usr_obj_sd(TALLOC_CTX *ctx, SEC_DESC_BUF **buf, DOM_SID *usr_sid)
+{
+	extern DOM_SID global_sid_Builtin;
+	extern DOM_SID global_sid_World;
+	DOM_SID adm_sid;
+	DOM_SID act_sid;
+
+	SEC_ACE ace[4];
+	SEC_ACCESS mask;
+
+	SEC_ACL *psa = NULL;
+	SEC_DESC *psd = NULL;
+	size_t sd_size;
+
+	sid_copy(&adm_sid, &global_sid_Builtin);
+	sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
+
+	sid_copy(&act_sid, &global_sid_Builtin);
+	sid_append_rid(&act_sid, BUILTIN_ALIAS_RID_ACCOUNT_OPS);
+
+	init_sec_access(&mask, 0x2035b);
+	init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+	init_sec_access(&mask, 0xf07ff);
+	init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+	init_sec_ace(&ace[2], &act_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+	init_sec_access(&mask,0x20044);
+	init_sec_ace(&ace[3], usr_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+	if((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 4, ace)) == NULL)
+		return NT_STATUS_NO_MEMORY;
+
+	if((psd = make_sec_desc(ctx, SEC_DESC_REVISION, NULL, NULL, NULL, psa, &sd_size)) == NULL)
+		return NT_STATUS_NO_MEMORY;
+
+	if((*buf = make_sec_desc_buf(ctx, sd_size, psd)) == NULL)
+		return NT_STATUS_NO_MEMORY;
+
+	return NT_STATUS_NOPROBLEMO;
+}
+
+/*******************************************************************
+ _samr_query_sec_obj
+ ********************************************************************/
+
+uint32 _samr_query_sec_obj(pipes_struct *p, SAMR_Q_QUERY_SEC_OBJ *q_u, SAMR_R_QUERY_SEC_OBJ *r_u)
+{
+	DOM_SID pol_sid;
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* find the policy handle.  open a policy on it. */
+	if ((find_lsa_policy_by_hnd(&q_u->user_pol)) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* Get the SID. */
+	if (!get_lsa_policy_samr_sid(&q_u->user_pol, &pol_sid))
+		return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+	r_u->status = samr_make_usr_obj_sd(p->mem_ctx, &r_u->buf, &pol_sid);
+
+	if (r_u->status == NT_STATUS_NOPROBLEMO)
+		r_u->ptr = 1;
+
+	return r_u->status;
+}
+
+/*******************************************************************
+makes a SAM_ENTRY / UNISTR2* structure from a user list.
+********************************************************************/
+
+static void make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR2 **uni_name_pp,
+                uint32 num_sam_entries, SAM_USER_INFO_21 *pass)
+{
+	uint32 i;
+	SAM_ENTRY *sam;
+	UNISTR2 *uni_name;
+
+	*sam_pp = NULL;
+	*uni_name_pp = NULL;
+
+	if (num_sam_entries == 0)
+		return;
+
+	sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+
+	uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+
+	if (sam == NULL || uni_name == NULL) {
+		DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
+		return;
+	}
+
+	for (i = 0; i < num_sam_entries; i++) {
+		int len = pass[i].uni_user_name.uni_str_len;
+
+		init_sam_entry(&sam[i], len, pass[i].user_rid);
+		copy_unistr2(&uni_name[i], &pass[i].uni_user_name);
+	}
+
+	*sam_pp = sam;
+	*uni_name_pp = uni_name;
+}
+
+/*******************************************************************
+ samr_reply_enum_dom_users
+ ********************************************************************/
+
+uint32 _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u, SAMR_R_ENUM_DOM_USERS *r_u)
+{
+	SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
+	int num_entries = 0;
+	int total_entries = 0;
+	BOOL ret;
+	
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* find the policy handle.  open a policy on it. */
+	if (find_lsa_policy_by_hnd(&q_u->pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
+
+	become_root();
+	ret = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+								MAX_SAM_ENTRIES, q_u->acb_mask);
+	unbecome_root();
+
+	if (!ret)
+		return NT_STATUS_ACCESS_DENIED;
+
+	/* 
+	 * Note from JRA. total_entries is not being used here. Currently if there is a
+	 * large user base then it looks like NT will enumerate until get_sampwd_entries
+	 * returns False due to num_entries being zero. This will cause an access denied
+	 * return. I don't think this is right and needs further investigation. Note that
+	 * this is also the same in the TNG code (I don't think that has been tested with
+	 * a very large user list as MAX_SAM_ENTRIES is set to 600).
+	 * 
+	 * I also think that one of the 'num_entries' return parameters is probably
+	 * the "max entries" parameter - but in the TNG code they're all currently set to the same
+	 * value (again I think this is wrong).
+	 */
+
+	make_user_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_acct_name, num_entries, pass);
+
+	init_samr_r_enum_dom_users(r_u, q_u->start_idx + num_entries, num_entries);
+
+	DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+makes a SAM_ENTRY / UNISTR2* structure from a group list.
+********************************************************************/
+
+static void make_group_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp, UNISTR2 **uni_name_pp,
+                uint32 num_sam_entries, DOMAIN_GRP *grp)
+{
+	uint32 i;
+	SAM_ENTRY *sam;
+	UNISTR2 *uni_name;
+
+	*sam_pp = NULL;
+	*uni_name_pp = NULL;
+
+	if (num_sam_entries == 0)
+		return;
+
+	sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+
+	uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+
+	if (sam == NULL || uni_name == NULL) {
+		DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
+		return;
+	}
+
+	for (i = 0; i < num_sam_entries; i++) {
+		/*
+		 * JRA. I think this should include the null. TNG does not.
+		 */
+		int len = strlen(grp[i].name)+1;
+
+		init_sam_entry(&sam[i], len, grp[i].rid);
+		init_unistr2(&uni_name[i], grp[i].name, len);
+	}
+
+	*sam_pp = sam;
+	*uni_name_pp = uni_name;
+}
+
+/*******************************************************************
+ Get the group entries - similar to get_sampwd_entries().
+ ********************************************************************/
+
+static BOOL get_group_alias_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 start_idx,
+				    uint32 *p_num_entries, uint32 max_entries)
+{
+	fstring sid_str;
+	fstring sam_sid_str;
+	uint32 num_entries = 0;
+
+	sid_to_string(sid_str, sid);
+	sid_to_string(sam_sid_str, &global_sam_sid);
+
+	*p_num_entries = 0;
+
+	/* well-known aliases */
+	if (strequal(sid_str, "S-1-5-32")) {
+		char *name;
+		while (!lp_hide_local_users() &&
+				num_entries < max_entries && 
+				((name = builtin_alias_rids[num_entries].name) != NULL)) {
+
+			fstrcpy(d_grp[num_entries].name, name);
+			d_grp[num_entries].rid = builtin_alias_rids[num_entries].rid;
+
+			num_entries++;
+		}
+	} else if (strequal(sid_str, sam_sid_str) && !lp_hide_local_users()) {
+		char *name;
+		char *sep;
+		struct group *grp;
+
+		sep = lp_winbind_separator();
+
+		/* local aliases */
+		/* we return the UNIX groups here.  This seems to be the right */
+		/* thing to do, since NT member servers return their local     */
+                /* groups in the same situation.                               */
+		setgrent();
+
+		while (num_entries < max_entries && ((grp = getgrent()) != NULL)) {
+			int i;
+			uint32 trid;
+			name = grp->gr_name;
+
+			/* Don't return winbind groups as they are not local! */
+
+			if (strchr(name, *sep) != NULL)
+				continue;
+
+			trid = pdb_gid_to_group_rid(grp->gr_gid);
+			for( i = 0; i < num_entries; i++)
+				if ( d_grp[i].rid == trid ) break;
+
+			if ( i < num_entries )
+				continue; /* rid was there, dup! */
+
+			/* JRA - added this for large group db enumeration... */
+
+			if (start_idx > 0) {
+				/* skip the requested number of entries.
+					not very efficient, but hey...
+				*/
+				start_idx--;
+				continue;
+			}
+
+			fstrcpy(d_grp[num_entries].name, name);
+			d_grp[num_entries].rid = trid;
+			num_entries++;
+		}
+
+		endgrent();
+	}
+
+	*p_num_entries = num_entries;
+
+	return True;
+}
+
+/*******************************************************************
+ Get the group entries - similar to get_sampwd_entries().
+ ********************************************************************/
+
+static BOOL get_group_domain_entries(DOMAIN_GRP *d_grp, DOM_SID *sid, uint32 start_idx,
+				     uint32 *p_num_entries, uint32 max_entries)
+{
+	fstring sid_str;
+	fstring sam_sid_str;
+	uint32 num_entries = 0;
+	fstring name="Domain Admins";
+	fstring comment="Just to make it work !";
+
+	sid_to_string(sid_str, sid);
+	sid_to_string(sam_sid_str, &global_sam_sid);
+
+	*p_num_entries = 0;
+
+	fstrcpy(d_grp[0].name, name);
+	fstrcpy(d_grp[0].comment, comment);
+	d_grp[0].rid = DOMAIN_GROUP_RID_ADMINS;
+	d_grp[0].attr=SID_NAME_DOM_GRP;
+
+	fstrcpy(d_grp[1].name, "Domain Users");
+	fstrcpy(d_grp[1].comment, "Just to make it work !");
+	d_grp[1].rid = DOMAIN_GROUP_RID_USERS;
+	d_grp[1].attr=SID_NAME_DOM_GRP;
+
+	num_entries = 2;
+
+	*p_num_entries = num_entries;
+
+	return True;
+}
+
+/*******************************************************************
+ samr_reply_enum_dom_groups
+ Only reply with one group - domain admins. This must be fixed for
+ a real PDC. JRA.
+ ********************************************************************/
+
+uint32 _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_R_ENUM_DOM_GROUPS *r_u)
+{
+	DOMAIN_GRP grp[2];
+	int num_entries;
+	DOM_SID sid;
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	if (!get_lsa_policy_samr_sid(&q_u->pol, &sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
+
+	get_group_domain_entries(grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
+
+	make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp);
+
+	init_samr_r_enum_dom_groups(r_u, q_u->start_idx, num_entries);
+
+	DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+
+/*******************************************************************
+ samr_reply_enum_dom_aliases
+ ********************************************************************/
+
+uint32 _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAMR_R_ENUM_DOM_ALIASES *r_u)
+{
+	DOMAIN_GRP grp[MAX_SAM_ENTRIES];
+	int num_entries = 0;
+	fstring sid_str;
+	DOM_SID sid;
+	
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	/* find the policy handle.  open a policy on it. */
+	if (!get_lsa_policy_samr_sid(&q_u->pol, &sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	sid_to_string(sid_str, &sid);
+	DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str));
+
+	if (!get_group_alias_entries(grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES))
+		return NT_STATUS_ACCESS_DENIED;
+
+	make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp);
+
+	init_samr_r_enum_dom_aliases(r_u, q_u->start_idx, num_entries);
+
+	DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_query_dispinfo
+ ********************************************************************/
+
+uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_QUERY_DISPINFO *r_u)
+{
+	SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES];
+	DOMAIN_GRP grps[MAX_SAM_ENTRIES];
+	uint16 acb_mask = ACB_NORMAL;
+    int num_entries = 0;
+    int orig_num_entries = 0;
+    int total_entries = 0;
+    uint32 data_size = 0;
+	DOM_SID sid;
+	BOOL ret;
+	SAM_DISPINFO_CTR *ctr;
+
+	DEBUG(5, ("samr_reply_query_dispinfo: %d\n", __LINE__));
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	if (!get_lsa_policy_samr_sid(&q_u->domain_pol, &sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* decide how many entries to get depending on the max_entries
+	   and max_size passed by client */
+
+	if(q_u->max_entries > MAX_SAM_ENTRIES)
+		q_u->max_entries = MAX_SAM_ENTRIES;
+
+	/* Get what we need from the password database */
+	switch (q_u->switch_level) {
+	case 0x2:
+		acb_mask = ACB_WSTRUST;
+		/* Fall through */
+	case 0x1:
+	case 0x4:
+		become_root();
+#if 0
+		ret = get_passwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+						MAX_SAM_ENTRIES, acb_mask);
+#endif
+#if 0
+	/*
+	 * Which should we use here ? JRA.
+	 */
+		ret = get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+						MAX_SAM_ENTRIES, acb_mask);
+#endif
+#if 1
+		ret = jf_get_sampwd_entries(pass, q_u->start_idx, &total_entries, &num_entries,
+						MAX_SAM_ENTRIES, acb_mask);
+#endif
+		unbecome_root();
+		if (!ret) {
+			DEBUG(5, ("get_sampwd_entries: failed\n"));
+			return NT_STATUS_ACCESS_DENIED;
+		}
+		break;
+	case 0x3:
+	case 0x5:
+		ret = get_group_domain_entries(grps, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES);
+		if (!ret)
+			return NT_STATUS_ACCESS_DENIED;
+		break;
+	default:
+		DEBUG(0,("_samr_query_dispinfo: Unknown info level (%u)\n", (unsigned int)q_u->switch_level ));
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+
+	if (num_entries > q_u->max_entries)
+		num_entries = q_u->max_entries;
+
+	if (num_entries > MAX_SAM_ENTRIES) {
+		num_entries = MAX_SAM_ENTRIES;
+		DEBUG(5, ("limiting number of entries to %d\n", num_entries));
+	}
+
+	data_size = q_u->max_size;
+	orig_num_entries = num_entries;
+
+	ctr = (SAM_DISPINFO_CTR *)talloc(p->mem_ctx,sizeof(SAM_DISPINFO_CTR));
+
+	/* Now create reply structure */
+	switch (q_u->switch_level) {
+	case 0x1:
+		ctr->sam.info1 = (SAM_DISPINFO_1 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_1));
+		init_sam_dispinfo_1(ctr->sam.info1, &num_entries, &data_size, q_u->start_idx, pass);
+		break;
+	case 0x2:
+		ctr->sam.info2 = (SAM_DISPINFO_2 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_2));
+		init_sam_dispinfo_2(ctr->sam.info2, &num_entries, &data_size, q_u->start_idx, pass);
+		break;
+	case 0x3:
+		ctr->sam.info3 = (SAM_DISPINFO_3 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_3));
+		init_sam_dispinfo_3(ctr->sam.info3, &num_entries, &data_size, q_u->start_idx, grps);
+		break;
+	case 0x4:
+		ctr->sam.info4 = (SAM_DISPINFO_4 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_4));
+		init_sam_dispinfo_4(ctr->sam.info4, &num_entries, &data_size, q_u->start_idx, pass);
+		break;
+	case 0x5:
+		ctr->sam.info5 = (SAM_DISPINFO_5 *)talloc(p->mem_ctx,num_entries*sizeof(SAM_DISPINFO_5));
+		init_sam_dispinfo_5(ctr->sam.info5, &num_entries, &data_size, q_u->start_idx, grps);
+		break;
+	default:
+		ctr->sam.info = NULL;
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	DEBUG(5, ("_samr_query_dispinfo: %d\n", __LINE__));
+
+	init_samr_r_query_dispinfo(r_u, num_entries, data_size, q_u->switch_level, ctr, r_u->status);
+
+	if (num_entries < orig_num_entries) {
+		return STATUS_MORE_ENTRIES;
+	}
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_query_aliasinfo
+ ********************************************************************/
+
+uint32 _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAMR_R_QUERY_ALIASINFO *r_u)
+{
+	fstring alias_desc = "Local Unix group";
+	fstring alias="";
+	enum SID_NAME_USE type;
+	uint32 alias_rid;
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	DEBUG(5,("_samr_query_aliasinfo: %d\n", __LINE__));
+
+	/* find the policy handle.  open a policy on it. */
+	if (find_lsa_policy_by_hnd(&q_u->pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	alias_rid = get_lsa_policy_samr_rid(&q_u->pol);
+	if(alias_rid == 0xffffffff)
+		return NT_STATUS_NO_SUCH_ALIAS;
+
+	if(!local_lookup_rid(alias_rid, alias, &type))
+	return NT_STATUS_NO_SUCH_ALIAS;
+
+	switch (q_u->switch_level) {
+	case 3:
+		r_u->ptr = 1;
+		r_u->ctr.switch_value1 = 3;
+		init_samr_alias_info3(&r_u->ctr.alias.info3, alias_desc);
+		break;
+	default:
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	DEBUG(5,("_samr_query_aliasinfo: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+#if 0
+/*******************************************************************
+ samr_reply_lookup_ids
+ ********************************************************************/
+
+ uint32 _samr_lookup_ids(pipes_struct *p, SAMR_Q_LOOKUP_IDS *q_u, SAMR_R_LOOKUP_IDS *r_u)
+{
+    uint32 rid[MAX_SAM_ENTRIES];
+    int num_rids = q_u->num_sids1;
+
+    r_u->status = NT_STATUS_NOPROBLEMO;
+
+    DEBUG(5,("_samr_lookup_ids: %d\n", __LINE__));
+
+    if (num_rids > MAX_SAM_ENTRIES) {
+        num_rids = MAX_SAM_ENTRIES;
+        DEBUG(5,("_samr_lookup_ids: truncating entries to %d\n", num_rids));
+    }
+
+#if 0
+    int i;
+    SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids);
+
+    for (i = 0; i < num_rids && status == 0; i++)
+    {
+        struct sam_passwd *sam_pass;
+        fstring user_name;
+
+
+        fstrcpy(user_name, unistrn2(q_u->uni_user_name[i].buffer,
+                                    q_u->uni_user_name[i].uni_str_len));
+
+        /* find the user account */
+        become_root();
+        sam_pass = get_smb21pwd_entry(user_name, 0);
+        unbecome_root();
+
+        if (sam_pass == NULL)
+        {
+            status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+            rid[i] = 0;
+        }
+        else
+        {
+            rid[i] = sam_pass->user_rid;
+        }
+    }
+#endif
+
+    num_rids = 1;
+    rid[0] = BUILTIN_ALIAS_RID_USERS;
+
+    init_samr_r_lookup_ids(&r_u, num_rids, rid, NT_STATUS_NOPROBLEMO);
+
+    DEBUG(5,("_samr_lookup_ids: %d\n", __LINE__));
+
+    return r_u->status;
+}
+#endif
+
+/*******************************************************************
+ _samr_lookup_names
+ ********************************************************************/
+
+uint32 _samr_lookup_names(pipes_struct *p, SAMR_Q_LOOKUP_NAMES *q_u, SAMR_R_LOOKUP_NAMES *r_u)
+{
+    uint32 rid[MAX_SAM_ENTRIES];
+    enum SID_NAME_USE type[MAX_SAM_ENTRIES];
+    int i;
+    int num_rids = q_u->num_names1;
+    DOM_SID pol_sid;
+
+    r_u->status = NT_STATUS_NOPROBLEMO;
+
+    DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
+
+    ZERO_ARRAY(rid);
+    ZERO_ARRAY(type);
+
+    if (!get_lsa_policy_samr_sid(&q_u->pol, &pol_sid)) {
+        init_samr_r_lookup_names(p->mem_ctx, r_u, 0, NULL, NULL, NT_STATUS_OBJECT_TYPE_MISMATCH);
+        return r_u->status;
+    }
+
+    if (num_rids > MAX_SAM_ENTRIES) {
+        num_rids = MAX_SAM_ENTRIES;
+        DEBUG(5,("_samr_lookup_names: truncating entries to %d\n", num_rids));
+    }
+
+    SMB_ASSERT_ARRAY(q_u->uni_name, num_rids);
+
+    for (i = 0; i < num_rids; i++) {
+        fstring name;
+
+        r_u->status = NT_STATUS_NONE_MAPPED;
+
+        rid [i] = 0xffffffff;
+        type[i] = SID_NAME_UNKNOWN;
+
+        fstrcpy(name, dos_unistrn2(q_u->uni_name[i].buffer, q_u->uni_name[i].uni_str_len));
+
+        if(sid_equal(&pol_sid, &global_sam_sid)) {
+            DOM_SID sid;
+            if(local_lookup_name(global_myname, name, &sid, &type[i])) {
+                sid_split_rid( &sid, &rid[i]);
+                r_u->status = NT_STATUS_NOPROBLEMO;
+            }
+        }
+    }
+
+    init_samr_r_lookup_names(p->mem_ctx, r_u, num_rids, rid, type, r_u->status);
+
+    DEBUG(5,("_samr_lookup_names: %d\n", __LINE__));
+
+    return r_u->status;
+}
+
+/*******************************************************************
+ _samr_chgpasswd_user
+ ********************************************************************/
+
+uint32 _samr_chgpasswd_user(pipes_struct *p, SAMR_Q_CHGPASSWD_USER *q_u, SAMR_R_CHGPASSWD_USER *r_u)
+{
+    fstring user_name;
+    fstring wks;
+
+    DEBUG(5,("_samr_chgpasswd_user: %d\n", __LINE__));
+
+    r_u->status = NT_STATUS_NOPROBLEMO;
+
+    fstrcpy(user_name, dos_unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len));
+    fstrcpy(wks      , dos_unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len));
+
+    DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
+
+    if (!pass_oem_change(user_name, q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
+                         q_u->nt_newpass.pass, q_u->nt_oldhash.hash))
+        r_u->status = NT_STATUS_WRONG_PASSWORD;
+
+    init_samr_r_chgpasswd_user(r_u, r_u->status);
+
+    DEBUG(5,("_samr_chgpasswd_user: %d\n", __LINE__));
+
+    return r_u->status;
+}
+
+/*******************************************************************
+makes a SAMR_R_LOOKUP_RIDS structure.
+********************************************************************/
+
+static BOOL make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, fstring names[],
+	    UNIHDR **pp_hdr_name, UNISTR2 **pp_uni_name)
+{
+	uint32 i;
+	UNIHDR *hdr_name;
+	UNISTR2 *uni_name;
+
+	*pp_uni_name = NULL;
+	*pp_hdr_name = NULL;
+
+	if (num_names != 0) {
+		hdr_name = (UNIHDR *)talloc(ctx, sizeof(UNIHDR)*num_names);
+		if (hdr_name == NULL)
+			return False;
+
+		uni_name = (UNISTR2 *)talloc(ctx,sizeof(UNISTR2)*num_names);
+		if (uni_name == NULL)
+			return False;
+	}
+
+	for (i = 0; i < num_names; i++) {
+		int len = names[i] != NULL ? strlen(names[i]) : 0;
+		DEBUG(10, ("names[%d]:%s\n", i, names[i]));
+		init_uni_hdr(&hdr_name[i], len);
+		init_unistr2(&uni_name[i], names[i], len);
+	}
+
+	*pp_uni_name = uni_name;
+	*pp_hdr_name = hdr_name;
+
+	return True;
+}
+
+/*******************************************************************
+ _samr_lookup_rids
+ ********************************************************************/
+
+uint32 _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOKUP_RIDS *r_u)
+{
+	fstring group_names[MAX_SAM_ENTRIES];
+	uint32 group_attrs[MAX_SAM_ENTRIES];
+	UNIHDR *hdr_name = NULL;
+	UNISTR2 *uni_name = NULL;
+	DOM_SID pol_sid;
+	int num_rids = q_u->num_rids1;
+	int i;
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__));
+
+	/* find the policy handle.  open a policy on it. */
+	if (!get_lsa_policy_samr_sid(&q_u->pol, &pol_sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	if (num_rids > MAX_SAM_ENTRIES) {
+		num_rids = MAX_SAM_ENTRIES;
+		DEBUG(5,("_samr_lookup_rids: truncating entries to %d\n", num_rids));
+	}
+
+	r_u->status = NT_STATUS_NONE_MAPPED;
+
+	for (i = 0; i < num_rids; i++) {
+		fstring tmpname;
+		fstring domname;
+		DOM_SID sid;
+   		enum SID_NAME_USE type;
+
+		group_attrs[i] = SID_NAME_UNKNOWN;
+		*group_names[i] = '\0';
+
+		if (sid_equal(&pol_sid, &global_sam_sid)) {
+			sid_copy(&sid, &pol_sid);
+			sid_append_rid(&sid, q_u->rid[i]);
+
+			if (lookup_sid(&sid, domname, tmpname, &type)) {
+				r_u->status = NT_STATUS_NOPROBLEMO;
+				group_attrs[i] = (uint32)type;
+				fstrcpy(group_names[i],tmpname);
+			}
+		}
+	}
+
+	if(!make_samr_lookup_rids(p->mem_ctx, num_rids, group_names, &hdr_name, &uni_name))
+		return NT_STATUS_NO_MEMORY;
+
+	init_samr_r_lookup_rids(r_u, num_rids, hdr_name, uni_name, group_attrs);
+
+	DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ _api_samr_open_user
+ ********************************************************************/
+
+uint32 _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_USER *r_u)
+{
+    struct sam_passwd *sam_pass;
+    DOM_SID sid;
+    POLICY_HND domain_pol = q_u->domain_pol;
+    uint32 user_rid = q_u->user_rid;
+    POLICY_HND *user_pol = &r_u->user_pol;
+
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    /* find the domain policy handle. */
+    if (find_lsa_policy_by_hnd(&domain_pol) == -1)
+        return NT_STATUS_INVALID_HANDLE;
+
+    /* get a (unique) handle.  open a policy on it. */
+    if (!open_lsa_policy_hnd(user_pol))
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+    become_root();
+    sam_pass = getsam21pwrid(user_rid);
+    unbecome_root();
+
+    /* check that the RID exists in our domain. */
+    if (sam_pass == NULL) {
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_NO_SUCH_USER;
+    }
+
+    /* Get the domain SID stored in the domain policy */
+    if(!get_lsa_policy_samr_sid(&domain_pol, &sid)) {
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_INVALID_HANDLE;
+    }
+
+    /* append the user's RID to it */
+    if(!sid_append_rid(&sid, user_rid)) {
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_NO_SUCH_USER;
+    }
+
+    /* associate the user's SID with the handle. */
+    if (!set_lsa_policy_samr_sid(user_pol, &sid)) {
+        /* oh, whoops.  don't know what error message to return, here */
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+    }
+
+    return r_u->status;
+}
+
+/*************************************************************************
+ get_user_info_10
+ *************************************************************************/
+
+static BOOL get_user_info_10(SAM_USER_INFO_10 *id10, uint32 user_rid)
+{
+    struct smb_passwd *smb_pass;
+
+    if (!pdb_rid_is_user(user_rid)) {
+        DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+        return False;
+    }
+
+    become_root();
+    smb_pass = getsmbpwrid(user_rid);
+    unbecome_root();
+
+    if (smb_pass == NULL)
+    {
+        DEBUG(4,("User 0x%x not found\n", user_rid));
+        return False;
+    }
+
+    DEBUG(3,("User:[%s]\n", smb_pass->smb_name));
+
+    init_sam_user_info10(id10, smb_pass->acct_ctrl);
+
+    return True;
+}
+
+/*************************************************************************
+ get_user_info_12
+ *************************************************************************/
+
+static BOOL get_user_info_12(SAM_USER_INFO_12 * id12, uint32 user_rid)
+{
+    struct smb_passwd *smb_pass;
+
+	become_root();
+	smb_pass = getsmbpwrid(user_rid);
+	unbecome_root();
+
+	if (smb_pass == NULL) {
+		DEBUG(4, ("User 0x%x not found\n", user_rid));
+		return False;
+	}
+
+    DEBUG(3,("User:[%s] 0x%x\n", smb_pass->smb_name, smb_pass->acct_ctrl));
+
+	if (smb_pass->acct_ctrl & ACB_DISABLED)
+        return False;
+
+	init_sam_user_info12(id12, smb_pass->smb_passwd, smb_pass->smb_nt_passwd);
+
+	return True;
+}
+
+/*************************************************************************
+ get_user_info_21
+ *************************************************************************/
+
+static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid)
+{
+    NTTIME dummy_time;
+    struct sam_passwd *sam_pass;
+    LOGON_HRS hrs;
+    int i;
+
+    if (!pdb_rid_is_user(user_rid)) {
+        DEBUG(4,("RID 0x%x is not a user RID\n", user_rid));
+        return False;
+    }
+
+    become_root();
+    sam_pass = getsam21pwrid(user_rid);
+    unbecome_root();
+
+    if (sam_pass == NULL) {
+        DEBUG(4,("User 0x%x not found\n", user_rid));
+        return False;
+    }
+
+    DEBUG(3,("User:[%s]\n", sam_pass->smb_name));
+
+    dummy_time.low  = 0xffffffff;
+    dummy_time.high = 0x7fffffff;
+
+    DEBUG(5,("get_user_info_21 - TODO: convert unix times to NTTIMEs\n"));
+
+    /* create a LOGON_HRS structure */
+    hrs.len = sam_pass->hours_len;
+    SMB_ASSERT_ARRAY(hrs.hours, hrs.len);
+    for (i = 0; i < hrs.len; i++)
+        hrs.hours[i] = sam_pass->hours[i];
+
+    init_sam_user_info21A(id21,
+
+               &dummy_time, /* logon_time */
+               &dummy_time, /* logoff_time */
+               &dummy_time, /* kickoff_time */
+               &dummy_time, /* pass_last_set_time */
+               &dummy_time, /* pass_can_change_time */
+               &dummy_time, /* pass_must_change_time */
+
+               sam_pass->smb_name, /* user_name */
+               sam_pass->full_name, /* full_name */
+               sam_pass->home_dir, /* home_dir */
+               sam_pass->dir_drive, /* dir_drive */
+               sam_pass->logon_script, /* logon_script */
+               sam_pass->profile_path, /* profile_path */
+               sam_pass->acct_desc, /* description */
+               sam_pass->workstations, /* workstations user can log in from */
+               sam_pass->unknown_str, /* don't know, yet */
+               sam_pass->munged_dial, /* dialin info.  contains dialin path and tel no */
+
+               sam_pass->user_rid, /* RID user_id */
+               sam_pass->group_rid, /* RID group_id */
+               sam_pass->acct_ctrl,
+
+               sam_pass->unknown_3, /* unknown_3 */
+               sam_pass->logon_divs, /* divisions per week */
+               &hrs, /* logon hours */
+               sam_pass->unknown_5,
+               sam_pass->unknown_6);
+
+    return True;
+}
+
+/*******************************************************************
+ _samr_query_userinfo
+ ********************************************************************/
+
+uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_QUERY_USERINFO *r_u)
+{
+	SAM_USERINFO_CTR *ctr;
+	uint32 rid = 0;
+
+	r_u->status=NT_STATUS_NO_PROBLEMO;
+
+	/* search for the handle */
+	if (find_lsa_policy_by_hnd(&q_u->pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* find the user's rid */
+	if ((rid = get_lsa_policy_samr_rid(&q_u->pol)) == 0xffffffff)
+		return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+	DEBUG(5,("_samr_query_userinfo: rid:0x%x\n", rid));
+
+	ctr = (SAM_USERINFO_CTR *)talloc(p->mem_ctx, sizeof(SAM_USERINFO_CTR));
+	if (!ctr)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(ctr);
+
+	/* ok!  user info levels (lots: see MSDEV help), off we go... */
+	ctr->switch_value = q_u->switch_value;
+
+	switch (q_u->switch_value) {
+	case 0x10:
+		ctr->info.id10 = (SAM_USER_INFO_10 *)talloc(p->mem_ctx, sizeof(SAM_USER_INFO_10));
+		if (ctr->info.id10 == NULL)
+			return NT_STATUS_NO_MEMORY;
+
+		if (!get_user_info_10(ctr->info.id10, rid))
+			return NT_STATUS_NO_SUCH_USER;
+		break;
+
+#if 0
+/* whoops - got this wrong.  i think.  or don't understand what's happening. */
+        case 0x11:
+        {
+            NTTIME expire;
+            info = (void *)&id11;
+
+            expire.low = 0xffffffff;
+            expire.high = 0x7fffffff;
+
+            ctr->info.id = (SAM_USER_INFO_11 *)talloc(p->mem_ctx,
+                                    sizeof
+                                    (*ctr->
+                                     info.
+                                     id11));
+            init_sam_user_info11(ctr->info.id11, &expire,
+                         "BROOKFIELDS$",    /* name */
+                         0x03ef,    /* user rid */
+                         0x201, /* group rid */
+                         0x0080);   /* acb info */
+
+            break;
+        }
+#endif
+
+	case 0x12:
+		ctr->info.id12 = (SAM_USER_INFO_12 *)talloc(p->mem_ctx, sizeof(SAM_USER_INFO_12));
+		if (ctr->info.id12 == NULL)
+			return NT_STATUS_NO_MEMORY;
+
+		if (!get_user_info_12(ctr->info.id12, rid))
+			return NT_STATUS_NO_SUCH_USER;
+		break;
+
+	case 21:
+		ctr->info.id21 = (SAM_USER_INFO_21 *)talloc(p->mem_ctx,sizeof(SAM_USER_INFO_21));
+		if (ctr->info.id21 == NULL)
+			return NT_STATUS_NO_MEMORY;
+		if (!get_user_info_21(ctr->info.id21, rid))
+			return NT_STATUS_NO_SUCH_USER;
+		break;
+
+	default:
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	init_samr_r_query_userinfo(r_u, ctr, r_u->status);
+
+	DEBUG(5,("_samr_query_userinfo: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_query_usergroups
+ ********************************************************************/
+
+uint32 _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, SAMR_R_QUERY_USERGROUPS *r_u)
+{
+    struct sam_passwd *sam_pass;
+    DOM_GID *gids = NULL;
+    int num_groups = 0;
+    pstring groups;
+    uint32 rid;
+
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
+
+    /* find the policy handle.  open a policy on it. */
+    if (find_lsa_policy_by_hnd(&q_u->pol) == -1)
+        return NT_STATUS_INVALID_HANDLE;
+
+    /* find the user's rid */
+    if ((rid = get_lsa_policy_samr_rid(&q_u->pol)) == 0xffffffff)
+        return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+    become_root();
+    sam_pass = getsam21pwrid(rid);
+    unbecome_root();
+
+    if (sam_pass == NULL)
+        return NT_STATUS_NO_SUCH_USER;
+
+    get_domain_user_groups(groups, sam_pass->smb_name);
+    gids = NULL;
+    num_groups = make_dom_gids(p->mem_ctx, groups, &gids);
+
+    /* construct the response.  lkclXXXX: gids are not copied! */
+    init_samr_r_query_usergroups(r_u, num_groups, gids, r_u->status);
+
+    DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
+
+    return r_u->status;
+}
+
+/*******************************************************************
+ _samr_query_dom_info
+ ********************************************************************/
+
+uint32 _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SAMR_R_QUERY_DOMAIN_INFO *r_u)
+{
+    SAM_UNK_CTR *ctr;
+    uint16 switch_value = 0;
+
+	if ((ctr = (SAM_UNK_CTR *)talloc(p->mem_ctx, sizeof(SAM_UNK_CTR))) == NULL)
+		return NT_STATUS_NO_MEMORY;
+
+    ZERO_STRUCTP(ctr);
+
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+
+    /* find the policy handle.  open a policy on it. */
+    if (find_lsa_policy_by_hnd(&q_u->domain_pol) == -1)
+        return NT_STATUS_INVALID_HANDLE;
+
+    switch (q_u->switch_value) {
+        case 0x01:
+            switch_value = 0x1;
+            init_unk_info1(&ctr->info.inf1);
+            break;
+        case 0x02:
+            switch_value = 0x2;
+			/* The time call below is to get a sequence number for the sam. FIXME !!! JRA. */
+            init_unk_info2(&ctr->info.inf2, global_myworkgroup, global_myname, (uint32) time(NULL));
+            break;
+        case 0x03:
+            switch_value = 0x3;
+            init_unk_info3(&ctr->info.inf3);
+            break;
+        case 0x06:
+            switch_value = 0x6;
+            init_unk_info6(&ctr->info.inf6);
+            break;
+        case 0x07:
+            switch_value = 0x7;
+            init_unk_info7(&ctr->info.inf7);
+            break;
+        case 0x0c:
+            switch_value = 0xc;
+            init_unk_info12(&ctr->info.inf12);
+            break;
+        default:
+            return NT_STATUS_INVALID_INFO_CLASS;
+            break;
+    }
+
+    init_samr_r_query_dom_info(r_u, q_u->switch_value, ctr, NT_STATUS_NOPROBLEMO);
+
+    DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__));
+
+    return r_u->status;
+}
+
+/*******************************************************************
+ _api_samr_create_user
+ ********************************************************************/
+
+uint32 _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CREATE_USER *r_u)
+{
+    struct sam_passwd *sam_pass;
+    fstring mach_acct;
+    pstring err_str;
+    pstring msg_str;
+    int local_flags=0;
+    DOM_SID sid;
+    pstring add_script;
+    POLICY_HND dom_pol = q_u->domain_pol;
+    UNISTR2 user_account = q_u->uni_name;
+    uint16 acb_info = q_u->acb_info;
+    POLICY_HND *user_pol = &r_u->user_pol;
+
+    /* find the policy handle.  open a policy on it. */
+    if (find_lsa_policy_by_hnd(&dom_pol) == -1)
+        return NT_STATUS_INVALID_HANDLE;
+
+    /* find the machine account: tell the caller if it exists.
+       lkclXXXX i have *no* idea if this is a problem or not
+       or even if you are supposed to construct a different
+       reply if the account already exists...
+     */
+
+    fstrcpy(mach_acct, dos_unistrn2(user_account.buffer, user_account.uni_str_len));
+    strlower(mach_acct);
+
+    become_root();
+    sam_pass = getsam21pwnam(mach_acct);
+    unbecome_root();
+    if (sam_pass != NULL) {
+        /* machine account exists: say so */
+        return NT_STATUS_USER_EXISTS;
+    }
+
+    /* get a (unique) handle.  open a policy on it. */
+    if (!open_lsa_policy_hnd(user_pol))
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+    local_flags=LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_SET_NO_PASSWORD;
+    local_flags|= (acb_info & ACB_WSTRUST) ? LOCAL_TRUST_ACCOUNT:0;
+
+    /*
+     * NB. VERY IMPORTANT ! This call must be done as the current pipe user,
+     * *NOT* surrounded by a become_root()/unbecome_root() call. This ensures
+     * that only people with write access to the smbpasswd file will be able
+     * to create a user. JRA.
+     */
+
+    /*
+     * add the user in the /etc/passwd file or the unix authority system.
+     * We don't check if the smb_create_user() function succed or not for 2 reasons:
+     * a) local_password_change() checks for us if the /etc/passwd account really exists
+     * b) smb_create_user() would return an error if the account already exists
+     * and as it could return an error also if it can't create the account, it would be tricky.
+     *
+     * So we go the easy way, only check after if the account exists.
+     * JFM (2/3/2001), to clear any possible bad understanding (-:
+     */
+
+    pstrcpy(add_script, lp_adduser_script());
+
+    if(*add_script)
+        smb_create_user(mach_acct, NULL);
+
+    /* add the user in the smbpasswd file or the Samba authority database */
+    if (!local_password_change(mach_acct, local_flags, NULL, err_str,
+         sizeof(err_str), msg_str, sizeof(msg_str)))
+    {
+        DEBUG(0, ("%s\n", err_str));
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_ACCESS_DENIED;
+    }
+
+    become_root();
+    sam_pass = getsam21pwnam(mach_acct);
+    unbecome_root();
+    if (sam_pass == NULL) {
+        /* account doesn't exist: say so */
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_ACCESS_DENIED;
+    }
+
+    /* Get the domain SID stored in the domain policy */
+    if(!get_lsa_policy_samr_sid(&dom_pol, &sid)) {
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_INVALID_HANDLE;
+    }
+
+    /* append the user's RID to it */
+    if(!sid_append_rid(&sid, sam_pass->user_rid)) {
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_NO_SUCH_USER;
+    }
+
+    /* associate the SID with the (unique) handle. */
+    if (!set_lsa_policy_samr_sid(user_pol, &sid)) {
+        /* oh, whoops.  don't know what error message to return, here */
+        close_lsa_policy_hnd(user_pol);
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+    }
+
+    r_u->user_rid=sam_pass->user_rid;
+    r_u->unknown_0 = 0x000703ff;
+
+    return NT_STATUS_NO_PROBLEMO;
+}
+
+/*******************************************************************
+ samr_reply_connect_anon
+ ********************************************************************/
+
+uint32 _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONNECT_ANON *r_u)
+{
+    /* set up the SAMR connect_anon response */
+
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    /* get a (unique) handle.  open a policy on it. */
+    if (!open_lsa_policy_hnd(&r_u->connect_pol))
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+    /* associate the domain SID with the (unique) handle. */
+    if (!set_lsa_policy_samr_pol_status(&r_u->connect_pol, q_u->unknown_0)) {
+        close_lsa_policy_hnd(&r_u->connect_pol);
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+    }
+
+    return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_connect
+ ********************************************************************/
+
+uint32 _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u)
+{
+    DEBUG(5,("_samr_connect: %d\n", __LINE__));
+
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    /* get a (unique) handle.  open a policy on it. */
+    if (!open_lsa_policy_hnd(&r_u->connect_pol))
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+    /* associate the domain SID with the (unique) handle. */
+    if (!set_lsa_policy_samr_pol_status(&r_u->connect_pol, q_u->access_mask)) {
+        close_lsa_policy_hnd(&r_u->connect_pol);
+        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+    }
+
+    DEBUG(5,("_samr_connect: %d\n", __LINE__));
+
+    return r_u->status;
+}
+
+/**********************************************************************
+ api_samr_lookup_domain
+ **********************************************************************/
+
+uint32 _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_LOOKUP_DOMAIN *r_u)
+{
+    r_u->status = NT_STATUS_NO_PROBLEMO;
+
+    if (find_lsa_policy_by_hnd(&q_u->connect_pol) == -1)
+        return NT_STATUS_INVALID_HANDLE;
+
+    /* assume the domain name sent is our global_myname and
+       send global_sam_sid */
+    init_samr_r_lookup_domain(r_u, &global_sam_sid, r_u->status);
+
+    return r_u->status;
+}
+
+/******************************************************************
+makes a SAMR_R_ENUM_DOMAINS structure.
+********************************************************************/
+
+static BOOL make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam,
+			UNISTR2 **pp_uni_name, uint32 num_sam_entries, fstring doms[])
+{
+	uint32 i;
+	SAM_ENTRY *sam;
+	UNISTR2 *uni_name;
+
+	DEBUG(5, ("make_enum_domains\n"));
+
+	*pp_sam = NULL;
+	*pp_uni_name = NULL;
+
+	if (num_sam_entries == 0)
+		return True;
+
+	sam = (SAM_ENTRY *)talloc(ctx, sizeof(SAM_ENTRY)*num_sam_entries);
+	uni_name = (UNISTR2 *)talloc(ctx, sizeof(UNISTR2)*num_sam_entries);
+
+	if (sam == NULL || uni_name == NULL)
+		return False;
+
+	for (i = 0; i < num_sam_entries; i++) {
+		int len = doms[i] != NULL ? strlen(doms[i]) : 0;
+
+		init_sam_entry(&sam[i], len, 0);
+		init_unistr2(&uni_name[i], doms[i], len);
+	}
+
+	*pp_sam = sam;
+	*pp_uni_name = uni_name;
+
+	return True;
+}
+
+/**********************************************************************
+ api_samr_enum_domains
+ **********************************************************************/
+
+uint32 _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM_DOMAINS *r_u)
+{
+	uint32 num_entries = 2;
+	fstring dom[2];
+
+	r_u->status = NT_STATUS_NO_PROBLEMO;
+
+	fstrcpy(dom[0],global_myworkgroup);
+	fstrcpy(dom[1],"Builtin");
+
+	if (!make_enum_domains(p->mem_ctx, &r_u->sam, &r_u->uni_dom_name, num_entries, dom))
+		return NT_STATUS_NO_MEMORY;
+
+	init_samr_r_enum_domains(r_u, q_u->start_idx + num_entries, num_entries);
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ api_samr_open_alias
+ ********************************************************************/
+
+uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN_ALIAS *r_u)
+{
+	DOM_SID sid;
+	POLICY_HND domain_pol = q_u->dom_pol;
+	uint32 alias_rid = q_u->rid_alias;
+	POLICY_HND *alias_pol = &r_u->pol;
+
+	r_u->status = NT_STATUS_NO_PROBLEMO;
+
+	/* get the domain policy. */
+	if (find_lsa_policy_by_hnd(&domain_pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* get a (unique) handle.  open a policy on it. */
+	if (!open_lsa_policy_hnd(alias_pol))
+		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+	/* Get the domain SID stored in the domain policy */
+	if(!get_lsa_policy_samr_sid(&domain_pol, &sid)) {
+		close_lsa_policy_hnd(alias_pol);
+		return NT_STATUS_INVALID_HANDLE;
+	}
+
+	/*
+	 * we should check if the rid really exist !!!
+	 * JFM.
+	 */
+
+
+	/* append the alias' RID to it */
+	if(!sid_append_rid(&sid, alias_rid)) {
+		close_lsa_policy_hnd(alias_pol);
+		return NT_STATUS_NO_SUCH_USER;
+	}
+
+	/* associate a SID with the (unique) handle. */
+	if (!set_lsa_policy_samr_sid(alias_pol, &sid)) {
+		/* oh, whoops.  don't know what error message to return, here */
+		close_lsa_policy_hnd(alias_pol);
+		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+	}
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ set_user_info_10
+ ********************************************************************/
+
+static BOOL set_user_info_10(const SAM_USER_INFO_10 *id10, uint32 rid)
+{
+	struct sam_passwd *pwd = getsam21pwrid(rid);
+	struct sam_passwd new_pwd;
+
+	if (id10 == NULL) {
+		DEBUG(5, ("set_user_info_10: NULL id10\n"));
+		return False;
+	}
+
+	if (pwd == NULL)
+		return False;
+
+	copy_sam_passwd(&new_pwd, pwd);
+
+	new_pwd.acct_ctrl = id10->acb_info;
+
+	if(!mod_sam21pwd_entry(&new_pwd, True))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+ set_user_info_12
+ ********************************************************************/
+
+static BOOL set_user_info_12(SAM_USER_INFO_12 *id12, uint32 rid)
+{
+	struct sam_passwd *pwd = getsam21pwrid(rid);
+	struct sam_passwd new_pwd;
+	static uchar nt_hash[16];
+	static uchar lm_hash[16];
+
+	if (pwd == NULL)
+		return False;
+
+	if (id12 == NULL) {
+		DEBUG(2, ("set_user_info_12: id12 is NULL\n"));
+		return False;
+	}
+
+	pdb_init_sam(&new_pwd);
+	copy_sam_passwd(&new_pwd, pwd);
+
+	memcpy(nt_hash, id12->nt_pwd, sizeof(nt_hash));
+	memcpy(lm_hash, id12->lm_pwd, sizeof(lm_hash));
+
+	new_pwd.smb_passwd = lm_hash;
+	new_pwd.smb_nt_passwd = nt_hash;
+
+	if(!mod_sam21pwd_entry(&new_pwd, True))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+ set_user_info_21
+ ********************************************************************/
+
+static BOOL set_user_info_21 (SAM_USER_INFO_21 *id21, uint32 rid)
+{
+	struct sam_passwd *pwd = getsam21pwrid(rid);
+	struct sam_passwd new_pwd;
+	static uchar nt_hash[16];
+	static uchar lm_hash[16];
+
+	if (id21 == NULL) {
+		DEBUG(5, ("set_user_info_21: NULL id21\n"));
+		return False;
+	}
+
+	if (pwd == NULL)
+		return False;
+
+	pdb_init_sam(&new_pwd);
+	/* we make a copy so that we can modify stuff */	
+	copy_sam_passwd(&new_pwd, pwd);
+	copy_id21_to_sam_passwd(&new_pwd, id21);
+
+	if (pwd->smb_nt_passwd != NULL) {
+		memcpy(nt_hash, pwd->smb_nt_passwd, 16);
+		new_pwd.smb_nt_passwd = nt_hash;
+	} else
+		new_pwd.smb_nt_passwd = NULL;
+
+	if (pwd->smb_nt_passwd != NULL) {
+		memcpy(lm_hash, pwd->smb_passwd, 16);
+		new_pwd.smb_passwd = lm_hash;
+	} else
+		new_pwd.smb_passwd = NULL;
+
+	if(!mod_sam21pwd_entry(&new_pwd, True))
+		return False;
+	
+	return True;
+}
+
+/*******************************************************************
+ set_user_info_23
+ ********************************************************************/
+
+static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
+{
+	struct sam_passwd *pwd = getsam21pwrid(rid);
+	struct sam_passwd new_pwd;
+	static uchar nt_hash[16];
+	static uchar lm_hash[16];
+	pstring buf;
+	uint32 len;
+
+	if (id23 == NULL) {
+		DEBUG(5, ("set_user_info_23: NULL id23\n"));
+		return False;
+	}
+
+	if (pwd == NULL)
+		return False;
+
+	pdb_init_sam(&new_pwd);
+	copy_sam_passwd(&new_pwd, pwd);
+	copy_id23_to_sam_passwd(&new_pwd, id23);
+
+	memset(buf, 0, sizeof(pstring));
+
+	if (!decode_pw_buffer((char*)id23->pass, buf, 256, &len, nt_hash, lm_hash))
+		return False;
+
+	new_pwd.smb_passwd = lm_hash;
+	new_pwd.smb_nt_passwd = nt_hash;
+
+	/* if it's a trust account, don't update /etc/passwd */
+	if ( ( (new_pwd.acct_ctrl &  ACB_DOMTRUST) == ACB_DOMTRUST ) ||
+	     ( (new_pwd.acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
+	     ( (new_pwd.acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
+	     DEBUG(5, ("Changing trust account password, not updating /etc/passwd\n"));
+	} else {
+
+		/* update the UNIX password */
+		if (lp_unix_password_sync() )
+			if(!chgpasswd(new_pwd.smb_name, "", buf, True))
+				return False;
+	}
+
+	memset(buf, 0, sizeof(buf));
+
+	if(!mod_sam21pwd_entry(&new_pwd, True))
+		return False;
+	
+	return True;
+}
+
+/*******************************************************************
+ set_user_info_24
+ ********************************************************************/
+
+static BOOL set_user_info_24(SAM_USER_INFO_24 *id24, uint32 rid)
+{
+	struct sam_passwd *pwd = getsam21pwrid(rid);
+	struct sam_passwd new_pwd;
+	static uchar nt_hash[16];
+	static uchar lm_hash[16];
+	uint32 len;
+	pstring buf;
+
+	if (pwd == NULL)
+		return False;
+
+	pdb_init_sam(&new_pwd);
+	copy_sam_passwd(&new_pwd, pwd);
+
+	memset(buf, 0, sizeof(pstring));
+
+	if (!decode_pw_buffer((char*)id24->pass, buf, 256, &len, nt_hash, lm_hash))
+		return False;
+
+	new_pwd.smb_passwd = lm_hash;
+	new_pwd.smb_nt_passwd = nt_hash;
+	
+	/* if it's a trust account, don't update /etc/passwd */
+	if ( ( (new_pwd.acct_ctrl &  ACB_DOMTRUST) == ACB_DOMTRUST ) ||
+	     ( (new_pwd.acct_ctrl &  ACB_WSTRUST) ==  ACB_WSTRUST) ||
+	     ( (new_pwd.acct_ctrl &  ACB_SVRTRUST) ==  ACB_SVRTRUST) ) {
+	     DEBUG(5, ("Changing trust account password, not updating /etc/passwd\n"));
+	} else {
+
+		/* update the UNIX password */
+		if (lp_unix_password_sync() )
+			if(!chgpasswd(new_pwd.smb_name, "", buf, True))
+				return False;
+	}
+	
+	memset(buf, 0, sizeof(buf));
+	
+	DEBUG(5,("set_user_info_24: pdb_update_sam_account()\n"));
+
+	/* update the SAMBA password */
+	if(!mod_sam21pwd_entry(&new_pwd, True))
+		return False;
+
+	return True;
+}
+
+/*******************************************************************
+ samr_reply_set_userinfo
+ ********************************************************************/
+
+uint32 _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_USERINFO *r_u)
+{
+	uint32 rid = 0x0;
+	DOM_SID sid;
+	struct current_user user;
+	struct smb_passwd *smb_pass;
+	unsigned char sess_key[16];
+	POLICY_HND *pol = &q_u->pol;
+	uint16 switch_value = q_u->switch_value;
+	SAM_USERINFO_CTR *ctr = q_u->ctr;
+
+	DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	if (p->ntlmssp_auth_validated) 	{
+		memcpy(&user, &p->pipe_user, sizeof(user));
+	} else 	{
+		extern struct current_user current_user;
+		memcpy(&user, &current_user, sizeof(user));
+	}
+
+	/* search for the handle */
+	if (find_lsa_policy_by_hnd(pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* find the policy handle.  open a policy on it. */
+	if (!get_lsa_policy_samr_sid(pol, &sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	sid_split_rid(&sid, &rid);
+
+	DEBUG(5, ("_samr_set_userinfo: rid:0x%x, level:%d\n", rid, switch_value));
+
+	if (ctr == NULL) {
+		DEBUG(5, ("_samr_set_userinfo: NULL info level\n"));
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+
+	/* 
+	 * We need the NT hash of the user who is changing the user's password.
+	 * This NT hash is used to generate a "user session key"
+	 * This "user session key" is in turn used to encrypt/decrypt the user's password.
+	 */
+
+	become_root();
+	smb_pass = getsmbpwuid(user.uid);
+	unbecome_root();
+	if(smb_pass == NULL) {
+		DEBUG(0,("_samr_set_userinfo: Unable to get smbpasswd entry for uid %u\n", (unsigned int)user.uid ));
+		return NT_STATUS_ACCESS_DENIED;
+	}
+		
+	memset(sess_key, '\0', 16);
+	mdfour(sess_key, smb_pass->smb_nt_passwd, 16);
+
+	/* ok!  user info levels (lots: see MSDEV help), off we go... */
+	switch (switch_value) {
+		case 0x12:
+			if (!set_user_info_12(ctr->info.id12, rid))
+				return NT_STATUS_ACCESS_DENIED;
+			break;
+
+		case 24:
+			SamOEMhash(ctr->info.id24->pass, sess_key, 1);
+			if (!set_user_info_24(ctr->info.id24, rid))
+				return NT_STATUS_ACCESS_DENIED;
+			break;
+
+		case 23:
+			SamOEMhash(ctr->info.id23->pass, sess_key, 1);
+			if (!set_user_info_23(ctr->info.id23, rid))
+				return NT_STATUS_ACCESS_DENIED;
+			break;
+
+		default:
+			return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ samr_reply_set_userinfo2
+ ********************************************************************/
+
+uint32 _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SET_USERINFO2 *r_u)
+{
+	DOM_SID sid;
+	uint32 rid = 0x0;
+	SAM_USERINFO_CTR *ctr = NULL;
+	POLICY_HND *pol = &q_u->pol;
+	uint16 switch_value = q_u->switch_value;
+
+	DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
+
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	ctr = (SAM_USERINFO_CTR *)talloc(p->mem_ctx, sizeof(SAM_USERINFO_CTR));
+	if (!ctr)
+	  return NT_STATUS_NO_MEMORY;
+
+	q_u->ctr = ctr;
+
+	/* search for the handle */
+	if (find_lsa_policy_by_hnd(pol) == -1)
+		return NT_STATUS_INVALID_HANDLE;
+
+	/* find the policy handle.  open a policy on it. */
+	if (!get_lsa_policy_samr_sid(pol, &sid))
+		return NT_STATUS_INVALID_HANDLE;
+
+	sid_split_rid(&sid, &rid);
+
+	DEBUG(5, ("samr_reply_set_userinfo2: rid:0x%x\n", rid));
+
+	if (ctr == NULL) {
+		DEBUG(5, ("samr_reply_set_userinfo2: NULL info level\n"));
+		return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	ctr->switch_value = switch_value;
+
+	/* ok!  user info levels (lots: see MSDEV help), off we go... */
+	switch (switch_value) {
+		case 21:
+			if (!set_user_info_21(ctr->info.id21, rid))
+				return NT_STATUS_ACCESS_DENIED;
+			break;
+		case 16:
+			if (!set_user_info_10(ctr->info.id10, rid))
+				return NT_STATUS_ACCESS_DENIED;
+			break;
+		default:
+			return NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	return r_u->status;
+}
+
+/*********************************************************************
+ _samr_query_aliasmem
+*********************************************************************/
+
+uint32 _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, SAMR_R_QUERY_USERALIASES *r_u)
+{
+  DEBUG(0,("_samr_query_useraliases: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_query_aliasmem
+*********************************************************************/
+
+uint32 _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_R_QUERY_ALIASMEM *r_u)
+{
+  DEBUG(0,("_samr_query_aliasmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_query_groupmem
+*********************************************************************/
+
+uint32 _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_R_QUERY_GROUPMEM *r_u)
+{
+  DEBUG(0,("_samr_query_groupmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_add_aliasmem
+*********************************************************************/
+
+uint32 _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_ADD_ALIASMEM *r_u)
+{
+  DEBUG(0,("_samr_add_aliasmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_del_aliasmem
+*********************************************************************/
+
+uint32 _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DEL_ALIASMEM *r_u)
+{
+  DEBUG(0,("_samr_del_aliasmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_add_groupmem
+*********************************************************************/
+
+uint32 _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_ADD_GROUPMEM *r_u)
+{
+  DEBUG(0,("_samr_add_groupmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_del_groupmem
+*********************************************************************/
+
+uint32 _samr_del_groupmem(pipes_struct *p, SAMR_Q_DEL_GROUPMEM *q_u, SAMR_R_DEL_GROUPMEM *r_u)
+{
+  DEBUG(0,("_samr_del_groupmem: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_delete_dom_user
+*********************************************************************/
+
+uint32 _samr_delete_dom_user(pipes_struct *p, SAMR_Q_DELETE_DOM_USER *q_u, SAMR_R_DELETE_DOM_USER *r_u )
+{
+  DEBUG(0,("_samr_delete_dom_user: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_delete_dom_group
+*********************************************************************/
+
+uint32 _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, SAMR_R_DELETE_DOM_GROUP *r_u)
+{
+  DEBUG(0,("_samr_delete_dom_group: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_delete_dom_alias
+*********************************************************************/
+
+uint32 _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, SAMR_R_DELETE_DOM_ALIAS *r_u)
+{
+  DEBUG(0,("_samr_delete_dom_alias: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_create_dom_group
+*********************************************************************/
+
+uint32 _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, SAMR_R_CREATE_DOM_GROUP *r_u)
+{
+  DEBUG(0,("_samr_create_dom_group: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_create_dom_alias
+*********************************************************************/
+
+uint32 _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, SAMR_R_CREATE_DOM_ALIAS *r_u)
+{
+  DEBUG(0,("_samr_create_dom_alias: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_query_groupinfo
+*********************************************************************/
+
+uint32 _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAMR_R_QUERY_GROUPINFO *r_u)
+{
+  DEBUG(0,("_samr_query_groupinfo: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_set_groupinfo
+*********************************************************************/
+
+uint32 _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_SET_GROUPINFO *r_u)
+{
+  DEBUG(0,("_samr_set_groupinfo: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_get_dom_pwinfo
+*********************************************************************/
+
+uint32 _samr_get_dom_pwinfo(pipes_struct *p, SAMR_Q_GET_DOM_PWINFO *q_u, SAMR_R_GET_DOM_PWINFO *r_u)
+{
+  DEBUG(0,("_samr_get_dom_pwinfo: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_open_group
+*********************************************************************/
+
+uint32 _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_GROUP *r_u)
+{
+  DEBUG(0,("_samr_open_group: Not yet implemented.\n"));
+  return False;
+}
+
+/*********************************************************************
+ _samr_unknown_2d
+*********************************************************************/
+
+uint32 _samr_unknown_2d(pipes_struct *p, SAMR_Q_UNKNOWN_2D *q_u, SAMR_R_UNKNOWN_2D *r_u)
+{
+  DEBUG(0,("_samr_unknown_2d: Not yet implemented.\n"));
+  return False;
+}
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
new file mode 100644
index 0000000000..80794609ea
--- /dev/null
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -0,0 +1,866 @@
+#define OLD_NTDOMAIN 1
+/* 
+ *  Unix SMB/Netbios implementation.
+ *  Version 1.9.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-1997,
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
+ *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Jeremy Allison					2001.
+ *  
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* This is the implementation of the srvsvc pipe. */
+
+#include "includes.h"
+
+extern int DEBUGLEVEL;
+extern pstring global_myname;
+
+/*******************************************************************
+ Fill in a share info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_share_info_1(SRV_SHARE_INFO_1 *sh1, int snum)
+{
+	int len_net_name;
+	pstring net_name;
+	pstring remark;
+	uint32 type;
+
+	pstrcpy(net_name, lp_servicename(snum));
+	pstrcpy(remark, lp_comment(snum));
+	pstring_sub(remark,"%S",lp_servicename(snum));
+	len_net_name = strlen(net_name);
+
+	/* work out the share type */
+	type = STYPE_DISKTREE;
+		
+	if (lp_print_ok(snum))
+		type = STYPE_PRINTQ;
+	if (strequal("IPC$", net_name))
+		type = STYPE_IPC;
+	if (net_name[len_net_name] == '$')
+		type |= STYPE_HIDDEN;
+
+	init_srv_share_info1(&sh1->info_1, net_name, type, remark);
+	init_srv_share_info1_str(&sh1->info_1_str, net_name, remark);
+}
+
+/*******************************************************************
+ Fill in a share info level 2 structure.
+ ********************************************************************/
+
+static void init_srv_share_info_2(SRV_SHARE_INFO_2 *sh2, int snum)
+{
+	int len_net_name;
+	pstring net_name;
+	pstring remark;
+	pstring path;
+	pstring passwd;
+	uint32 type;
+
+	pstrcpy(net_name, lp_servicename(snum));
+	pstrcpy(remark, lp_comment(snum));
+	pstring_sub(remark,"%S",lp_servicename(snum));
+	pstrcpy(path, lp_pathname(snum));
+	pstrcpy(passwd, "");
+	len_net_name = strlen(net_name);
+
+	/* work out the share type */
+	type = STYPE_DISKTREE;
+		
+	if (lp_print_ok(snum))
+		type = STYPE_PRINTQ;
+	if (strequal("IPC$", net_name))
+		type = STYPE_IPC;
+	if (net_name[len_net_name] == '$')
+		type |= STYPE_HIDDEN;
+
+	init_srv_share_info2(&sh2->info_2, net_name, type, remark, 0, 0xffffffff, 1, path, passwd);
+	init_srv_share_info2_str(&sh2->info_2_str, net_name, remark, path, passwd);
+}
+
+/***************************************************************************
+ Fill in a share info level 1005 structure.
+ ***************************************************************************/
+
+static void init_srv_share_info_1005(SRV_SHARE_INFO_1005* sh1005, int snum)
+{
+	sh1005->dfs_root_flag = 0;
+
+#ifdef WITH_MSDFS
+	if(lp_host_msdfs() && lp_msdfs_root(snum))
+		sh1005->dfs_root_flag = 3;
+#endif
+
+}
+
+/*******************************************************************
+ Fill in a share info structure.
+ ********************************************************************/
+
+static BOOL init_srv_share_info_ctr(TALLOC_CTX *ctx, SRV_SHARE_INFO_CTR *ctr,
+	       uint32 info_level, uint32 *resume_hnd, uint32 *total_entries)
+{
+	int num_entries = 0;
+	int num_services = lp_numservices();
+	int snum;
+
+	DEBUG(5,("init_srv_share_info_ctr\n"));
+
+	ZERO_STRUCTPN(ctr);
+
+	ctr->info_level = ctr->switch_value = info_level;
+	*resume_hnd = 0;
+
+	/* Count the number of entries. */
+	for (snum = 0; snum < num_services; snum++) {
+		if (lp_browseable(snum) && lp_snum_ok(snum))
+			num_entries++;
+	}
+
+	*total_entries = num_entries;
+	ctr->num_entries2 = ctr->num_entries = num_entries;
+	ctr->ptr_share_info = ctr->ptr_entries = 1;
+
+	if (!num_entries)
+		return True;
+
+	switch (info_level) {
+	case 1:
+	{
+		SRV_SHARE_INFO_1 *info1;
+		int i = 0;
+
+		info1 = talloc(ctx, num_entries * sizeof(SRV_SHARE_INFO_1));
+
+		for (snum = *resume_hnd; snum < num_services; snum++) {
+			if (lp_browseable(snum) && lp_snum_ok(snum)) {
+				init_srv_share_info_1(&info1[i++], snum);
+			}
+		}
+
+		ctr->share.info1 = info1;
+		break;
+	}
+
+	case 2:
+	{
+		SRV_SHARE_INFO_2 *info2;
+		int i = 0;
+
+		info2 = talloc(ctx, num_entries * sizeof(SRV_SHARE_INFO_2));
+
+		for (snum = *resume_hnd; snum < num_services; snum++) {
+			if (lp_browseable(snum) && lp_snum_ok(snum)) {
+				init_srv_share_info_2(&info2[i++], snum);
+			}
+		}
+
+		ctr->share.info2 = info2;
+		break;
+	}
+
+	default:
+		DEBUG(5,("init_srv_share_info_ctr: unsupported switch value %d\n", info_level));
+		return False;
+	}
+
+	return True;
+}
+
+/*******************************************************************
+ Inits a SRV_R_NET_SHARE_ENUM structure.
+********************************************************************/
+
+static void init_srv_r_net_share_enum(TALLOC_CTX *ctx, SRV_R_NET_SHARE_ENUM *r_n,
+				      uint32 info_level, uint32 resume_hnd)  
+{
+	DEBUG(5,("init_srv_r_net_share_enum: %d\n", __LINE__));
+
+	if (init_srv_share_info_ctr(ctx, &r_n->ctr, info_level,
+				    &resume_hnd, &r_n->total_entries)) {
+		r_n->status = NT_STATUS_NOPROBLEMO;
+	} else {
+		r_n->status = NT_STATUS_INVALID_INFO_CLASS;
+	}
+
+	init_enum_hnd(&r_n->enum_hnd, resume_hnd);
+}
+
+/*******************************************************************
+ Inits a SRV_R_NET_SHARE_GET_INFO structure.
+********************************************************************/
+
+static void init_srv_r_net_share_get_info(SRV_R_NET_SHARE_GET_INFO *r_n,
+				  char *share_name, uint32 info_level)
+{
+	uint32 status = NT_STATUS_NOPROBLEMO;
+	int snum;
+
+	DEBUG(5,("init_srv_r_net_share_get_info: %d\n", __LINE__));
+
+	r_n->switch_value = info_level;
+
+	snum = find_service(share_name);
+
+	if (snum >= 0) {
+		switch (info_level) {
+		case 1:
+			init_srv_share_info_1(&r_n->share.info1, snum);
+			break;
+		case 2:
+			init_srv_share_info_2(&r_n->share.info2, snum);
+			break;
+		case 1005:
+			init_srv_share_info_1005(&r_n->share.info1005, snum);
+			break;
+		default:
+			DEBUG(5,("init_srv_net_share_get_info: unsupported switch value %d\n", info_level));
+			status = NT_STATUS_INVALID_INFO_CLASS;
+			break;
+		}
+	} else {
+		status = NT_STATUS_BAD_NETWORK_NAME;
+	}
+
+	r_n->ptr_share_ctr = (status == NT_STATUS_NOPROBLEMO) ? 1 : 0;
+	r_n->status = status;
+}
+
+/*******************************************************************
+ fill in a sess info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_sess_0_info(SESS_INFO_0 *se0, SESS_INFO_0_STR *str0, char *name)
+{
+	init_srv_sess_info0(se0, name);
+	init_srv_sess_info0_str(str0, name);
+}
+
+/*******************************************************************
+ fill in a sess info level 0 structure.
+ ********************************************************************/
+
+static void init_srv_sess_info_0(SRV_SESS_INFO_0 *ss0, uint32 *snum, uint32 *stot)
+{
+	uint32 num_entries = 0;
+	(*stot) = 1;
+
+	if (ss0 == NULL) {
+		(*snum) = 0;
+		return;
+	}
+
+	DEBUG(5,("init_srv_sess_0_ss0\n"));
+
+	if (snum) {
+		for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++) {
+			init_srv_sess_0_info(&ss0->info_0[num_entries],
+								 &ss0->info_0_str[num_entries], "MACHINE");
+
+			/* move on to creating next session */
+			/* move on to creating next sess */
+			num_entries++;
+		}
+
+		ss0->num_entries_read  = num_entries;
+		ss0->ptr_sess_info     = num_entries > 0 ? 1 : 0;
+		ss0->num_entries_read2 = num_entries;
+		
+		if ((*snum) >= (*stot)) {
+			(*snum) = 0;
+		}
+
+	} else {
+		ss0->num_entries_read = 0;
+		ss0->ptr_sess_info = 0;
+		ss0->num_entries_read2 = 0;
+	}
+}
+
+/*******************************************************************
+ fill in a sess info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_sess_1_info(SESS_INFO_1 *se1, SESS_INFO_1_STR *str1,
+				char *name, char *user,
+				uint32 num_opens,
+				uint32 open_time, uint32 idle_time,
+				uint32 usr_flgs)
+{
+	init_srv_sess_info1(se1 , name, user, num_opens, open_time, idle_time, usr_flgs);
+	init_srv_sess_info1_str(str1, name, user);
+}
+
+/*******************************************************************
+ fill in a sess info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_sess_info_1(SRV_SESS_INFO_1 *ss1, uint32 *snum, uint32 *stot)
+{
+	uint32 num_entries = 0;
+	(*stot) = 1;
+
+	if (ss1 == NULL) {
+		(*snum) = 0;
+		return;
+	}
+
+	DEBUG(5,("init_srv_sess_1_ss1\n"));
+
+	if (snum) {
+		for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++) {
+			init_srv_sess_1_info(&ss1->info_1[num_entries],
+								 &ss1->info_1_str[num_entries],
+			                     "MACHINE", "dummy_user", 1, 10, 5, 0);
+
+			/* move on to creating next session */
+			/* move on to creating next sess */
+			num_entries++;
+		}
+
+		ss1->num_entries_read  = num_entries;
+		ss1->ptr_sess_info     = num_entries > 0 ? 1 : 0;
+		ss1->num_entries_read2 = num_entries;
+		
+		if ((*snum) >= (*stot)) {
+			(*snum) = 0;
+		}
+
+	} else {
+		ss1->num_entries_read = 0;
+		ss1->ptr_sess_info = 0;
+		ss1->num_entries_read2 = 0;
+		
+		(*stot) = 0;
+	}
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_SESS_ENUM structure.
+********************************************************************/
+
+static uint32 init_srv_sess_info_ctr(SRV_SESS_INFO_CTR *ctr,
+				int switch_value, uint32 *resume_hnd, uint32 *total_entries)
+{
+	uint32 status = NT_STATUS_NOPROBLEMO;
+	DEBUG(5,("init_srv_sess_info_ctr: %d\n", __LINE__));
+
+	ctr->switch_value = switch_value;
+
+	switch (switch_value) {
+	case 0:
+		init_srv_sess_info_0(&(ctr->sess.info0), resume_hnd, total_entries);
+		ctr->ptr_sess_ctr = 1;
+		break;
+	case 1:
+		init_srv_sess_info_1(&(ctr->sess.info1), resume_hnd, total_entries);
+		ctr->ptr_sess_ctr = 1;
+		break;
+	default:
+		DEBUG(5,("init_srv_sess_info_ctr: unsupported switch value %d\n", switch_value));
+		(*resume_hnd) = 0;
+		(*total_entries) = 0;
+		ctr->ptr_sess_ctr = 0;
+		status = NT_STATUS_INVALID_INFO_CLASS;
+		break;
+	}
+
+	return status;
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_SESS_ENUM structure.
+********************************************************************/
+
+static void init_srv_r_net_sess_enum(SRV_R_NET_SESS_ENUM *r_n,
+				uint32 resume_hnd, int sess_level, int switch_value)  
+{
+	DEBUG(5,("init_srv_r_net_sess_enum: %d\n", __LINE__));
+
+	r_n->sess_level  = sess_level;
+
+	if (sess_level == -1)
+		r_n->status = NT_STATUS_INVALID_INFO_CLASS;
+	else
+		r_n->status = init_srv_sess_info_ctr(r_n->ctr, switch_value, &resume_hnd, &r_n->total_entries);
+
+	if (r_n->status != NT_STATUS_NOPROBLEMO)
+		resume_hnd = 0;
+
+	init_enum_hnd(&r_n->enum_hnd, resume_hnd);
+}
+
+/*******************************************************************
+ fill in a conn info level 0 structure.
+ ********************************************************************/
+
+static void init_srv_conn_info_0(SRV_CONN_INFO_0 *ss0, uint32 *snum, uint32 *stot)
+{
+	uint32 num_entries = 0;
+	(*stot) = 1;
+
+	if (ss0 == NULL) {
+		(*snum) = 0;
+		return;
+	}
+
+	DEBUG(5,("init_srv_conn_0_ss0\n"));
+
+	if (snum) {
+		for (; (*snum) < (*stot) && num_entries < MAX_CONN_ENTRIES; (*snum)++) {
+
+			init_srv_conn_info0(&ss0->info_0[num_entries], (*stot));
+
+			/* move on to creating next connection */
+			/* move on to creating next conn */
+			num_entries++;
+		}
+
+		ss0->num_entries_read  = num_entries;
+		ss0->ptr_conn_info     = num_entries > 0 ? 1 : 0;
+		ss0->num_entries_read2 = num_entries;
+		
+		if ((*snum) >= (*stot)) {
+			(*snum) = 0;
+		}
+
+	} else {
+		ss0->num_entries_read = 0;
+		ss0->ptr_conn_info = 0;
+		ss0->num_entries_read2 = 0;
+
+		(*stot) = 0;
+	}
+}
+
+/*******************************************************************
+ fill in a conn info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_conn_1_info(CONN_INFO_1 *se1, CONN_INFO_1_STR *str1,
+				uint32 id, uint32 type,
+				uint32 num_opens, uint32 num_users, uint32 open_time,
+				char *usr_name, char *net_name)
+{
+	init_srv_conn_info1(se1 , id, type, num_opens, num_users, open_time, usr_name, net_name);
+	init_srv_conn_info1_str(str1, usr_name, net_name);
+}
+
+/*******************************************************************
+ fill in a conn info level 1 structure.
+ ********************************************************************/
+
+static void init_srv_conn_info_1(SRV_CONN_INFO_1 *ss1, uint32 *snum, uint32 *stot)
+{
+	uint32 num_entries = 0;
+	(*stot) = 1;
+
+	if (ss1 == NULL) {
+		(*snum) = 0;
+		return;
+	}
+
+	DEBUG(5,("init_srv_conn_1_ss1\n"));
+
+	if (snum) {
+		for (; (*snum) < (*stot) && num_entries < MAX_CONN_ENTRIES; (*snum)++) {
+			init_srv_conn_1_info(&ss1->info_1[num_entries],
+								 &ss1->info_1_str[num_entries],
+			                     (*stot), 0x3, 1, 1, 3,"dummy_user", "IPC$");
+
+			/* move on to creating next connection */
+			/* move on to creating next conn */
+			num_entries++;
+		}
+
+		ss1->num_entries_read  = num_entries;
+		ss1->ptr_conn_info     = num_entries > 0 ? 1 : 0;
+		ss1->num_entries_read2 = num_entries;
+		
+
+		if ((*snum) >= (*stot)) {
+			(*snum) = 0;
+		}
+
+	} else {
+		ss1->num_entries_read = 0;
+		ss1->ptr_conn_info = 0;
+		ss1->num_entries_read2 = 0;
+		
+		(*stot) = 0;
+	}
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_CONN_ENUM structure.
+********************************************************************/
+
+static uint32 init_srv_conn_info_ctr(SRV_CONN_INFO_CTR *ctr,
+				int switch_value, uint32 *resume_hnd, uint32 *total_entries)
+{
+	uint32 status = NT_STATUS_NOPROBLEMO;
+	DEBUG(5,("init_srv_conn_info_ctr: %d\n", __LINE__));
+
+	ctr->switch_value = switch_value;
+
+	switch (switch_value) {
+	case 0:
+		init_srv_conn_info_0(&ctr->conn.info0, resume_hnd, total_entries);
+		ctr->ptr_conn_ctr = 1;
+		break;
+	case 1:
+		init_srv_conn_info_1(&ctr->conn.info1, resume_hnd, total_entries);
+		ctr->ptr_conn_ctr = 1;
+		break;
+	default:
+		DEBUG(5,("init_srv_conn_info_ctr: unsupported switch value %d\n", switch_value));
+		(*resume_hnd = 0);
+		(*total_entries) = 0;
+		ctr->ptr_conn_ctr = 0;
+		status = NT_STATUS_INVALID_INFO_CLASS;
+		break;
+	}
+
+	return status;
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_CONN_ENUM structure.
+********************************************************************/
+
+static void init_srv_r_net_conn_enum(SRV_R_NET_CONN_ENUM *r_n,
+				uint32 resume_hnd, int conn_level, int switch_value)  
+{
+	DEBUG(5,("init_srv_r_net_conn_enum: %d\n", __LINE__));
+
+	r_n->conn_level  = conn_level;
+	if (conn_level == -1)
+		r_n->status = NT_STATUS_INVALID_INFO_CLASS;
+	else
+		r_n->status = init_srv_conn_info_ctr(r_n->ctr, switch_value, &resume_hnd, &r_n->total_entries);
+
+	if (r_n->status != NT_STATUS_NOPROBLEMO)
+		resume_hnd = 0;
+
+	init_enum_hnd(&r_n->enum_hnd, resume_hnd);
+}
+
+/*******************************************************************
+ fill in a file info level 3 structure.
+ ********************************************************************/
+
+static void init_srv_file_3_info(FILE_INFO_3 *fl3, FILE_INFO_3_STR *str3,
+				uint32 fnum, uint32 perms, uint32 num_locks,
+				char *path_name, char *user_name)
+{
+	init_srv_file_info3(fl3 , fnum, perms, num_locks, path_name, user_name);
+	init_srv_file_info3_str(str3, path_name, user_name);
+}
+
+/*******************************************************************
+ fill in a file info level 3 structure.
+ ********************************************************************/
+
+static void init_srv_file_info_3(SRV_FILE_INFO_3 *fl3, uint32 *fnum, uint32 *ftot)
+{
+	uint32 num_entries = 0;
+	(*ftot) = 1;
+
+	if (fl3 == NULL) {
+		(*fnum) = 0;
+		return;
+	}
+
+	DEBUG(5,("init_srv_file_3_fl3\n"));
+
+	for (; (*fnum) < (*ftot) && num_entries < MAX_FILE_ENTRIES; (*fnum)++) {
+		init_srv_file_3_info(&fl3->info_3[num_entries],
+			                 &fl3->info_3_str[num_entries],
+		                     (*fnum), 0x35, 0, "\\PIPE\\samr", "dummy user");
+
+		/* move on to creating next file */
+		num_entries++;
+	}
+
+	fl3->num_entries_read  = num_entries;
+	fl3->ptr_file_info     = num_entries > 0 ? 1 : 0;
+	fl3->num_entries_read2 = num_entries;
+	
+	if ((*fnum) >= (*ftot)) {
+		(*fnum) = 0;
+	}
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_FILE_ENUM structure.
+********************************************************************/
+
+static uint32 init_srv_file_info_ctr(SRV_FILE_INFO_CTR *ctr,
+				int switch_value, uint32 *resume_hnd, uint32 *total_entries)  
+{
+	uint32 status = NT_STATUS_NOPROBLEMO;
+	DEBUG(5,("init_srv_file_info_ctr: %d\n", __LINE__));
+
+	ctr->switch_value = switch_value;
+
+	switch (switch_value) {
+	case 3:
+		init_srv_file_info_3(&ctr->file.info3, resume_hnd, total_entries);
+		ctr->ptr_file_ctr = 1;
+		break;
+	default:
+		DEBUG(5,("init_srv_file_info_ctr: unsupported switch value %d\n", switch_value));
+		(*resume_hnd = 0);
+		(*total_entries) = 0;
+		ctr->ptr_file_ctr = 0;
+		status = NT_STATUS_INVALID_INFO_CLASS;
+		break;
+	}
+
+	return status;
+}
+
+/*******************************************************************
+ makes a SRV_R_NET_FILE_ENUM structure.
+********************************************************************/
+
+static void init_srv_r_net_file_enum(SRV_R_NET_FILE_ENUM *r_n,
+				uint32 resume_hnd, int file_level, int switch_value)  
+{
+	DEBUG(5,("init_srv_r_net_file_enum: %d\n", __LINE__));
+
+	r_n->file_level  = file_level;
+	if (file_level == 0)
+		r_n->status = NT_STATUS_INVALID_INFO_CLASS;
+	else
+		r_n->status = init_srv_file_info_ctr(r_n->ctr, switch_value, &resume_hnd, &(r_n->total_entries));
+
+	if (r_n->status != NT_STATUS_NOPROBLEMO)
+		resume_hnd = 0;
+
+	init_enum_hnd(&r_n->enum_hnd, resume_hnd);
+}
+
+/*******************************************************************
+net server get info
+********************************************************************/
+
+uint32 _srv_net_srv_get_info(pipes_struct *p, SRV_Q_NET_SRV_GET_INFO *q_u, SRV_R_NET_SRV_GET_INFO *r_u)
+{
+	uint32 status = NT_STATUS_NOPROBLEMO;
+	SRV_INFO_CTR *ctr = (SRV_INFO_CTR *)talloc(p->mem_ctx, sizeof(SRV_INFO_CTR));
+
+	if (!ctr)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(ctr);
+
+	DEBUG(5,("srv_net_srv_get_info: %d\n", __LINE__));
+
+	switch (q_u->switch_value) {
+	case 102:
+		init_srv_info_102(&ctr->srv.sv102,
+		                  500, global_myname, 
+						string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH),
+		                  lp_major_announce_version(), lp_minor_announce_version(),
+		                  lp_default_server_announce(),
+		                  0xffffffff, /* users */
+		                  0xf, /* disc */
+		                  0, /* hidden */
+		                  240, /* announce */
+		                  3000, /* announce delta */
+		                  100000, /* licenses */
+		                  "c:\\"); /* user path */
+		break;
+	case 101:
+		init_srv_info_101(&ctr->srv.sv101,
+		                  500, global_myname,
+		                  lp_major_announce_version(), lp_minor_announce_version(),
+		                  lp_default_server_announce(),
+		                  string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH));
+		break;
+	default:
+		status = NT_STATUS_INVALID_INFO_CLASS;
+		break;
+	}
+
+	/* set up the net server get info structure */
+	init_srv_r_net_srv_get_info(r_u, q_u->switch_value, ctr, status);
+
+	DEBUG(5,("srv_net_srv_get_info: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+net file enum
+********************************************************************/
+
+uint32 _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u)
+{
+	r_u->ctr = (SRV_FILE_INFO_CTR *)talloc(p->mem_ctx, sizeof(SRV_FILE_INFO_CTR));
+	if (!r_u->ctr)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(r_u->ctr);
+
+	DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
+
+	/* set up the */
+	init_srv_r_net_file_enum(r_u,
+				get_enum_hnd(&q_u->enum_hnd),
+				q_u->file_level,
+				q_u->ctr->switch_value);
+
+	DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+net conn enum
+********************************************************************/
+
+uint32 _srv_net_conn_enum(pipes_struct *p, SRV_Q_NET_CONN_ENUM *q_u, SRV_R_NET_CONN_ENUM *r_u)
+{
+	DEBUG(5,("srv_net_conn_enum: %d\n", __LINE__));
+
+	r_u->ctr = (SRV_CONN_INFO_CTR *)talloc(p->mem_ctx, sizeof(SRV_CONN_INFO_CTR));
+	if (!r_u->ctr)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(r_u->ctr);
+
+	/* set up the */
+	init_srv_r_net_conn_enum(r_u,
+				get_enum_hnd(&q_u->enum_hnd),
+				q_u->conn_level,
+				q_u->ctr->switch_value);
+
+	DEBUG(5,("srv_net_conn_enum: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+net sess enum
+********************************************************************/
+
+uint32 _srv_net_sess_enum(pipes_struct *p, SRV_Q_NET_SESS_ENUM *q_u, SRV_R_NET_SESS_ENUM *r_u)
+{
+	DEBUG(5,("_srv_net_sess_enum: %d\n", __LINE__));
+
+	r_u->ctr = (SRV_SESS_INFO_CTR *)talloc(p->mem_ctx, sizeof(SRV_SESS_INFO_CTR));
+	if (!r_u->ctr)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(r_u->ctr);
+
+	/* set up the */
+	init_srv_r_net_sess_enum(r_u,
+				get_enum_hnd(&q_u->enum_hnd),
+				q_u->sess_level,
+				q_u->ctr->switch_value);
+
+	DEBUG(5,("_srv_net_sess_enum: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ Net share enum.
+********************************************************************/
+
+uint32 _srv_net_share_enum(pipes_struct *p, SRV_Q_NET_SHARE_ENUM *q_u, SRV_R_NET_SHARE_ENUM *r_u)
+{
+	DEBUG(5,("_srv_net_share_enum: %d\n", __LINE__));
+
+	/* Create the list of shares for the response. */
+	init_srv_r_net_share_enum(p->mem_ctx, r_u,
+				q_u->ctr.info_level,
+				get_enum_hnd(&q_u->enum_hnd));
+
+	DEBUG(5,("_srv_net_share_enum: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+ Net share get info.
+********************************************************************/
+
+uint32 _srv_net_share_get_info(pipes_struct *p, SRV_Q_NET_SHARE_GET_INFO *q_u, SRV_R_NET_SHARE_GET_INFO *r_u)
+{
+	char *share_name;
+
+	DEBUG(5,("_srv_net_share_get_info: %d\n", __LINE__));
+
+	/* Create the list of shares for the response. */
+	share_name = dos_unistr2_to_str(&q_u->uni_share_name);
+	init_srv_r_net_share_get_info(r_u, share_name, q_u->info_level);
+
+	DEBUG(5,("_srv_net_share_get_info: %d\n", __LINE__));
+
+	return r_u->status;
+}
+
+/*******************************************************************
+time of day
+********************************************************************/
+
+uint32 _srv_net_remote_tod(pipes_struct *p, SRV_Q_NET_REMOTE_TOD *q_u, SRV_R_NET_REMOTE_TOD *r_u)
+{
+	TIME_OF_DAY_INFO *tod;
+	struct tm *t;
+	time_t unixdate = time(NULL);
+
+	tod = (TIME_OF_DAY_INFO *)talloc(p->mem_ctx, sizeof(TIME_OF_DAY_INFO));
+	if (!tod)
+		return NT_STATUS_NO_MEMORY;
+
+	ZERO_STRUCTP(tod);
+ 
+	r_u->tod = tod;
+	r_u->ptr_srv_tod = 0x1;
+	r_u->status = NT_STATUS_NOPROBLEMO;
+
+	DEBUG(5,("_srv_net_remote_tod: %d\n", __LINE__));
+
+	t = gmtime(&unixdate);
+
+	/* set up the */
+	init_time_of_day_info(tod,
+	                      unixdate,
+	                      0,
+	                      t->tm_hour,
+	                      t->tm_min,
+	                      t->tm_sec,
+	                      0,
+	                      TimeDiff(unixdate)/60,
+	                      10000,
+	                      t->tm_mday,
+	                      t->tm_mon + 1,
+	                      1900+t->tm_year,
+	                      t->tm_wday);
+	
+	DEBUG(5,("_srv_net_remote_tod: %d\n", __LINE__));
+
+	return r_u->status;
+}
+#undef OLD_NTDOMAIN