The jf_get_sampasswd_entries() is not used anymore.

Jeremy.
(This used to be commit bf1816099707b816c9b62ad5ab794dc49b833181)

1 files changed, 0 insertions, 335 deletions

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3f63df660b..b6ed81407d 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -311,341 +311,6 @@ static NTSTATUS get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
 		return NT_STATUS_OK;
 }
 
-static NTSTATUS jf_get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx,
-                                int *total_entries, uint32 *num_entries,
-                                int max_num_entries, uint16 acb_mask)
-{
-	SAM_ACCOUNT *pwd = NULL;
-	BOOL not_finished = True;
-
-	*num_entries = 0;
-	*total_entries = 0;
-
-	if (pw_buf == NULL)
-		return NT_STATUS_NO_MEMORY;
-	
-	DEBUG(10,("jf_get_sampwd_entries: start index:%d, max entries:%d, mask:%d\n", 
-		start_idx, max_num_entries, acb_mask));
-
-	if (!pdb_setsampwent(False)) {
-		DEBUG(0, ("jf_get_sampwd_entries: Unable to open passdb.\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	pdb_init_sam(&pwd);
-
-	while (((not_finished = pdb_getsampwent(pwd)) != False) && (*num_entries) < max_num_entries) {
-		int user_name_len;
-		int full_name_len;
-
-		if (acb_mask != 0 && !(pdb_get_acct_ctrl(pwd) & acb_mask)) {
-			pdb_reset_sam(pwd);
-			continue;
-		}
-
-		if (start_idx > 0) {
-			/* skip the requested number of entries.
-			   not very efficient, but hey...
-			*/
-			start_idx--;
-			pdb_reset_sam(pwd);
-			continue;
-		}
-
-		ZERO_STRUCTP(&pw_buf[(*num_entries)]);
-
-		user_name_len = strlen(pdb_get_username(pwd));
-		init_unistr2(&pw_buf[(*num_entries)].uni_user_name, pdb_get_username(pwd), user_name_len);
-		init_uni_hdr(&pw_buf[(*num_entries)].hdr_user_name, user_name_len);
-
-		full_name_len = strlen(pdb_get_fullname(pwd));
-		init_unistr2(&pw_buf[(*num_entries)].uni_full_name, pdb_get_fullname(pwd), full_name_len);
-		init_uni_hdr(&pw_buf[(*num_entries)].hdr_full_name, full_name_len);
-
-		pw_buf[(*num_entries)].user_rid = pdb_get_user_rid(pwd);
-		memset((char *)pw_buf[(*num_entries)].nt_pwd, '\0', 16);
-
-		/* Now check if the NT compatible password is available. */
-		if (pdb_get_nt_passwd(pwd))
-			memcpy( pw_buf[(*num_entries)].nt_pwd , pdb_get_nt_passwd(pwd), 16);
-
-		pw_buf[(*num_entries)].acb_info = pdb_get_acct_ctrl(pwd);
-
-		DEBUG(5, ("entry idx: %d user %s, rid 0x%x, acb %x\n", (*num_entries),
-                  pdb_get_username(pwd), pdb_get_user_rid(pwd), pdb_get_acct_ctrl(pwd) ));
-
-		(*num_entries)++;
-		
-		pdb_reset_sam(pwd);
-	}
-
-	pdb_endsampwent();
-
-	*total_entries = *num_entries;
-	
-	pdb_free_sam(&pwd);
-
-	if (not_finished)
-		return STATUS_MORE_ENTRIES;
-	else
-		return NT_STATUS_OK;
-}
-
-#if 0 /* This function appears to be unused! */
-
-/*******************************************************************
- 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);
-	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_m(unixname,'=');
-
-		if (!dosname)
-			continue;
-
-		*dosname++ = 0;
-
-		while (isspace(*unixname))
-			unixname++;
-		if ('!' == *unixname) {
-			unixname++;
-			while (*unixname && isspace(*unixname))
-				unixname++;
-		}
-    
-		if (!*unixname || strchr_m("#;",*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_m("@&+", *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;
-}
-
-#endif /* Unused function */
-
-#if 0 /* This function seems to be not used anywhere! */
-
-/*******************************************************************
- 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_m(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;
-}
-
-#endif /* Unused function */
-
 /*******************************************************************
  _samr_close_hnd
  ********************************************************************/